Changeset 10619 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/DeleteFromRelationConfirmationDialog.java

Timestamp:

2016-07-24T00:19:35+02:00 (8 years ago)

Author:

Don-vip

Message:

see #11390 - Java 8: use List.sort(Comparator) instead of Collections.sort(list, Comparator)

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/DeleteFromRelationConfirmationDialog.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/DeleteFromRelationConfirmationDialog.java

@@ -14 +14 @@
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashSet;
@@ -202 +201 @@
 
         protected void sort() {
-            Collections.sort(
-                    data,
-                    new Comparator<RelationToChildReference>() {
-                        private NameFormatter nf = DefaultNameFormatter.getInstance();
-                        @Override
-                        public int compare(RelationToChildReference o1, RelationToChildReference o2) {
-                            int cmp = o1.getChild().getDisplayName(nf).compareTo(o2.getChild().getDisplayName(nf));
-                            if (cmp != 0) return cmp;
-                            cmp = o1.getParent().getDisplayName(nf).compareTo(o2.getParent().getDisplayName(nf));
-                            if (cmp != 0) return cmp;
-                            return Integer.compare(o1.getPosition(), o2.getPosition());
-                        }
+            data.sort(new Comparator<RelationToChildReference>() {
+                    private NameFormatter nf = DefaultNameFormatter.getInstance();
+                    @Override
+                    public int compare(RelationToChildReference o1, RelationToChildReference o2) {
+                        int cmp = o1.getChild().getDisplayName(nf).compareTo(o2.getChild().getDisplayName(nf));
+                        if (cmp != 0) return cmp;
+                        cmp = o1.getParent().getDisplayName(nf).compareTo(o2.getParent().getDisplayName(nf));
+                        if (cmp != 0) return cmp;
+                        return Integer.compare(o1.getPosition(), o2.getPosition());
                     }
+                }
             );
         }