Changeset 9278 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

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

Author:

bastiK

Message:

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

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• osm/visitor/paint/StyledMapRenderer.java (modified) (13 diffs)
• validation/tests/MultipolygonTest.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

@@ -59 +59 @@
 import org.openstreetmap.josm.data.osm.visitor.paint.relations.MultipolygonCache;
 import org.openstreetmap.josm.gui.NavigatableComponent;
-import org.openstreetmap.josm.gui.mappaint.AreaElemStyle;
-import org.openstreetmap.josm.gui.mappaint.BoxTextElemStyle;
-import org.openstreetmap.josm.gui.mappaint.BoxTextElemStyle.HorizontalTextAlignment;
-import org.openstreetmap.josm.gui.mappaint.BoxTextElemStyle.VerticalTextAlignment;
-import org.openstreetmap.josm.gui.mappaint.ElemStyle;
 import org.openstreetmap.josm.gui.mappaint.ElemStyles;
-import org.openstreetmap.josm.gui.mappaint.MapImage;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
-import org.openstreetmap.josm.gui.mappaint.NodeElemStyle;
-import org.openstreetmap.josm.gui.mappaint.NodeElemStyle.Symbol;
-import org.openstreetmap.josm.gui.mappaint.RepeatImageElemStyle.LineImageAlignment;
 import org.openstreetmap.josm.gui.mappaint.StyleCache.StyleList;
-import org.openstreetmap.josm.gui.mappaint.TextElement;
 import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource;
 import org.openstreetmap.josm.gui.mappaint.mapcss.Selector;
+import org.openstreetmap.josm.gui.mappaint.styleelement.AreaElement;
+import org.openstreetmap.josm.gui.mappaint.styleelement.BoxTextElement;
+import org.openstreetmap.josm.gui.mappaint.styleelement.BoxTextElement.HorizontalTextAlignment;
+import org.openstreetmap.josm.gui.mappaint.styleelement.BoxTextElement.VerticalTextAlignment;
+import org.openstreetmap.josm.gui.mappaint.styleelement.MapImage;
+import org.openstreetmap.josm.gui.mappaint.styleelement.NodeElement;
+import org.openstreetmap.josm.gui.mappaint.styleelement.NodeElement.Symbol;
+import org.openstreetmap.josm.gui.mappaint.styleelement.RepeatImageElement.LineImageAlignment;
+import org.openstreetmap.josm.gui.mappaint.styleelement.StyleElement;
+import org.openstreetmap.josm.gui.mappaint.styleelement.TextLabel;
 import org.openstreetmap.josm.tools.CompositeList;
 import org.openstreetmap.josm.tools.Geometry;
