Changeset 9278 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/StyleElement.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)
• StyleElement.java (moved) (moved from trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java ) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/StyleElement.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.Font;
@@ -10 +10 @@
 import org.openstreetmap.josm.data.osm.visitor.paint.MapPaintSettings;
 import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer;
+import org.openstreetmap.josm.gui.mappaint.Cascade;
+import org.openstreetmap.josm.gui.mappaint.Keyword;
+import org.openstreetmap.josm.gui.mappaint.StyleKeys;
 import org.openstreetmap.josm.gui.mappaint.mapcss.Instruction.RelativeFloat;
 
-public abstract class ElemStyle implements StyleKeys {
+public abstract class StyleElement implements StyleKeys {
 
     protected static final int ICON_IMAGE_IDX = 0;
@@ -30 +33 @@
     // primitive; true, if it is a highlight or modifier
 
-    public ElemStyle(float major_z_index, float z_index, float object_z_index, boolean isModifier) {
+    public StyleElement(float major_z_index, float z_index, float object_z_index, boolean isModifier) {
         this.majorZIndex = major_z_index;
         this.zIndex = z_index;
@@ -37 +40 @@
     }
 
-    protected ElemStyle(Cascade c, float default_major_z_index) {
+    protected StyleElement(Cascade c, float default_major_z_index) {
         majorZIndex = c.get(MAJOR_Z_INDEX, default_major_z_index, Float.class);
         zIndex = c.get(Z_INDEX, 0f, Float.class);
@@ -208 +211 @@
     @Override
     public boolean equals(Object o) {
-        if (!(o instanceof ElemStyle))
+        if (!(o instanceof StyleElement))
             return false;
-        ElemStyle s = (ElemStyle) o;
+        StyleElement s = (StyleElement) o;
         return isModifier == s.isModifier &&
                 majorZIndex == s.majorZIndex &&