Changeset 9278 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/TextLabel.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

Location:

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

Files:

• . (added)
• TextLabel.java (moved) (moved from trunk/src/org/openstreetmap/josm/gui/mappaint/TextElement.java ) (9 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/TextLabel.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;
@@ -7 +7 @@
 
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.gui.mappaint.LabelCompositionStrategy.DeriveLabelFromNameTagsCompositionStrategy;
-import org.openstreetmap.josm.gui.mappaint.LabelCompositionStrategy.StaticLabelCompositionStrategy;
-import org.openstreetmap.josm.gui.mappaint.LabelCompositionStrategy.TagLookupCompositionStrategy;
+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.TagKeyReference;
+import org.openstreetmap.josm.gui.mappaint.StyleKeys;
+import org.openstreetmap.josm.gui.mappaint.styleelement.LabelCompositionStrategy.DeriveLabelFromNameTagsCompositionStrategy;
+import org.openstreetmap.josm.gui.mappaint.styleelement.LabelCompositionStrategy.StaticLabelCompositionStrategy;
+import org.openstreetmap.josm.gui.mappaint.styleelement.LabelCompositionStrategy.TagLookupCompositionStrategy;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.Utils;
@@ -18 +22 @@
  * @since 3880
  */
-public class TextElement implements StyleKeys {
+public class TextLabel implements StyleKeys {
     public static final LabelCompositionStrategy AUTO_LABEL_COMPOSITION_STRATEGY = new DeriveLabelFromNameTagsCompositionStrategy();
 
@@ -45 +49 @@
      * @param haloColor halo color
      */
-    public TextElement(LabelCompositionStrategy strategy, Font font, int xOffset, int yOffset, Color color, Float haloRadius, Color haloColor) {
+    public TextLabel(LabelCompositionStrategy strategy, Font font, int xOffset, int yOffset, Color color, Float haloRadius, Color haloColor) {
         CheckParameterUtil.ensureParameterNotNull(font);
         CheckParameterUtil.ensureParameterNotNull(color);
@@ -62 +66 @@
      * @param other the other element.
      */
-    public TextElement(TextElement other) {
+    public TextLabel(TextLabel other) {
         this.labelCompositionStrategy = other.labelCompositionStrategy;
         this.font = other.font;
@@ -116 +120 @@
      * @throws IllegalArgumentException if {@code defaultTextColor} is null
      */
-    public static TextElement create(Environment env, Color defaultTextColor, boolean defaultAnnotate) {
+    public static TextLabel create(Environment env, Color defaultTextColor, boolean defaultAnnotate) {
         CheckParameterUtil.ensureParameterNotNull(defaultTextColor);
         Cascade c = env.mc.getCascade(env.layer);
@@ -124 +128 @@
         String s = strategy.compose(env.osm);
         if (s == null) return null;
-        Font font = ElemStyle.getFont(c, s);
+        Font font = StyleElement.getFont(c, s);
 
         float xOffset = 0;
@@ -157 +161 @@
         }
 
-        return new TextElement(strategy, font, (int) xOffset, -(int) yOffset, color, haloRadius, haloColor);
+        return new TextLabel(strategy, font, (int) xOffset, -(int) yOffset, color, haloRadius, haloColor);
     }
 
@@ -212 +216 @@
         if (obj == null || getClass() != obj.getClass())
             return false;
-        final TextElement other = (TextElement) obj;
+        final TextLabel other = (TextLabel) obj;
         return Objects.equals(labelCompositionStrategy, other.labelCompositionStrategy) &&
         Objects.equals(font, other.font) &&