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

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

Files:

• dialogs/changeset/ChangesetCacheManagerModel.java (modified) (2 diffs)
• dialogs/changeset/ChangesetListModel.java (modified) (2 diffs)
• io/SaveLayersModel.java (modified) (2 diffs)
• layer/geoimage/CorrelateGpxWithImages.java (modified) (2 diffs)
• layer/gpx/ImportAudioAction.java (modified) (3 diffs)
• layer/markerlayer/MarkerLayer.java (modified) (2 diffs)
• preferences/imagery/CacheContentsPanel.java (modified) (2 diffs)
• preferences/plugin/PluginPreferencesModel.java (modified) (2 diffs)
• tagging/TagEditorModel.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerModel.java

@@ -6 +6 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
@@ -150 +151 @@
 
     protected void sort() {
-        data.sort((o1, o2) -> {
-                if (o1.getId() < o2.getId()) return 1;
-                if (o1.getId() == o2.getId()) return 0;
-                return -1;
-            }
-        );
+        data.sort(Comparator.comparingInt(Changeset::getId).reversed());
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListModel.java

@@ -4 +4 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
@@ -139 +140 @@
 
     protected void sort() {
-        data.sort((cs1, cs2) -> {
-                if (cs1.getId() > cs2.getId()) return -1;
-                if (cs1.getId() == cs2.getId()) return 0;
-                return 1;
-            }
-        );
+        data.sort(Comparator.comparingInt(Changeset::getId).reversed());
     }
 

trunk/src/org/openstreetmap/josm/gui/io/SaveLayersModel.java

@@ -6 +6 @@
 import java.io.File;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 
@@ -70 +71 @@
             layerInfo.add(new SaveLayerInfo(layer));
         }
-        layerInfo.sort((o1, o2) -> o1.compareTo(o2));
+        layerInfo.sort(Comparator.naturalOrder());
         fireTableDataChanged();
     }

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));
         }
     }

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/CacheContentsPanel.java

@@ -7 +7 @@
 import java.awt.event.ActionEvent;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
@@ -104 +105 @@
             sortedStats.add(new Pair<>(e.getKey(), e.getValue()[0]));
         }
-        sortedStats.sort((o1, o2) -> -1 * o1.b.compareTo(o2.b));
+        sortedStats.sort(Comparator.comparing(o -> o.b, Comparator.reverseOrder()));
         String[][] ret = new String[sortedStats.size()][3];
         int index = 0;

trunk/src/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferencesModel.java

@@ -5 +5 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -146 +147 @@
      */
     protected void sort() {
-        availablePlugins.sort((o1, o2) -> {
-                String n1 = o1.getName() == null ? "" : o1.getName().toLowerCase(Locale.ENGLISH);
-                String n2 = o2.getName() == null ? "" : o2.getName().toLowerCase(Locale.ENGLISH);
-                return n1.compareTo(n2);
-            }
-        );
+        availablePlugins.sort(Comparator.comparing(
+                o -> o.getName() == null ? "" : o.getName().toLowerCase(Locale.ENGLISH)));
     }
 

trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java

@@ -8 +8 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Comparator;
 import java.util.EnumSet;
 import java.util.HashMap;
@@ -561 +562 @@
      */
     protected void sort() {
-        tags.sort((self, other) -> self.getName().compareTo(other.getName()));
+        tags.sort(Comparator.comparing(TagModel::getName));
     }