Various code improvements from IntelliJ inspections

api/src/main/java/edu/cornell/mannlib/semservices/service/impl/AgrovocService.java

@@ -190,7 +190,7 @@ public class AgrovocService implements ExternalConceptService {
 	}
 
 	protected String getAgrovocTermCode(String rdf) throws Exception {
-		String termcode = new String();
+		String termcode = "";
 		try {
 			Document doc = XMLUtils.parse(rdf);
 			NodeList nodes = doc.getElementsByTagName("hasCodeAgrovoc");
@@ -199,13 +199,7 @@ public class AgrovocService implements ExternalConceptService {
 				termcode = node.getTextContent();
 			}
 
-		} catch (SAXException e) {
+		} catch (SAXException | IOException | ParserConfigurationException e) {
-			// e.printStackTrace();
-			throw e;
-		} catch (ParserConfigurationException e) {
-			// e.printStackTrace();
-			throw e;
-		} catch (IOException e) {
 			// e.printStackTrace();
 			throw e;
 		}
@@ -213,7 +207,7 @@ public class AgrovocService implements ExternalConceptService {
 	}
 
 	protected String getConceptURIFromRDF(String rdf) {
-		String conceptUri = new String();
+		String conceptUri = "";
 		try {
 			Document doc = XMLUtils.parse(rdf);
 			NodeList nodes = doc.getElementsByTagName("skos:Concept");
@@ -222,13 +216,7 @@ public class AgrovocService implements ExternalConceptService {
 			NamedNodeMap attrs = node.getAttributes();
 			Attr idAttr = (Attr) attrs.getNamedItem("rdf:about");
 			conceptUri = idAttr.getTextContent();
-		} catch (IOException e) {
+		} catch (IOException | ParserConfigurationException | SAXException e) {
-			e.printStackTrace();
-			System.err.println("rdf: " + rdf);
-		} catch (SAXException e) {
-			e.printStackTrace();
-			System.err.println("rdf: " + rdf);
-		} catch (ParserConfigurationException e) {
 			e.printStackTrace();
 			System.err.println("rdf: " + rdf);
 		}
@@ -254,13 +242,7 @@ public class AgrovocService implements ExternalConceptService {
 				}
 
 			
-		} catch (IOException e) {
+		} catch (IOException | ParserConfigurationException | SAXException e) {
-			e.printStackTrace();
-			System.err.println("rdf: " + rdf);
-		} catch (SAXException e) {
-			e.printStackTrace();
-			System.err.println("rdf: " + rdf);
-		} catch (ParserConfigurationException e) {
 			e.printStackTrace();
 			System.err.println("rdf: " + rdf);
 		}
@@ -270,7 +252,7 @@ public class AgrovocService implements ExternalConceptService {
 
 	protected String getDbpediaDescription(String uri) throws Exception {
 		String descriptionSource = " (Source: DBpedia)";
-		String description = new String();
+		String description = "";
 		String qs = ""
 				+ "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n"
 				+ "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n"
@@ -329,7 +311,7 @@ public class AgrovocService implements ExternalConceptService {
 	 * @param uri The URI
 	 */
 	protected String stripConceptId(String uri) {
-		String conceptId = new String();
+		String conceptId = "";
 		int lastslash = uri.lastIndexOf('/');
 		conceptId = uri.substring(lastslash + 1, uri.length());
 		return conceptId;

api/src/main/java/edu/cornell/mannlib/semservices/service/impl/GemetService.java

@@ -150,7 +150,7 @@ public class GemetService implements ExternalConceptService  {
       if (obj.has(key)) {
          return obj.get(key).asText();
       } else {
-         return new String("");
+         return "";
       }
    }
 
@@ -160,7 +160,7 @@ public class GemetService implements ExternalConceptService  {
     * @throws Exception
     */
    protected String getAvailableLangs(String concept_uri) throws Exception {
-      String result = new String();
+      String result = "";
       String serviceUrl = GemetWS_address + "getAvailableLanguages" +
       "?concept_uri=" + concept_uri;
       try {
@@ -177,7 +177,7 @@ public class GemetService implements ExternalConceptService  {
     * @throws Exception
     */
    protected String getConcept(String concept_uri) throws Exception {
-      String result = new String();
+      String result = "";
       String serviceUrl = GemetWS_address + "getConcept" +
       "?concept_uri=" + concept_uri +
       "&language=en";
@@ -196,20 +196,27 @@ public class GemetService implements ExternalConceptService  {
     * @throws Exception
     */
    protected String getAllTranslationsForConcept(String concept_uri, String property) throws Exception {
-      String result = new String();
+      String result = "";
-      String property_uri = new String();
+      String property_uri = "";
-      if (property.equals("definition")) {
+      switch (property) {
+         case "definition":
             property_uri = definitionUri;
-      } else if (property.equals("preferredLabel")) {
+            break;
+         case "preferredLabel":
             property_uri = prefLabelUri;
-      } else if (property.equals("scopeNote")) {
+            break;
+         case "scopeNote":
             property_uri = scopeNoteUri;
-      } else if (property.equals("nonPreferredLabels")) {
+            break;
+         case "nonPreferredLabels":
             property_uri = altLabelUri;
-      } else if (property.equals("example")) {
+            break;
+         case "example":
             property_uri = exampleUri;
-      } else if (property.equals("acronymLabel")) {
+            break;
+         case "acronymLabel":
             property_uri = acronymLabelUri;
+            break;
       }
 
       String serviceUrl = GemetWS_address + "getAllTranslationsForConcept" +
@@ -234,14 +241,18 @@ public class GemetService implements ExternalConceptService  {
     * @throws Exception
     */
    protected String getRelatedConcepts(String concept_uri, String relation) throws Exception {
-      String result = new String();
+      String result = "";
-      String relation_uri = new String();
+      String relation_uri = "";
-      if (relation.equals("broader")) {
+      switch (relation) {
+         case "broader":
             relation_uri = broaderUri;
-      } else if (relation.equals("narrower")) {
+            break;
+         case "narrower":
             relation_uri = narrowerUri;
-      } else if (relation.equals("related")) {
+            break;
+         case "related":
             relation_uri = relatedUri;
+            break;
       }
       String serviceUrl = GemetWS_address + "getRelatedConcepts" +
       "?concept_uri=" + concept_uri +
@@ -263,7 +274,7 @@ public class GemetService implements ExternalConceptService  {
     * @throws Exception
     */
    protected String getConceptsMatchingKeyword(String keyword) throws Exception {
-      String result = new String();
+      String result = "";
       String encodedKeyword = URLEncoder.encode(keyword, "UTF-8"); 
       String serviceUrl = GemetWS_address + "getConceptsMatchingKeyword" +
       "?keyword="  + encodedKeyword +
@@ -283,7 +294,7 @@ public class GemetService implements ExternalConceptService  {
     * @param url URI
     */
    protected String getGemetResults(String url) throws Exception  {
-      String results = new String();
+      String results = "";
       //System.out.println("url: "+url);
       try {
 
@@ -310,7 +321,7 @@ public class GemetService implements ExternalConceptService  {
     
    protected List<String> getRelatedUris(String json) {
 	   List<String> uriList = new ArrayList<String>();
-	   String uri = new String();
+	   String uri = "";
 	   ArrayNode jsonArray = (ArrayNode) JacksonUtils.parseJson(json);
 	    if (jsonArray.size() == 0) {
            return new ArrayList<String>();
@@ -338,7 +349,7 @@ public class GemetService implements ExternalConceptService  {
 	}
 
    protected String stripConceptId(String uri) {
-	     String conceptId = new String();
+	     String conceptId = "";
 	     int lastslash = uri.lastIndexOf('/');
 	     conceptId = uri.substring(lastslash + 1, uri.length());
 	     return conceptId;

api/src/main/java/edu/cornell/mannlib/semservices/service/impl/LCSHService.java

@@ -176,7 +176,7 @@ public class LCSHService implements ExternalConceptService {
 
 	protected List<String> getConceptURIFromXML(String rdf) {
 		List<String> uris = new ArrayList<String>();
-		String conceptUri = new String();
+		String conceptUri = "";
 		try {
 			Document doc = XMLUtils.parse(rdf);
 			NodeList nodes = doc.getElementsByTagName("entry");
@@ -202,13 +202,8 @@ public class LCSHService implements ExternalConceptService {
 				uris.add(conceptUri);
 			}
 
-		} catch (IOException e) {
+		} catch (IOException | ParserConfigurationException | SAXException e) {
 			log.error("error occurred in parsing " +rdf, e);
-		} catch (SAXException e) {
-			log.error("error occurred in parsing " +rdf, e);
-		} catch (ParserConfigurationException e) {
-			log.error("error occurred in parsing " +rdf, e);
-
 		}
         return uris;
 
@@ -222,7 +217,7 @@ public class LCSHService implements ExternalConceptService {
 	 * @param uri URI
 	 */
 	protected String stripConceptId(String uri) {
-		String conceptId = new String();
+		String conceptId = "";
 		int lastslash = uri.lastIndexOf('/');
 		conceptId = uri.substring(lastslash + 1, uri.length());
 		return conceptId;

api/src/main/java/edu/cornell/mannlib/semservices/service/impl/UMLSService.java

@@ -132,7 +132,7 @@ public class UMLSService implements ExternalConceptService {
     private List<Concept> processOutput(String results) throws Exception {
         List<Concept> conceptList = new ArrayList<Concept>();
         List<String> bestMatchIdList = new ArrayList<String>();
-        String bestMatchId = new String();
+        String bestMatchId = "";
 
         try {
             ObjectNode json = (ObjectNode) JacksonUtils.parseJson(results);
@@ -179,13 +179,13 @@ public class UMLSService implements ExternalConceptService {
         if (obj.has(key)) {
             return obj.get(key).asText();
         } else {
-            return new String("");
+            return "";
         }
     }
 
 
     protected String stripConceptId(String uri) {
-        String conceptId = new String();
+        String conceptId = "";
         int lastslash = uri.lastIndexOf('/');
         conceptId = uri.substring(lastslash + 1, uri.length());
         return conceptId;
@@ -196,7 +196,7 @@ public class UMLSService implements ExternalConceptService {
             throw new IllegalStateException("Unable to read umls.properties");
         }
 
-        if (ticketGrantingTicketURL == null || lastUpdate + 28700000l < System.currentTimeMillis()) {
+        if (ticketGrantingTicketURL == null || lastUpdate + 28700000L < System.currentTimeMillis()) {
             try {
                 if (!StringUtils.isEmpty(apikey)) {
                     ticketGrantingTicketURL = Request.Post(UMLS_AUTH_KEY_URL).useExpectContinue().version(HttpVersion.HTTP_1_1)

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

@@ -24,7 +24,6 @@ import edu.cornell.mannlib.vitro.webapp.controller.individual.IndividualRequestA
 import edu.cornell.mannlib.vitro.webapp.controller.individual.IndividualRequestAnalyzer;
 import edu.cornell.mannlib.vitro.webapp.controller.individual.IndividualRequestInfo;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.QueryUtils;
-import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.VIVOIndividualTemplateModel;
 import freemarker.ext.beans.BeansWrapper;
 import freemarker.template.DefaultObjectWrapper;
 

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

@@ -7,20 +7,16 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import org.apache.jena.query.QuerySolution;
 import org.apache.jena.query.ResultSet;
-import org.apache.jena.rdf.model.RDFNode;
 
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.ajax.VitroAjaxController;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.QueryUtils;
 
@@ -68,7 +64,7 @@ public class GeoFocusMapLocations extends AbstractAjaxResponder {
 		try {
             geoLocations = getGeoLocations(vreq);
             
-            String response = "[";
+            StringBuilder response = new StringBuilder("[");
             String geometry = "{\"geometry\": {\"type\": \"Point\",\"coordinates\": \"\"},";
             String typeProps = "\"type\": \"Feature\",\"properties\": {\"mapType\": \"\",";
             String previousLabel = "";
@@ -111,18 +107,18 @@ public class GeoFocusMapLocations extends AbstractAjaxResponder {
                                         + "\",\"local\": \""
                                         + local
                                         + "\"}},";                 
-                    response +=  tempStr;
+                    response.append(tempStr);
                     previousLabel = label;
                 }
             }
 			if ( response.lastIndexOf(",") > 0 ) {
-			    response = response.substring(0, response.lastIndexOf(","));
+			    response = new StringBuilder(response.substring(0, response.lastIndexOf(",")));
 			}
-			response += " ]";
+			response.append(" ]");
 			if ( log.isDebugEnabled() ) {
-				log.debug(response);
+				log.debug(response.toString());
 			}
-			return response;
+			return response.toString();
 		} catch (Exception e) {
 			log.error("Failed geographic focus locations", e);
 			return EMPTY_RESPONSE;

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

@@ -2,26 +2,20 @@
 package edu.cornell.mannlib.vitro.webapp.controller.ajax;
 
 import java.io.IOException;
-import java.lang.Integer;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import org.apache.jena.query.QuerySolution;
 import org.apache.jena.query.ResultSet;
-import org.apache.jena.rdf.model.RDFNode;
 
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.ajax.VitroAjaxController;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.QueryUtils;
 
 public class GeoFocusResearcherCount extends AbstractAjaxResponder {
@@ -47,15 +41,15 @@ public class GeoFocusResearcherCount extends AbstractAjaxResponder {
 		try {
             geoFocusCount = getGeoFocusCount(vreq);
             
-            String response = "{ ";
+            StringBuilder response = new StringBuilder("{ ");
             
             for (Map<String, String> map: geoFocusCount) {
                 String theCount  = map.get("count");
-                response += "\"count\": \"" + theCount + "\"";
+                response.append("\"count\": \"").append(theCount).append("\"");
             }
-			response += " }";
+			response.append(" }");
-			log.debug(response);
+			log.debug(response.toString());
-			return response;
+			return response.toString();
 		} catch (Exception e) {
 			log.error("Failed geographic focus count", e);
 			return EMPTY_RESPONSE;

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

@@ -6,10 +6,8 @@ import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.List;
 
 import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.CSVParser;
@@ -221,24 +219,24 @@ class CsvFileHarvestJob implements FileHarvestJob {
             try {
                 int rowNum = 0;
                 int numberFields = 0;
-                String errorMsg = "File header does not match template";
+                StringBuilder errorMsg = new StringBuilder("File header does not match template");
                 for (CSVRecord cRecord : cReader) {
                     rowNum++;
                     if (false) {
                         numberFields = cRecord.size();
-                        errorMsg += "file header items: ";
+                        errorMsg.append("file header items: ");
                         for(int i = 0; i < cRecord.size(); i++) {
-                            errorMsg += cRecord.get(i) + ", ";
+                            errorMsg.append(cRecord.get(i)).append(", ");
                         }
                     } else {
                         if (cRecord.size() > 0)  {
                             if(cRecord.size() != numberFields) {
                                 if (errorMsg != null) {
-                                    errorMsg += "template items: ";
+                                    errorMsg.append("template items: ");
                                     for(int i = 0; i < cRecord.size(); i++) {
-                                        errorMsg += cRecord.get(i) + ", ";
+                                        errorMsg.append(cRecord.get(i)).append(", ");
                                     }
-                                    return errorMsg;
+                                    return errorMsg.toString();
                                 }
                                 return "Mismatch in number of entries in row " + rowNum + ": expected " + numberFields + ", found " + cRecord.size();
                             }

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

@@ -455,9 +455,9 @@ public class FileHarvestController extends FreemarkerHttpServlet {
                     unsentLogLinesList.clear();
                 }
 
-                String progressSinceLastCheck = "";
+                StringBuilder progressSinceLastCheck = new StringBuilder();
                 for(int i = 0; i < unsentLogLines.length; i++) {
-                    progressSinceLastCheck += unsentLogLines[i] + newline;
+                    progressSinceLastCheck.append(unsentLogLines[i]).append(newline);
                 }
 
                 boolean finished = sessionInfo.isFinished();
@@ -484,7 +484,7 @@ public class FileHarvestController extends FreemarkerHttpServlet {
 
                 if(!abnormalTermination) {
 	                json = generateJson(false);
-	                json.put("progressSinceLastCheck", progressSinceLastCheck);
+	                json.put("progressSinceLastCheck", progressSinceLastCheck.toString());
 	                json.put("finished", finished);
 	                json.put("newlyAddedUris", newlyAddedUris);
 	                json.put("newlyAddedUrls", newlyAddedUrls);
@@ -635,10 +635,11 @@ public class FileHarvestController extends FreemarkerHttpServlet {
                 boolean match = false;
                 String[] validRdfTypesForJob = job.getRdfTypesForLinks();
                 for(String rdfType : validRdfTypesForJob) {
-                	if(types.contains(rdfType))
+                	if(types.contains(rdfType)) {
                         match = true;
                         break;
                     }
+                }
                 
                 if(match) {
 

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

@@ -3,6 +3,7 @@
 package edu.cornell.mannlib.vitro.webapp.controller.harvester; 
 
 import java.util.ArrayList;
+import java.util.Collections;
 
 /* //PLEASE SEE JAVADOC COMMENT FOR CLASS BELOW
 import org.vivoweb.harvester.diff.Diff;
@@ -175,9 +176,7 @@ class Harvester {
         for(int i = 0; i < args.length; i++) {
             if(args[i] instanceof String[]) {
                 String[] array = (String[])(args[i]);
-                for(int j = 0; j < array.length; j++) {
+                Collections.addAll(allData, array);
-                    allData.add(array[j]);
-                }
             } else {
                 allData.add(args[i].toString());
             }

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

@@ -93,8 +93,6 @@ public class DataVisualizationController extends VitroHttpServlet {
 						   log);
 			}
 
-            return;
-            
         } else {
     		
     		UtilityFunctions.handleMalformedParameters(

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

@@ -3,6 +3,7 @@
 package edu.cornell.mannlib.vitro.webapp.controller.visualization;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -249,9 +250,7 @@ public class ShortURLVisualizationController extends FreemarkerHttpServlet {
 		
 		if (urlParams.length > 1 
 				&& urlParams[0].equalsIgnoreCase("vis")) {
-			for (int ii=1; ii < urlParams.length; ii++) {
+			matchedGroups.addAll(Arrays.asList(urlParams).subList(1, urlParams.length));
-				matchedGroups.add(urlParams[ii]);
-			}
 		}
 		
 		return matchedGroups;

api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/N3TransitionToV2Mapping.java

@@ -1,8 +1,6 @@
 /* $This file is distributed under the terms of the license in LICENSE$ */
 package edu.cornell.mannlib.vitro.webapp.edit.n3editing;
 
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.JspToGeneratorMapping;
-
 import java.util.HashMap;
 import java.util.Map;
 

api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PersonHasPublicationValidator.java

@@ -6,7 +6,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/PublicationHasAuthorValidator.java

@@ -8,8 +8,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang3.StringUtils;
-
 import org.apache.jena.rdf.model.Literal;
 
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.N3ValidatorVTwo;

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

@@ -4,7 +4,6 @@ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -23,17 +22,12 @@ import org.apache.commons.logging.LogFactory;
 import org.apache.jena.query.QuerySolution;
 import org.apache.jena.query.ResultSet;
 import org.apache.jena.rdf.model.RDFNode;
-import org.apache.jena.rdf.model.Literal;
 import org.apache.jena.vocabulary.RDFS;
 import org.apache.jena.vocabulary.XSD;
 
-import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyComparator;
-import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;
-import edu.cornell.mannlib.vitro.webapp.beans.Individual;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.QueryUtils;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.PublicationHasAuthorValidator;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeIntervalValidationVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;

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

@@ -2,8 +2,6 @@
 
 package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
 
-import java.util.HashMap;
-
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ConstantFieldOptions;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions;

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

@@ -1,10 +1,6 @@
 /* $This file is distributed under the terms of the license in LICENSE$ */
 package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
 import javax.servlet.http.HttpSession;
 
 import org.apache.commons.logging.Log;
@@ -12,9 +8,6 @@ import org.apache.commons.logging.LogFactory;
 
 import org.apache.jena.query.QuerySolution;
 import org.apache.jena.query.ResultSet;
-import org.apache.jena.rdf.model.Literal;
-import org.apache.jena.rdf.model.Model;
-import org.apache.jena.rdf.model.ModelFactory;
 import org.apache.jena.rdf.model.RDFNode;
 import org.apache.jena.vocabulary.XSD;
 

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

@@ -4,7 +4,6 @@ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators
 
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesOptions;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesWithParent;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions;
 /**
  * Generates the edit configuration for adding a Role to a Person.  

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

@@ -4,7 +4,6 @@ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -23,17 +22,12 @@ import org.apache.commons.logging.LogFactory;
 import org.apache.jena.query.QuerySolution;
 import org.apache.jena.query.ResultSet;
 import org.apache.jena.rdf.model.RDFNode;
-import org.apache.jena.rdf.model.Literal;
 import org.apache.jena.vocabulary.RDFS;
 import org.apache.jena.vocabulary.XSD;
 
-import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyComparator;
-import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;
-import edu.cornell.mannlib.vitro.webapp.beans.Individual;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.QueryUtils;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.FirstAndLastNameValidator;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeIntervalValidationVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;

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

@@ -2,12 +2,9 @@
 
 package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
 
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import javax.servlet.http.HttpSession;
 
@@ -17,12 +14,8 @@ import org.apache.commons.logging.LogFactory;
 import org.apache.jena.vocabulary.XSD;
 
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesOptions;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaVClassOptions;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation;
 
 public class AddFullNameToPersonGenerator extends VivoBaseGenerator implements

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

@@ -3,7 +3,6 @@
 package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
 
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesOptions;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions;
 

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

@@ -2,27 +2,16 @@
 
 package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
 
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 import javax.servlet.http.HttpSession;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.apache.jena.vocabulary.XSD;
-
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesOptions;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaVClassOptions;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation;
 
 public class AddOrcidIdToPersonGenerator extends VivoBaseGenerator implements

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

@@ -14,10 +14,8 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.AutocompleteRequiredInput
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeIntervalValidationVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeWithPrecisionVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesOptions;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesWithParent;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaVClassOptions;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation;
 
 public class AddPresenterRoleToPersonGenerator extends VivoBaseGenerator implements

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

@@ -3,7 +3,6 @@
 package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
 
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesOptions;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ConstantFieldOptions;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions;
 

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

@@ -3,7 +3,6 @@
 package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 
 import java.util.HashMap;
 import java.util.List;

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

@@ -3,24 +3,15 @@
 package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
 
 import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
 
 import javax.servlet.http.HttpSession;
 
 import org.apache.jena.vocabulary.XSD;
 
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.AutocompleteRequiredInputValidator;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeIntervalValidationVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeWithPrecisionVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesWithParent;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ConstantFieldOptions;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaVClassOptions;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation;
 
 public class GrantAdministeredByGenerator extends VivoBaseGenerator implements

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

@@ -13,13 +13,9 @@ import org.apache.jena.vocabulary.XSD;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.FirstAndLastNameValidator;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeIntervalValidationVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeWithPrecisionVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesOptions;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesWithParent;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaVClassOptions;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation;
 import edu.cornell.mannlib.vitro.webapp.utils.FrontEndEditingUtils.EditMode;
 import edu.cornell.mannlib.vitro.webapp.utils.generators.EditModeUtils;

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

@@ -3,24 +3,15 @@
 package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
 
 import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
 
 import javax.servlet.http.HttpSession;
 
 import org.apache.jena.vocabulary.XSD;
 
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.AutocompleteRequiredInputValidator;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeIntervalValidationVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeWithPrecisionVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesWithParent;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ConstantFieldOptions;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaVClassOptions;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation;
 
 public class OrganizationAdministersGrantGenerator extends VivoBaseGenerator implements

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

@@ -16,7 +16,6 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.FirstAndLastNameValidator
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeIntervalValidationVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeWithPrecisionVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesOptions;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesWithParent;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaVClassOptions;

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

@@ -17,7 +17,6 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeWithPrecisio
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesWithParent;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaVClassOptions;
 
 public class OrganizationHasPositionHistoryGenerator extends VivoBaseGenerator
 		implements EditConfigurationGenerator {

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

@@ -15,7 +15,6 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeIntervalVali
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeWithPrecisionVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaVClassOptions;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation;
 
 public class PersonHasAwardOrHonorGenerator extends VivoBaseGenerator implements

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

@@ -2,12 +2,9 @@
 
 package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
 
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import javax.servlet.http.HttpSession;
 
@@ -17,12 +14,8 @@ import org.apache.commons.logging.LogFactory;
 import org.apache.jena.vocabulary.XSD;
 
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesOptions;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaVClassOptions;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation;
 
 public class PersonHasEmailGenerator extends VivoBaseGenerator implements

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

@@ -4,7 +4,6 @@ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators
 
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.Map;
 
 import javax.servlet.http.HttpSession;
 
@@ -16,11 +15,9 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.AutocompleteRequiredInput
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeIntervalValidationVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeWithPrecisionVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesWithParent;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ConstantFieldOptions;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaVClassOptions;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation;
 
 public class PersonHasIssuedCredentialGenerator extends VivoBaseGenerator implements

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

@@ -17,10 +17,8 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.AutocompleteRequiredInput
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeIntervalValidationVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeWithPrecisionVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesOptions;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesWithParent;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaVClassOptions;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation;
 import edu.cornell.mannlib.vitro.webapp.utils.FrontEndEditingUtils.EditMode;
 import edu.cornell.mannlib.vitro.webapp.utils.generators.EditModeUtils;

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

@@ -2,12 +2,9 @@
 
 package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
 
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import javax.servlet.http.HttpSession;
 
@@ -17,12 +14,8 @@ import org.apache.commons.logging.LogFactory;
 import org.apache.jena.vocabulary.XSD;
 
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesOptions;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaVClassOptions;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation;
 
 public class PersonHasPreferredTitleGenerator extends VivoBaseGenerator implements

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

@@ -11,15 +11,9 @@ import javax.servlet.http.HttpSession;
 import org.apache.jena.vocabulary.XSD;
 
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.FirstAndLastNameValidator;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeIntervalValidationVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.DateTimeWithPrecisionVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesOptions;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesWithParent;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaVClassOptions;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation;
 import edu.cornell.mannlib.vitro.webapp.utils.FrontEndEditingUtils.EditMode;
 import edu.cornell.mannlib.vitro.webapp.utils.generators.EditModeUtils;

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

@@ -2,12 +2,9 @@
 
 package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
 
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import javax.servlet.http.HttpSession;
 
@@ -17,12 +14,8 @@ import org.apache.commons.logging.LogFactory;
 import org.apache.jena.vocabulary.XSD;
 
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesOptions;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaVClassOptions;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation;
 
 public class SubjectHasMailingAddressGenerator extends VivoBaseGenerator implements

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

@@ -2,18 +2,14 @@
 
 package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
 
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import javax.servlet.http.HttpSession;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.commons.lang3.StringUtils;
 
 import org.apache.jena.rdf.model.Literal;
 import org.apache.jena.rdf.model.Model;
@@ -22,12 +18,8 @@ import org.apache.jena.rdf.model.ModelFactory;
 import org.apache.jena.vocabulary.XSD;
 
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesOptions;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaVClassOptions;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation;
 
 public class SubjectHasPhoneFaxNumberGenerator extends VivoBaseGenerator implements

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

@@ -7,7 +7,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import edu.cornell.mannlib.vitro.webapp.web.templatemodels.searchresult.VIVOIndividualSearchResult;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

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

@@ -20,7 +20,6 @@ import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.FoafNameToRdfsLabelPreprocessor;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation;
 
 /**

api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/AddAssociatedConceptsPreprocessor.java

@@ -746,7 +746,7 @@ public class AddAssociatedConceptsPreprocessor extends
 	//This will either generate or retrieve URIs for the concept semantic type labels if they exist
 	//We will then update the submission to include this 
 		private String getConceptSemanticTypeURIValues() {
-			String pseudoInputString = "";
+			StringBuilder pseudoInputString = new StringBuilder();
 			if(conceptSemanticTypeLabelValues !=  null && !conceptSemanticTypeLabelValues.isEmpty()) {
 				String[] conceptSemanticTypeLabels = convertDelimitedStringToArray(conceptSemanticTypeLabelValues);
 				//keep track of what label values already exist and to which label variables they map
@@ -761,7 +761,7 @@ public class AddAssociatedConceptsPreprocessor extends
 					if(uri != "") {
 						String[] urisToAdd = new String[1];
 						urisToAdd[0] = uri;
-						pseudoInputString = uri;
+						pseudoInputString = new StringBuilder(uri);
 						log.debug("uris to add" + uri);
 						submission.addUriToForm(this.editConfiguration, "conceptSemanticTypeURI", urisToAdd);
 					}
@@ -809,21 +809,21 @@ public class AddAssociatedConceptsPreprocessor extends
 							}
 						}
 						if(i != 0) {
-							pseudoInputString += ","; 
+							pseudoInputString.append(",");
 						}
-						pseudoInputString += uri;
+						pseudoInputString.append(uri);
 					
 					}
 					
 					//Add this string to the uris for the form
 					String[] urisToAdd = new String[1];
-					urisToAdd[0] = pseudoInputString;
+					urisToAdd[0] = pseudoInputString.toString();
 					log.debug("uris to add" + pseudoInputString);
 					submission.addUriToForm(this.editConfiguration, "conceptSemanticTypeURI", urisToAdd);
 					
 				}
 			}
-			return pseudoInputString;
+			return pseudoInputString.toString();
 		}
 		
 	private String getURIForSemanticTypeLabel(String label) {

api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ManageLabelsForPersonPreprocessor.java

@@ -3,27 +3,16 @@
 package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.jena.ontology.OntModel;
 import org.apache.jena.rdf.model.Literal;
-import org.apache.jena.rdf.model.Model;
-import org.apache.jena.rdf.model.Property;
-import org.apache.jena.rdf.model.ResIterator;
-import org.apache.jena.rdf.model.Resource;
-import org.apache.jena.rdf.model.Statement;
 
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 /*
  * This preprocessor is used to set the language attribute on the label based on the user selection
  * on the manage labels page when adding a new label.
  */
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.BaseEditSubmissionPreprocessorVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.MultiValueEditSubmission;
 

api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/RoleToActivityPredicatePreprocessor.java

@@ -4,40 +4,10 @@ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocess
 
 import java.util.Map;
 import java.util.List;
-import java.util.ArrayList;
-import java.util.HashMap;
 
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.apache.jena.query.Query;
-import org.apache.jena.query.QueryExecution;
-import org.apache.jena.query.QueryExecutionFactory;
-import org.apache.jena.query.QueryFactory;
-import org.apache.jena.query.QuerySolution;
-import org.apache.jena.query.ResultSet;
-import org.apache.jena.rdf.model.Literal;
-import org.apache.jena.rdf.model.Model;
-import org.apache.jena.rdf.model.ModelFactory;
-import org.apache.jena.rdf.model.Resource;
-import org.apache.jena.rdf.model.ResourceFactory;
-import org.apache.jena.vocabulary.XSD;
-import org.apache.jena.rdf.model.Property;
-import org.apache.jena.shared.Lock;
-
-import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.BaseEditSubmissionPreprocessorVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.MultiValueEditSubmission;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
-
-import org.vivoweb.webapp.util.ModelUtils;
 
 public class RoleToActivityPredicatePreprocessor extends RoleToPredicatePreprocessor {
 	public RoleToActivityPredicatePreprocessor(EditConfigurationVTwo editConfig, WebappDaoFactory wadf) {

api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/RoleToPredicatePreprocessor.java

@@ -5,37 +5,16 @@ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocess
 import java.util.Map;
 import java.util.List;
 import java.util.ArrayList;
-import java.util.HashMap;
 
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import org.apache.jena.query.Query;
-import org.apache.jena.query.QueryExecution;
-import org.apache.jena.query.QueryExecutionFactory;
-import org.apache.jena.query.QueryFactory;
-import org.apache.jena.query.QuerySolution;
-import org.apache.jena.query.ResultSet;
-import org.apache.jena.rdf.model.Literal;
-import org.apache.jena.rdf.model.Model;
-import org.apache.jena.rdf.model.ModelFactory;
-import org.apache.jena.rdf.model.Resource;
-import org.apache.jena.rdf.model.ResourceFactory;
-import org.apache.jena.vocabulary.XSD;
-import org.apache.jena.rdf.model.Property;
-import org.apache.jena.shared.Lock;
-
 import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.BaseEditSubmissionPreprocessorVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.MultiValueEditSubmission;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
 
 import org.vivoweb.webapp.util.ModelUtils;
 

api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/documentBuilding/CalculateParameters.java

@@ -213,7 +213,7 @@ public class CalculateParameters implements DocumentModifier, ContextModelsUser
     		queryList = null;	
     		Iterator<String> itr = adjacentNodes.iterator();
     		while(itr.hasNext()){
-    			adjacentNodesConcat.append(itr.next() + " ");
+    			adjacentNodesConcat.append(itr.next()).append(" ");
     		}
     		
     		info[0] = adjacentNodesConcat.toString();

api/src/main/java/edu/cornell/mannlib/vitro/webapp/searchindex/extensions/LabelsAcrossContextNodes.java

@@ -353,13 +353,9 @@ public class LabelsAcrossContextNodes implements IndexingUriFinder,
 		String subjectUri = stmt.getSubject().getURI();
 		String predicateUri = stmt.getPredicate().getURI();
 
-		if (incomingPropertyUri.equals(predicateUri)
+		return incomingPropertyUri.equals(predicateUri)
 				&& (contextNodeClasses.isEmpty() || isAnyMatch(
-						contextNodeClasses, getTypes(subjectUri)))) {
+				contextNodeClasses, getTypes(subjectUri)));
-			return true;
-		} else {
-			return false;
-		}
 	}
 
 	private boolean isAnyMatch(Set<String> set1, Set<String> set2) {

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

@@ -72,11 +72,7 @@ public class ConceptSearchServiceUtils {
 	        Class classDefinition = Class.forName(searchServiceClassName);
 	        object = classDefinition.newInstance();
 	        conceptServiceClass = (ExternalConceptService) object;
-	    } catch (InstantiationException e) {
+	    } catch (InstantiationException | ClassNotFoundException | IllegalAccessException e) {
-	        System.out.println(e);
-	    } catch (IllegalAccessException e) {
-	        System.out.println(e);
-	    } catch (ClassNotFoundException e) {
 	        System.out.println(e);
 	    }
 

api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipGraphMLWriter.java

@@ -2,7 +2,6 @@
 
 package edu.cornell.mannlib.vitro.webapp.visualization.coauthorship;
 
-import java.io.OutputStreamWriter;
 import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -26,7 +25,6 @@ import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.OutputKeys;
 import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
@@ -81,11 +79,7 @@ public class CoAuthorshipGraphMLWriter {
 			transformer.transform(source, result);
 
 			graphMLContent.append(writer.toString());
-		} catch (TransformerConfigurationException e) {
+		} catch (ParserConfigurationException | TransformerException e) {
-			throw new IllegalStateException("XML error generating GraphML", e);
-		} catch (TransformerException e) {
-			throw new IllegalStateException("XML error generating GraphML", e);
-		} catch (ParserConfigurationException e) {
 			throw new IllegalStateException("XML error generating GraphML", e);
 		}
 

api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipRequestHandler.java

@@ -22,7 +22,6 @@ import edu.cornell.mannlib.vitro.webapp.controller.visualization.VisualizationFr
 import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CollaborationData;
 import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException;
 import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaborator;
-import edu.cornell.mannlib.vitro.webapp.visualization.visutils.QueryRunner;
 import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions;
 import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler;
 
@@ -168,7 +167,7 @@ public class CoAuthorshipRequestHandler implements VisualizationRequestHandler {
 		
 		String coAuthorSeparator = "; ";
 		for (Collaborator currCoAuthor : coAuthors) {
-			coAuthorsMerged.append(currCoAuthor.getCollaboratorName() + coAuthorSeparator);
+			coAuthorsMerged.append(currCoAuthor.getCollaboratorName()).append(coAuthorSeparator);
 		}
 		
 		return StringUtils.removeEnd(coAuthorsMerged.toString(), coAuthorSeparator);

api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coauthorship/CoAuthorshipVisCodeGenerator.java

@@ -101,12 +101,9 @@ public class CoAuthorshipVisCodeGenerator {
 		if (yearToUniqueCoauthors.size() > 0) {
 			try {
 				minPublishedYear = Integer.parseInt(Collections.min(publishedYears));
-			} catch (NoSuchElementException e1) {
+			} catch (NoSuchElementException | NumberFormatException e1) {
 				log.debug("vis: " + e1.getMessage() + " error occurred for " 
 							+ yearToUniqueCoauthors.toString());
-			} catch (NumberFormatException e2) {
-				log.debug("vis: " + e2.getMessage() + " error occurred for " 
-							+ yearToUniqueCoauthors.toString());
 			}
         }
 		

api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/constants/QueryConstants.java

@@ -52,8 +52,7 @@ public class QueryConstants {
 		StringBuilder prefixSection = new StringBuilder(); 
 		
 		for (Map.Entry<String, String> prefixEntry : PREFIX_TO_NAMESPACE.entrySet()) {
-			prefixSection.append("PREFIX " + prefixEntry.getKey() 
+			prefixSection.append("PREFIX ").append(prefixEntry.getKey()).append(": <").append(prefixEntry.getValue()).append(">\n");
-									+ ": <" + prefixEntry.getValue() + ">\n");
 		}
 		return prefixSection.toString();
 	}

api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountConstructQueryRunner.java

@@ -15,11 +15,6 @@ import org.apache.jena.iri.IRI;
 import org.apache.jena.iri.IRIFactory;
 import org.apache.jena.iri.Violation;
 
-import org.apache.jena.query.Dataset;
-import org.apache.jena.query.Query;
-import org.apache.jena.query.QueryExecution;
-import org.apache.jena.query.QueryExecutionFactory;
-import org.apache.jena.query.QueryFactory;
 import org.apache.jena.query.Syntax;
 import org.apache.jena.rdf.model.Model;
 import org.apache.jena.rdf.model.ModelFactory;

api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGrantCountRequestHandler.java

@@ -164,7 +164,7 @@ public class CoPIGrantCountRequestHandler implements VisualizationRequestHandler
 		
 		String coPISeparator = ";";
 		for (Collaborator currentCoPI : coInvestigators) {
-			coPIsMerged.append(currentCoPI.getCollaboratorName() + coPISeparator);
+			coPIsMerged.append(currentCoPI.getCollaboratorName()).append(coPISeparator);
 		}
 		
 		return StringUtils.removeEnd(coPIsMerged.toString(), coPISeparator);

api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIGraphMLWriter.java

@@ -25,7 +25,6 @@ import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.OutputKeys;
 import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
@@ -83,11 +82,7 @@ public class CoPIGraphMLWriter {
 			transformer.transform(source, result);
 
 			graphMLContent.append(writer.toString());
-		} catch (TransformerConfigurationException e) {
+		} catch (ParserConfigurationException | TransformerException e) {
-			throw new IllegalStateException("XML error generating GraphML", e);
-		} catch (TransformerException e) {
-			throw new IllegalStateException("XML error generating GraphML", e);
-		} catch (ParserConfigurationException e) {
 			throw new IllegalStateException("XML error generating GraphML", e);
 		}
 

api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/coprincipalinvestigator/CoPIVisCodeGenerator.java

@@ -111,12 +111,9 @@ public class CoPIVisCodeGenerator {
 			try {
 				minGrantYear = Integer.parseInt(Collections
 						.min(investigatedYears));
-			} catch (NoSuchElementException e1) {
+			} catch (NoSuchElementException | NumberFormatException e1) {
 				log.debug("vis: " + e1.getMessage() + " error occurred for "
 						+ yearToUniqueCoPIs.toString());
-			} catch (NumberFormatException e2) {
-				log.debug("vis: " + e2.getMessage() + " error occurred for "
-						+ yearToUniqueCoPIs.toString());
 			}
         }
 

api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/modelconstructor/ModelConstructorRequestHandler.java

@@ -103,10 +103,7 @@ public class ModelConstructorRequestHandler implements
 															  parseModelIdentifier.getType(), vitroRequest.getRDFService());
 				refreshedModels.add(parseModelIdentifier);
 
-			} catch (IllegalConstructedModelIdentifierException e) {
+			} catch (IllegalConstructedModelIdentifierException | MalformedQueryParametersException e) {
-				e.printStackTrace();
-			} catch (MalformedQueryParametersException e) {
-				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
         }

api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountRequestHandler.java

@@ -112,7 +112,7 @@ public class PersonGrantCountRequestHandler implements VisualizationRequestHandl
 				UtilityFunctions.getYearToActivityCount(authorGrants);
 
 
-		boolean shouldVIVOrenderVis = yearToGrantCount.size() > 0 ? true : false;
+		boolean shouldVIVOrenderVis = (yearToGrantCount.size() > 0);
 			
 			/*
 	    	 * Computations required to generate HTML for the sparkline & related context.

api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/persongrantcount/PersonGrantCountVisCodeGenerator.java

@@ -102,12 +102,9 @@ public class PersonGrantCountVisCodeGenerator {
 			try {
 				minGrantYear = Integer.parseInt(Collections
 						.min(grantYears));
-			} catch (NoSuchElementException e1) {
+			} catch (NoSuchElementException | NumberFormatException e1) {
 				log.debug("vis: " + e1.getMessage() + " error occurred for "
 						+ yearToGrantCount.toString());
-			} catch (NumberFormatException e2) {
-				log.debug("vis: " + e2.getMessage() + " error occurred for "
-						+ yearToGrantCount.toString());
 			}
         }
 

api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java

@@ -5,7 +5,6 @@ package edu.cornell.mannlib.vitro.webapp.visualization.personlevel;
 import java.util.HashMap;
 import java.util.Map;
 
-import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
 import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CoAuthorshipData;
 import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CoInvestigationData;
 import edu.cornell.mannlib.vitro.webapp.visualization.visutils.CollaborationDataViewHelper;

api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountQueryRunner.java

@@ -7,7 +7,6 @@ import java.util.Set;
 
 import org.apache.jena.rdf.model.Model;
 import org.apache.jena.rdf.model.ModelFactory;
-import org.apache.jena.rdf.model.Resource;
 import org.apache.jena.rdf.model.ResourceFactory;
 import org.apache.jena.rdf.model.Statement;
 import org.apache.jena.vocabulary.RDFS;
@@ -20,21 +19,17 @@ import org.apache.jena.iri.IRI;
 import org.apache.jena.iri.IRIFactory;
 import org.apache.jena.iri.Violation;
 
-import org.apache.jena.query.Dataset;
 import org.apache.jena.query.Query;
 import org.apache.jena.query.QueryExecution;
 import org.apache.jena.query.QueryExecutionFactory;
 import org.apache.jena.query.QueryFactory;
 import org.apache.jena.query.QuerySolution;
-import org.apache.jena.query.ResultSet;
 import org.apache.jena.query.Syntax;
 import org.apache.jena.rdf.model.RDFNode;
 
 import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryConstants;
-import edu.cornell.mannlib.vitro.webapp.visualization.constants.QueryFieldLabels;
 import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException;
 import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Activity;
-import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Individual;
 import edu.cornell.mannlib.vitro.webapp.visualization.visutils.QueryRunner;
 
 

api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountRequestHandler.java

@@ -21,7 +21,6 @@ import edu.cornell.mannlib.vitro.webapp.controller.visualization.DataVisualizati
 import edu.cornell.mannlib.vitro.webapp.controller.visualization.VisualizationFrameworkConstants;
 import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryParametersException;
 import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Activity;
-import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Individual;
 import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.SparklineData;
 import edu.cornell.mannlib.vitro.webapp.visualization.visutils.QueryRunner;
 import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions;

api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/PersonPublicationCountVisCodeGenerator.java

@@ -103,12 +103,9 @@ public class PersonPublicationCountVisCodeGenerator {
 		if (yearToPublicationCount.size() > 0) {
 			try {
 				minPublishedYear = Integer.parseInt(Collections.min(publishedYears));
-			} catch (NoSuchElementException e1) {
+			} catch (NoSuchElementException | NumberFormatException e1) {
 				log.debug("vis: " + e1.getMessage() + " error occurred for " 
 								+ yearToPublicationCount.toString());
-			} catch (NumberFormatException e2) {
-				log.debug("vis: " + e2.getMessage() + " error occurred for " 
-								+ yearToPublicationCount.toString());
 			}
         }
 		

api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/setup/VisualizationSetup.java

@@ -5,7 +5,6 @@ package edu.cornell.mannlib.vitro.webapp.visualization.setup;
 import edu.cornell.mannlib.vitro.webapp.modelaccess.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
 import edu.cornell.mannlib.vitro.webapp.visualization.utilities.CachingRDFServiceExecutor;
-import edu.cornell.mannlib.vitro.webapp.visualization.utilities.VisualizationCaches;
 
 import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;

api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/UtilitiesRequestHandler.java

@@ -5,7 +5,6 @@ package edu.cornell.mannlib.vitro.webapp.visualization.utilities;
 import java.util.HashMap;
 import java.util.Map;
 
-import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceException;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.ResultSetConsumer;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
@@ -34,7 +33,6 @@ import edu.cornell.mannlib.vitro.webapp.visualization.exceptions.MalformedQueryP
 import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.GenericQueryMap;
 import edu.cornell.mannlib.vitro.webapp.visualization.visutils.AllPropertiesQueryRunner;
 import edu.cornell.mannlib.vitro.webapp.visualization.visutils.GenericQueryRunner;
-import edu.cornell.mannlib.vitro.webapp.visualization.visutils.QueryRunner;
 import edu.cornell.mannlib.vitro.webapp.visualization.visutils.UtilityFunctions;
 import edu.cornell.mannlib.vitro.webapp.visualization.visutils.VisualizationRequestHandler;
 

api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/utilities/VisualizationCaches.java

@@ -8,7 +8,6 @@ import org.apache.jena.query.QuerySolution;
 import org.apache.jena.rdf.model.Literal;
 import org.apache.jena.rdf.model.Model;
 import org.apache.jena.rdf.model.ModelFactory;
-import org.apache.jena.rdf.model.RDFNode;
 import org.apache.jena.rdf.model.Resource;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService;
 import edu.cornell.mannlib.vitro.webapp.rdfservice.ResultSetConsumer;

api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/AllPropertiesQueryRunner.java

@@ -12,13 +12,7 @@ import org.apache.jena.iri.IRI;
 import org.apache.jena.iri.IRIFactory;
 import org.apache.jena.iri.Violation;
 
-import org.apache.jena.query.Dataset;
-import org.apache.jena.query.Query;
-import org.apache.jena.query.QueryExecution;
-import org.apache.jena.query.QueryExecutionFactory;
-import org.apache.jena.query.QueryFactory;
 import org.apache.jena.query.QuerySolution;
-import org.apache.jena.query.ResultSet;
 import org.apache.jena.query.Syntax;
 import org.apache.jena.rdf.model.RDFNode;
 
@@ -78,7 +72,7 @@ public class AllPropertiesQueryRunner implements QueryRunner<GenericQueryMap> {
 							+ filterClause
 							+ "}";
             	
-        log.debug("sparqlQuery = " + sparqlQuery.toString());
+        log.debug("sparqlQuery = " + sparqlQuery);
         
 		return sparqlQuery;
 	}

api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/GenericQueryRunner.java

@@ -76,12 +76,11 @@ public class GenericQueryRunner implements QueryRunner<ResultSet> {
 		for (Map.Entry<String, String> currentfieldLabelToOutputFieldLabel 
 				: this.fieldLabelToOutputFieldLabel.entrySet()) {
 			
-			sparqlQuery.append("\t(str(?" + currentfieldLabelToOutputFieldLabel.getKey() + ") as ?" 
+			sparqlQuery.append("\t(str(?").append(currentfieldLabelToOutputFieldLabel.getKey()).append(") as ?").append(currentfieldLabelToOutputFieldLabel.getValue()).append(")\n");
-									+ currentfieldLabelToOutputFieldLabel.getValue() + ")\n");
 			
 		}
 		
-		sparqlQuery.append("\n" + this.aggregationRules + "\n");
+		sparqlQuery.append("\n").append(this.aggregationRules).append("\n");
 		
 		sparqlQuery.append("WHERE {\n");
 		

api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/GenericQueryRunnerOnModel.java

@@ -73,12 +73,11 @@ public class GenericQueryRunnerOnModel implements QueryRunner<ResultSet> {
 		for (Map.Entry<String, String> currentfieldLabelToOutputFieldLabel 
 				: this.fieldLabelToOutputFieldLabel.entrySet()) {
 			
-			sparqlQuery.append("\t(str(?" + currentfieldLabelToOutputFieldLabel.getKey() + ") as ?" 
+			sparqlQuery.append("\t(str(?").append(currentfieldLabelToOutputFieldLabel.getKey()).append(") as ?").append(currentfieldLabelToOutputFieldLabel.getValue()).append(")\n");
-									+ currentfieldLabelToOutputFieldLabel.getValue() + ")\n");
 			
 		}
 		
-		sparqlQuery.append("\n" + this.aggregationRules + "\n");
+		sparqlQuery.append("\n").append(this.aggregationRules).append("\n");
 		
 		sparqlQuery.append("WHERE {\n");
 		

api/src/main/java/edu/cornell/mannlib/vitro/webapp/visualization/visutils/PDFDocument.java

@@ -96,9 +96,6 @@ public class PDFDocument {
 		
         createImage(document, pdfWriter, featureHeaderStyle);
 		
-		} catch (DocumentException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
 		} catch (Exception e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();

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

@@ -52,12 +52,7 @@ public class VIVOIndividualTemplateModel extends IndividualTemplateModel {
     
     /* Template methods (for efficiency, not pre-computed) */
     public boolean conceptSubclass() {
-        if ( isVClass(AWARD_CLASS) || isVClass(DEGREE_CLASS) ||isVClass(CONTACT_CLASS) || isVClass(CREDENTIAL_CLASS) || isVClass(DTP_CLASS) ) {
+        return isVClass(AWARD_CLASS) || isVClass(DEGREE_CLASS) || isVClass(CONTACT_CLASS) || isVClass(CREDENTIAL_CLASS) || isVClass(DTP_CLASS);
-            return true;
-        }
-        else {
-            return false;
-        }
     }
 
     public boolean person() {

api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidAddExternalIdHandler.java

@@ -13,7 +13,6 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import edu.cornell.mannlib.orcidclient.OrcidClientException;
-import edu.cornell.mannlib.orcidclient.actions.AddExternalIdAction;
 import edu.cornell.mannlib.orcidclient.auth.AuthorizationStatus;
 import edu.cornell.mannlib.orcidclient.beans.ExternalId;
 import edu.cornell.mannlib.vitro.webapp.beans.Individual;

api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidConfirmationState.java

@@ -17,14 +17,11 @@ import java.util.Set;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
-import javax.xml.bind.JAXBElement;
-import javax.xml.namespace.QName;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import edu.cornell.mannlib.orcidclient.model.ExternalIdentifier;
-import edu.cornell.mannlib.orcidclient.model.ExternalIdentifiers;
 import edu.cornell.mannlib.orcidclient.model.OrcidBio;
 import edu.cornell.mannlib.orcidclient.model.OrcidId;
 import edu.cornell.mannlib.orcidclient.model.OrcidProfile;

api/src/main/java/edu/cornell/mannlib/vivo/orcid/controller/OrcidReadProfileHandler.java

@@ -13,7 +13,6 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
 import edu.cornell.mannlib.orcidclient.OrcidClientException;
-import edu.cornell.mannlib.orcidclient.actions.ReadPublicBioAction;
 import edu.cornell.mannlib.orcidclient.auth.AuthorizationStatus;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;

api/src/main/java/org/vivoweb/reasoner/plugin/DCTitleForDocuments.java

@@ -2,18 +2,6 @@
 
 package org.vivoweb.reasoner.plugin;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.apache.jena.ontology.OntModel;
-import org.apache.jena.rdf.model.Model;
-import org.apache.jena.rdf.model.Property;
-import org.apache.jena.rdf.model.RDFNode;
-import org.apache.jena.rdf.model.Resource;
-import org.apache.jena.rdf.model.ResourceFactory;
-import org.apache.jena.rdf.model.Statement;
-import org.apache.jena.rdf.model.StmtIterator;
-import org.apache.jena.vocabulary.RDF;
 import org.apache.jena.vocabulary.RDFS;
 
 import edu.cornell.mannlib.vitro.webapp.reasoner.ReasonerPlugin;

api/src/main/java/org/vivoweb/webapp/sitemap/SiteMapServlet.java

@@ -20,7 +20,6 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStream;
 
 @WebServlet(name = "SiteMapServlet", urlPatterns = {"/robots.txt","/sitemap.xml"})
 public class SiteMapServlet extends VitroHttpServlet {

api/src/main/java/org/vivoweb/webapp/startup/DataGetterN3Setup.java

@@ -1,6 +1,5 @@
 package org.vivoweb.webapp.startup;
 
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.VIVODefaultAddMissingIndividualFormGenerator;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessDataGetterN3Map;
 
 import javax.servlet.ServletContextEvent;

api/src/main/java/org/vivoweb/webapp/startup/GeneratorSetup.java

@@ -1,8 +1,6 @@
 package org.vivoweb.webapp.startup;
 
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.JspToGeneratorMapping;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.VIVODefaultAddMissingIndividualFormGenerator;
-import edu.cornell.mannlib.vitro.webapp.web.templatemodels.searchresult.VIVOIndividualSearchResult;
 
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;

api/src/main/java/org/vivoweb/webapp/startup/JSONWrapperSetup.java

@@ -7,10 +7,7 @@ import org.apache.jena.query.QuerySolution;
 import org.apache.jena.query.ResultSet;
 import edu.cornell.mannlib.vitro.webapp.beans.Individual;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
 import edu.cornell.mannlib.vitro.webapp.controller.individuallist.IndividualJsonWrapper;
-import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyStatementDao;
-import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.QueryUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
@@ -18,8 +15,6 @@ import org.apache.commons.logging.LogFactory;
 
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
-import java.util.Collection;
-import java.util.Map;
 
 public class JSONWrapperSetup implements ServletContextListener {
     private static final Log log = LogFactory.getLog(JSONWrapperSetup.class);

api/src/main/java/org/vivoweb/webapp/startup/SiteAdminSetup.java

@@ -2,9 +2,6 @@ package org.vivoweb.webapp.startup;
 
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.InstitutionalInternalClassController;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.SiteAdminController;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
-import edu.cornell.mannlib.vitro.webapp.utils.menuManagement.MenuManagementDataUtils;
-import edu.cornell.mannlib.vitro.webapp.utils.menuManagement.VIVOMenuManagementDataUtils;
 import edu.cornell.mannlib.vitro.webapp.visualization.tools.ToolsRequestHandler;
 
 import javax.servlet.ServletContextEvent;

api/src/main/java/org/vivoweb/webapp/startup/TemplateModelSetup.java

@@ -1,13 +1,8 @@
 package org.vivoweb.webapp.startup;
 
-import edu.cornell.mannlib.vitro.webapp.beans.Individual;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.VIVOIndividualTemplateModel;
 import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.IndividualTemplateModelBuilder;
 import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.VIVOIndividualTemplateModelBuilder;
-import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individuallist.ListedIndividual;
 import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individuallist.ListedIndividualBuilder;
-import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individuallist.VIVOListedIndividual;
 import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individuallist.VIVOListedIndividualBuilder;
 
 import javax.servlet.ServletContextEvent;