diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/IndividualTypeRetryController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/IndividualTypeRetryController.java index 65f3b09e6..b6af307e9 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/IndividualTypeRetryController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/IndividualTypeRetryController.java @@ -66,10 +66,7 @@ public class IndividualTypeRetryController extends BaseEditController { continue; } prohibitedURIset.add(vc.getURI()); - for (Iterator djURIIt = vcDao.getDisjointWithClassURIs(vc.getURI()).iterator(); djURIIt.hasNext(); ) { - String djURI = djURIIt.next(); - prohibitedURIset.add(djURI); - } + prohibitedURIset.addAll(vcDao.getDisjointWithClassURIs(vc.getURI())); } List eligibleVClasses = new ArrayList(); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaAdminActions.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaAdminActions.java index 126ac767d..8a9450480 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaAdminActions.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/jena/JenaAdminActions.java @@ -133,9 +133,7 @@ public class JenaAdminActions extends BaseEditController { typeSet.add((Resource) stmt.getObject()); } } - for (Resource classRes : ontModel.listClasses().toList()) { - typeSet.add(classRes); - } + typeSet.addAll(ontModel.listClasses().toList()); for (Resource ontClass : typeSet) { if (!ontClass.isAnon()) { // Only query for named classes System.out.println("Describing "+ontClass.getURI()); diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetAllVClasses.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetAllVClasses.java index 0814eeef9..64a9ef869 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetAllVClasses.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/json/GetAllVClasses.java @@ -37,9 +37,7 @@ public class GetAllVClasses extends JsonObjectProducer { VClassGroupsForRequest vcgc = VClassGroupCache.getVClassGroups(vreq); List groups = vcgc.getGroups(); for(VClassGroup vcg: groups) { - for( VClass vc : vcg){ - vclasses.add(vc); - } + vclasses.addAll(vcg); } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationUtils.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationUtils.java index cc85e5fdc..dec801149 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationUtils.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationUtils.java @@ -296,9 +296,7 @@ public class EditConfigurationUtils { /** Make a copy of list of Strings. */ public static List copy(List list) { List copyList = new ArrayList(); - for(String l: list) { - copyList.add(l); - } + copyList.addAll(list); return copyList; } 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 1436d1934..e44621d9c 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 @@ -145,9 +145,7 @@ public class DefaultObjectPropertyFormGenerator implements EditConfigurationGene if (!rangeVClass.isUnion()) { types.add(rangeVClass); } else { - for (VClass unionComponent : rangeVClass.getUnionComponents()) { - types.add(unionComponent); - } + types.addAll(rangeVClass.getUnionComponents()); } return types; } else { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManagePageGenerator.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManagePageGenerator.java index a60bde138..a9b04a267 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManagePageGenerator.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManagePageGenerator.java @@ -679,9 +679,7 @@ private String getExistingIsSelfContainedTemplateQuery() { VClassGroupsForRequest vcgc = VClassGroupCache.getVClassGroups(vreq); List groups = vcgc.getGroups(); for(VClassGroup vcg: groups) { - for( VClass vc : vcg){ - vclasses.add(vc); - } + vclasses.addAll(vcg); } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/ProcessRdfFormController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/ProcessRdfFormController.java index 0b21f0586..4eaedf7fa 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/ProcessRdfFormController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/ProcessRdfFormController.java @@ -207,9 +207,7 @@ public class ProcessRdfFormController extends FreemarkerHttpServlet{ public static List makeListCopy(List list) { List copyOfN3 = new ArrayList(); - for( String str : list){ - copyOfN3.add(str); - } + copyOfN3.addAll(list); return copyOfN3; } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/ABoxRecomputer.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/ABoxRecomputer.java index 9fd4cca96..4dbbc7bbb 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/ABoxRecomputer.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/reasoner/ABoxRecomputer.java @@ -239,9 +239,7 @@ public class ABoxRecomputer { } } if(rebuildModel.size() - prevRebuildSize > 0) { - for (String sameAsInd : sameAsInds) { - individualQueue.add(sameAsInd); - } + individualQueue.addAll(sameAsInds); } } return additionalInferences; diff --git a/api/src/main/java/edu/ucsf/vitro/opensocial/OpenSocialManager.java b/api/src/main/java/edu/ucsf/vitro/opensocial/OpenSocialManager.java index 93b9d8fdc..a00d17399 100644 --- a/api/src/main/java/edu/ucsf/vitro/opensocial/OpenSocialManager.java +++ b/api/src/main/java/edu/ucsf/vitro/opensocial/OpenSocialManager.java @@ -240,9 +240,7 @@ public class OpenSocialManager { } } } - for (PreparedGadget gadget : removedGadgets) { - gadgets.remove(gadget); - } + gadgets.removeAll(removedGadgets); } public void removeGadget(String name) {