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

Timestamp:

2013-02-12T21:48:45+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #8419 - RelationComparator considers different relations equal (patch by Zverikk)

File:

• trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java (modified) (2 diffs)

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

@@ -121 +121 @@
      * @param name  the name without the id
      * @param primitive the primitive
-     * @return the decorated name
      */
     protected void decorateNameWithId(StringBuilder name, IPrimitive primitive) {
@@ -384 +383 @@
                 String name2 = getRelationName(r2);
 
-                return ALPHANUM_COMPARATOR.compare(name1, name2);
+                comp = ALPHANUM_COMPARATOR.compare(name1, name2);
+                if (comp != 0)
+                    return comp;
             }