Merge commit '495982ddab1b22ff1c5e49ae5acece7c4cc699e8' into develop

This commit is contained in:
brianjlowe 2013-12-02 16:23:54 -05:00
commit 345f713f0d

View file

@ -143,24 +143,25 @@ public class VclassEditController extends BaseEditController {
// if supported, we want to show only the asserted superclasses and subclasses. // if supported, we want to show only the asserted superclasses and subclasses.
VClassDao vcDao = ModelAccess.on(getServletContext()).getBaseWebappDaoFactory().getVClassDao(); VClassDao vcDao = ModelAccess.on(getServletContext()).getBaseWebappDaoFactory().getVClassDao();
VClassDao displayVcDao = ModelAccess.on(getServletContext()).getWebappDaoFactory().getVClassDao();
List<VClass> superVClasses = getVClassesForURIList( List<VClass> superVClasses = getVClassesForURIList(
vcDao.getSuperClassURIs(vcl.getURI(),false), vcDao); vcDao.getSuperClassURIs(vcl.getURI(),false), displayVcDao);
sortForPickList(superVClasses, request); sortForPickList(superVClasses, request);
request.setAttribute("superclasses",superVClasses); request.setAttribute("superclasses",superVClasses);
List<VClass> subVClasses = getVClassesForURIList( List<VClass> subVClasses = getVClassesForURIList(
vcDao.getSubClassURIs(vcl.getURI()), vcDao); vcDao.getSubClassURIs(vcl.getURI()), displayVcDao);
sortForPickList(subVClasses, request); sortForPickList(subVClasses, request);
request.setAttribute("subclasses",subVClasses); request.setAttribute("subclasses",subVClasses);
List<VClass> djVClasses = getVClassesForURIList( List<VClass> djVClasses = getVClassesForURIList(
vcDao.getDisjointWithClassURIs(vcl.getURI()), vcDao); vcDao.getDisjointWithClassURIs(vcl.getURI()), displayVcDao);
sortForPickList(djVClasses, request); sortForPickList(djVClasses, request);
request.setAttribute("disjointClasses",djVClasses); request.setAttribute("disjointClasses",djVClasses);
List<VClass> eqVClasses = getVClassesForURIList( List<VClass> eqVClasses = getVClassesForURIList(
vcDao.getEquivalentClassURIs(vcl.getURI()), vcDao); vcDao.getEquivalentClassURIs(vcl.getURI()), displayVcDao);
sortForPickList(eqVClasses, request); sortForPickList(eqVClasses, request);
request.setAttribute("equivalentClasses",eqVClasses); request.setAttribute("equivalentClasses",eqVClasses);