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

Timestamp:

2011-06-01T21:50:26+02:00 (13 years ago)

Author:

stoecker

Message:

fix #6233 - better sorting for upload dialog

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java

@@ -51 +51 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.OsmPrimitiveComparator;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.Relation;
@@ -916 +917 @@
     }
 
-    /** Comparator, comparing by type and objects display names */
-    static private class OsmPrimitiveComparator implements Comparator<OsmPrimitive> {
-        final private HashMap<OsmPrimitive, String> cache= new HashMap<OsmPrimitive, String>();
-        final private DefaultNameFormatter df  = DefaultNameFormatter.getInstance();
-
-        private String cachedName(OsmPrimitive p) {
-            String name = cache.get(p);
-            if (name == null) {
-                name = p.getDisplayName(df);
-                cache.put(p, name);
-            }
-            return name;
-        }
-
-        private int compareName(OsmPrimitive a, OsmPrimitive b) {
-            String an = cachedName(a);
-            String bn = cachedName(b);
-            // make sure display names starting with digits are the end of the
-            // list
-            if (Character.isDigit(an.charAt(0)) && Character.isDigit(bn.charAt(0)))
-                return an.compareTo(bn);
-            else if (Character.isDigit(an.charAt(0)) && !Character.isDigit(bn.charAt(0)))
-                return 1;
-            else if (!Character.isDigit(an.charAt(0)) && Character.isDigit(bn.charAt(0)))
-                return -1;
-            return an.compareTo(bn);
+    /** Quicker comparator, comparing just by type and ID's */
+    static private class OsmPrimitiveQuickComparator implements Comparator<OsmPrimitive> {
+
+        private int compareId(OsmPrimitive a, OsmPrimitive b) {
+            long id_a=a.getUniqueId();
+            long id_b=b.getUniqueId();
+            if (id_a<id_b) return -1;
+            if (id_a>id_b) return 1;
+            return 0;
         }
 
@@ -956 +940 @@
         public int compare(OsmPrimitive a, OsmPrimitive b) {
             if (a.getType().equals(b.getType()))
-                return compareName(a, b);
-            return compareType(a, b);
-        }
-    }
-
-    /** Quicker comparator, comparing just by type and ID's */
-    static private class OsmPrimitiveQuickComparator implements Comparator<OsmPrimitive> {
-
-        private int compareId(OsmPrimitive a, OsmPrimitive b) {
-            long id_a=a.getUniqueId();
-            long id_b=b.getUniqueId();
-            if (id_a<id_b) return -1;
-            if (id_a>id_b) return 1;
-            return 0;
-        }
-
-        private int compareType(OsmPrimitive a, OsmPrimitive b) {
-            // show ways before relations, then nodes
-            if (a.getType().equals(OsmPrimitiveType.WAY)) return -1;
-            if (a.getType().equals(OsmPrimitiveType.NODE)) return 1;
-            // a is a relation
-            if (b.getType().equals(OsmPrimitiveType.WAY)) return 1;
-            // b is a node
-            return -1;
-        }
-
-        public int compare(OsmPrimitive a, OsmPrimitive b) {
-            if (a.getType().equals(b.getType()))
                 return compareId(a, b);
             return compareType(a, b);