Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java	(revision 2589)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java	(revision 2590)
@@ -741,7 +741,7 @@
 
         /* rotate icon with direction last node in from to */
-        ImageIcon rotatedIcon = ImageProvider.createRotatedImage(null /*icon2*/, inactive || r.isDisabled() ? 
-                                                                                    nodeStyle.getDisabledIcon() :
-                                                                                    nodeStyle.icon, iconAngle);
+        ImageIcon rotatedIcon = ImageProvider.createRotatedImage(null /*icon2*/, inactive || r.isDisabled() ?
+                nodeStyle.getDisabledIcon() :
+                    nodeStyle.icon, iconAngle);
 
         /* scale down icon to 16*16 pixels */
@@ -1311,5 +1311,5 @@
     boolean drawable(OsmPrimitive osm)
     {
-        return !osm.isDeleted() && !osm.isFiltered() && !osm.isIncomplete();
+        return osm.isUsable() && !osm.isFiltered();
     }
 
@@ -1389,8 +1389,9 @@
             for (final Way osm : selectedLast(data, data.searchWays(bbox))) {
                 if (drawable(osm) && osm.mappaintDrawnCode != paintid) {
-                    if (isPrimitiveArea(osm) && osm.mappaintDrawnAreaCode != paintid)
+                    if (isPrimitiveArea(osm) && osm.mappaintDrawnAreaCode != paintid) {
                         drawWay(osm, fillAreas);
-                    else
+                    } else {
                         noAreaWays.add(osm);
+                    }
                 }
             }