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

Timestamp:

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

Author:

bastiK

Message:

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

Location:

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement

Files:

• . (added)
• AreaElement.java (moved) (moved from trunk/src/org/openstreetmap/josm/gui/mappaint/AreaElemStyle.java ) (7 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/AreaElement.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.mappaint;
+package org.openstreetmap.josm.gui.mappaint.styleelement;
 
 import java.awt.Color;
@@ -12 +12 @@
 import org.openstreetmap.josm.data.osm.visitor.paint.PaintColors;
 import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer;
+import org.openstreetmap.josm.gui.mappaint.Cascade;
+import org.openstreetmap.josm.gui.mappaint.Environment;
+import org.openstreetmap.josm.gui.mappaint.Keyword;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.IconReference;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.Utils;
 
-public class AreaElemStyle extends ElemStyle {
+public class AreaElement extends StyleElement {
 
     /**
@@ -24 +27 @@
     public Color color;
     public MapImage fillImage;
-    public TextElement text;
+    public TextLabel text;
     public Float extent;
     public Float extentThreshold;
 
-    protected AreaElemStyle(Cascade c, Color color, MapImage fillImage, Float extent, Float extentThreshold, TextElement text) {
+    protected AreaElement(Cascade c, Color color, MapImage fillImage, Float extent, Float extentThreshold, TextLabel text) {
         super(c, 1f);
         CheckParameterUtil.ensureParameterNotNull(color);
@@ -38 +41 @@
     }
 
-    public static AreaElemStyle create(final Environment env) {
+    public static AreaElement create(final Environment env) {
         final Cascade c = env.mc.getCascade(env.layer);
         MapImage fillImage = null;
@@ -76 +79 @@
         }
 
-        TextElement text = null;
+        TextLabel text = null;
         Keyword textPos = c.get(TEXT_POSITION, null, Keyword.class);
         if (textPos == null || "center".equals(textPos.val)) {
-            text = TextElement.create(env, PaintColors.AREA_TEXT.get(), true);
+            text = TextLabel.create(env, PaintColors.AREA_TEXT.get(), true);
         }
 
@@ -86 +89 @@
 
         if (color != null)
-            return new AreaElemStyle(c, color, fillImage, extent, extentThreshold, text);
+            return new AreaElement(c, color, fillImage, extent, extentThreshold, text);
         else
             return null;
@@ -118 +121 @@
         if (!super.equals(obj))
             return false;
-        AreaElemStyle other = (AreaElemStyle) obj;
+        AreaElement other = (AreaElement) obj;
         // we should get the same image object due to caching
         if (!Objects.equals(fillImage, other.fillImage))