litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

VIVO-459 change "show classes with restrictions on this property" to use languageNeutralWebappDaoFactory when finding classes

Browse source
This commit is contained in:
brianjlowe 2013-11-04 13:32:57 -05:00
parent 878c00027e
commit be6bbdea6f
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListDatatypePropertiesController.java
View file

@ -64,7 +64,9 @@ public class ListDatatypePropertiesController extends FreemarkerHttpServlet {
List<DataProperty> props = new ArrayList<DataProperty>(); List<DataProperty> props = new ArrayList<DataProperty>();
if (vreq.getParameter("propsForClass") != null) { if (vreq.getParameter("propsForClass") != null) {
noResultsMsgStr = "There are no data properties that apply to this class."; noResultsMsgStr = "There are no data properties that apply to this class.";
Collection <DataProperty> dataProps = dao.getDataPropertiesForVClass(vreq.getParameter("vclassUri")); Collection <DataProperty> dataProps = vreq.getLanguageNeutralWebappDaoFactory()
.getDataPropertyDao().getDataPropertiesForVClass(
vreq.getParameter("vclassUri"));
Iterator<DataProperty> dataPropIt = dataProps.iterator(); Iterator<DataProperty> dataPropIt = dataProps.iterator();
HashSet<String> propURIs = new HashSet<String>(); HashSet<String> propURIs = new HashSet<String>();
while (dataPropIt.hasNext()) { while (dataPropIt.hasNext()) {

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListPropertyWebappsController.java
View file

@ -59,7 +59,7 @@ public class ListPropertyWebappsController extends FreemarkerHttpServlet {
String ontologyUri = vreq.getParameter("ontologyUri"); String ontologyUri = vreq.getParameter("ontologyUri");
ObjectPropertyDao dao = vreq.getUnfilteredWebappDaoFactory().getObjectPropertyDao(); ObjectPropertyDao dao = vreq.getUnfilteredWebappDaoFactory().getObjectPropertyDao();
PropertyInstanceDao piDao = vreq.getUnfilteredWebappDaoFactory().getPropertyInstanceDao(); PropertyInstanceDao piDao = vreq.getLanguageNeutralWebappDaoFactory().getPropertyInstanceDao();
VClassDao vcDao = vreq.getUnfilteredWebappDaoFactory().getVClassDao(); VClassDao vcDao = vreq.getUnfilteredWebappDaoFactory().getVClassDao();
PropertyGroupDao pgDao = vreq.getUnfilteredWebappDaoFactory().getPropertyGroupDao(); PropertyGroupDao pgDao = vreq.getUnfilteredWebappDaoFactory().getPropertyGroupDao();

2
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ListVClassWebappsController.java
View file

@ -51,7 +51,7 @@ public class ListVClassWebappsController extends FreemarkerHttpServlet {
List<VClass> classes = null; List<VClass> classes = null;
if (vreq.getParameter("showPropertyRestrictions") != null) { if (vreq.getParameter("showPropertyRestrictions") != null) {
PropertyDao pdao = vreq.getUnfilteredWebappDaoFactory().getObjectPropertyDao(); PropertyDao pdao = vreq.getLanguageNeutralWebappDaoFactory().getObjectPropertyDao();
classes = pdao.getClassesWithRestrictionOnProperty(vreq.getParameter("propertyURI")); classes = pdao.getClassesWithRestrictionOnProperty(vreq.getParameter("propertyURI"));
} else { } else {
VClassDao vcdao = vreq.getUnfilteredWebappDaoFactory().getVClassDao(); VClassDao vcdao = vreq.getUnfilteredWebappDaoFactory().getVClassDao();