Changeset 3803 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2011-01-22T19:27:33+01:00 (14 years ago)

Author:

bastiK

Message:

Don't merge all mappaitn style rules into one StyleSet, but keep them as separate StyleSources. This allows switching styles on and off at runtime.

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• osm/visitor/paint/MapPaintVisitor.java (modified) (3 diffs)
• validation/tests/MultipolygonTest.java (modified) (3 diffs)

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

@@ -34 +34 @@
 import org.openstreetmap.josm.gui.mappaint.AreaElemStyle;
 import org.openstreetmap.josm.gui.mappaint.ElemStyle;
+import org.openstreetmap.josm.gui.mappaint.ElemStyles;
 import org.openstreetmap.josm.gui.mappaint.IconElemStyle;
 import org.openstreetmap.josm.gui.mappaint.LineElemStyle;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
 import org.openstreetmap.josm.gui.mappaint.SimpleNodeElemStyle;
-import org.openstreetmap.josm.gui.mappaint.StyleSource;
 
 public class MapPaintVisitor implements PaintVisitor {
@@ -49 +49 @@
     private boolean drawRestriction;
     private boolean leftHandTraffic;
-    private StyleSource styles;
+    private ElemStyles styles;
     private double circum;
     private double dist;
@@ -535 +535 @@
         zoomLevelDisplay = Main.pref.getBoolean("mappaint.zoomLevelDisplay", false);
         circum = nc.getDist100Pixel();
-        styles = MapPaintStyles.getStyles().getStyleSet();
+        styles = MapPaintStyles.getStyles();
         drawMultipolygon = Main.pref.getBoolean("mappaint.multipolygon", true);
         drawRestriction = Main.pref.getBoolean("mappaint.restriction", true);

trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java

@@ -24 +24 @@
 import org.openstreetmap.josm.gui.mappaint.AreaElemStyle;
 import org.openstreetmap.josm.gui.mappaint.ElemStyle;
+import org.openstreetmap.josm.gui.mappaint.ElemStyles;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
-import org.openstreetmap.josm.gui.mappaint.StyleSource;
 
 public class MultipolygonTest extends Test {
@@ -41 +41 @@
     protected static final int NO_STYLE_POLYGON = 1611;
 
-    private static StyleSource styles;
+    private static ElemStyles styles;
 
     private final List<List<Node>> nonClosedWays = new ArrayList<List<Node>>();
@@ -52 +52 @@
     @Override
     public void initialize() throws Exception {
-        styles = MapPaintStyles.getStyles().getStyleSet();
+        styles = MapPaintStyles.getStyles();
     }