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

Timestamp:

2016-07-26T02:17:04+02:00 (8 years ago)

Author:

Don-vip

Message:

see #11390 - use functional comparators

Location:

trunk/src/org/openstreetmap/josm/gui/layer

Files:

• geoimage/CorrelateGpxWithImages.java (modified) (2 diffs)
• gpx/ImportAudioAction.java (modified) (3 diffs)
• markerlayer/MarkerLayer.java (modified) (2 diffs)

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

@@ -30 +30 @@
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.Dictionary;
@@ -1082 +1083 @@
         }
 
-        dateImgLst.sort((o1, o2) -> o1.getExifTime().compareTo(o2.getExifTime()));
+        dateImgLst.sort(Comparator.comparing(ImageEntry::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.Comparator;
 
 import javax.swing.AbstractAction;
@@ -87 +88 @@
             // long as they don't overlap, that's fine)
             if (sel.length > 1) {
-                Arrays.sort(sel, (a, b) -> a.lastModified() <= b.lastModified() ? -1 : 1);
+                Arrays.sort(sel, Comparator.comparingLong(File::lastModified));
             }
             StringBuilder names = new StringBuilder();
@@ -277 +278 @@
         /* we must have got at least one waypoint now */
 
-        ((ArrayList<WayPoint>) waypoints).sort((a, b) -> a.time <= b.time ? -1 : 1);
+        ((ArrayList<WayPoint>) waypoints).sort(Comparator.comparingDouble(o -> o.time));
 
         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.Comparator;
 import java.util.List;
 
@@ -233 +234 @@
         if (from instanceof MarkerLayer) {
             data.addAll(((MarkerLayer) from).data);
-            data.sort((o1, o2) -> Double.compare(o1.time, o2.time));
+            data.sort(Comparator.comparingDouble(o -> o.time));
         }
     }