Minor code improvements

api/src/main/java/edu/cornell/mannlib/vedit/util/FormUtils.java

@@ -73,12 +73,11 @@ public class FormUtils {
 
         Method[] meths = beanClass.getMethods();
 
-        for (int i=0; i<meths.length; i++) {
+        for (Method currMeth : meths) {
 
-            if (meths[i].getName().indexOf("set") == 0) {
+            if (currMeth.getName().indexOf("set") == 0) {
 
                 // we have a setter method
-                Method currMeth = meths[i];
                 Class[] currMethParamTypes = currMeth.getParameterTypes();
                 Class currMethType = currMethParamTypes[0];
 
@@ -91,9 +90,6 @@ public class FormUtils {
 
                     //see if there's something in the bean using
                     //the related getter method
-
-                    Class[] paramClass = new Class[1];
-                    paramClass[0] = currMethType;
                     try {
                         Method getter = beanClass.getMethod(
                                 "get" + elementName, (Class[]) null);
@@ -107,8 +103,7 @@ public class FormUtils {
                         if (existingData != null) {
                             if (existingData instanceof String) {
                                 value += existingData;
-                            }
+                            } else if (!(existingData instanceof Integer
-                            else if (!(existingData instanceof Integer 
                                     && (Integer) existingData < 0)) {
                                 value += existingData.toString();
                             }
@@ -375,8 +370,8 @@ public class FormUtils {
     public static Map beanParamMapFromString(String params) {
         String[] param = params.split(";");
         Map beanParamMap = new HashMap();
-        for (int i=0; i<param.length; i++) {
+        for (String aParam : param) {
-            String[] p = param[i].split(":");
+            String[] p = aParam.split(":");
             beanParamMap.put(p[0], new String(Base64.decodeBase64(p[1].getBytes())));
         }
         return beanParamMap;

api/src/main/java/edu/cornell/mannlib/vedit/util/Stemmer.java

@@ -549,8 +549,8 @@ class Stemmer
    {
       char[] w = new char[501];
       Stemmer s = new Stemmer();
-      for (int i = 0; i < args.length; i++) {
+       for (String arg : args) {
-    	  System.out.println( StemString( args[i], 100 ));
+           System.out.println(StemString(arg, 100));
        }
    }
 }

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/Controllers.java

@@ -73,8 +73,8 @@ public class Controllers {
         if (Controllers.letters == null) {
             char c[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ".toCharArray();
             Controllers.letters = new ArrayList<String>(c.length);
-            for (int i = 0; i < c.length; i++) {
+            for (char aC : c) {
-                letters.add("" + c[i]);
+                letters.add("" + aC);
             }
         }
         return Controllers.letters;

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesOperationController.java

@@ -72,17 +72,17 @@ public class Classes2ClassesOperationController extends BaseEditController {
 	                if ((subclassURIstrs != null) && (subclassURIstrs.length > 1)) {
 	                    String superclassURIstr = request.getParameter("SuperclassURI");
 	                    if (superclassURIstr != null) {
-	                        for (int i=0; i<subclassURIstrs.length; i++) {
+                            for (String subclassURIstr : subclassURIstrs) {
                                 switch (modeStr) {
                                     case "disjointWith":
-                                        vcDao.removeDisjointWithClass(superclassURIstr, subclassURIstrs[i]);
+                                        vcDao.removeDisjointWithClass(superclassURIstr, subclassURIstr);
                                         break;
                                     case "equivalentClass":
-                                        vcDao.removeEquivalentClass(superclassURIstr, subclassURIstrs[i]);
+                                        vcDao.removeEquivalentClass(superclassURIstr, subclassURIstr);
                                         break;
                                     default:
                                         Classes2Classes c2c = new Classes2Classes();
-                                        c2c.setSubclassURI(subclassURIstrs[i]);
+                                        c2c.setSubclassURI(subclassURIstr);
                                         c2c.setSuperclassURI(superclassURIstr);
                                         vcDao.deleteClasses2Classes(c2c);
                                         break;
@@ -93,17 +93,17 @@ public class Classes2ClassesOperationController extends BaseEditController {
 	                    String subclassURIstr = subclassURIstrs[0];
 	                    String[] superclassURIstrs = request.getParameterValues("SuperclassURI");
 	                    if (superclassURIstrs != null) {
-	                        for (int i=0; i<superclassURIstrs.length; i++) {
+                            for (String superclassURIstr : superclassURIstrs) {
                                 switch (modeStr) {
                                     case "disjointWith":
-                                        vcDao.removeDisjointWithClass(superclassURIstrs[i], subclassURIstr);
+                                        vcDao.removeDisjointWithClass(superclassURIstr, subclassURIstr);
                                         break;
                                     case "equivalentClass":
-                                        vcDao.removeEquivalentClass(subclassURIstr, superclassURIstrs[i]);
+                                        vcDao.removeEquivalentClass(subclassURIstr, superclassURIstr);
                                         break;
                                     default:
                                         Classes2Classes c2c = new Classes2Classes();
-                                        c2c.setSuperclassURI(superclassURIstrs[i]);
+                                        c2c.setSuperclassURI(superclassURIstr);
                                         c2c.setSubclassURI(subclassURIstr);
                                         vcDao.deleteClasses2Classes(c2c);
                                         break;

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityEditController.java

@@ -211,7 +211,7 @@ public class EntityEditController extends BaseEditController {
 
     public void doPost (HttpServletRequest request, HttpServletResponse response) {
     	log.trace("Please don't POST to the "+this.getClass().getName()+". Use GET instead as there should be no change of state.");
-        doPost(request,response);
+        doGet(request,response);
     }
 
 }

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/IndividualTypeOperationController.java

@@ -67,8 +67,8 @@ public class IndividualTypeOperationController extends BaseEditController {
 	                String[] typeURIstrs = request.getParameterValues("TypeURI");
 	                String individualURIstr = request.getParameter("individualURI");
 	                    if (individualURIstr != null) {
-	                        for (int i=0; i<typeURIstrs.length; i++) {                        	
+                            for (String typeURIstr : typeURIstrs) {
-	                            dao.removeVClass(individualURIstr, typeURIstrs[i]);
+                                dao.removeVClass(individualURIstr, typeURIstr);
                             }
 	                    }
 	            } else if (request.getParameter("operation").equals("add")) {

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/IndividualTypeRetryController.java

@@ -60,8 +60,7 @@ public class IndividualTypeRetryController extends BaseEditController {
 	    sortForPickList(allVClasses, vreq);
 			
 		Set<String> prohibitedURIset = new HashSet<String>();
-		for (Iterator<VClass> indClassIt = ind.getVClasses(false).iterator(); indClassIt.hasNext(); ) {
+		for (VClass vc : ind.getVClasses(false)) {
-			VClass vc = indClassIt.next();
 			if (vc.isAnonymous()) {
 				continue;
 			}

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesOperationController.java

@@ -128,11 +128,11 @@ public class Properties2PropertiesOperationController extends
             if ((subpropertyURIstrs != null) && (subpropertyURIstrs.length > 1)) {
                 String superpropertyURIstr = request.getParameter("SuperpropertyURI");
                 if (superpropertyURIstr != null) {
-                    for (int i=0; i<subpropertyURIstrs.length; i++) {
+					for (String subpropertyURIstr : subpropertyURIstrs) {
 						if (modeStr.equals("equivalentProperty")) {
-                    		opDao.removeEquivalentProperty(superpropertyURIstr, subpropertyURIstrs[i]);
+							opDao.removeEquivalentProperty(superpropertyURIstr, subpropertyURIstr);
 						} else {
-                    		opDao.removeSuperproperty(subpropertyURIstrs[i], superpropertyURIstr);
+							opDao.removeSuperproperty(subpropertyURIstr, superpropertyURIstr);
 						}
 					}
                 }
@@ -140,11 +140,11 @@ public class Properties2PropertiesOperationController extends
                 String subpropertyURIstr = subpropertyURIstrs[0];
                 String[] superpropertyURIstrs = request.getParameterValues("SuperpropertyURI");
                 if (superpropertyURIstrs != null) {
-                    for (int i=0; i<superpropertyURIstrs.length; i++) {
+					for (String superpropertyURIstr : superpropertyURIstrs) {
 						if (modeStr.equals("equivalentProperty")) {
-                        	opDao.removeEquivalentProperty(subpropertyURIstr,superpropertyURIstrs[i]);
+							opDao.removeEquivalentProperty(subpropertyURIstr, superpropertyURIstr);
 						} else {
-                        	opDao.removeSuperproperty(subpropertyURIstr,superpropertyURIstrs[i]);
+							opDao.removeSuperproperty(subpropertyURIstr, superpropertyURIstr);
 						}
 					}
                 }

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/RefactorOperationController.java

@@ -141,9 +141,8 @@ public class RefactorOperationController extends BaseEditController {
 											results.add("    With:      "+goodState.toString());
 											fixed++;
 										}
-										for(int i = 0; i<queue.size(); i++)
+										for (Statement aQueue : queue) {
-										{
+											ontModel.add(aQueue);
-											ontModel.add(queue.get(i));
 										}
 										ontModel.remove(toRemove);
 										badStatements.close();
@@ -267,9 +266,9 @@ public class RefactorOperationController extends BaseEditController {
 		if ( (refererStr = epo.getReferer()) != null) {
 			String controllerStr = null;
 			String[] controllers = {"entityEdit", "propertyEdit", "datapropEdit", "ontologyEdit", "vclassEdit"};
-			for (int i=0; i<controllers.length; i++) {
+			for (String controller : controllers) {
-				if (refererStr.indexOf(controllers[i]) > -1) {
+				if (refererStr.indexOf(controller) > -1) {
-					controllerStr = controllers[i];
+					controllerStr = controller;
 				}
 			}
 			if (controllerStr != null) {

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassEditController.java

@@ -100,12 +100,12 @@ public class VclassEditController extends BaseEditController {
         
         boolean foundComment = false;
         StringBuffer commSb = null;
-        for (Iterator<String> commIt = request.getUnfilteredWebappDaoFactory().getCommentsForResource(vcl.getURI()).iterator(); commIt.hasNext();) { 
+        for (String s : request.getUnfilteredWebappDaoFactory().getCommentsForResource(vcl.getURI())) {
             if (commSb == null) {
                 commSb = new StringBuffer();
                 foundComment = true;
             }
-            commSb.append(commIt.next()).append(" ");
+            commSb.append(s).append(" ");
         }
         if (!foundComment) {
             commSb = new StringBuffer("no comments yet");

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/DataPropertyStatementListingController.java

@@ -83,9 +83,9 @@ public class DataPropertyStatementListingController extends BaseEditController {
         
         int count = 0;
 
-        for (Iterator<DataPropertyStatement> i = dpsDao.getDataPropertyStatements(dp,startAt,endAt).iterator(); i.hasNext();) {
+       for (DataPropertyStatement dataPropertyStatement : dpsDao.getDataPropertyStatements(dp, startAt, endAt)) {
            count++;
-        	DataPropertyStatement dps = i.next();
+           DataPropertyStatement dps = dataPropertyStatement;
            Individual subj = iDao.getIndividualByURI(dps.getIndividualURI());
            results.add("XX");
            results.add(ListingControllerWebUtils.formatIndividualLink(subj));

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ObjectPropertyStatementListingController.java

@@ -115,9 +115,9 @@ public class ObjectPropertyStatementListingController extends
         int count = 0;
 
 
-        for (Iterator<ObjectPropertyStatement> i = opsDao.getObjectPropertyStatements(op,startAt,endAt).iterator(); i.hasNext();) {
+       for (ObjectPropertyStatement objectPropertyStatement : opsDao.getObjectPropertyStatements(op, startAt, endAt)) {
            count++;
-        	ObjectPropertyStatement ops = i.next();
+           ObjectPropertyStatement ops = objectPropertyStatement;
            Individual subj = iDao.getIndividualByURI(ops.getSubjectURI());
            Individual obj = iDao.getIndividualByURI(ops.getObjectURI());
            results.add("XX");

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/GrefinePropertyListServlet.java

@@ -84,8 +84,7 @@ public class GrefinePropertyListServlet extends VitroHttpServlet {
 				ObjectNode completeJson = JsonNodeFactory.instance.objectNode();
 				ArrayNode propertiesJsonArr = JsonNodeFactory.instance.arrayNode();
 				if (classPropertiesMap.size() > 0) {
-					for (Iterator<VClass> iter = classPropertiesMap.keySet().iterator(); iter.hasNext();) { // add results to schema
+					for (VClass vc : classPropertiesMap.keySet()) { // add results to schema
-						VClass vc = (VClass) iter.next();
 						//System.out.println("vc uri: " + vc.getURI());
 						//System.out.println("vc name: " + vc.getName());	
 
@@ -148,8 +147,7 @@ public class GrefinePropertyListServlet extends VitroHttpServlet {
 					HashMap<VClass, List<DataProperty>> lvl2ClassPropertiesMap = 
 						populateClassPropertiesMap(vcDao, dao, lvl2Class.getURI(), propURIs);	
 					if (lvl2ClassPropertiesMap.size() > 0) {
-						for (Iterator<VClass> iter = lvl2ClassPropertiesMap.keySet().iterator(); iter.hasNext();) { // add results to schema
+						for (VClass vc : lvl2ClassPropertiesMap.keySet()) { // add results to schema
-							VClass vc = (VClass) iter.next();
 							ArrayList<DataProperty> vcProps = (ArrayList<DataProperty>) lvl2ClassPropertiesMap.get(vc);
 							for (DataProperty prop : vcProps) {
 								String nameStr = prop.getPublicName() == null ? prop.getName() : prop.getPublicName();

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/JSONReconcileServlet.java

@@ -134,8 +134,7 @@ public class JSONReconcileServlet extends VitroHttpServlet {
 		}
 
 		try {
-			for (int i = 0; i < queries.size(); i++) {
+			for (String queryStr : queries) {
-				String queryStr = queries.get(i);
 				ObjectMapper mapper = new ObjectMapper();
 				JsonNode json = mapper.readTree(queryStr);
 
@@ -218,10 +217,10 @@ public class JSONReconcileServlet extends VitroHttpServlet {
 			}
 			// process and add to json defaultTypes
 			ArrayNode defaultTypesJsonArr = JsonNodeFactory.instance.arrayNode();
-			for (int i = 0; i<idNameArray.length; i++) {
+			for (String[] anIdNameArray : idNameArray) {
 				ObjectNode defaultTypesJson = JsonNodeFactory.instance.objectNode();
-				defaultTypesJson.put("id", idNameArray[i][0].trim());
+				defaultTypesJson.put("id", anIdNameArray[0].trim());
-				defaultTypesJson.put("name", idNameArray[i][1].trim());
+				defaultTypesJson.put("name", anIdNameArray[1].trim());
 				defaultTypesJsonArr.add(defaultTypesJson);
 			}
 			json.put("defaultTypes", defaultTypesJsonArr);

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaAdminActions.java

@@ -230,8 +230,7 @@ public class JenaAdminActions extends BaseEditController {
     				}
     			}
     		}
-    		for (Iterator<Statement> removeIt = statementsToRemove.iterator(); removeIt.hasNext(); ) {
+			for (Statement stmt : statementsToRemove) {
-    			Statement stmt = removeIt.next();
 				memoryModel.remove(stmt);
 			}
     	} finally {

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java

@@ -304,8 +304,8 @@ public class JenaIngestController extends BaseEditController {
             // there's got to be a better way to do this
             byte[] badCharBytes = String.valueOf(cece.getBadChar()).getBytes();
             StringBuilder errorMsg = new StringBuilder("Cannot encode character with byte values: (decimal) ");
-            for (int i=0; i<badCharBytes.length; i++) {
+            for (byte badCharByte : badCharBytes) {
-                errorMsg.append(badCharBytes[i]);
+                errorMsg.append(badCharByte);
             }
             throw new RuntimeException(errorMsg.toString(), cece);
         } catch (Exception e) {
@@ -344,8 +344,8 @@ public class JenaIngestController extends BaseEditController {
         JenaIngestUtils utils = new JenaIngestUtils();
         if(sourceModel != null && sourceModel.length != 0) {
             List<Model> sourceModelList = new ArrayList<Model>();
-            for (int i = 0; i < sourceModel.length ; i++) {
+            for (String aSourceModel : sourceModel) {
-                Model m = maker.getModel(sourceModel[i]);
+                Model m = maker.getModel(aSourceModel);
                 if (m != null) {
                     sourceModelList.add(m);
                 }
@@ -740,8 +740,7 @@ public class JenaIngestController extends BaseEditController {
                     files = new File[1];
                     files[0] = file;
                 }
-                for (int i=0; i<files.length; i++) {
+                for (File currentFile : files) {
-                    File currentFile = files[i];
                     log.info("Reading file " + currentFile.getName());
                     FileInputStream fis;
                     try {
@@ -794,8 +793,8 @@ public class JenaIngestController extends BaseEditController {
             source.addSubModel(
                     (Model) vreq.getSession().getAttribute("csv2rdfResult")); 
         } else {
-            for (int i=0; i<sourceModel.length; i++) {
+            for (String aSourceModel : sourceModel) {
-                Model m = getModel(sourceModel[i],vreq);
+                Model m = getModel(aSourceModel, vreq);
                 source.addSubModel(m);
             }
         }
@@ -825,8 +824,8 @@ public class JenaIngestController extends BaseEditController {
     private void doSmushSingleModel(VitroRequest vreq) {
         OntModel source = ModelFactory.createOntologyModel(OntModelSpec.OWL_DL_MEM);
         String[] sourceModel = vreq.getParameterValues("sourceModelName");
-        for (int i=0; i<sourceModel.length; i++) {
+        for (String aSourceModel : sourceModel) {
-            Model m = getModel(sourceModel[i],vreq);
+            Model m = getModel(aSourceModel, vreq);
             source.addSubModel(m);
         }
         Model destination = getModel(vreq.getParameter("destinationModelName"),vreq);
@@ -845,8 +844,8 @@ public class JenaIngestController extends BaseEditController {
 		OntModel jenaOntModel = ModelAccess.on(getServletContext()).getOntModel();
         OntModel source = ModelFactory.createOntologyModel(OntModelSpec.OWL_DL_MEM);
         String[] sourceModel = vreq.getParameterValues("sourceModelName");
-        for (int i=0; i<sourceModel.length; i++) {
+        for (String aSourceModel : sourceModel) {
-            Model m = getModel(sourceModel[i],vreq);
+            Model m = getModel(aSourceModel, vreq);
             source.addSubModel(m);
         }
         Model destination = getModel(vreq.getParameter("destinationModelName"),vreq); 
@@ -924,8 +923,8 @@ public class JenaIngestController extends BaseEditController {
     public void doGenerateTBox(VitroRequest vreq) {
         OntModel source = ModelFactory.createOntologyModel(OntModelSpec.OWL_DL_MEM);
         String[] sourceModel = vreq.getParameterValues("sourceModelName");
-        for (int i=0; i<sourceModel.length; i++) {
+        for (String aSourceModel : sourceModel) {
-            Model m = getModel(sourceModel[i],vreq);
+            Model m = getModel(aSourceModel, vreq);
             source.addSubModel(m);
         }
         String destinationModelStr = vreq.getParameter("destinationModelName");
@@ -1025,13 +1024,13 @@ public class JenaIngestController extends BaseEditController {
                         char[] cleanChars = new char[chars.length];
                         int cleanPos = 0;
                         boolean badChar = false;
-                        for (int i=0; i<chars.length; i++) {
+                        for (char aChar : chars) {
-                            if (java.lang.Character.getNumericValue(chars[i])>31 && java.lang.Character.isDefined(chars[i])) {
+                            if (Character.getNumericValue(aChar) > 31 && Character.isDefined(aChar)) {
-                                cleanChars[cleanPos] = chars[i];
+                                cleanChars[cleanPos] = aChar;
                                 cleanPos++;
                             } else {
                                 log.error("Bad char in " + lex);
-                                log.error("Numeric value " + java.lang.Character.getNumericValue(chars[i])); 
+                                log.error("Numeric value " + Character.getNumericValue(aChar));
                                 badChar = true;
                             }
                         }

api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadController.java

@@ -393,8 +393,7 @@ public class RDFUploadController extends JenaIngestController {
                     files = new File[1];
                     files[0] = file;
                 }
-                for (int i=0; i<files.length; i++) {
+                for (File currentFile : files) {
-                    File currentFile = files[i];
                     log.debug("Reading file " + currentFile.getName());
                     try {
                         readIntoModel(fileStream.getInputStream(), language,

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/WebappDaoFactoryConfig.java

@@ -58,7 +58,7 @@ public class WebappDaoFactoryConfig {
 	}
 	
 	public Map<FullPropertyKey, String> getCustomListViewConfigFileMap() {
-	    return this.getCustomListViewConfigFileMap();    
+	    return customListViewConfigFileMap;
 	}
 	
     public void setCustomListViewConfigFileMap(

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoJena.java

@@ -236,8 +236,7 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao {
                 }
                 List<VClass> vclasses = ent.getVClasses(false);
                 if (vclasses != null) {
-                    for (Iterator<VClass> typeIt = vclasses.iterator(); typeIt.hasNext(); ) {
+                    for (VClass vc : vclasses) {
-                        VClass vc = typeIt.next();
                         ind.addRDFType(ResourceFactory.createResource(vc.getURI()));
                     }
                 }
@@ -316,24 +315,21 @@ public class IndividualDaoJena extends JenaBaseDao implements IndividualDao {
                     if (vcl == null) {
                         conservativeTypeDeletion = true; // if the bean has null here instead of an empty list, we don't want to trust it and just start deleting any existing types.  So we'll just update the Vitro flag-related types and leave the rest alone.
                     } else {
-                        for (Iterator<VClass> typeIt = vcl.iterator(); typeIt.hasNext(); ) {
+                        for (VClass vc : vcl) {
-                            VClass vc = typeIt.next();
                             newTypeURIsSet.add(vc.getURI());
                         }
                     }
                 } catch (Exception e) {
                     log.error(e, e);
                 }
-                for (Iterator<String> oldIt = oldTypeURIsSet.iterator(); oldIt.hasNext();) {
+                for (String uri : oldTypeURIsSet) {
-                    String uri = oldIt.next();
                     if (!newTypeURIsSet.contains(uri)) {
                         if ((!conservativeTypeDeletion) || (uri.indexOf(VitroVocabulary.vitroURI) == 0)) {
                             ind.removeRDFType(ResourceFactory.createResource(uri));
                         }
                     }
                 }
-                for (Iterator<String> newIt = newTypeURIsSet.iterator(); newIt.hasNext();) {
+                for (String uri : newTypeURIsSet) {
-                    String uri = newIt.next();
                     if (!oldTypeURIsSet.contains(uri)) {
                         ind.addRDFType(ResourceFactory.createResource(uri));
                     }

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualJena.java

@@ -348,8 +348,7 @@ public class IndividualJena extends IndividualImpl implements Individual {
     		if (this.propertyList == null) {
     			getObjectPropertyList();
     		}
-    		for (Iterator i = this.propertyList.iterator(); i.hasNext();) { 
+			for (ObjectProperty op : this.propertyList) {
-    			ObjectProperty op = (ObjectProperty) i.next();
 				if (op.getURI() != null) {
 					map.put(op.getURI(), op);
 				}
@@ -402,8 +401,7 @@ public class IndividualJena extends IndividualImpl implements Individual {
     		if (this.datatypePropertyList == null) {
     			getDataPropertyList();
     		}
-    		for (Iterator i = this.datatypePropertyList.iterator(); i.hasNext();) { 
+			for (DataProperty dp : this.datatypePropertyList) {
-    			DataProperty dp = (DataProperty) i.next();
 				if (dp.getURI() != null) {
 					map.put(dp.getURI(), dp);
 				}

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualSDB.java

@@ -602,8 +602,7 @@ public class IndividualSDB extends IndividualImpl implements Individual {
     		if (this.propertyList == null) {
     			getObjectPropertyList();
     		}
-    		for (Iterator i = this.propertyList.iterator(); i.hasNext();) { 
+			for (ObjectProperty op : this.propertyList) {
-    			ObjectProperty op = (ObjectProperty) i.next();
 				if (op.getURI() != null) {
 					map.put(op.getURI(), op);
 				}
@@ -660,8 +659,7 @@ public class IndividualSDB extends IndividualImpl implements Individual {
     		if (this.datatypePropertyList == null) {
     			getDataPropertyList();
     		}
-    		for (Iterator i = this.datatypePropertyList.iterator(); i.hasNext();) { 
+			for (DataProperty dp : this.datatypePropertyList) {
-    			DataProperty dp = (DataProperty) i.next();
 				if (dp.getURI() != null) {
 					map.put(dp.getURI(), dp);
 				}

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaModelUtils.java

@@ -93,9 +93,7 @@ public class JenaModelUtils {
             try {                    
                 List<VClass> rootClasses = myWebappDaoFactory.getVClassDao()
                         .getRootClasses();
-                for (Iterator<VClass> rootClassIt = rootClasses.iterator(); 
+                for (VClass rootClass : rootClasses) {
-                        rootClassIt.hasNext(); ) {
-                    VClass rootClass = rootClassIt.next();	                    
                     Individual classGroup = modelForClassgroups.createIndividual(
                             wadf.getDefaultNamespace() + "vitroClassGroup" +
                                     rootClass.getLocalName(), classGroupClass);
@@ -105,10 +103,8 @@ public class JenaModelUtils {
                             rootClass.getURI());
                     modelForClassgroupAnnotations.add(
                             rootClassRes, inClassGroupProperty, classGroup);
-                    for (Iterator<String> childIt = myWebappDaoFactory.getVClassDao()
+                    for (String childURI : myWebappDaoFactory.getVClassDao()
-                            .getAllSubClassURIs(rootClass.getURI()).iterator(); 
+                            .getAllSubClassURIs(rootClass.getURI())) {
-                            childIt.hasNext(); ) {
-                        String childURI = childIt.next();
                         Resource childClass = modelForClassgroupAnnotations
                                 .getResource(childURI);
                         if (!modelForClassgroupAnnotations.contains(

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyDaoJena.java

@@ -310,9 +310,8 @@ public class PropertyDaoJena extends JenaBaseDao implements PropertyDao {
 	}
 
     @Override
-	public void removeEquivalentProperty(Property property,
+	public void removeEquivalentProperty(Property property, Property equivalentProperty) {
-			Property equivalentProperty) {
+		removeEquivalentProperty(property.getURI(), equivalentProperty.getURI());
-		removeEquivalentProperty(property, equivalentProperty);
 	}
 	
 	protected void removeABoxStatementsWithPredicate(Property predicate) {

api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactorySDB.java

@@ -115,29 +115,29 @@ public class WebappDaoFactorySDB extends WebappDaoFactoryJena {
 	public static String getFilterBlock(String[] graphVars, 
 	                                    SDBDatasetMode datasetMode) {
 	    StringBuilder filterBlock = new StringBuilder();
-	    for (int i = 0; i < graphVars.length; i++) {
+		for (String graphVar : graphVars) {
 			switch (datasetMode) {
 				case ASSERTIONS_ONLY:
 					filterBlock.append("FILTER (")
-	                        .append("(!bound(").append(graphVars[i])
+							.append("(!bound(").append(graphVar)
 							.append(")) || (")
-	                        .append(graphVars[i])
+							.append(graphVar)
 							.append(" != <")
 							.append(ModelNames.ABOX_INFERENCES)
 							.append("> ")
-	                        .append("&& ").append(graphVars[i]).append(" != <")
+							.append("&& ").append(graphVar).append(" != <")
 							.append(ModelNames.TBOX_INFERENCES)
 							.append(">")
 							.append(") ) \n");
 					break;
 				case INFERENCES_ONLY:
 					filterBlock.append("FILTER (")
-                        .append("(!bound(").append(graphVars[i])
+							.append("(!bound(").append(graphVar)
 							.append(")) || (")
-                        .append(graphVars[i])
+							.append(graphVar)
 							.append(" = <")
 							.append(ModelNames.ABOX_INFERENCES)
-                        .append("> || ").append(graphVars[i])
+							.append("> || ").append(graphVar)
 							.append(" = <")
 							.append(ModelNames.TBOX_INFERENCES)
 							.append(">) )\n");

api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/listener/impl/IndividualDataPropertyStatementProcessor.java

@@ -45,7 +45,7 @@ public class IndividualDataPropertyStatementProcessor implements ChangeListener
         while (dpmIt.hasNext()) {
             String key = (String) dpmIt.next();
             String[] data = (String[])dpm.get(key);
-            for (int dataRow=0; dataRow<data.length; ++dataRow){
+            for (String aData : data) {
                 String[] keyArg = key.split("_");
                 String rowId = keyArg[2];
                 DataPropertyStatement dataPropertyStmt = new DataPropertyStatementImpl();
@@ -64,7 +64,7 @@ public class IndividualDataPropertyStatementProcessor implements ChangeListener
                 } catch (Exception e) {
                     log.error("Messed up beanParamMap?");
                 }
-                dataPropertyStmt.setData(data[dataRow]);
+                dataPropertyStmt.setData(aData);
                 Individual individual = null;
                 // need to rethink this
                 if (((Individual) epo.getOriginalBean()).getURI() != null) {

api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaVClassOptions.java

@@ -28,9 +28,9 @@ public class IndividualsViaVClassOptions implements FieldOptions {
             throw new Exception("vclassURIs must not be null or empty ");
                 
         this.vclassURIs = new ArrayList<String>(vclassURIs.length);
-        for(int i=0;i<vclassURIs.length;i++){
+        for (String vclassURI : vclassURIs) {
-            if( vclassURIs[i] != null && !vclassURIs[i].trim().isEmpty() )
+            if (vclassURI != null && !vclassURI.trim().isEmpty())
-                this.vclassURIs.add(vclassURIs[i]);
+                this.vclassURIs.add(vclassURI);
         }                              
     }
 

api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/RdfTypeOptions.java

@@ -32,8 +32,7 @@ public class RdfTypeOptions implements FieldOptions {
             WebappDaoFactory wdf) {        
         Map<String,String> uriToLabel = new HashMap<String,String>();
 
-        for(int i=0;i<typeURIs.length; i++){
+        for (String uri : typeURIs) {
-            String uri = typeURIs[i];
             VClass vc = wdf.getVClassDao().getVClassByURI(uri);
             if (vc == null) {
                 uriToLabel.put(uri, uri);

api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultAddMissingIndividualFormGenerator.java

@@ -43,13 +43,6 @@ public class DefaultAddMissingIndividualFormGenerator implements EditConfigurati
 	private String template = "defaultAddMissingIndividualForm.ftl";
 	private static String createCommand = "create";
 	protected static String objectVarName = "newIndividual";
-	private static HashMap<String,String> defaultsForXSDtypes ;
-
-	static {
-		defaultsForXSDtypes = new HashMap<String,String>();
-		//defaultsForXSDtypes.put("http://www.w3.org/2001/XMLSchema#dateTime","2001-01-01T12:00:00");
-		defaultsForXSDtypes.put("http://www.w3.org/2001/XMLSchema#dateTime","#Unparseable datetime defaults to now");
-	}
 
 	//Method which checks whether this particular generator should be employed
 	public static final boolean isCreateNewIndividual(VitroRequest vreq, HttpSession session) {

api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultDeleteGenerator.java

@@ -29,12 +29,6 @@ public class DefaultDeleteGenerator extends BaseEditConfigurationGenerator imple
 	private DataPropertyStatement dps = null;
 	private String dataLiteral = null;
 	private String template = "confirmDeletePropertyForm.ftl";
-	private static HashMap<String,String> defaultsForXSDtypes ;
-	  static {
-		defaultsForXSDtypes = new HashMap<String,String>();
-		//defaultsForXSDtypes.put("http://www.w3.org/2001/XMLSchema#dateTime","2001-01-01T12:00:00");
-		defaultsForXSDtypes.put("http://www.w3.org/2001/XMLSchema#dateTime","#Unparseable datetime defaults to now");
-	  }
 
 	//In this case, simply return the edit configuration currently saved in session
 	//Since this is forwarding from another form, an edit configuration should already exist in session

api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultObjectPropertyFormGenerator.java

@@ -68,14 +68,6 @@ public class DefaultObjectPropertyFormGenerator implements EditConfigurationGene
 	protected long maxNonACRangeIndividualCount = 300;
 	protected String customErrorMessages = null;
 	
-	private static HashMap<String,String> defaultsForXSDtypes ;
-	  static {
-		defaultsForXSDtypes = new HashMap<String,String>();
-		//defaultsForXSDtypes.put("http://www.w3.org/2001/XMLSchema#dateTime","2001-01-01T12:00:00");
-		defaultsForXSDtypes.put("http://www.w3.org/2001/XMLSchema#dateTime","#Unparseable datetime defaults to now");
-	  }
-	  
-	  
     @Override
     public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
             HttpSession session) throws Exception {

api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/NewIndividualFormGenerator.java

@@ -36,13 +36,6 @@ public class NewIndividualFormGenerator implements EditConfigurationGenerator {
 		
 	private String template = "newIndividualForm.ftl";
 	
-	private static HashMap<String,String> defaultsForXSDtypes ;
-	static {
-		defaultsForXSDtypes = new HashMap<String,String>();
-		//defaultsForXSDtypes.put("http://www.w3.org/2001/XMLSchema#dateTime","2001-01-01T12:00:00");
-		defaultsForXSDtypes.put("http://www.w3.org/2001/XMLSchema#dateTime","#Unparseable datetime defaults to now");
-	}
-	  
     @Override
     public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession session) {
     	EditConfigurationVTwo editConfiguration = new EditConfigurationVTwo();

api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/VitroURL.java

@@ -120,9 +120,9 @@ class VitroURL {
             if (len>0) {
                 String[] temp = new String[len];
                 int tempI = 0;
-                for (int i=0; i<splitStr.length; i++) {
+                for (String aSplitStr : splitStr) {
-                    if (!splitStr[i].equals("")) {
+                    if (!aSplitStr.equals("")) {
-                        temp[tempI] = splitStr[i];
+                        temp[tempI] = aSplitStr;
                         tempI++;
                     }
                 }

api/src/main/java/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/RDFServiceImpl.java

@@ -350,27 +350,23 @@ public abstract class RDFServiceImpl implements RDFService {
     @Override
     public long countTriples(RDFNode subject, RDFNode predicate, RDFNode object) throws RDFServiceException {
         StringBuilder whereClause = new StringBuilder();
-        StringBuilder orderBy = new StringBuilder();
 
         if ( subject != null ) {
             appendNode(whereClause.append(' '), subject);
         } else {
             whereClause.append(" ?s");
-            orderBy.append(" ?s");
         }
 
         if ( predicate != null ) {
             appendNode(whereClause.append(' '), predicate);
         } else {
             whereClause.append(" ?p");
-            orderBy.append(" ?p");
         }
 
         if ( object != null ) {
             appendNode(whereClause.append(' '), object);
         } else {
             whereClause.append(" ?o");
-            orderBy.append(" ?o");
         }
 
         long estimate = -1;

api/src/main/java/edu/cornell/mannlib/vitro/webapp/servlet/setup/UpdateKnowledgeBase.java

@@ -508,8 +508,8 @@ public class UpdateKnowledgeBase {
 					"containing RDF files.");
 		}
 		File[] rdfFiles = directory.listFiles();
-		for (int i = 0; i < rdfFiles.length; i++) {
+		for (File rdfFile : rdfFiles) {
-			readFile(rdfFiles[i], om, directoryPath);
+			readFile(rdfFile, om, directoryPath);
 		}
 		return om;
 	}

api/src/main/java/edu/cornell/mannlib/vitro/webapp/sparql/GetClazzAllProperties.java

@@ -147,8 +147,8 @@ public class GetClazzAllProperties extends BaseEditController {
 		respo.append("<options>");
 		Object[] keys = hm.keySet().toArray();
 		Arrays.sort(keys);
-		for (int i = 0; i < keys.length; i++) {
+		for (Object key1 : keys) {
-			String key = (String) keys[i];
+			String key = (String) key1;
 			String value = hm.get(key);
 
 			respo.append("<option>" + "<key>").append(key).append("</key>").append("<value>").append(value.substring(0, value.length() - 1)).append("</value>").append("<type>").append(value.charAt(value.length() - 1)).append("</type>").append("</option>");

api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/JsonToFmModel.java

@@ -148,9 +148,8 @@ public final class JsonToFmModel
             {
                 sb.append(tabs).append("[\n");
                 List l = (List)entry.getValue();
-                for (int i = 0; i < l.size(); i++)
+                for (Object aL : l) {
-                {
+                    sb.append(tabs).append(aL).append(":").append((aL != null) ? aL.getClass() : "null").append("\n");
-                    sb.append(tabs).append(l.get(i)).append(":").append((l.get(i) != null) ? l.get(i).getClass() : "null").append("\n");
                 }
                 sb.append(tabs).append("]\n");
             }

api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/Stemmer.java

@@ -548,8 +548,8 @@ public class Stemmer
    {
       char[] w = new char[501];
       Stemmer s = new Stemmer();
-      for (int i = 0; i < args.length; i++) {
+       for (String arg : args) {
-         log.trace( StemString( args[i], 100 ));
+           log.trace(StemString(arg, 100));
        }
    }
   

api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaIngestUtils.java

@@ -383,8 +383,8 @@ public class JenaIngestUtils {
                         Literal lit = (Literal) obj;
                         String unsplitStr = lit.getLexicalForm();
                         String[] splitPieces = delimiterPattern.split(unsplitStr);
-                        for (int i=0; i<splitPieces.length; i++) {
+                        for (String splitPiece : splitPieces) {
-                            String newLexicalForm = splitPieces[i];
+                            String newLexicalForm = splitPiece;
                             if (trim) {
                                 newLexicalForm = newLexicalForm.trim();
                             }

api/src/main/java/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/PropertyGroupTemplateModel.java

@@ -116,8 +116,7 @@ public class PropertyGroupTemplateModel extends BaseTemplateModel {
     @Override
 	public String toString(){
         StringBuilder ptmStr = new StringBuilder();
-        for( int i=0; i < properties.size() ; i ++ ){
+        for (PropertyTemplateModel ptm : properties) {
-            PropertyTemplateModel ptm = properties.get(i);
             String spacer = "\n  ";
             if (ptm != null)
                 ptmStr.append(spacer).append(ptm.toString());

api/src/test/java/edu/cornell/mannlib/vitro/webapp/startup/StartupManagerTest.java

@@ -301,8 +301,8 @@ public class StartupManagerTest extends AbstractTestClass {
 			return "";
 		}
 		StringBuilder result = new StringBuilder();
-		for (int i = 0; i < classes.length; i++) {
+		for (Class<?> aClass : classes) {
-			result.append(classes[i].getName()).append('\n');
+			result.append(aClass.getName()).append('\n');
 		}
 		return result.toString();
 	}

api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/VClassGroupDaoStub.java

@@ -39,11 +39,11 @@ public class VClassGroupDaoStub implements VClassGroupDao {
 	public List<VClassGroup> getPublicGroupsWithVClasses() {
 		List<VClassGroup> list = new ArrayList<>();
 		for (VClassGroup group: groups) {
-			if (!group.isEmpty()) {
+			if (group != null) {
 				list.add(group);
 			}
 		}
-		return groups;
+		return list;
 	}
 
 	// ----------------------------------------------------------------------

api/src/test/resources/edu/cornell/mannlib/vitro/webapp/test_config_default.properties

@@ -4,4 +4,4 @@
 whichfile = test_config_default
 
 # This ends with a blank, in order to test the removal of whitespace
-trimmed = whitespace_test\u0020
+trimmed = whitespace_test

legacy/webapp/languages/es_GO/i18n/all_es_GO.properties

@@ -234,7 +234,7 @@ verbose_turn_off = Apagar
 resource_uri = URI de recursos
 
 individual_not_found = Individual no encontrado
-individual_not_found_msg = El individuo no se encontró en el sistema.
+individual_not_found_msg = El individuo no se encontr<EFBFBD> en el sistema.
 entity_to_query_for = Este id es el identificador de la entidad para consultar. netid también funciona.
 
 menu_ordering = Menú pedidos
@@ -424,12 +424,12 @@ run_sdb_setup = Ejecutar la instalación SDB
 unrecognized_user = Usuario no reconocido
 no_individual_associated_with_id = Por alguna razón, no hay ninguna persona en VIVO que se asocia con su ID de red. Tal vez usted debería ponerse en contacto con el administrador de VIVO.
 
-page_not_created = página no pudo ser creado
+page_not_created = p<EFBFBD>gina no pudo ser creado
-page_not_created_msg = Se ha producido un error al crear la página, por favor, compruebe los registros.
+page_not_created_msg = Se ha producido un error al crear la p<EFBFBD>gina, por favor, compruebe los registros.
-page_not_found = Página no encontrada
+page_not_found = P<EFBFBD>gina no encontrada
-page_not_found_msg = La página no se ha encontrado en el sistema.
+page_not_found_msg = La p<EFBFBD>gina no se ha encontrado en el sistema.
-page_uri_missing = No se especifica la página URI
+page_uri_missing = No se especifica la p<EFBFBD>gina URI
-page_uri_missing_msg = No se pudo generar la página pd no estaba claro en qué página se está solicitando. Una asignación de dirección URL es posible que falte.
+page_uri_missing_msg = No se pudo generar la p<EFBFBD>gina pd no estaba claro en qu<71> p<>gina se est<73> solicitando. Una asignaci<63>n de direcci<63>n URL es posible que falte.
 
 #
 # site admin templates ( /templates/freemarker/body/siteAdmin )