Changeset 8141 in josm

Timestamp:

2015-03-15T19:19:06+01:00 (9 years ago)

Author:

bastiK

Message:

applied #11231 - MapCSS: Use PriorityQueue instead of sorting an ArrayList (patch by Michael Zangl)

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java

@@ -13 +13 @@
 import java.text.MessageFormat;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -20 +19 @@
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.PriorityQueue;
 import java.util.Set;
 import java.util.concurrent.locks.ReadWriteLock;
@@ -137 +137 @@
         public final Map<String,Map<String,Set<MapCSSRule>>> index = new HashMap<>();
         /* rules without SimpleKeyValueCondition */
-        public final Set<MapCSSRule> remaining = new HashSet<>();
+        public final ArrayList<MapCSSRule> remaining = new ArrayList<>();
 
         public void add(MapCSSRule rule) {
@@ -178 +178 @@
                 rulesWithMatchingKeyValue.add(r);
             }
+            Collections.sort(remaining);
         }
 
@@ -188 +189 @@
          * You must have a read lock of STYLE_SOURCE_LOCK when calling this method.
          */
-        public Collection<MapCSSRule> getRuleCandidates(OsmPrimitive osm) {
-            List<MapCSSRule> ruleCandidates = new ArrayList<>(remaining);
+        public PriorityQueue<MapCSSRule> getRuleCandidates(OsmPrimitive osm) {
+            PriorityQueue<MapCSSRule> ruleCandidates = new PriorityQueue<>(remaining);
             for (Map.Entry<String,String> e : osm.getKeys().entrySet()) {
                 Map<String,Set<MapCSSRule>> v = index.get(e.getKey());
@@ -199 +200 @@
                 }
             }
-            Collections.sort(ruleCandidates);
             return ruleCandidates;
         }
@@ -489 +489 @@
         int lastDeclUsed = -1;
 
-        for (MapCSSRule r : matchingRuleIndex.getRuleCandidates(osm)) {
+        PriorityQueue<MapCSSRule> candidates = matchingRuleIndex.getRuleCandidates(osm);
+        MapCSSRule r;
+        while ((r = candidates.poll()) != null) {
             env.clearSelectorMatchingInformation();
             env.layer = null;