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

Timestamp:

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

Author:

bastiK

Message:

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

File:

• trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

@@ -59 +59 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
-import org.openstreetmap.josm.gui.mappaint.ElemStyle;
-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.Range;
 import org.openstreetmap.josm.gui.mappaint.StyleCache.StyleList;
+import org.openstreetmap.josm.gui.mappaint.styleelement.MapImage;
+import org.openstreetmap.josm.gui.mappaint.styleelement.StyleElement;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPreset;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
@@ -82 +81 @@
 import com.kitfox.svg.SVGDiagram;
 import com.kitfox.svg.SVGUniverse;
+import org.openstreetmap.josm.gui.mappaint.styleelement.NodeElement;
 
 /**
@@ -1300 +1300 @@
         if (primitive instanceof org.openstreetmap.josm.data.osm.Node) {
             Pair<StyleList, Range> nodeStyles = MapPaintStyles.getStyles().generateStyles(primitive, 100, false);
-            for (ElemStyle style : nodeStyles.a) {
-                if (style instanceof NodeElemStyle) {
-                    NodeElemStyle nodeStyle = (NodeElemStyle) style;
+            for (StyleElement style : nodeStyles.a) {
+                if (style instanceof NodeElement) {
+                    NodeElement nodeStyle = (NodeElement) style;
                     MapImage icon = nodeStyle.mapImage;
                     if (icon != null) {