diff --git a/api/src/main/java/edu/cornell/mannlib/vedit/controller/BaseEditController.java b/api/src/main/java/edu/cornell/mannlib/vedit/controller/BaseEditController.java index 53ef1ba96..2eb753a48 100644 --- a/api/src/main/java/edu/cornell/mannlib/vedit/controller/BaseEditController.java +++ b/api/src/main/java/edu/cornell/mannlib/vedit/controller/BaseEditController.java @@ -182,7 +182,7 @@ public class BaseEditController extends VitroHttpServlet { } - Collections.sort(bodyVal, new ListComparator(vreq.getCollator())); + bodyVal.sort(new ListComparator(vreq.getCollator())); for (String aBodyVal : bodyVal) { options.add(hashMap.get(aBodyVal)); } 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 f7148ccd1..fa63f41c7 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 @@ -267,7 +267,7 @@ public class FormUtils { } } - Collections.sort(options, (o1, o2) -> o1.getBody().compareTo(o2.getBody())); + options.sort((o1, o2) -> o1.getBody().compareTo(o2.getBody())); return options; } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/IndividualImpl.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/IndividualImpl.java index 838e8ab05..eb36922ce 100755 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/IndividualImpl.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/IndividualImpl.java @@ -308,7 +308,7 @@ public class IndividualImpl extends BaseResourceBean implements Individual, Comp protected void sortPropertiesForDisplay( ){ //here we sort the Property objects - Collections.sort(getObjectPropertyList(), new ObjectProperty.DisplayComparator()); + getObjectPropertyList().sort(new ObjectProperty.DisplayComparator()); } public JsonNode toJSON() { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ObjectProperty.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ObjectProperty.java index ffc42cf14..05c27ed83 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ObjectProperty.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/ObjectProperty.java @@ -463,7 +463,7 @@ public class ObjectProperty extends Property implements Comparable1) { try { - Collections.sort(pg.getPropertyList(),new Property.DisplayComparatorIgnoringPropertyGroup()); + pg.getPropertyList().sort(new Property.DisplayComparatorIgnoringPropertyGroup()); } catch (Exception ex) { log.error("Exception sorting property group "+pg.getName()+" property list: "+ex.getMessage()); } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/VitroHttpServlet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/VitroHttpServlet.java index 3d765c4a8..7b6b556bc 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/VitroHttpServlet.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/VitroHttpServlet.java @@ -205,7 +205,7 @@ public class VitroHttpServlet extends HttpServlet implements MultipartRequestWra protected void sortForPickList(List beans, VitroRequest vreq) { - Collections.sort(beans, new PickListSorter(vreq)); + beans.sort(new PickListSorter(vreq)); } protected class PickListSorter implements Comparator { diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsPage.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsPage.java index 97df47c7f..a4bf15ac4 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsPage.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsPage.java @@ -60,12 +60,12 @@ public abstract class UserAccountsPage extends AbstractPageHandler { } } - Collections.sort(list, new Comparator() { - @Override - public int compare(PermissionSet ps1, PermissionSet ps2) { - return ps1.getUri().compareTo(ps2.getUri()); - } - }); + list.sort(new Comparator() { + @Override + public int compare(PermissionSet ps1, PermissionSet ps2) { + return ps1.getUri().compareTo(ps2.getUri()); + } + }); return list; } diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/FauxPropertyRetryController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/FauxPropertyRetryController.java index 1a2c3a32d..941c6e7f6 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/FauxPropertyRetryController.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/edit/FauxPropertyRetryController.java @@ -244,8 +244,7 @@ public class FauxPropertyRetryController extends BaseEditController { private List