Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java	(revision 2465)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java	(revision 2466)
@@ -76,7 +76,6 @@
     protected double dist;
     protected Collection<String> regionalNameOrder;
-    protected Boolean useStyleCache;
+    protected boolean useStyleCache;
     private static int paintid = 0;
-    private static int viewid = 0;
     private EastNorth minEN;
     private EastNorth maxEN;
@@ -250,5 +249,5 @@
     }
 
-    public void drawWay(Way w, LineElemStyle l, Color color, Boolean selected) {
+    public void drawWay(Way w, LineElemStyle l, Color color, boolean selected) {
         /* show direction arrows, if draw.segment.relevant_directions_only is not set,
            the way is tagged with a direction key
@@ -388,7 +387,7 @@
         {
             Way w = null;
-            Boolean selected = false;
+            boolean selected = false;
             List<Node> n = null;
-            Boolean joined = true;
+            boolean joined = true;
             while(joined && left != 0)
             {
@@ -487,10 +486,9 @@
     }
 
-    public void drawSelectedMember(OsmPrimitive osm, ElemStyle style, Boolean area,
-            Boolean areaselected)
+    public void drawSelectedMember(OsmPrimitive osm, ElemStyle style, boolean area,
+            boolean areaselected)
     {
         if(osm instanceof Way)
         {
-            Way w = (Way)osm;
             if(style instanceof AreaElemStyle)
             {
@@ -520,5 +518,5 @@
 
     @Override
-    public void visit(Relation r) {};
+    public void visit(Relation r) {}
     public void paintUnselectedRelation(Relation r) {
 
@@ -648,5 +646,5 @@
             Node firstNode = viaWay.firstNode();
             Node lastNode = viaWay.lastNode();
-            Boolean onewayvia = false;
+            boolean onewayvia = false;
 
             String onewayviastr = viaWay.get("oneway");
@@ -908,11 +906,11 @@
     }
 
-    public Boolean drawMultipolygon(Relation r) {
+    public boolean drawMultipolygon(Relation r) {
         Collection<Way> inner = new LinkedList<Way>();
         Collection<Way> outer = new LinkedList<Way>();
         Collection<Way> innerclosed = new LinkedList<Way>();
         Collection<Way> outerclosed = new LinkedList<Way>();
-        Boolean incomplete = false;
-        Boolean drawn = false;
+        boolean incomplete = false;
+        boolean drawn = false;
 
         for (RelationMember m : r.getMembers())
@@ -967,6 +965,6 @@
         if(wayStyle != null && wayStyle instanceof AreaElemStyle)
         {
-            Boolean zoomok = isZoomOk(wayStyle);
-            Boolean visible = false;
+            boolean zoomok = isZoomOk(wayStyle);
+            boolean visible = false;
             Collection<Way> outerjoin = new LinkedList<Way>();
             Collection<Way> innerjoin = new LinkedList<Way>();
@@ -1212,5 +1210,5 @@
     }
 
-    protected void drawNode(Node n, ImageIcon icon, boolean annotate, Boolean selected) {
+    protected void drawNode(Node n, ImageIcon icon, boolean annotate, boolean selected) {
         Point p = nc.getPoint(n);
         if ((p.x < 0) || (p.y < 0) || (p.x > nc.getWidth()) || (p.y > nc.getHeight())) return;
@@ -1459,5 +1457,4 @@
 
         ++paintid;
-        viewid = nc.getViewID();
 
         //profilerVisibleNodes = 0;
@@ -1622,4 +1619,5 @@
         }
 
+
         //if(profiler)
         //{
Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java	(revision 2465)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java	(revision 2466)
@@ -105,5 +105,5 @@
     }
 
-    protected void getSettings(Boolean virtual) {
+    protected void getSettings(boolean virtual) {
         showDirectionArrow = Main.pref.getBoolean("draw.segment.direction", true);
         showRelevantDirectionsOnly = Main.pref.getBoolean("draw.segment.relevant_directions_only", true);
@@ -132,5 +132,5 @@
     public void visitAll(DataSet data, boolean virtual, Bounds bounds) {
         this.ds = data;
-        //boolean profiler = Main.pref.getBoolean("simplepaint.profiler",false);
+        //boolean profiler = Main.pref.getboolean("simplepaint.profiler",false);
         //long profilerStart = java.lang.System.currentTimeMillis();
         //long profilerLast = profilerStart;
@@ -264,5 +264,5 @@
     }
 
-    public static Boolean isLargeSegment(Point p1, Point p2, int space)
+    public static boolean isLargeSegment(Point p1, Point p2, int space)
     {
         int xd = p1.x-p2.x; if(xd < 0) {