Changeset 9284 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java

Timestamp:

2016-01-03T18:13:45+01:00 (9 years ago)

Author:

bastiK

Message:

refactor some code from StyleCache into separate classes (see #9891)

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java (modified) (16 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java

@@ -21 +21 @@
 import org.openstreetmap.josm.data.osm.visitor.paint.relations.MultipolygonCache;
 import org.openstreetmap.josm.gui.NavigatableComponent;
-import org.openstreetmap.josm.gui.mappaint.StyleCache.StyleList;
 import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource;
 import org.openstreetmap.josm.gui.mappaint.styleelement.AreaElement;
@@ -80 +79 @@
      * @return list of styles
      */
-    public StyleList get(OsmPrimitive osm, double scale, NavigatableComponent nc) {
+    public StyleElementList get(OsmPrimitive osm, double scale, NavigatableComponent nc) {
         return getStyleCacheWithRange(osm, scale, nc).a;
     }
@@ -94 +93 @@
      * @return pair containing style list and range
      */
-    public Pair<StyleList, Range> getStyleCacheWithRange(OsmPrimitive osm, double scale, NavigatableComponent nc) {
+    public Pair<StyleElementList, Range> getStyleCacheWithRange(OsmPrimitive osm, double scale, NavigatableComponent nc) {
         if (osm.mappaintStyle == null || osm.mappaintCacheIdx != cacheIdx || scale <= 0) {
             osm.mappaintStyle = StyleCache.EMPTY_STYLECACHE;
         } else {
-            Pair<StyleList, Range> lst = osm.mappaintStyle.getWithRange(scale);
+            Pair<StyleElementList, Range> lst = osm.mappaintStyle.getWithRange(scale);
             if (lst.a != null)
                 return lst;
         }
-        Pair<StyleList, Range> p = getImpl(osm, scale, nc);
+        Pair<StyleElementList, Range> p = getImpl(osm, scale, nc);
         if (osm instanceof Node && isDefaultNodes()) {
             if (p.a.isEmpty()) {
@@ -123 +122 @@
                 }
                 if (!hasNonModifier) {
-                    p.a = new StyleList(p.a, NodeElement.SIMPLE_NODE_ELEMSTYLE);
+                    p.a = new StyleElementList(p.a, NodeElement.SIMPLE_NODE_ELEMSTYLE);
                     if (!hasText) {
                         if (TextLabel.AUTO_LABEL_COMPOSITION_STRATEGY.compose(osm) != null) {
-                            p.a = new StyleList(p.a, BoxTextElement.SIMPLE_NODE_TEXT_ELEMSTYLE);
+                            p.a = new StyleElementList(p.a, BoxTextElement.SIMPLE_NODE_TEXT_ELEMSTYLE);
                         }
                     }
@@ -142 +141 @@
                 AreaElement area = Utils.find(p.a, AreaElement.class);
                 LineElement line = area == null ? LineElement.UNTAGGED_WAY : LineElement.createSimpleLineStyle(area.color, true);
-                p.a = new StyleList(p.a, line);
+                p.a = new StyleElementList(p.a, line);
             }
         }
@@ -186 +185 @@
      * @return pair containing style list and range
      */
-    private Pair<StyleList, Range> getImpl(OsmPrimitive osm, double scale, NavigatableComponent nc) {
+    private Pair<StyleElementList, Range> getImpl(OsmPrimitive osm, double scale, NavigatableComponent nc) {
         if (osm instanceof Node)
             return generateStyles(osm, scale, false);
         else if (osm instanceof Way) {
-            Pair<StyleList, Range> p = generateStyles(osm, scale, false);
+            Pair<StyleElementList, Range> p = generateStyles(osm, scale, false);
 
             boolean isOuterWayOfSomeMP = false;
@@ -216 +215 @@
                             }
                         }
-                        p.a = new StyleList(tmp);
+                        p.a = new StyleElementList(tmp);
                         isOuterWayOfSomeMP = true;
                     }
 
                     if (!hasIndependentLineStyle) {
-                        Pair<StyleList, Range> mpElemStyles;
+                        Pair<StyleElementList, Range> mpElemStyles;
                         synchronized (r) {
                             mpElemStyles = getStyleCacheWithRange(r, scale, nc);
@@ -234 +233 @@
                         p.b = Range.cut(p.b, mpElemStyles.b);
                         if (mpLine != null) {
-                            p.a = new StyleList(p.a, mpLine);
+                            p.a = new StyleElementList(p.a, mpLine);
                             break;
                         } else if (wayColor == null && isDefaultLines()) {
@@ -255 +254 @@
                     }
                     if (!hasLineStyle) {
-                        p.a = new StyleList(p.a, LineElement.createSimpleLineStyle(wayColor, true));
+                        p.a = new StyleElementList(p.a, LineElement.createSimpleLineStyle(wayColor, true));
                     }
                 }
@@ -281 +280 @@
                     if (!hasIndependentElemStyle && !multipolygon.getOuterWays().isEmpty()) {
                         Color mpColor = null;
-                        StyleList mpElemStyles = null;
+                        StyleElementList mpElemStyles = null;
                         synchronized (ref) {
                             mpElemStyles = get(ref, scale, nc);
@@ -291 +290 @@
                             }
                         }
-                        p.a = new StyleList(p.a, LineElement.createSimpleLineStyle(mpColor, true));
+                        p.a = new StyleElementList(p.a, LineElement.createSimpleLineStyle(mpColor, true));
                     }
                     return p;
@@ -298 +297 @@
             return p;
         } else if (osm instanceof Relation) {
-            Pair<StyleList, Range> p = generateStyles(osm, scale, true);
+            Pair<StyleElementList, Range> p = generateStyles(osm, scale, true);
             if (drawMultipolygon && ((Relation) osm).isMultipolygon()) {
                 if (!Utils.exists(p.a, AreaElement.class) && Main.pref.getBoolean("multipolygon.deprecated.outerstyle", true)) {
@@ -304 +303 @@
                     Multipolygon multipolygon = MultipolygonCache.getInstance().get(nc, (Relation) osm);
                     for (Way w : multipolygon.getOuterWays()) {
-                        Pair<StyleList, Range> wayStyles = generateStyles(w, scale, false);
+                        Pair<StyleElementList, Range> wayStyles = generateStyles(w, scale, false);
                         p.b = Range.cut(p.b, wayStyles.b);
                         StyleElement area = Utils.find(wayStyles.a, AreaElement.class);
                         if (area != null) {
-                            p.a = new StyleList(p.a, area);
+                            p.a = new StyleElementList(p.a, area);
                             break;
                         }
@@ -332 +331 @@
      * @return the generated styles and the valid range as a pair
      */
-    public Pair<StyleList, Range> generateStyles(OsmPrimitive osm, double scale, boolean pretendWayIsClosed) {
+    public Pair<StyleElementList, Range> generateStyles(OsmPrimitive osm, double scale, boolean pretendWayIsClosed) {
 
         List<StyleElement> sl = new ArrayList<>();
@@ -377 +376 @@
             }
         }
-        return new Pair<>(new StyleList(sl), mc.range);
+        return new Pair<>(new StyleElementList(sl), mc.range);
     }
 
@@ -501 +500 @@
             if (MapPaintStyles.getStyles() == null)
                 return false;
-            StyleList styles = MapPaintStyles.getStyles().generateStyles(p, 1.0, false).a;
+            StyleElementList styles = MapPaintStyles.getStyles().generateStyles(p, 1.0, false).a;
             if (styles.isEmpty()) {
                 return false;