Changeset 2679 in josm for trunk

Timestamp:

2009-12-24T15:38:14+01:00 (15 years ago)

Author:

jttt

Message:

Fixed #4230 NPE when searching for ^name$:[a-z] in Iceland.osm

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/visitor/paint/MapPaintVisitor.java (modified) (1 diff)
• gui/mappaint/ElemStyle.java (modified) (1 diff)

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

@@ -85 +85 @@
         if (osm.mappaintStyle == null && osm instanceof Node) {
             osm.mappaintStyle = SimpleNodeElemStyle.INSTANCE;
+        }
+
+        if (osm.mappaintStyle == null && osm instanceof Way) {
+            osm.mappaintStyle = LineElemStyle.UNTAGGED_WAY;
         }
 

trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java

@@ -27 +27 @@
     }
 
-    public String getCode()
-    {
-        if(code == null && rules != null)
-        {
+    public String getCode() {
+        if(code == null) {
             code = "";
-            for(Rule r: rules) {
-                code += r.toCode();
+            if (rules != null) {
+                for(Rule r: rules) {
+                    code += r.toCode();
+                }
             }
         }