From d97544b9912ed71ba51e1439b614d83a3a622ac2 Mon Sep 17 00:00:00 2001 From: Graham Triggs Date: Mon, 18 Sep 2017 11:49:47 +0100 Subject: [PATCH] Minor code improvements --- .../cornell/mannlib/vedit/util/FormUtils.java | 35 +++--- .../cornell/mannlib/vedit/util/Stemmer.java | 6 +- .../vitro/webapp/controller/Controllers.java | 4 +- .../Classes2ClassesOperationController.java | 20 ++-- .../controller/edit/EntityEditController.java | 2 +- .../IndividualTypeOperationController.java | 6 +- .../edit/IndividualTypeRetryController.java | 7 +- ...perties2PropertiesOperationController.java | 28 ++--- .../edit/RefactorOperationController.java | 11 +- .../controller/edit/VclassEditController.java | 8 +- ...ataPropertyStatementListingController.java | 20 ++-- ...ectPropertyStatementListingController.java | 48 ++++---- .../grefine/GrefinePropertyListServlet.java | 106 +++++++++--------- .../grefine/JSONReconcileServlet.java | 11 +- .../controller/jena/JenaAdminActions.java | 7 +- .../controller/jena/JenaIngestController.java | 37 +++--- .../controller/jena/RDFUploadController.java | 7 +- .../webapp/dao/WebappDaoFactoryConfig.java | 2 +- .../webapp/dao/jena/IndividualDaoJena.java | 14 +-- .../vitro/webapp/dao/jena/IndividualJena.java | 22 ++-- .../vitro/webapp/dao/jena/IndividualSDB.java | 22 ++-- .../vitro/webapp/dao/jena/JenaModelUtils.java | 16 +-- .../webapp/dao/jena/PropertyDaoJena.java | 5 +- .../webapp/dao/jena/WebappDaoFactorySDB.java | 62 +++++----- ...ividualDataPropertyStatementProcessor.java | 58 +++++----- .../fields/IndividualsViaVClassOptions.java | 6 +- .../n3editing/VTwo/fields/RdfTypeOptions.java | 35 +++--- ...aultAddMissingIndividualFormGenerator.java | 7 -- .../generators/DefaultDeleteGenerator.java | 8 +- .../DefaultObjectPropertyFormGenerator.java | 8 -- .../NewIndividualFormGenerator.java | 7 -- .../vitro/webapp/filters/VitroURL.java | 6 +- .../rdfservice/impl/RDFServiceImpl.java | 4 - .../servlet/setup/UpdateKnowledgeBase.java | 4 +- .../webapp/sparql/GetClazzAllProperties.java | 4 +- .../vitro/webapp/utils/JsonToFmModel.java | 5 +- .../mannlib/vitro/webapp/utils/Stemmer.java | 6 +- .../webapp/utils/jena/JenaIngestUtils.java | 6 +- .../PropertyGroupTemplateModel.java | 5 +- .../webapp/startup/StartupManagerTest.java | 4 +- .../vitro/webapp/dao/VClassGroupDaoStub.java | 4 +- .../webapp/test_config_default.properties | 2 +- api/src/test/resources/log4j.properties | 8 +- .../WEB-INF/classes/log4j.properties | 10 +- legacy/utilities/solrtester/log4j.properties | 4 +- .../config/licenser/licenser.properties | 2 +- legacy/webapp/config/log4j.properties | 10 +- .../languages/es_GO/i18n/all_es_GO.properties | 16 +-- solr/src/main/resources/log4j.properties | 10 +- webapp/src/main/webapp/i18n/all.properties | 4 +- 50 files changed, 344 insertions(+), 405 deletions(-) diff --git a/api/src/main/java/edu/cornell/mannlib/vedit/util/FormUtils.java b/api/src/main/java/edu/cornell/mannlib/vedit/util/FormUtils.java index ba9f8fcce..da30a34b8 100644 --- a/api/src/main/java/edu/cornell/mannlib/vedit/util/FormUtils.java +++ b/api/src/main/java/edu/cornell/mannlib/vedit/util/FormUtils.java @@ -73,43 +73,38 @@ public class FormUtils { Method[] meths = beanClass.getMethods(); - for (int i=0; i(c.length); - for (int i = 0; i < c.length; i++) { - letters.add("" + c[i]); + for (char aC : c) { + letters.add("" + aC); } } return Controllers.letters; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesOperationController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesOperationController.java index 026a55476..7001a6ee2 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesOperationController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesOperationController.java @@ -72,43 +72,43 @@ public class Classes2ClassesOperationController extends BaseEditController { if ((subclassURIstrs != null) && (subclassURIstrs.length > 1)) { String superclassURIstr = request.getParameter("SuperclassURI"); if (superclassURIstr != null) { - for (int i=0; i prohibitedURIset = new HashSet(); - for (Iterator indClassIt = ind.getVClasses(false).iterator(); indClassIt.hasNext(); ) { - VClass vc = indClassIt.next(); - if(vc.isAnonymous()) { - continue; + for (VClass vc : ind.getVClasses(false)) { + if (vc.isAnonymous()) { + continue; } prohibitedURIset.add(vc.getURI()); prohibitedURIset.addAll(vcDao.getDisjointWithClassURIs(vc.getURI())); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesOperationController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesOperationController.java index 93fd5723a..0fb4c8689 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesOperationController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/Properties2PropertiesOperationController.java @@ -128,25 +128,25 @@ public class Properties2PropertiesOperationController extends if ((subpropertyURIstrs != null) && (subpropertyURIstrs.length > 1)) { String superpropertyURIstr = request.getParameter("SuperpropertyURI"); if (superpropertyURIstr != null) { - for (int i=0; i -1) { - controllerStr = controllers[i]; + for (String controller : controllers) { + if (refererStr.indexOf(controller) > -1) { + controllerStr = controller; } } if (controllerStr != null) { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassEditController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassEditController.java index f509aae17..16458c420 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassEditController.java +++ b/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 commIt = request.getUnfilteredWebappDaoFactory().getCommentsForResource(vcl.getURI()).iterator(); commIt.hasNext();) { - if (commSb==null) { + for (String s : request.getUnfilteredWebappDaoFactory().getCommentsForResource(vcl.getURI())) { + if (commSb == null) { commSb = new StringBuffer(); - foundComment=true; + foundComment = true; } - commSb.append(commIt.next()).append(" "); + commSb.append(s).append(" "); } if (!foundComment) { commSb = new StringBuffer("no comments yet"); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/DataPropertyStatementListingController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/DataPropertyStatementListingController.java index eef50a63b..3ef92c160 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/DataPropertyStatementListingController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/DataPropertyStatementListingController.java @@ -82,16 +82,16 @@ public class DataPropertyStatementListingController extends BaseEditController { DataProperty dp = dpDao.getDataPropertyByURI(propURIStr); int count = 0; - - for (Iterator i = dpsDao.getDataPropertyStatements(dp,startAt,endAt).iterator(); i.hasNext();) { - count++; - DataPropertyStatement dps = i.next(); - Individual subj = iDao.getIndividualByURI(dps.getIndividualURI()); - results.add("XX"); - results.add(ListingControllerWebUtils.formatIndividualLink(subj)); - results.add(dp.getPublicName()); - results.add(dps.getData()); - } + + for (DataPropertyStatement dataPropertyStatement : dpsDao.getDataPropertyStatements(dp, startAt, endAt)) { + count++; + DataPropertyStatement dps = dataPropertyStatement; + Individual subj = iDao.getIndividualByURI(dps.getIndividualURI()); + results.add("XX"); + results.add(ListingControllerWebUtils.formatIndividualLink(subj)); + results.add(dp.getPublicName()); + results.add(dps.getData()); + } if (count == 0) { results.add("XX"); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ObjectPropertyStatementListingController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ObjectPropertyStatementListingController.java index ba56b401c..8d022f6de 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ObjectPropertyStatementListingController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/listing/ObjectPropertyStatementListingController.java @@ -115,30 +115,30 @@ public class ObjectPropertyStatementListingController extends int count = 0; - for (Iterator i = opsDao.getObjectPropertyStatements(op,startAt,endAt).iterator(); i.hasNext();) { - count++; - ObjectPropertyStatement ops = i.next(); - Individual subj = iDao.getIndividualByURI(ops.getSubjectURI()); - Individual obj = iDao.getIndividualByURI(ops.getObjectURI()); - results.add("XX"); - results.add(ListingControllerWebUtils.formatIndividualLink(subj)); - if (showVClasses) { - try { - results.add(ListingControllerWebUtils.formatVClassLinks(subj.getVClasses(true))); - } catch (Exception e) { - results.add("?"); - } - } - results.add(op.getDomainPublic()); - results.add(ListingControllerWebUtils.formatIndividualLink(obj)); - if (showVClasses) { - try { - results.add(ListingControllerWebUtils.formatVClassLinks(obj.getVClasses(true))); - } catch (Exception e) { - results.add("?"); - } - } - } + for (ObjectPropertyStatement objectPropertyStatement : opsDao.getObjectPropertyStatements(op, startAt, endAt)) { + count++; + ObjectPropertyStatement ops = objectPropertyStatement; + Individual subj = iDao.getIndividualByURI(ops.getSubjectURI()); + Individual obj = iDao.getIndividualByURI(ops.getObjectURI()); + results.add("XX"); + results.add(ListingControllerWebUtils.formatIndividualLink(subj)); + if (showVClasses) { + try { + results.add(ListingControllerWebUtils.formatVClassLinks(subj.getVClasses(true))); + } catch (Exception e) { + results.add("?"); + } + } + results.add(op.getDomainPublic()); + results.add(ListingControllerWebUtils.formatIndividualLink(obj)); + if (showVClasses) { + try { + results.add(ListingControllerWebUtils.formatVClassLinks(obj.getVClasses(true))); + } catch (Exception e) { + results.add("?"); + } + } + } if (count == 0) { results.add("XX"); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/GrefinePropertyListServlet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/GrefinePropertyListServlet.java index 57d8f01f3..38d14a676 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/GrefinePropertyListServlet.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/GrefinePropertyListServlet.java @@ -84,35 +84,34 @@ public class GrefinePropertyListServlet extends VitroHttpServlet { ObjectNode completeJson = JsonNodeFactory.instance.objectNode(); ArrayNode propertiesJsonArr = JsonNodeFactory.instance.arrayNode(); if (classPropertiesMap.size() > 0) { - for (Iterator iter = classPropertiesMap.keySet().iterator(); iter.hasNext();) { // add results to schema - VClass vc = (VClass) iter.next(); + for (VClass vc : classPropertiesMap.keySet()) { // add results to schema //System.out.println("vc uri: " + vc.getURI()); //System.out.println("vc name: " + vc.getName()); - ArrayList vcProps = (ArrayList)classPropertiesMap.get(vc); - for (DataProperty prop: vcProps) { - String nameStr = prop.getPublicName()==null ? prop.getName() : prop.getPublicName(); - //System.out.println("--- uri: " + prop.getURI()); - //System.out.println("--- name: " + nameStr); - // top level - ObjectNode propertiesItemJson = JsonNodeFactory.instance.objectNode(); - ObjectNode rootSchemaJson = JsonNodeFactory.instance.objectNode(); - rootSchemaJson.put("id", vc.getURI()); - rootSchemaJson.put("name", vc.getName()); - rootSchemaJson.put("alias", JsonNodeFactory.instance.arrayNode()); - propertiesItemJson.put("schema", rootSchemaJson); - // second level - propertiesItemJson.put("id", prop.getURI()); - propertiesItemJson.put("name", nameStr); - propertiesItemJson.put("alias", JsonNodeFactory.instance.arrayNode()); + ArrayList vcProps = (ArrayList) classPropertiesMap.get(vc); + for (DataProperty prop : vcProps) { + String nameStr = prop.getPublicName() == null ? prop.getName() : prop.getPublicName(); + //System.out.println("--- uri: " + prop.getURI()); + //System.out.println("--- name: " + nameStr); + // top level + ObjectNode propertiesItemJson = JsonNodeFactory.instance.objectNode(); + ObjectNode rootSchemaJson = JsonNodeFactory.instance.objectNode(); + rootSchemaJson.put("id", vc.getURI()); + rootSchemaJson.put("name", vc.getName()); + rootSchemaJson.put("alias", JsonNodeFactory.instance.arrayNode()); + propertiesItemJson.put("schema", rootSchemaJson); + // second level + propertiesItemJson.put("id", prop.getURI()); + propertiesItemJson.put("name", nameStr); + propertiesItemJson.put("alias", JsonNodeFactory.instance.arrayNode()); - ObjectNode expectsJson = JsonNodeFactory.instance.objectNode(); - expectsJson.put("id", prop.getURI()); - expectsJson.put("name", nameStr); - expectsJson.put("alias", JsonNodeFactory.instance.arrayNode()); - propertiesItemJson.put("expects", expectsJson); - - propertiesJsonArr.add(propertiesItemJson); + ObjectNode expectsJson = JsonNodeFactory.instance.objectNode(); + expectsJson.put("id", prop.getURI()); + expectsJson.put("name", nameStr); + expectsJson.put("alias", JsonNodeFactory.instance.arrayNode()); + propertiesItemJson.put("expects", expectsJson); + + propertiesJsonArr.add(propertiesItemJson); } } } @@ -148,36 +147,35 @@ public class GrefinePropertyListServlet extends VitroHttpServlet { HashMap> lvl2ClassPropertiesMap = populateClassPropertiesMap(vcDao, dao, lvl2Class.getURI(), propURIs); if (lvl2ClassPropertiesMap.size() > 0) { - for (Iterator iter = lvl2ClassPropertiesMap.keySet().iterator(); iter.hasNext();) { // add results to schema - VClass vc = (VClass) iter.next(); - ArrayList vcProps = (ArrayList)lvl2ClassPropertiesMap.get(vc); - for (DataProperty prop: vcProps) { - String nameStr = prop.getPublicName()==null ? prop.getName() : prop.getPublicName(); - // top level - ObjectNode propertiesItemJson = JsonNodeFactory.instance.objectNode(); - - ObjectNode rootSchemaJson = JsonNodeFactory.instance.objectNode(); - rootSchemaJson.put("id", topClass.getURI()); - rootSchemaJson.put("name", topClass.getName()); - rootSchemaJson.put("alias", JsonNodeFactory.instance.arrayNode()); - propertiesItemJson.put("schema", rootSchemaJson); + for (VClass vc : lvl2ClassPropertiesMap.keySet()) { // add results to schema + ArrayList vcProps = (ArrayList) lvl2ClassPropertiesMap.get(vc); + for (DataProperty prop : vcProps) { + String nameStr = prop.getPublicName() == null ? prop.getName() : prop.getPublicName(); + // top level + ObjectNode propertiesItemJson = JsonNodeFactory.instance.objectNode(); - // second level - propertiesItemJson.put("id", vc.getURI()); - propertiesItemJson.put("name", vc.getName()); - propertiesItemJson.put("alias", JsonNodeFactory.instance.arrayNode()); - - propertiesItemJson.put("id2", prop.getURI()); - propertiesItemJson.put("name2", nameStr); - propertiesItemJson.put("alias2", JsonNodeFactory.instance.arrayNode()); - - ObjectNode expectsJson = JsonNodeFactory.instance.objectNode(); - expectsJson.put("id", prop.getURI()); - expectsJson.put("name", nameStr); - expectsJson.put("alias", JsonNodeFactory.instance.arrayNode()); - propertiesItemJson.put("expects", expectsJson); - - propertiesJsonArr.add(propertiesItemJson); + ObjectNode rootSchemaJson = JsonNodeFactory.instance.objectNode(); + rootSchemaJson.put("id", topClass.getURI()); + rootSchemaJson.put("name", topClass.getName()); + rootSchemaJson.put("alias", JsonNodeFactory.instance.arrayNode()); + propertiesItemJson.put("schema", rootSchemaJson); + + // second level + propertiesItemJson.put("id", vc.getURI()); + propertiesItemJson.put("name", vc.getName()); + propertiesItemJson.put("alias", JsonNodeFactory.instance.arrayNode()); + + propertiesItemJson.put("id2", prop.getURI()); + propertiesItemJson.put("name2", nameStr); + propertiesItemJson.put("alias2", JsonNodeFactory.instance.arrayNode()); + + ObjectNode expectsJson = JsonNodeFactory.instance.objectNode(); + expectsJson.put("id", prop.getURI()); + expectsJson.put("name", nameStr); + expectsJson.put("alias", JsonNodeFactory.instance.arrayNode()); + propertiesItemJson.put("expects", expectsJson); + + propertiesJsonArr.add(propertiesItemJson); } } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/JSONReconcileServlet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/JSONReconcileServlet.java index ad175f1f2..d60b2b3f4 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/JSONReconcileServlet.java +++ b/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++) { - String queryStr = queries.get(i); + for (String queryStr : queries) { ObjectMapper mapper = new ObjectMapper(); JsonNode json = mapper.readTree(queryStr); @@ -147,7 +146,7 @@ public class JSONReconcileServlet extends VitroHttpServlet { searchNoTypeMap.put(INTERNAL_QUERY_NAME, json); } } else { // multiple queries - for (Iterator iter = json.fieldNames(); iter.hasNext();) { + for (Iterator iter = json.fieldNames(); iter.hasNext(); ) { ArrayList jsonList = new ArrayList(); String key = iter.next(); JsonNode jsonLvl2 = json.get(key); @@ -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 removeIt = statementsToRemove.iterator(); removeIt.hasNext(); ) { - Statement stmt = removeIt.next(); - memoryModel.remove(stmt); - } + for (Statement stmt : statementsToRemove) { + memoryModel.remove(stmt); + } } finally { memoryModel.leaveCriticalSection(); } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java index e615ba866..81dd98fed 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaIngestController.java +++ b/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 sourceModelList = new ArrayList(); - for (int i = 0; i < sourceModel.length ; i++) { - Model m = maker.getModel(sourceModel[i]); + for (String aSourceModel : sourceModel) { + Model m = maker.getModel(aSourceModel); if (m != null) { sourceModelList.add(m); } @@ -740,9 +740,8 @@ public class JenaIngestController extends BaseEditController { files = new File[1]; files[0] = file; } - for (int i=0; i31 && java.lang.Character.isDefined(chars[i])) { - cleanChars[cleanPos] = chars[i]; + for (char aChar : chars) { + if (Character.getNumericValue(aChar) > 31 && Character.isDefined(aChar)) { + 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; } } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadController.java index 7a3b9d31e..8a507cb79 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/RDFUploadController.java @@ -393,15 +393,14 @@ public class RDFUploadController extends JenaIngestController { files = new File[1]; files[0] = file; } - for (int i=0; i getCustomListViewConfigFileMap() { - return this.getCustomListViewConfigFileMap(); + return customListViewConfigFileMap; } public void setCustomListViewConfigFileMap( diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoJena.java index c1acf746a..15f114eba 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualDaoJena.java +++ b/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 vclasses = ent.getVClasses(false); if (vclasses != null) { - for (Iterator typeIt = vclasses.iterator(); typeIt.hasNext(); ) { - VClass vc = typeIt.next(); + for (VClass vc : vclasses) { 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 typeIt = vcl.iterator(); typeIt.hasNext(); ) { - VClass vc = typeIt.next(); + for (VClass vc : vcl) { newTypeURIsSet.add(vc.getURI()); } } } catch (Exception e) { log.error(e, e); } - for (Iterator oldIt = oldTypeURIsSet.iterator(); oldIt.hasNext();) { - String uri = oldIt.next(); + for (String uri : oldTypeURIsSet) { if (!newTypeURIsSet.contains(uri)) { - if ( (!conservativeTypeDeletion) || (uri.indexOf(VitroVocabulary.vitroURI) == 0) ) { + if ((!conservativeTypeDeletion) || (uri.indexOf(VitroVocabulary.vitroURI) == 0)) { ind.removeRDFType(ResourceFactory.createResource(uri)); } } } - for (Iterator newIt = newTypeURIsSet.iterator(); newIt.hasNext();) { - String uri = newIt.next(); + for (String uri : newTypeURIsSet) { if (!oldTypeURIsSet.contains(uri)) { ind.addRDFType(ResourceFactory.createResource(uri)); } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualJena.java index 82a348046..d2461fce9 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualJena.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualJena.java @@ -348,12 +348,11 @@ public class IndividualJena extends IndividualImpl implements Individual { if (this.propertyList == null) { getObjectPropertyList(); } - for (Iterator i = this.propertyList.iterator(); i.hasNext();) { - ObjectProperty op = (ObjectProperty) i.next(); - if (op.getURI() != null) { - map.put(op.getURI(), op); - } - } + for (ObjectProperty op : this.propertyList) { + if (op.getURI() != null) { + map.put(op.getURI(), op); + } + } this.objectPropertyMap = map; return map; } @@ -402,12 +401,11 @@ public class IndividualJena extends IndividualImpl implements Individual { if (this.datatypePropertyList == null) { getDataPropertyList(); } - for (Iterator i = this.datatypePropertyList.iterator(); i.hasNext();) { - DataProperty dp = (DataProperty) i.next(); - if (dp.getURI() != null) { - map.put(dp.getURI(), dp); - } - } + for (DataProperty dp : this.datatypePropertyList) { + if (dp.getURI() != null) { + map.put(dp.getURI(), dp); + } + } this.dataPropertyMap = map; return map; } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualSDB.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualSDB.java index 5cc27bd07..f92266499 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualSDB.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/IndividualSDB.java @@ -602,12 +602,11 @@ public class IndividualSDB extends IndividualImpl implements Individual { if (this.propertyList == null) { getObjectPropertyList(); } - for (Iterator i = this.propertyList.iterator(); i.hasNext();) { - ObjectProperty op = (ObjectProperty) i.next(); - if (op.getURI() != null) { - map.put(op.getURI(), op); - } - } + for (ObjectProperty op : this.propertyList) { + if (op.getURI() != null) { + map.put(op.getURI(), op); + } + } this.objectPropertyMap = map; return map; } @@ -660,12 +659,11 @@ public class IndividualSDB extends IndividualImpl implements Individual { if (this.datatypePropertyList == null) { getDataPropertyList(); } - for (Iterator i = this.datatypePropertyList.iterator(); i.hasNext();) { - DataProperty dp = (DataProperty) i.next(); - if (dp.getURI() != null) { - map.put(dp.getURI(), dp); - } - } + for (DataProperty dp : this.datatypePropertyList) { + if (dp.getURI() != null) { + map.put(dp.getURI(), dp); + } + } this.dataPropertyMap = map; return map; } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaModelUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaModelUtils.java index d0f7bea6e..97d3ad69a 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaModelUtils.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaModelUtils.java @@ -93,11 +93,9 @@ public class JenaModelUtils { try { List rootClasses = myWebappDaoFactory.getVClassDao() .getRootClasses(); - for (Iterator rootClassIt = rootClasses.iterator(); - rootClassIt.hasNext(); ) { - VClass rootClass = rootClassIt.next(); + for (VClass rootClass : rootClasses) { Individual classGroup = modelForClassgroups.createIndividual( - wadf.getDefaultNamespace() + "vitroClassGroup" + + wadf.getDefaultNamespace() + "vitroClassGroup" + rootClass.getLocalName(), classGroupClass); classGroup.setLabel(rootClass.getName(), null); @@ -105,16 +103,14 @@ public class JenaModelUtils { rootClass.getURI()); modelForClassgroupAnnotations.add( rootClassRes, inClassGroupProperty, classGroup); - for (Iterator childIt = myWebappDaoFactory.getVClassDao() - .getAllSubClassURIs(rootClass.getURI()).iterator(); - childIt.hasNext(); ) { - String childURI = childIt.next(); + for (String childURI : myWebappDaoFactory.getVClassDao() + .getAllSubClassURIs(rootClass.getURI())) { Resource childClass = modelForClassgroupAnnotations .getResource(childURI); if (!modelForClassgroupAnnotations.contains( childClass, inClassGroupProperty, (RDFNode) null)) { - childClass.addProperty(inClassGroupProperty, classGroup); - } + childClass.addProperty(inClassGroupProperty, classGroup); + } } } } catch (Exception e) { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyDaoJena.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyDaoJena.java index e322d1fc7..3c2447bc6 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/PropertyDaoJena.java +++ b/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, - Property equivalentProperty) { - removeEquivalentProperty(property, equivalentProperty); + public void removeEquivalentProperty(Property property, Property equivalentProperty) { + removeEquivalentProperty(property.getURI(), equivalentProperty.getURI()); } protected void removeABoxStatementsWithPredicate(Property predicate) { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactorySDB.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactorySDB.java index ca77a08fa..72d432197 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactorySDB.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/dao/jena/WebappDaoFactorySDB.java @@ -115,37 +115,37 @@ 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++) { - switch (datasetMode) { - case ASSERTIONS_ONLY : - filterBlock.append("FILTER (") - .append("(!bound(").append(graphVars[i]) - .append(")) || (") - .append(graphVars[i]) - .append(" != <") - .append(ModelNames.ABOX_INFERENCES) - .append("> ") - .append("&& ").append(graphVars[i]).append(" != <") - .append(ModelNames.TBOX_INFERENCES) - .append(">") - .append(") ) \n"); - break; - case INFERENCES_ONLY : - filterBlock.append("FILTER (") - .append("(!bound(").append(graphVars[i]) - .append(")) || (") - .append(graphVars[i]) - .append(" = <") - .append(ModelNames.ABOX_INFERENCES) - .append("> || ").append(graphVars[i]) - .append(" = <") - .append(ModelNames.TBOX_INFERENCES) - .append(">) )\n"); - break; - default: - break; - } - } + for (String graphVar : graphVars) { + switch (datasetMode) { + case ASSERTIONS_ONLY: + filterBlock.append("FILTER (") + .append("(!bound(").append(graphVar) + .append(")) || (") + .append(graphVar) + .append(" != <") + .append(ModelNames.ABOX_INFERENCES) + .append("> ") + .append("&& ").append(graphVar).append(" != <") + .append(ModelNames.TBOX_INFERENCES) + .append(">") + .append(") ) \n"); + break; + case INFERENCES_ONLY: + filterBlock.append("FILTER (") + .append("(!bound(").append(graphVar) + .append(")) || (") + .append(graphVar) + .append(" = <") + .append(ModelNames.ABOX_INFERENCES) + .append("> || ").append(graphVar) + .append(" = <") + .append(ModelNames.TBOX_INFERENCES) + .append(">) )\n"); + break; + default: + break; + } + } return filterBlock.toString(); } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/listener/impl/IndividualDataPropertyStatementProcessor.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/listener/impl/IndividualDataPropertyStatementProcessor.java index 7ac1a44e6..efd6d6f19 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/listener/impl/IndividualDataPropertyStatementProcessor.java +++ b/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; dataRow0 && rowId != null) { - - DataPropertyDao dataPropertyDao = (DataPropertyDao)epo.getAdditionalDaoMap().get("DataProperty"); - DataProperty dp = dataPropertyDao.getDataPropertyByURI(dataPropertyStmt.getDatapropURI()); - if (dp != null) { - String rangeDatatypeURI = dataPropertyDao.getRequiredDatatypeURI(individual, dp); - if (rangeDatatypeURI != null) { - dataPropertyStmt.setDatatypeURI(rangeDatatypeURI); - String validationMsg = BasicValidationVTwo.validateAgainstDatatype(dataPropertyStmt.getData(), rangeDatatypeURI); - // Since this backend editing system is de facto deprecated, - // not worrying about implementing per-field validation - if (validationMsg != null) { - validationMsg = "'" + dataPropertyStmt.getData() + "'" - + " is invalid. " - + validationMsg; - throw new RuntimeException(validationMsg); - } - } - } - + if (dataPropertyStmt.getData().length() > 0 && rowId != null) { + + DataPropertyDao dataPropertyDao = (DataPropertyDao) epo.getAdditionalDaoMap().get("DataProperty"); + DataProperty dp = dataPropertyDao.getDataPropertyByURI(dataPropertyStmt.getDatapropURI()); + if (dp != null) { + String rangeDatatypeURI = dataPropertyDao.getRequiredDatatypeURI(individual, dp); + if (rangeDatatypeURI != null) { + dataPropertyStmt.setDatatypeURI(rangeDatatypeURI); + String validationMsg = BasicValidationVTwo.validateAgainstDatatype(dataPropertyStmt.getData(), rangeDatatypeURI); + // Since this backend editing system is de facto deprecated, + // not worrying about implementing per-field validation + if (validationMsg != null) { + validationMsg = "'" + dataPropertyStmt.getData() + "'" + + " is invalid. " + + validationMsg; + throw new RuntimeException(validationMsg); + } + } + } + dataPropertyStatementDao.insertNewDataPropertyStatement(dataPropertyStmt); } //else if (dataPropertyStmt.getData().length()>0 && rowId != null) { - // dataPropertyStatementDao.updateDataPropertyStatement(dataPropertyStmt); + // dataPropertyStatementDao.updateDataPropertyStatement(dataPropertyStmt); //} else if (dataPropertyStmt.getData().length()==0 && rowId != null) { - // dataPropertyStatementDao.deleteDataPropertyStatement(dataPropertyStmt); + // dataPropertyStatementDao.deleteDataPropertyStatement(dataPropertyStmt); //} } } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaVClassOptions.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaVClassOptions.java index aa5e0afdd..52acc06e0 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaVClassOptions.java +++ b/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(vclassURIs.length); - for(int i=0;i uriToLabel = new HashMap(); - - for(int i=0;i subclassUris = wdf.getVClassDao().getAllSubClassURIs( uri ); - if( subclassUris == null ) + + uriToLabel.put(uri, vc.getPickListName()); + List subclassUris = wdf.getVClassDao().getAllSubClassURIs(uri); + if (subclassUris == null) continue; - - for( String subUri : subclassUris ){ - VClass subVc = wdf.getVClassDao().getVClassByURI( subUri ); - if( vc != null ){ - uriToLabel.put(subUri,subVc.getPickListName()); - }else{ - uriToLabel.put(subUri,subUri); + + for (String subUri : subclassUris) { + VClass subVc = wdf.getVClassDao().getVClassByURI(subUri); + if (vc != null) { + uriToLabel.put(subUri, subVc.getPickListName()); + } else { + uriToLabel.put(subUri, subUri); } - } + } } return uriToLabel; diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultAddMissingIndividualFormGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultAddMissingIndividualFormGenerator.java index 3fb637143..6302a7b5e 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultAddMissingIndividualFormGenerator.java +++ b/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 defaultsForXSDtypes ; - - static { - defaultsForXSDtypes = new HashMap(); - //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) { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultDeleteGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultDeleteGenerator.java index d3b0e8bbc..f052ecf37 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultDeleteGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultDeleteGenerator.java @@ -29,13 +29,7 @@ public class DefaultDeleteGenerator extends BaseEditConfigurationGenerator imple private DataPropertyStatement dps = null; private String dataLiteral = null; private String template = "confirmDeletePropertyForm.ftl"; - private static HashMap defaultsForXSDtypes ; - static { - defaultsForXSDtypes = new HashMap(); - //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 @Override diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultObjectPropertyFormGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultObjectPropertyFormGenerator.java index e44621d9c..92027e071 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultObjectPropertyFormGenerator.java +++ b/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 defaultsForXSDtypes ; - static { - defaultsForXSDtypes = new HashMap(); - //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 { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/NewIndividualFormGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/NewIndividualFormGenerator.java index 7ccd0463a..5f0b120c7 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/NewIndividualFormGenerator.java +++ b/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 defaultsForXSDtypes ; - static { - defaultsForXSDtypes = new HashMap(); - //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(); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/VitroURL.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/VitroURL.java index 5621215ab..386db34a7 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/filters/VitroURL.java +++ b/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"); Object[] keys = hm.keySet().toArray(); Arrays.sort(keys); - for (int i = 0; i < keys.length; i++) { - String key = (String) keys[i]; + for (Object key1 : keys) { + String key = (String) key1; String value = hm.get(key); respo.append(""); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/JsonToFmModel.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/JsonToFmModel.java index d2449a3ca..5085510f4 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/JsonToFmModel.java +++ b/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++) - { - sb.append(tabs).append(l.get(i)).append(":").append((l.get(i) != null) ? l.get(i).getClass() : "null").append("\n"); + for (Object aL : l) { + sb.append(tabs).append(aL).append(":").append((aL != null) ? aL.getClass() : "null").append("\n"); } sb.append(tabs).append("]\n"); } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/Stemmer.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/Stemmer.java index 315feefd4..ad5bf7be9 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/Stemmer.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/Stemmer.java @@ -548,9 +548,9 @@ public class Stemmer { char[] w = new char[501]; Stemmer s = new Stemmer(); - for (int i = 0; i < args.length; i++) { - log.trace( StemString( args[i], 100 )); - } + for (String arg : args) { + log.trace(StemString(arg, 100)); + } } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaIngestUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaIngestUtils.java index 39184b998..c8e909191 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/utils/jena/JenaIngestUtils.java +++ b/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 aClass : classes) { + result.append(aClass.getName()).append('\n'); } return result.toString(); } diff --git a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/VClassGroupDaoStub.java b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/VClassGroupDaoStub.java index 092df201e..0006d93f6 100644 --- a/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/VClassGroupDaoStub.java +++ b/api/src/test/java/stubs/edu/cornell/mannlib/vitro/webapp/dao/VClassGroupDaoStub.java @@ -39,11 +39,11 @@ public class VClassGroupDaoStub implements VClassGroupDao { public List getPublicGroupsWithVClasses() { List list = new ArrayList<>(); for (VClassGroup group: groups) { - if (!group.isEmpty()) { + if (group != null) { list.add(group); } } - return groups; + return list; } // ---------------------------------------------------------------------- diff --git a/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/test_config_default.properties b/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/test_config_default.properties index ace1e0ba1..290e777e3 100644 --- a/api/src/test/resources/edu/cornell/mannlib/vitro/webapp/test_config_default.properties +++ b/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 diff --git a/api/src/test/resources/log4j.properties b/api/src/test/resources/log4j.properties index 91c6e1872..8df713484 100644 --- a/api/src/test/resources/log4j.properties +++ b/api/src/test/resources/log4j.properties @@ -4,7 +4,7 @@ # It's not very important, because the tests themselves will override this # configuration in AbstractTestClass.initializeLogging(). # -log4j.rootLogger=WARN, AllAppender -log4j.appender.AllAppender=org.apache.log4j.ConsoleAppender -log4j.appender.AllAppender.layout=org.apache.log4j.PatternLayout -log4j.appender.AllAppender.layout.ConversionPattern=%p %t %c - %m%n +log4j.rootLogger=WARN, AllAppender +log4j.appender.AllAppender=org.apache.log4j.ConsoleAppender +log4j.appender.AllAppender.layout=org.apache.log4j.PatternLayout +log4j.appender.AllAppender.layout.ConversionPattern=%p %t %c - %m%n diff --git a/installer/solr/src/main/webResources/WEB-INF/classes/log4j.properties b/installer/solr/src/main/webResources/WEB-INF/classes/log4j.properties index 89f1b4378..b8307c2b3 100644 --- a/installer/solr/src/main/webResources/WEB-INF/classes/log4j.properties +++ b/installer/solr/src/main/webResources/WEB-INF/classes/log4j.properties @@ -1,11 +1,11 @@ -log4j.appender.AllAppender=org.apache.log4j.RollingFileAppender +log4j.appender.AllAppender=org.apache.log4j.RollingFileAppender log4j.appender.AllAppender.File= ${catalina.base}/logs/${app-name}solr.log -log4j.appender.AllAppender.MaxFileSize=10MB -log4j.appender.AllAppender.MaxBackupIndex=10 -log4j.appender.AllAppender.layout=org.apache.log4j.PatternLayout +log4j.appender.AllAppender.MaxFileSize=10MB +log4j.appender.AllAppender.MaxBackupIndex=10 +log4j.appender.AllAppender.layout=org.apache.log4j.PatternLayout log4j.appender.AllAppender.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c{1}] %m%n -log4j.rootLogger=INFO, AllAppender +log4j.rootLogger=INFO, AllAppender # Make all of the Solr classes quieter... log4j.logger.org.apache.solr.level = WARNING diff --git a/legacy/utilities/solrtester/log4j.properties b/legacy/utilities/solrtester/log4j.properties index b18505604..2fd6bf9e7 100644 --- a/legacy/utilities/solrtester/log4j.properties +++ b/legacy/utilities/solrtester/log4j.properties @@ -1,9 +1,9 @@ log4j.appender.AllAppender=org.apache.log4j.ConsoleAppender -log4j.appender.AllAppender.layout=org.apache.log4j.PatternLayout +log4j.appender.AllAppender.layout=org.apache.log4j.PatternLayout log4j.appender.AllAppender.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c] %m%n # log4j.appender.AllAppender.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c{1}] %m%n -log4j.rootLogger=INFO, AllAppender +log4j.rootLogger=INFO, AllAppender # Make all of the Solr classes quieter... log4j.logger.org.apache.solr=WARN diff --git a/legacy/webapp/config/licenser/licenser.properties b/legacy/webapp/config/licenser/licenser.properties index 1b0aaa076..e295c2d0f 100644 --- a/legacy/webapp/config/licenser/licenser.properties +++ b/legacy/webapp/config/licenser/licenser.properties @@ -10,7 +10,7 @@ source_dir = ../../../ # (if relative, then relative to this file) target_dir = -# A list of filename globs that match the files we want to license, +# A list of filename globs that match the files we want to license, # delimited by commas with optional white-space. file_matchers = *.java, *.jsp, *.tld, *.xsl, *.xslt, *.css, *.js, *.ftl, *.xml diff --git a/legacy/webapp/config/log4j.properties b/legacy/webapp/config/log4j.properties index 6b8e9bf83..3d3b93c64 100644 --- a/legacy/webapp/config/log4j.properties +++ b/legacy/webapp/config/log4j.properties @@ -23,15 +23,15 @@ # The "production" version of this file is log4j.properties. # debug.log4j.properties exists will be used instead, if it exists, but is not stored in Subversion. -log4j.appender.AllAppender=org.apache.log4j.RollingFileAppender +log4j.appender.AllAppender=org.apache.log4j.RollingFileAppender log4j.appender.AllAppender.File= $${catalina.base}/logs/${webapp.name}.all.log -log4j.appender.AllAppender.MaxFileSize=10MB -log4j.appender.AllAppender.MaxBackupIndex=10 -log4j.appender.AllAppender.layout=org.apache.log4j.PatternLayout +log4j.appender.AllAppender.MaxFileSize=10MB +log4j.appender.AllAppender.MaxBackupIndex=10 +log4j.appender.AllAppender.layout=org.apache.log4j.PatternLayout log4j.appender.AllAppender.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c{1}] %m%n -log4j.rootLogger=INFO, AllAppender +log4j.rootLogger=INFO, AllAppender # These classes are too chatty to display INFO messages. log4j.logger.edu.cornell.mannlib.vitro.webapp.startup.StartupStatus=WARN diff --git a/legacy/webapp/languages/es_GO/i18n/all_es_GO.properties b/legacy/webapp/languages/es_GO/i18n/all_es_GO.properties index 3741d22d6..490c286cf 100644 --- a/legacy/webapp/languages/es_GO/i18n/all_es_GO.properties +++ b/legacy/webapp/languages/es_GO/i18n/all_es_GO.properties @@ -7,7 +7,7 @@ save_changes = Guardar cambios save_entry=Guardar entrada select_existing=Seleccione existente select_an_existing=Seleccione una existente -add_an_entry_to=Agregar una entrada de tipo +add_an_entry_to=Agregar una entrada de tipo change_entry_for=Cambie la entrada de: add_new_entry_for=Añadir nueva entrada para: change_text_for=Cambie el texto para: @@ -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� 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_msg = Se ha producido un error al crear la página, por favor, compruebe los registros. -page_not_found = Página no encontrada -page_not_found_msg = La página no se ha encontrado en el sistema. -page_uri_missing = No se especifica la pá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_not_created = p�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_found = P�gina no encontrada +page_not_found_msg = La p�gina no se ha encontrado en el sistema. +page_uri_missing = No se especifica la p�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. # # site admin templates ( /templates/freemarker/body/siteAdmin ) diff --git a/solr/src/main/resources/log4j.properties b/solr/src/main/resources/log4j.properties index 342cef918..dcc389c9a 100644 --- a/solr/src/main/resources/log4j.properties +++ b/solr/src/main/resources/log4j.properties @@ -1,11 +1,11 @@ -log4j.appender.AllAppender=org.apache.log4j.RollingFileAppender +log4j.appender.AllAppender=org.apache.log4j.RollingFileAppender log4j.appender.AllAppender.File= ${catalina.base}/logs/solr.log -log4j.appender.AllAppender.MaxFileSize=10MB -log4j.appender.AllAppender.MaxBackupIndex=10 -log4j.appender.AllAppender.layout=org.apache.log4j.PatternLayout +log4j.appender.AllAppender.MaxFileSize=10MB +log4j.appender.AllAppender.MaxBackupIndex=10 +log4j.appender.AllAppender.layout=org.apache.log4j.PatternLayout log4j.appender.AllAppender.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %-5p [%c{1}] %m%n -log4j.rootLogger=INFO, AllAppender +log4j.rootLogger=INFO, AllAppender # Make all of the Solr classes quieter... log4j.logger.org.apache.solr.level = WARNING diff --git a/webapp/src/main/webapp/i18n/all.properties b/webapp/src/main/webapp/i18n/all.properties index a980cc36d..b25b63184 100644 --- a/webapp/src/main/webapp/i18n/all.properties +++ b/webapp/src/main/webapp/i18n/all.properties @@ -7,7 +7,7 @@ save_changes=Save changes save_entry=Save entry select_existing=Select existing select_an_existing=Select an existing -add_an_entry_to=Add an entry of type +add_an_entry_to=Add an entry of type change_entry_for=Change entry for: add_new_entry_for=Add new entry for: change_text_for=Change text for: @@ -675,7 +675,7 @@ javascript_require_to_edit = In order to edit content, you'll need to enable Jav javascript_instructions = java script instructions to_enable_javascript = Here are the instructions for enabling JavaScript in your web browser external_auth_name = external authentication name -external_login_text = Log in using BearCat Shibboleth +external_login_text = Log in using BearCat Shibboleth account = account change_password_to_login = Change Password to Log in new_password_capitalized = New Password