Changeset 7073 in josm for trunk/src/org

Timestamp:

2014-05-07T23:21:47+02:00 (11 years ago)

Author:

bastiK

Message:

see #9691 - really fix broken MapCSSTagChecker unit test

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• osm/DataSet.java (modified) (1 diff)
• validation/tests/MapCSSTagChecker.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -55 +55 @@
  * Dataset is threadsafe - accessing Dataset simultaneously from different threads should never
  * lead to data corruption or ConccurentModificationException. However when for example one thread
- * removes primitive and other thread try to add another primitive reffering to the removed primitive,
+ * removes primitive and other thread try to add another primitive referring to the removed primitive,
  * DataIntegrityException will occur.
  *

trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java

@@ -48 +48 @@
 import org.openstreetmap.josm.io.UTFInputStreamReader;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
-import org.openstreetmap.josm.tools.MultiMap;
 import org.openstreetmap.josm.tools.Predicate;
 import org.openstreetmap.josm.tools.Utils;
@@ -192 +191 @@
             removeMetaRules(source);
             // group rules with common declaration block
-            MultiMap<MapCSSRule.Declaration, MapCSSRule> rules = new MultiMap<>();
+            Map<Declaration, List<Selector>> g = new LinkedHashMap<>();
             for (MapCSSRule rule : source.rules) {
-                rules.put(rule.declaration, rule);
+                if (!g.containsKey(rule.declaration)) {
+                    List<Selector> sels = new ArrayList<>();
+                    sels.add(rule.selector);
+                    g.put(rule.declaration, sels);
+                } else {
+                    g.get(rule.declaration).add(rule.selector);
+                }
             }
             List<TagCheck> result = new ArrayList<>();
-            for (Collection<MapCSSRule> rulesCommonDecl : rules.values()) {
-                List<Selector> selectors = new ArrayList<>();
-                for (MapCSSRule rule : rulesCommonDecl) {
-                    selectors.add(rule.selector);
-                }
-                if (!rulesCommonDecl.isEmpty()) {
-                    result.add(TagCheck.ofMapCSSRule(
-                            new GroupedMapCSSRule(selectors, rulesCommonDecl.iterator().next().declaration)));
-                }
+            for (Map.Entry<Declaration, List<Selector>> map : g.entrySet()) {
+                result.add(TagCheck.ofMapCSSRule(
+                        new GroupedMapCSSRule(map.getValue(), map.getKey())));
             }
             return result;