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

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)

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• APIDataSet.java (modified) (3 diffs)
• osm/NoteData.java (modified) (1 diff)
• osm/history/History.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/APIDataSet.java

@@ -4 +4 @@
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -72 +71 @@
         }
         OsmPrimitiveComparator c = new OsmPrimitiveComparator(false, true);
-        Collections.sort(toDelete, c);
-        Collections.sort(toAdd, c);
-        Collections.sort(toUpdate, c);
+        toDelete.sort(c);
+        toAdd.sort(c);
+        toUpdate.sort(c);
     }
 
@@ -332 +331 @@
             }
             List<Relation> ret = new ArrayList<>(relations);
-            Collections.sort(
-                    ret,
-                    (o1, o2) -> Integer.compare(uploadOrder.indexOf(o1), uploadOrder.indexOf(o2))
-                    );
+            ret.sort((o1, o2) -> Integer.compare(uploadOrder.indexOf(o1), uploadOrder.indexOf(o2)));
             return ret;
         }

trunk/src/org/openstreetmap/josm/data/osm/NoteData.java

@@ -102 +102 @@
     public Collection<Note> getSortedNotes() {
         final List<Note> list = new ArrayList<>(noteList);
-        Collections.sort(list, comparator);
+        list.sort(comparator);
         return list;
     }

trunk/src/org/openstreetmap/josm/data/osm/history/History.java

@@ -4 +4 @@
 import java.text.MessageFormat;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Date;
 import java.util.List;
@@ -69 +68 @@
     public History sortAscending() {
         List<HistoryOsmPrimitive> copy = new ArrayList<>(versions);
-        Collections.sort(copy, (o1, o2) -> o1.compareTo(o2));
+        copy.sort((o1, o2) -> o1.compareTo(o2));
         return new History(id, type, copy);
     }
@@ -79 +78 @@
     public History sortDescending() {
         List<HistoryOsmPrimitive> copy = new ArrayList<>(versions);
-        Collections.sort(copy, (o1, o2) -> o2.compareTo(o1));
+        copy.sort((o1, o2) -> o2.compareTo(o1));
         return new History(id, type, copy);
     }