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

Timestamp:

2013-03-19T02:09:12+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #8517 - Sort validator results (based on patch by windu.2b)

File:

• trunk/src/org/openstreetmap/josm/tools/MultiMap.java (modified) (9 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;
 
 /**
@@ -20 +20 @@
 public class MultiMap<A, B> {
 
-    private final Map<A, LinkedHashSet<B>> map;
+    private final Map<A, Set<B>> map;
 
     public MultiMap() {
-        map = new HashMap<A, LinkedHashSet<B>>();
+        map = new HashMap<A, Set<B>>();
     }
 
     public MultiMap(int capacity) {
-        map = new HashMap<A, LinkedHashSet<B>>(capacity);
+        map = new HashMap<A, Set<B>>(capacity);
     }
 
@@ -36 +36 @@
      */
     public void put(A key, B value) {
-        LinkedHashSet<B> vals = map.get(key);
+        Set<B> vals = map.get(key);
         if (vals == null) {
-            vals = new LinkedHashSet<B>();
+            vals = new TreeSet<B>();
             map.put(key, vals);
         }
@@ -53 +53 @@
         if (map.containsKey(key))
             return;
-        map.put(key, new LinkedHashSet<B>());
+        map.put(key, new TreeSet<B>());
     }
 
@@ -62 +62 @@
      */
     public void putAll(A key, Collection<B> values) {
-        LinkedHashSet<B> vals = map.get(key);
+        Set<B> vals = map.get(key);
         if (vals == null) {
-            vals = new LinkedHashSet<B>(values);
+            vals = new TreeSet<B>(values);
             map.put(key, vals);
         }
@@ -91 +91 @@
      * Like get, but returns an empty Set if nothing has been mapped to the key.
      */
-    public LinkedHashSet<B> getValues(A key) {
+    public Set<B> getValues(A key) {
         if (!map.containsKey(key))
-            return new LinkedHashSet<B>();
+            return new TreeSet<B>();
         return map.get(key);
     }
@@ -121 +121 @@
     }
 
-    public Set<Entry<A, LinkedHashSet<B>>> entrySet() {
+    public Set<Entry<A, Set<B>>> entrySet() {
         return map.entrySet();
     }
@@ -135 +135 @@
      * Returns a collection of all value sets.
      */
-    public Collection<LinkedHashSet<B>> values() {
+    public Collection<Set<B>> values() {
         return map.values();
     }
@@ -155 +155 @@
      * Removes all mappings for a certain key.
      */
-    public LinkedHashSet<B> remove(A key) {
+    public Set<B> remove(A key) {
         return map.remove(key);
     }
 
+    @Override
     public String toString() {
         List<String> entries = new ArrayList<String>(map.size());