Changeset 10619 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

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

Author:

Don-vip

Message:

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

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• ExtensionFileFilter.java (modified) (1 diff)
• JoinNodeWayAction.java (modified) (2 diffs)
• PurgeAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java

@@ -119 +119 @@
 
     protected static void sort(List<ExtensionFileFilter> filters) {
-        Collections.sort(
-                filters,
-                new Comparator<ExtensionFileFilter>() {
-                    private AllFormatsImporter all = new AllFormatsImporter();
-                    @Override
-                    public int compare(ExtensionFileFilter o1, ExtensionFileFilter o2) {
-                        if (o1.getDescription().equals(all.filter.getDescription())) return 1;
-                        if (o2.getDescription().equals(all.filter.getDescription())) return -1;
-                        return o1.getDescription().compareTo(o2.getDescription());
-                    }
+        filters.sort(new Comparator<ExtensionFileFilter>() {
+                private AllFormatsImporter all = new AllFormatsImporter();
+                @Override
+                public int compare(ExtensionFileFilter o1, ExtensionFileFilter o2) {
+                    if (o1.getDescription().equals(all.filter.getDescription())) return 1;
+                    if (o2.getDescription().equals(all.filter.getDescription())) return -1;
+                    return o1.getDescription().compareTo(o2.getDescription());
                 }
+            }
         );
     }

trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java

@@ -130 +130 @@
             List<Integer> segmentIndexes = new LinkedList<>();
             segmentIndexes.addAll(innerEntry.keySet());
-            Collections.sort(segmentIndexes, Collections.reverseOrder());
+            segmentIndexes.sort(Collections.reverseOrder());
 
             List<Node> wayNodes = w.getNodes();
@@ -149 +149 @@
                 List<Node> nodesToAdd = new LinkedList<>();
                 nodesToAdd.addAll(nodesInSegment);
-                Collections.sort(nodesToAdd, new NodeDistanceToRefNodeComparator(
+                nodesToAdd.sort(new NodeDistanceToRefNodeComparator(
                         w.getNode(segmentIndex), w.getNode(segmentIndex+1), !joinWayToNode));
                 wayNodes.addAll(segmentIndex + 1, nodesToAdd);

trunk/src/org/openstreetmap/josm/actions/PurgeAction.java

@@ -13 +13 @@
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
@@ -244 +243 @@
                             ImageProvider.get("warning-small"), JLabel.LEFT), GBC.eol().fill(GBC.HORIZONTAL));
 
-            Collections.sort(toPurgeAdditionally, (o1, o2) -> {
+            toPurgeAdditionally.sort((o1, o2) -> {
                 int type = o2.getType().compareTo(o1.getType());
                 if (type != 0)