Index: trunk/test/functional/mapcss/performance/PerformanceTest.groovy
===================================================================
--- trunk/test/functional/mapcss/performance/PerformanceTest.groovy	(revision 4084)
+++ trunk/test/functional/mapcss/performance/PerformanceTest.groovy	(revision 4087)
@@ -12,5 +12,5 @@
 import org.openstreetmap.josm.data.Bounds
 import org.openstreetmap.josm.data.osm.DataSet
-import org.openstreetmap.josm.data.osm.visitor.paint.MapPaintVisitor
+import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer
 import org.openstreetmap.josm.gui.MainApplication
 import org.openstreetmap.josm.gui.layer.OsmDataLayer
@@ -116,5 +116,5 @@
         Graphics2D g = img.createGraphics()
         g.setClip(0,0, mv.getWidth(), mv.getHeight())
-        def visitor = new MapPaintVisitor()
+        def visitor = new StyledMapRenderer()
         visitor.setNavigatableComponent(Main.map.mapView)
         visitor.setGraphics(g)
@@ -122,5 +122,5 @@
         print "Rendering ..."
         long time = timed {
-            visitor.visitAll(ds, false, new Bounds(-90,-180,90,180))
+            visitor.render(ds, false, new Bounds(-90,-180,90,180))
         }
         println "DONE"
Index: trunk/test/performance/org/openstreetmap/josm/data/osm/MapPaintVisitorPerformanceTest.java
===================================================================
--- trunk/test/performance/org/openstreetmap/josm/data/osm/MapPaintVisitorPerformanceTest.java	(revision 4084)
+++ trunk/test/performance/org/openstreetmap/josm/data/osm/MapPaintVisitorPerformanceTest.java	(revision 4087)
@@ -10,6 +10,6 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
-import org.openstreetmap.josm.data.osm.visitor.paint.MapPaintVisitor;
-import org.openstreetmap.josm.data.osm.visitor.paint.PaintVisitor;
+import org.openstreetmap.josm.data.osm.visitor.paint.Rendering;
+import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer;
 import org.openstreetmap.josm.data.projection.Mercator;
 import org.openstreetmap.josm.gui.NavigatableComponent;
@@ -52,11 +52,8 @@
 
     private static void test(int iterations, DataSet ds, Bounds bounds) throws Exception {
-        PaintVisitor visitor = new MapPaintVisitor();
+        Rendering visitor = new StyledMapRenderer(g,nc,false);
         nc.zoomTo(bounds);
-        visitor.setGraphics(g);
-        visitor.setNavigatableComponent(nc);
-        visitor.setInactive(false);
         for (int i=0; i<iterations; i++) {
-            visitor.visitAll(ds, true, bounds);
+            visitor.render(ds, true, bounds);
         }
     }