Changeset 6804 in josm for trunk/src/org/openstreetmap

Timestamp:

2014-02-02T23:35:42+01:00 (11 years ago)

Author:

simon04

Message:

fix #9668 - Sort entries in validation results naturally

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/TestError.java (modified) (2 diffs)
• gui/DefaultNameFormatter.java (modified) (3 diffs)
• gui/dialogs/relation/sort/RelationSorter.java (modified) (3 diffs)
• tools/AlphanumComparator.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/validation/TestError.java

@@ -25 +25 @@
 import org.openstreetmap.josm.data.osm.event.WayNodesChangedEvent;
 import org.openstreetmap.josm.data.validation.util.MultipleNameVisitor;
+import org.openstreetmap.josm.tools.AlphanumComparator;
 
 /**
@@ -300 +301 @@
         v1.visit(getPrimitives());
         v2.visit(o.getPrimitives());
-        return v1.toString().compareToIgnoreCase(v2.toString());
+        return AlphanumComparator.getInstance().compare(v1.toString(), v2.toString());
     }
 

trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java

@@ -356 +356 @@
 
     private final Comparator<Relation> relationComparator = new Comparator<Relation>() {
-        private final AlphanumComparator ALPHANUM_COMPARATOR = new AlphanumComparator();
         @Override
         public int compare(Relation r1, Relation r2) {
@@ -378 +377 @@
                 String type2 = getRelationTypeName(r2);
 
-                int comp = ALPHANUM_COMPARATOR.compare(type1, type2);
+                int comp = AlphanumComparator.getInstance().compare(type1, type2);
                 if (comp != 0)
                     return comp;
@@ -385 +384 @@
                 String name2 = getRelationName(r2);
 
-                comp = ALPHANUM_COMPARATOR.compare(name1, name2);
+                comp = AlphanumComparator.getInstance().compare(name1, name2);
                 if (comp != 0)
                     return comp;

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationSorter.java

@@ -54 +54 @@
     private static class AssociatedStreetRoleAddressHouseSorter implements AdditionalSorter {
 
-        public static final AlphanumComparator ALPHANUM_COMPARATOR = new AlphanumComparator();
-
         @Override
         public boolean acceptsMember(RelationMember m) {
@@ -66 +64 @@
                 @Override
                 public int compare(RelationMember a, RelationMember b) {
-                    final int houseNumber = ALPHANUM_COMPARATOR.compare(
+                    final int houseNumber = AlphanumComparator.getInstance().compare(
                             a.getMember().get("addr:housenumber"),
                             b.getMember().get("addr:housenumber"));
@@ -74 +72 @@
                     final String aDisplayName = a.getMember().getDisplayName(DefaultNameFormatter.getInstance());
                     final String bDisplayName = b.getMember().getDisplayName(DefaultNameFormatter.getInstance());
-                    return ALPHANUM_COMPARATOR.compare(aDisplayName, bDisplayName);
+                    return AlphanumComparator.getInstance().compare(aDisplayName, bDisplayName);
                 }
             });

trunk/src/org/openstreetmap/josm/tools/AlphanumComparator.java

@@ -39 +39 @@
  */
 public class AlphanumComparator implements Comparator<String> {
+
+    private static final AlphanumComparator INSTANCE = new AlphanumComparator();
+
+    public static AlphanumComparator getInstance() {
+        return INSTANCE;
+    }
+
+    /**
+     * Constructs a new Alphanum Comparator.
+     * @deprecated use {@link #getInstance()} instead.
+     */
+    @Deprecated
+    public AlphanumComparator() {
+    }
 
     /**