From 12e6af44f560aeef5d4eb7befe8c9913b514dd22 Mon Sep 17 00:00:00 2001
From: j2blake <j2blake@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Sun, 17 Jul 2011 13:59:53 +0000
Subject: [PATCH] Clarify login in fillDataPropertiesForIndividual by using
 generic-types on collections, and converting to new-style for loops.

---
 .../webapp/dao/jena/DataPropertyDaoJena.java  | 35 ++++++++-----------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJena.java
index ce01884eb..f9ae4080f 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJena.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/DataPropertyDaoJena.java
@@ -59,10 +59,9 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements
     
     protected static final Log log = LogFactory.getLog(DataPropertyDaoJena.class.getName());
     
-    private class DataPropertyRanker implements Comparator {
-        public int compare (Object o1, Object o2) {
-            DataProperty dp1 = (DataProperty) o1;
-            DataProperty dp2 = (DataProperty) o2;
+    private class DataPropertyRanker implements Comparator<DataProperty> {
+        @Override
+		public int compare (DataProperty dp1, DataProperty dp2) {
             int diff = dp1.getDisplayTier() - dp2.getDisplayTier();
             if (diff==0)
                 return dp1.getPublicName().compareTo(dp2.getPublicName());
@@ -127,22 +126,23 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements
         removeABoxStatementsWithPredicate(URI);
     }
 
-    public void fillDataPropertiesForIndividual(Individual entity) {
+    @Override
+	public void fillDataPropertiesForIndividual(Individual entity) {
         if( entity == null ) return;
-        List dataprops = new ArrayList();
+        List<DataProperty> dataprops = new ArrayList<DataProperty>();
         dataprops.addAll( getDataPropertyStatements(entity.getDataPropertyStatements()) );
         entity.setDatatypePropertyList(dataprops);
     }
 
-    private List getDataPropertyStatements(List dataPropertyStmts) {
-        if( dataPropertyStmts == null || dataPropertyStmts.size() < 1) return new ArrayList();
-        HashMap hash = new HashMap();
-        String uris ="";
-        Iterator it = dataPropertyStmts.iterator();
-        while(it.hasNext()){
-            DataPropertyStatement dataPropertyStmt = (DataPropertyStatement)it.next();
+    private List<DataProperty> getDataPropertyStatements(List<DataPropertyStatement> dataPropertyStmts) {
+		if (dataPropertyStmts == null || dataPropertyStmts.isEmpty()) {
+			return new ArrayList<DataProperty>();
+		}
+
+		HashMap<String, DataProperty> hash = new HashMap<String, DataProperty>();
+        for (DataPropertyStatement dataPropertyStmt: dataPropertyStmts) {
             if (hash.containsKey(dataPropertyStmt.getDatapropURI())) {
-                DataProperty p = (DataProperty) hash.get(dataPropertyStmt.getDatapropURI());
+                DataProperty p = hash.get(dataPropertyStmt.getDatapropURI());
                 p.addDataPropertyStatement(dataPropertyStmt);
             } else {
             	OntModel ontModel = getOntModelSelector().getTBoxModel();
@@ -160,12 +160,7 @@ public class DataPropertyDaoJena extends PropertyDaoJena implements
             }
         }
 
-        List dataprops = new ArrayList();
-        Iterator keyIt = hash.keySet().iterator();
-        while (keyIt.hasNext()) {
-            Object key = keyIt.next();
-            dataprops.add(hash.get(key));
-        }
+        List<DataProperty> dataprops = new ArrayList<DataProperty>(hash.values());
         Collections.sort(dataprops, new DataPropertyRanker());
         return dataprops;
     }