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

Timestamp:

2010-11-25T18:06:50+01:00 (13 years ago)

Author:

bastiK

Message:

Replace Bag by MultiMap.
Both collections are quite similar, but there is a technical difference: Bag is backed by an ArrayList and MultiMap by a LinkedHashSet. So with a Bag you could map a key multiple times to a certain value. I haven't found any usage where this behaviour is required or intended.
Also there could be a certain performance drawback with LinkedHashSet compared to ArrayList. However in the typical validator use case the value collection represents duplicate or crossing ways, so the number of elements is usually 1 or 2 and mostly smaller than the initial capacity (LHS=16, AL=10). (But I could have overlooked some use cases.)

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/validator/ValidatorTreePanel.java (modified) (8 diffs)
• layer/ValidatorLayer.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java

@@ -8 +8 @@
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
@@ -23 +24 @@
 import org.openstreetmap.josm.data.validation.Severity;
 import org.openstreetmap.josm.data.validation.TestError;
-import org.openstreetmap.josm.data.validation.util.Bag;
 import org.openstreetmap.josm.data.validation.util.MultipleNameVisitor;
+import org.openstreetmap.josm.tools.MultiMap;
 
 /**
@@ -138 +139 @@
         }
 
-        Map<Severity, Bag<String, TestError>> errorTree = new HashMap<Severity, Bag<String, TestError>>();
-        Map<Severity, HashMap<String, Bag<String, TestError>>> errorTreeDeep = new HashMap<Severity, HashMap<String, Bag<String, TestError>>>();
+        Map<Severity, MultiMap<String, TestError>> errorTree = new HashMap<Severity, MultiMap<String, TestError>>();
+        Map<Severity, HashMap<String, MultiMap<String, TestError>>> errorTreeDeep = new HashMap<Severity, HashMap<String, MultiMap<String, TestError>>>();
         for (Severity s : Severity.values()) {
-            errorTree.put(s, new Bag<String, TestError>(20));
-            errorTreeDeep.put(s, new HashMap<String, Bag<String, TestError>>());
+            errorTree.put(s, new MultiMap<String, TestError>(20));
+            errorTreeDeep.put(s, new HashMap<String, MultiMap<String, TestError>>());
         }
 
@@ -165 +166 @@
             }
             if (d != null) {
-                Bag<String, TestError> b = errorTreeDeep.get(s).get(m);
+                MultiMap<String, TestError> b = errorTreeDeep.get(s).get(m);
                 if (b == null) {
-                    b = new Bag<String, TestError>(20);
+                    b = new MultiMap<String, TestError>(20);
                     errorTreeDeep.get(s).put(m, b);
                 }
-                b.add(d, e);
+                b.put(d, e);
             } else {
-                errorTree.get(s).add(m, e);
+                errorTree.get(s).put(m, e);
             }
         }
@@ -178 +179 @@
         List<TreePath> expandedPaths = new ArrayList<TreePath>();
         for (Severity s : Severity.values()) {
-            Bag<String, TestError> severityErrors = errorTree.get(s);
-            Map<String, Bag<String, TestError>> severityErrorsDeep = errorTreeDeep.get(s);
+            MultiMap<String, TestError> severityErrors = errorTree.get(s);
+            Map<String, MultiMap<String, TestError>> severityErrorsDeep = errorTreeDeep.get(s);
             if (severityErrors.isEmpty() && severityErrorsDeep.isEmpty()) {
                 continue;
@@ -192 +193 @@
             }
 
-            for (Entry<String, List<TestError>> msgErrors : severityErrors.entrySet()) {
+            for (Entry<String, LinkedHashSet<TestError>> msgErrors : severityErrors.entrySet()) {
                 // Message node
-                List<TestError> errs = msgErrors.getValue();
+                Set<TestError> errs = msgErrors.getValue();
                 String msg = msgErrors.getKey() + " (" + errs.size() + ")";
                 DefaultMutableTreeNode messageNode = new DefaultMutableTreeNode(msg);
@@ -209 +210 @@
                 }
             }
-            for (Entry<String, Bag<String, TestError>> bag : severityErrorsDeep.entrySet()) {
+            for (Entry<String, MultiMap<String, TestError>> bag : severityErrorsDeep.entrySet()) {
                 // Group node
-                Bag<String, TestError> errorlist = bag.getValue();
+                MultiMap<String, TestError> errorlist = bag.getValue();
                 DefaultMutableTreeNode groupNode = null;
                 if (errorlist.size() > 1) {
@@ -222 +223 @@
                 }
 
-                for (Entry<String, List<TestError>> msgErrors : errorlist.entrySet()) {
+                for (Entry<String, LinkedHashSet<TestError>> msgErrors : errorlist.entrySet()) {
                     // Message node
-                    List<TestError> errs = msgErrors.getValue();
+                    Set<TestError> errs = msgErrors.getValue();
                     String msg;
                     if (groupNode != null) {

trunk/src/org/openstreetmap/josm/gui/layer/ValidatorLayer.java

@@ -19 +19 @@
 import org.openstreetmap.josm.data.validation.Severity;
 import org.openstreetmap.josm.data.validation.TestError;
-import org.openstreetmap.josm.data.validation.util.Bag;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
@@ -25 +24 @@
 import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.MultiMap;
 
 /**
@@ -78 +78 @@
     @Override
     public String getToolTipText() {
-        Bag<Severity, TestError> errorTree = new Bag<Severity, TestError>();
+        MultiMap<Severity, TestError> errorTree = new MultiMap<Severity, TestError>();
         List<TestError> errors = Main.map.validatorDialog.tree.getErrors();
         for (TestError e : errors) {
-            errorTree.add(e.getSeverity(), e);
+            errorTree.put(e.getSeverity(), e);
         }