Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java	(revision 3801)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java	(revision 3803)
@@ -34,9 +34,9 @@
 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,5 +49,5 @@
     private boolean drawRestriction;
     private boolean leftHandTraffic;
-    private StyleSource styles;
+    private ElemStyles styles;
     private double circum;
     private double dist;
@@ -535,5 +535,5 @@
         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);
Index: trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java	(revision 3801)
+++ trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java	(revision 3803)
@@ -24,6 +24,6 @@
 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,5 +41,5 @@
     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,5 +52,5 @@
     @Override
     public void initialize() throws Exception {
-        styles = MapPaintStyles.getStyles().getStyleSet();
+        styles = MapPaintStyles.getStyles();
     }