diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/AllClassGroupsListingController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/AllClassGroupsListingController.java index e9706f0c0..ae246712b 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/AllClassGroupsListingController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/AllClassGroupsListingController.java @@ -28,17 +28,8 @@ public class AllClassGroupsListingController extends BaseEditController { private static final long serialVersionUID = 1L; - public void doGet(HttpServletRequest request, HttpServletResponse response) { - - if(!checkLoginStatus(request,response)) - return; - - try { - super.doGet(request, response); - } catch (Throwable t) { - t.printStackTrace(); - } - + @Override + public void doGet(HttpServletRequest request, HttpServletResponse response) { VitroRequest vreq = new VitroRequest(request); Portal portal = vreq.getPortal(); @@ -56,9 +47,7 @@ public class AllClassGroupsListingController extends BaseEditController { results.add("XX"); if (groups != null) { - Iterator groupsIt = groups.iterator(); - while (groupsIt.hasNext()) { - VClassGroup vcg = (VClassGroup) groupsIt.next(); + for(VClassGroup vcg: groups) { results.add("XX"); String publicName = vcg.getPublicName(); if ( StringUtils.isBlank(publicName) ) { @@ -82,7 +71,7 @@ public class AllClassGroupsListingController extends BaseEditController { results.add("@@entities"); Iterator classIt = classList.iterator(); while (classIt.hasNext()) { - VClass vcw = (VClass) classIt.next(); + VClass vcw = classIt.next(); results.add("XX"); if (vcw.getName() != null && vcw.getURI() != null) { try { diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ClassHierarchyListingController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ClassHierarchyListingController.java index 0ba5810e8..2ea6fa15b 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ClassHierarchyListingController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ClassHierarchyListingController.java @@ -48,19 +48,12 @@ public class ClassHierarchyListingController extends BaseEditController { private VClassDao vcDao = null; - public void doGet(HttpServletRequest request, HttpServletResponse response) { + @Override + public void doGet(HttpServletRequest request, HttpServletResponse response) { VitroRequest vrequest = new VitroRequest(request); Portal portal = vrequest.getPortal(); try { - - try { - super.doGet(request, response); - } catch (Exception e) { - log.error("Exception calling super.doGet() from "+this.getClass().getName()+":"); - e.printStackTrace(); - } - boolean inferred = (vrequest.getParameter("inferred") != null); if (vrequest.getAssertionsWebappDaoFactory() != null && !inferred) { @@ -69,7 +62,7 @@ public class ClassHierarchyListingController extends BaseEditController { vcDao = vrequest.getFullWebappDaoFactory().getVClassDao(); } - ArrayList results = new ArrayList(); + ArrayList results = new ArrayList(); results.add("XX"); // column 1 results.add("class"); // column 2 results.add("shortdef"); // column 3 @@ -83,7 +76,7 @@ public class ClassHierarchyListingController extends BaseEditController { String ontologyUri = request.getParameter("ontologyUri"); String startClassUri = request.getParameter("vclassUri"); - List roots = null; + List roots = null; if (ontologyUri != null) { roots = vcDao.getOntologyRootClasses(ontologyUri); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/DataPropertyHierarchyListingController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/DataPropertyHierarchyListingController.java index f95320d22..e2e590378 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/DataPropertyHierarchyListingController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/DataPropertyHierarchyListingController.java @@ -48,24 +48,18 @@ public class DataPropertyHierarchyListingController extends BaseEditController { private PropertyGroupDao pgDao = null; private DatatypeDao dDao = null; - public void doGet(HttpServletRequest request, HttpServletResponse response) { + @Override + public void doGet(HttpServletRequest request, HttpServletResponse response) { VitroRequest vrequest = new VitroRequest(request); Portal portal = vrequest.getPortal(); try { - try { - super.doGet(request, response); - } catch (Exception e) { - log.error("Exception calling super.doGet() from "+this.getClass().getName()+":"); - e.printStackTrace(); - } - dpDao = vrequest.getAssertionsWebappDaoFactory().getDataPropertyDao(); vcDao = vrequest.getAssertionsWebappDaoFactory().getVClassDao(); pgDao = vrequest.getAssertionsWebappDaoFactory().getPropertyGroupDao(); dDao = vrequest.getAssertionsWebappDaoFactory().getDatatypeDao(); - ArrayList results = new ArrayList(); + ArrayList results = new ArrayList(); results.add("XX"); // column 1 results.add("property"); // column 2 results.add("domain vclass"); // column 3 @@ -79,7 +73,7 @@ public class DataPropertyHierarchyListingController extends BaseEditController { String ontologyUri = request.getParameter("ontologyUri"); String startPropertyUri = request.getParameter("propertyUri"); - List roots = null; + List roots = null; if (startPropertyUri != null) { roots = new LinkedList(); @@ -92,7 +86,7 @@ public class DataPropertyHierarchyListingController extends BaseEditController { } if (roots!=null) { - Iterator rootIt = roots.iterator(); + Iterator rootIt = roots.iterator(); if (!rootIt.hasNext()) { DataProperty dp = new DataProperty(); dp.setURI(ontologyUri+"fake"); @@ -102,7 +96,7 @@ public class DataPropertyHierarchyListingController extends BaseEditController { results.addAll(addDataPropertyDataToResultsList(dp,0,ontologyUri)); } else { while (rootIt.hasNext()) { - DataProperty root = (DataProperty) rootIt.next(); + DataProperty root = rootIt.next(); if ( (ontologyUri==null) || ( (ontologyUri!=null) && (root.getNamespace()!=null) && (ontologyUri.equals(root.getNamespace())) ) ) { ArrayList childResults = new ArrayList(); addChildren(root, childResults, 0, ontologyUri); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ObjectPropertyHierarchyListingController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ObjectPropertyHierarchyListingController.java index 68046ebd5..badcc6498 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ObjectPropertyHierarchyListingController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ObjectPropertyHierarchyListingController.java @@ -46,23 +46,17 @@ public class ObjectPropertyHierarchyListingController extends BaseEditController private VClassDao vcDao = null; private PropertyGroupDao pgDao = null; - public void doGet(HttpServletRequest request, HttpServletResponse response) { + @Override + public void doGet(HttpServletRequest request, HttpServletResponse response) { VitroRequest vrequest = new VitroRequest(request); Portal portal = vrequest.getPortal(); try { - try { - super.doGet(request, response); - } catch (Exception e) { - log.error("Exception calling super.doGet() from "+this.getClass().getName()+":"); - e.printStackTrace(); - } - opDao = vrequest.getAssertionsWebappDaoFactory().getObjectPropertyDao(); vcDao = vrequest.getAssertionsWebappDaoFactory().getVClassDao(); pgDao = vrequest.getAssertionsWebappDaoFactory().getPropertyGroupDao(); - ArrayList results = new ArrayList(); + ArrayList results = new ArrayList(); results.add("XX"); // column 1 results.add("property"); // column 2 results.add("domain vclass"); // column 3 @@ -76,7 +70,7 @@ public class ObjectPropertyHierarchyListingController extends BaseEditController String ontologyUri = request.getParameter("ontologyUri"); String startPropertyUri = request.getParameter("propertyUri"); - List roots = null; + List roots = null; if (startPropertyUri != null) { roots = new LinkedList(); @@ -89,7 +83,7 @@ public class ObjectPropertyHierarchyListingController extends BaseEditController } if (roots!=null) { - Iterator rootIt = roots.iterator(); + Iterator rootIt = roots.iterator(); if (!rootIt.hasNext()) { ObjectProperty op = new ObjectProperty(); op.setURI(ontologyUri+"fake"); @@ -98,7 +92,7 @@ public class ObjectPropertyHierarchyListingController extends BaseEditController results.addAll(addObjectPropertyDataToResultsList(op,0,ontologyUri)); } else { while (rootIt.hasNext()) { - ObjectProperty root = (ObjectProperty) rootIt.next(); + ObjectProperty root = rootIt.next(); if ( (ontologyUri==null) || ( (ontologyUri!=null) && (root.getNamespace()!=null) && (ontologyUri.equals(root.getNamespace())) ) ) { ArrayList childResults = new ArrayList(); addChildren(root, childResults, 0, ontologyUri); diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/OntologiesListingController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/OntologiesListingController.java index 7239d340e..e0c0055e9 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/OntologiesListingController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/OntologiesListingController.java @@ -27,12 +27,6 @@ public class OntologiesListingController extends BaseEditController { VitroRequest vrequest = new VitroRequest(request); Portal portal = vrequest.getPortal(); - try { - super.doGet(request, response); - } catch (Throwable t) { - t.printStackTrace(); - } - //need to figure out how to structure the results object to put the classes underneath String noResultsMsgStr = "No ontologies found"; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/PropertyGroupsListingController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/PropertyGroupsListingController.java index 51a3feae8..1408543b2 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/PropertyGroupsListingController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/PropertyGroupsListingController.java @@ -28,14 +28,8 @@ import edu.cornell.mannlib.vitro.webapp.dao.PropertyGroupDao; @RequiresAuthorizationFor(UseOntologyEditorPages.class) public class PropertyGroupsListingController extends BaseEditController { + @Override public void doGet(HttpServletRequest request, HttpServletResponse response) { - - try { - super.doGet(request, response); - } catch (Throwable t) { - t.printStackTrace(); - } - VitroRequest vrequest = new VitroRequest(request); Portal portal = vrequest.getPortal(); @@ -43,9 +37,9 @@ public class PropertyGroupsListingController extends BaseEditController { PropertyGroupDao dao = vrequest.getFullWebappDaoFactory().getPropertyGroupDao(); - List groups = dao.getPublicGroups(true); + List groups = dao.getPublicGroups(true); - ArrayList results = new ArrayList(); + ArrayList results = new ArrayList(); results.add("XX"); results.add("Group"); results.add("Public description"); @@ -139,12 +133,13 @@ public class PropertyGroupsListingController extends BaseEditController { } - private class PropertyGroupDisplayComparator implements Comparator { - public int compare (Object o1, Object o2) { + private class PropertyGroupDisplayComparator implements Comparator { + @Override + public int compare (PropertyGroup o1, PropertyGroup o2) { try { - int diff = ((PropertyGroup)o1).getDisplayRank() - ((PropertyGroup)o2).getDisplayRank(); + int diff = o1.getDisplayRank() - o2.getDisplayRank(); if (diff==0) { - return ((PropertyGroup)o1).getName().compareToIgnoreCase(((PropertyGroup)o2).getName()); + return o1.getName().compareToIgnoreCase(o2.getName()); } return diff; } catch (Exception e) {