Changeset 5822 in josm for trunk/src/org/openstreetmap/josm/tools/MultiMap.java

Timestamp:

2013-04-02T02:26:07+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #8546 - Validator do not detect errors named identically (partial revert of r5783, reopens #8517). This is due to TreeMap that uses compareTo() instead of equals() (see Javadoc)

File:

• trunk/src/org/openstreetmap/josm/tools/MultiMap.java (modified) (5 diffs)

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

@@ -5 +5 @@
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
-import java.util.TreeSet;
 
 /**
@@ -38 +38 @@
         Set<B> vals = map.get(key);
         if (vals == null) {
-            vals = new TreeSet<B>();
+            vals = new LinkedHashSet<B>();
             map.put(key, vals);
         }
@@ -53 +53 @@
         if (map.containsKey(key))
             return;
-        map.put(key, new TreeSet<B>());
+        map.put(key, new LinkedHashSet<B>());
     }
 
@@ -64 +64 @@
         Set<B> vals = map.get(key);
         if (vals == null) {
-            vals = new TreeSet<B>(values);
+            vals = new LinkedHashSet<B>(values);
             map.put(key, vals);
         }
@@ -93 +93 @@
     public Set<B> getValues(A key) {
         if (!map.containsKey(key))
-            return new TreeSet<B>();
+            return new LinkedHashSet<B>();
         return map.get(key);
     }