Changeset 2590 in josm for trunk/src/org

Timestamp:

2009-12-06T18:18:04+01:00 (15 years ago)

Author:

jttt

Message:

Fix #4114 NPE when zooming out while relation editor is open

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java (modified) (3 diffs)

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

@@ -741 +741 @@
 
         /* 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 +1311 @@
     boolean drawable(OsmPrimitive osm)
     {
-        return !osm.isDeleted() && !osm.isFiltered() && !osm.isIncomplete();
+        return osm.isUsable() && !osm.isFiltered();
     }
 
@@ -1389 +1389 @@
             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);
+                    }
                 }
             }