Changeset 9284 in josm for trunk/src/org/openstreetmap/josm/data/osm

Timestamp:

2016-01-03T18:13:45+01:00 (9 years ago)

Author:

bastiK

Message:

refactor some code from StyleCache into separate classes (see #9891)

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (modified) (4 diffs)

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

@@ -61 +61 @@
 import org.openstreetmap.josm.gui.mappaint.ElemStyles;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
-import org.openstreetmap.josm.gui.mappaint.StyleCache.StyleList;
+import org.openstreetmap.josm.gui.mappaint.StyleElementList;
 import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource;
 import org.openstreetmap.josm.gui.mappaint.mapcss.Selector;
@@ -1825 +1825 @@
 
         public void add(Node osm, int flags) {
-            StyleList sl = styles.get(osm, circum, nc);
+            StyleElementList sl = styles.get(osm, circum, nc);
             for (StyleElement s : sl) {
                 output.add(new StyleRecord(s, osm, flags));
@@ -1832 +1832 @@
 
         public void add(Relation osm, int flags) {
-            StyleList sl = styles.get(osm, circum, nc);
+            StyleElementList sl = styles.get(osm, circum, nc);
             for (StyleElement s : sl) {
                 if (drawMultipolygon && drawArea && s instanceof AreaElement && (flags & FLAG_DISABLED) == 0) {
@@ -1843 +1843 @@
 
         public void add(Way osm, int flags) {
-            StyleList sl = styles.get(osm, circum, nc);
+            StyleElementList sl = styles.get(osm, circum, nc);
             for (StyleElement s : sl) {
                 if (!(drawArea && (flags & FLAG_DISABLED) == 0) && s instanceof AreaElement) {