Changeset 10619 in josm for trunk/src/org/openstreetmap/josm/gui/layer

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/gui/layer

Files:

• AbstractTileSourceLayer.java (modified) (1 diff)
• OsmDataLayer.java (modified) (1 diff)
• geoimage/CorrelateGpxWithImages.java (modified) (1 diff)
• gpx/ImportAudioAction.java (modified) (2 diffs)
• markerlayer/MarkerLayer.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

@@ -1447 +1447 @@
                 return;
             List<Tile> allTiles = allTilesCreate();
-            Collections.sort(allTiles, getTileDistanceComparator());
+            allTiles.sort(getTileDistanceComparator());
             for (Tile t : allTiles) {
                 loadTile(t, force);

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -646 +646 @@
          */
         final List<Way> sortedWays = new ArrayList<>(ways);
-        Collections.sort(sortedWays, new OsmPrimitiveComparator(true, false)); // sort by OsmPrimitive#getUniqueId ascending
+        sortedWays.sort(new OsmPrimitiveComparator(true, false)); // sort by OsmPrimitive#getUniqueId ascending
         Collections.reverse(sortedWays); // sort by OsmPrimitive#getUniqueId descending
         for (Way w : sortedWays) {

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java

@@ -1081 +1081 @@
         }
 
-        Collections.sort(dateImgLst, (o1, o2) -> o1.getExifTime().compareTo(o2.getExifTime()));
+        dateImgLst.sort((o1, o2) -> o1.getExifTime().compareTo(o2.getExifTime()));
 
         return dateImgLst;

trunk/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java

@@ -11 +11 @@
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 
 import javax.swing.AbstractAction;
@@ -278 +277 @@
         /* we must have got at least one waypoint now */
 
-        Collections.sort((ArrayList<WayPoint>) waypoints, (a, b) -> a.time <= b.time ? -1 : 1);
+        ((ArrayList<WayPoint>) waypoints).sort((a, b) -> a.time <= b.time ? -1 : 1);
 
         firstTime = -1.0; /* this time of the first waypoint, not first trackpoint */

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java

@@ -19 +19 @@
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 
@@ -234 +233 @@
         if (from instanceof MarkerLayer) {
             data.addAll(((MarkerLayer) from).data);
-            Collections.sort(data, (o1, o2) -> Double.compare(o1.time, o2.time));
+            data.sort((o1, o2) -> Double.compare(o1.time, o2.time));
         }
     }