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

Timestamp:

2016-01-03T15:50:53+01:00 (8 years ago)

Author:

bastiK

Message:

move ElemStyle classes to new package, rename to (Style)Element

File:

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

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

@@ -23 +23 @@
 import org.openstreetmap.josm.gui.mappaint.StyleCache.StyleList;
 import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource;
+import org.openstreetmap.josm.gui.mappaint.styleelement.AreaElement;
+import org.openstreetmap.josm.gui.mappaint.styleelement.BoxTextElement;
+import org.openstreetmap.josm.gui.mappaint.styleelement.LineElement;
+import org.openstreetmap.josm.gui.mappaint.styleelement.LineTextElement;
+import org.openstreetmap.josm.gui.mappaint.styleelement.NodeElement;
+import org.openstreetmap.josm.gui.mappaint.styleelement.RepeatImageElement;
+import org.openstreetmap.josm.gui.mappaint.styleelement.StyleElement;
+import org.openstreetmap.josm.gui.mappaint.styleelement.TextLabel;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.tools.Pair;
@@ -97 +105 @@
         if (osm instanceof Node && isDefaultNodes()) {
             if (p.a.isEmpty()) {
-                if (TextElement.AUTO_LABEL_COMPOSITION_STRATEGY.compose(osm) != null) {
-                    p.a = NodeElemStyle.DEFAULT_NODE_STYLELIST_TEXT;
+                if (TextLabel.AUTO_LABEL_COMPOSITION_STRATEGY.compose(osm) != null) {
+                    p.a = NodeElement.DEFAULT_NODE_STYLELIST_TEXT;
                 } else {
-                    p.a = NodeElemStyle.DEFAULT_NODE_STYLELIST;
+                    p.a = NodeElement.DEFAULT_NODE_STYLELIST;
                 }
             } else {
                 boolean hasNonModifier = false;
                 boolean hasText = false;
-                for (ElemStyle s : p.a) {
-                    if (s instanceof BoxTextElemStyle) {
+                for (StyleElement s : p.a) {
+                    if (s instanceof BoxTextElement) {
                         hasText = true;
                     } else {
@@ -115 +123 @@
                 }
                 if (!hasNonModifier) {
-                    p.a = new StyleList(p.a, NodeElemStyle.SIMPLE_NODE_ELEMSTYLE);
+                    p.a = new StyleList(p.a, NodeElement.SIMPLE_NODE_ELEMSTYLE);
                     if (!hasText) {
-                        if (TextElement.AUTO_LABEL_COMPOSITION_STRATEGY.compose(osm) != null) {
-                            p.a = new StyleList(p.a, BoxTextElemStyle.SIMPLE_NODE_TEXT_ELEMSTYLE);
+                        if (TextLabel.AUTO_LABEL_COMPOSITION_STRATEGY.compose(osm) != null) {
+                            p.a = new StyleList(p.a, BoxTextElement.SIMPLE_NODE_TEXT_ELEMSTYLE);
                         }
                     }
@@ -125 +133 @@
         } else if (osm instanceof Way && isDefaultLines()) {
             boolean hasProperLineStyle = false;
-            for (ElemStyle s : p.a) {
+            for (StyleElement s : p.a) {
                 if (s.isProperLineStyle()) {
                     hasProperLineStyle = true;
@@ -132 +140 @@
             }
             if (!hasProperLineStyle) {
-                AreaElemStyle area = Utils.find(p.a, AreaElemStyle.class);
-                LineElemStyle line = area == null ? LineElemStyle.UNTAGGED_WAY : LineElemStyle.createSimpleLineStyle(area.color, true);
+                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);
             }
@@ -197 +205 @@
                     boolean hasIndependentLineStyle = false;
                     if (!isOuterWayOfSomeMP) { // do this only one time
-                        List<ElemStyle> tmp = new ArrayList<>(p.a.size());
-                        for (ElemStyle s : p.a) {
-                            if (s instanceof AreaElemStyle) {
-                                wayColor = ((AreaElemStyle) s).color;
+                        List<StyleElement> tmp = new ArrayList<>(p.a.size());
+                        for (StyleElement s : p.a) {
+                            if (s instanceof AreaElement) {
+                                wayColor = ((AreaElement) s).color;
                             } else {
                                 tmp.add(s);
@@ -217 +225 @@
                             mpElemStyles = getStyleCacheWithRange(r, scale, nc);
                         }
-                        ElemStyle mpLine = null;
-                        for (ElemStyle s : mpElemStyles.a) {
+                        StyleElement mpLine = null;
+                        for (StyleElement s : mpElemStyles.a) {
                             if (s.isProperLineStyle()) {
                                 mpLine = s;
@@ -229 +237 @@
                             break;
                         } else if (wayColor == null && isDefaultLines()) {
-                            AreaElemStyle mpArea = Utils.find(mpElemStyles.a, AreaElemStyle.class);
+                            AreaElement mpArea = Utils.find(mpElemStyles.a, AreaElement.class);
                             if (mpArea != null) {
                                 wayColor = mpArea.color;
@@ -240 +248 @@
                 if (isDefaultLines()) {
                     boolean hasLineStyle = false;
-                    for (ElemStyle s : p.a) {
+                    for (StyleElement s : p.a) {
                         if (s.isProperLineStyle()) {
                             hasLineStyle = true;
@@ -247 +255 @@
                     }
                     if (!hasLineStyle) {
-                        p.a = new StyleList(p.a, LineElemStyle.createSimpleLineStyle(wayColor, true));
+                        p.a = new StyleList(p.a, LineElement.createSimpleLineStyle(wayColor, true));
                     }
                 }
@@ -265 +273 @@
                     p = generateStyles(osm, scale, false);
                     boolean hasIndependentElemStyle = false;
-                    for (ElemStyle s : p.a) {
-                        if (s.isProperLineStyle() || s instanceof AreaElemStyle) {
+                    for (StyleElement s : p.a) {
+                        if (s.isProperLineStyle() || s instanceof AreaElement) {
                             hasIndependentElemStyle = true;
                             break;
@@ -277 +285 @@
                             mpElemStyles = get(ref, scale, nc);
                         }
-                        for (ElemStyle mpS : mpElemStyles) {
-                            if (mpS instanceof AreaElemStyle) {
-                                mpColor = ((AreaElemStyle) mpS).color;
+                        for (StyleElement mpS : mpElemStyles) {
+                            if (mpS instanceof AreaElement) {
+                                mpColor = ((AreaElement) mpS).color;
                                 break;
                             }
                         }
-                        p.a = new StyleList(p.a, LineElemStyle.createSimpleLineStyle(mpColor, true));
+                        p.a = new StyleList(p.a, LineElement.createSimpleLineStyle(mpColor, true));
                     }
                     return p;
@@ -292 +300 @@
             Pair<StyleList, Range> p = generateStyles(osm, scale, true);
             if (drawMultipolygon && ((Relation) osm).isMultipolygon()) {
-                if (!Utils.exists(p.a, AreaElemStyle.class) && Main.pref.getBoolean("multipolygon.deprecated.outerstyle", true)) {
+                if (!Utils.exists(p.a, AreaElement.class) && Main.pref.getBoolean("multipolygon.deprecated.outerstyle", true)) {
                     // look at outer ways to find area style
                     Multipolygon multipolygon = MultipolygonCache.getInstance().get(nc, (Relation) osm);
@@ -298 +306 @@
                         Pair<StyleList, Range> wayStyles = generateStyles(w, scale, false);
                         p.b = Range.cut(p.b, wayStyles.b);
-                        ElemStyle area = Utils.find(wayStyles.a, AreaElemStyle.class);
+                        StyleElement area = Utils.find(wayStyles.a, AreaElement.class);
                         if (area != null) {
                             p.a = new StyleList(p.a, area);
@@ -326 +334 @@
     public Pair<StyleList, Range> generateStyles(OsmPrimitive osm, double scale, boolean pretendWayIsClosed) {
 
-        List<ElemStyle> sl = new ArrayList<>();
+        List<StyleElement> sl = new ArrayList<>();
         MultiCascade mc = new MultiCascade();
         Environment env = new Environment(osm, mc, null, null);
@@ -342 +350 @@
             env.layer = e.getKey();
             if (osm instanceof Way) {
-                addIfNotNull(sl, AreaElemStyle.create(env));
-                addIfNotNull(sl, RepeatImageElemStyle.create(env));
-                addIfNotNull(sl, LineElemStyle.createLine(env));
-                addIfNotNull(sl, LineElemStyle.createLeftCasing(env));
-                addIfNotNull(sl, LineElemStyle.createRightCasing(env));
-                addIfNotNull(sl, LineElemStyle.createCasing(env));
-                addIfNotNull(sl, LineTextElemStyle.create(env));
+                addIfNotNull(sl, AreaElement.create(env));
+                addIfNotNull(sl, RepeatImageElement.create(env));
+                addIfNotNull(sl, LineElement.createLine(env));
+                addIfNotNull(sl, LineElement.createLeftCasing(env));
+                addIfNotNull(sl, LineElement.createRightCasing(env));
+                addIfNotNull(sl, LineElement.createCasing(env));
+                addIfNotNull(sl, LineTextElement.create(env));
             } else if (osm instanceof Node) {
-                NodeElemStyle nodeStyle = NodeElemStyle.create(env);
+                NodeElement nodeStyle = NodeElement.create(env);
                 if (nodeStyle != null) {
                     sl.add(nodeStyle);
-                    addIfNotNull(sl, BoxTextElemStyle.create(env, nodeStyle.getBoxProvider()));
+                    addIfNotNull(sl, BoxTextElement.create(env, nodeStyle.getBoxProvider()));
                 } else {
-                    addIfNotNull(sl, BoxTextElemStyle.create(env, NodeElemStyle.SIMPLE_NODE_ELEMSTYLE_BOXPROVIDER));
+                    addIfNotNull(sl, BoxTextElement.create(env, NodeElement.SIMPLE_NODE_ELEMSTYLE_BOXPROVIDER));
                 }
             } else if (osm instanceof Relation) {
                 if (((Relation) osm).isMultipolygon()) {
-                    addIfNotNull(sl, AreaElemStyle.create(env));
-                    addIfNotNull(sl, RepeatImageElemStyle.create(env));
-                    addIfNotNull(sl, LineElemStyle.createLine(env));
-                    addIfNotNull(sl, LineElemStyle.createCasing(env));
-                    addIfNotNull(sl, LineTextElemStyle.create(env));
+                    addIfNotNull(sl, AreaElement.create(env));
+                    addIfNotNull(sl, RepeatImageElement.create(env));
+                    addIfNotNull(sl, LineElement.createLine(env));
+                    addIfNotNull(sl, LineElement.createCasing(env));
+                    addIfNotNull(sl, LineTextElement.create(env));
                 } else if ("restriction".equals(osm.get("type"))) {
-                    addIfNotNull(sl, NodeElemStyle.create(env));
+                    addIfNotNull(sl, NodeElement.create(env));
                 }
             }
@@ -448 +456 @@
 
     /**
-     * Returns the first AreaElemStyle for a given primitive.
+     * Returns the first AreaElement for a given primitive.
      * @param p the OSM primitive
      * @param pretendWayIsClosed For styles that require the way to be closed,
      * we pretend it is. This is useful for generating area styles from the (segmented)
      * outer ways of a multipolygon.
-     * @return first AreaElemStyle found or {@code null}.
-     */
-    public static AreaElemStyle getAreaElemStyle(OsmPrimitive p, boolean pretendWayIsClosed) {
+     * @return first AreaElement found or {@code null}.
+     */
+    public static AreaElement getAreaElemStyle(OsmPrimitive p, boolean pretendWayIsClosed) {
         MapCSSStyleSource.STYLE_SOURCE_LOCK.readLock().lock();
         try {
             if (MapPaintStyles.getStyles() == null)
                 return null;
-            for (ElemStyle s : MapPaintStyles.getStyles().generateStyles(p, 1.0, pretendWayIsClosed).a) {
-                if (s instanceof AreaElemStyle)
-                    return (AreaElemStyle) s;
+            for (StyleElement s : MapPaintStyles.getStyles().generateStyles(p, 1.0, pretendWayIsClosed).a) {
+                if (s instanceof AreaElement)
+                    return (AreaElement) s;
             }
             return null;
@@ -471 +479 @@
 
     /**
-     * Determines whether primitive has an AreaElemStyle.
+     * Determines whether primitive has an AreaElement.
      * @param p the OSM primitive
      * @param pretendWayIsClosed For styles that require the way to be closed,
      * we pretend it is. This is useful for generating area styles from the (segmented)
      * outer ways of a multipolygon.
-     * @return {@code true} if primitive has an AreaElemStyle
+     * @return {@code true} if primitive has an AreaElement
      */
     public static boolean hasAreaElemStyle(OsmPrimitive p, boolean pretendWayIsClosed) {
@@ -483 +491 @@
 
     /**
-     * Determines whether primitive has <b>only</b> an AreaElemStyle.
+     * Determines whether primitive has <b>only</b> an AreaElement.
      * @param p the OSM primitive
-     * @return {@code true} if primitive has only an AreaElemStyle
+     * @return {@code true} if primitive has only an AreaElement
      * @since 7486
      */
@@ -497 +505 @@
                 return false;
             }
-            for (ElemStyle s : styles) {
-                if (!(s instanceof AreaElemStyle)) {
+            for (StyleElement s : styles) {
+                if (!(s instanceof AreaElement)) {
                     return false;
                 }