@@ -190 +190 @@
 
     private static class StyleRecord implements Comparable<StyleRecord> {
-        private final ElemStyle style;
+        private final StyleElement style;
         private final OsmPrimitive osm;
         private final int flags;
 
-        StyleRecord(ElemStyle style, OsmPrimitive osm, int flags) {
+        StyleRecord(StyleElement style, OsmPrimitive osm, int flags) {
             this.style = style;
             this.osm = osm;
@@ -223 +223 @@
 
             // simple node on top of icons and shapes
-            if (this.style == NodeElemStyle.SIMPLE_NODE_ELEMSTYLE && other.style != NodeElemStyle.SIMPLE_NODE_ELEMSTYLE)
+            if (this.style == NodeElement.SIMPLE_NODE_ELEMSTYLE && other.style != NodeElement.SIMPLE_NODE_ELEMSTYLE)
                 return 1;
-            if (this.style != NodeElemStyle.SIMPLE_NODE_ELEMSTYLE && other.style == NodeElemStyle.SIMPLE_NODE_ELEMSTYLE)
+            if (this.style != NodeElement.SIMPLE_NODE_ELEMSTYLE && other.style == NodeElement.SIMPLE_NODE_ELEMSTYLE)
                 return -1;
 
@@ -418 +418 @@
      * @param text text style to use
      */
-    private void displayText(GlyphVector gv, String s, int x, int y, boolean disabled, TextElement text) {
+    private void displayText(GlyphVector gv, String s, int x, int y, boolean disabled, TextLabel text) {
         if (gv == null && s.isEmpty()) return;
         if (isInactiveMode || disabled) {
@@ -472 +472 @@
      */
     protected void drawArea(OsmPrimitive osm, Path2D.Double path, Color color,
-            MapImage fillImage, Float extent, Path2D.Double pfClip, boolean disabled, TextElement text) {
+            MapImage fillImage, Float extent, Path2D.Double pfClip, boolean disabled, TextLabel text) {
 
         Shape area = path.createTransformedShape(nc.getAffineTransform());
@@ -525 +525 @@
     }
 
-    private void drawAreaText(OsmPrimitive osm, TextElement text, Shape area) {
+    private void drawAreaText(OsmPrimitive osm, TextLabel text, Shape area) {
         if (text != null && isShowNames()) {
             // abort if we can't compose the label to be rendered
@@ -612 +612 @@
      * @param text The text to write on the area.
      */
-    public void drawArea(Relation r, Color color, MapImage fillImage, Float extent, Float extentThreshold, boolean disabled, TextElement text) {
+    public void drawArea(Relation r, Color color, MapImage fillImage, Float extent, Float extentThreshold, boolean disabled, TextLabel text) {
         Multipolygon multipolygon = MultipolygonCache.getInstance().get(nc, r);
         if (!r.isDisabled() && !multipolygon.getOuterWays().isEmpty()) {
@@ -648 +648 @@
      * @param text The text to write on the area.
      */
-    public void drawArea(Way w, Color color, MapImage fillImage, Float extent, Float extentThreshold, boolean disabled, TextElement text) {
+    public void drawArea(Way w, Color color, MapImage fillImage, Float extent, Float extentThreshold, boolean disabled, TextLabel text) {
         Path2D.Double pfClip = null;
         if (extent != null) {
@@ -678 +678 @@
     }
 
-    public void drawBoxText(Node n, BoxTextElemStyle bs) {
+    public void drawBoxText(Node n, BoxTextElement bs) {
         if (!isShowNames() || bs == null)
             return;
 
         Point p = nc.getPoint(n);
-        TextElement text = bs.text;
+        TextLabel text = bs.text;
         String s = text.labelCompositionStrategy.compose(n);
         if (s == null) return;
@@ -1204 +1204 @@
      * @param text The text definition (font/.../text content) to draw.
      */
-    public void drawTextOnPath(Way way, TextElement text) {
+    public void drawTextOnPath(Way way, TextLabel text) {
         if (way == null || text == null)
             return;
@@ -1826 +1826 @@
         public void add(Node osm, int flags) {
             StyleList sl = styles.get(osm, circum, nc);
-            for (ElemStyle s : sl) {
+            for (StyleElement s : sl) {
                 output.add(new StyleRecord(s, osm, flags));
             }
@@ -1833 +1833 @@
         public void add(Relation osm, int flags) {
             StyleList sl = styles.get(osm, circum, nc);
-            for (ElemStyle s : sl) {
-                if (drawMultipolygon && drawArea && s instanceof AreaElemStyle && (flags & FLAG_DISABLED) == 0) {
+            for (StyleElement s : sl) {
+                if (drawMultipolygon && drawArea && s instanceof AreaElement && (flags & FLAG_DISABLED) == 0) {
                     output.add(new StyleRecord(s, osm, flags));
-                } else if (drawRestriction && s instanceof NodeElemStyle) {
+                } else if (drawRestriction && s instanceof NodeElement) {
                     output.add(new StyleRecord(s, osm, flags));
                 }
@@ -1844 +1844 @@
         public void add(Way osm, int flags) {
             StyleList sl = styles.get(osm, circum, nc);
-            for (ElemStyle s : sl) {
-                if (!(drawArea && (flags & FLAG_DISABLED) == 0) && s instanceof AreaElemStyle) {
+            for (StyleElement s : sl) {
+                if (!(drawArea && (flags & FLAG_DISABLED) == 0) && s instanceof AreaElement) {
                     continue;
                 }

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

@@ -31 +31 @@
 import org.openstreetmap.josm.data.validation.TestError;
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
-import org.openstreetmap.josm.gui.mappaint.AreaElemStyle;
+import org.openstreetmap.josm.gui.mappaint.styleelement.AreaElement;
 import org.openstreetmap.josm.gui.mappaint.ElemStyles;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
@@ -182 +182 @@
 
             if (styles != null && !"boundary".equals(r.get("type"))) {
-                AreaElemStyle area = ElemStyles.getAreaElemStyle(r, false);
+                AreaElement area = ElemStyles.getAreaElemStyle(r, false);
                 boolean areaStyle = area != null;
                 // If area style was not found for relation then use style of ways
@@ -206 +206 @@
                 if (area != null) {
                     for (Way wInner : polygon.getInnerWays()) {
-                        AreaElemStyle areaInner = ElemStyles.getAreaElemStyle(wInner, false);
+                        AreaElement areaInner = ElemStyles.getAreaElemStyle(wInner, false);
 
                         if (areaInner != null && area.equals(areaInner)) {
@@ -218 +218 @@
                     }
                     for (Way wOuter : polygon.getOuterWays()) {
-                        AreaElemStyle areaOuter = ElemStyles.getAreaElemStyle(wOuter, false);
+                        AreaElement areaOuter = ElemStyles.getAreaElemStyle(wOuter, false);
                         if (areaOuter != null) {
                             List<OsmPrimitive> l = new ArrayList<>();