Changeset 1205 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2009-01-02T15:09:04+01:00 (16 years ago)

Author:

stoecker

Message:

fix bug #1949 and some other minor issues

File:

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

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

@@ -307 +307 @@
         for (RelationMember m : r.members)
         {
-            if (!m.member.incomplete && !m.member.deleted
+            if (m.member != null && !m.member.incomplete && !m.member.deleted
             && !(m.member instanceof Relation))
             {
@@ -355 +355 @@
                 {
                     /* second call - draw nodes */
-                    if (!m.member.incomplete && !m.member.deleted
+                    if (m.member != null && !m.member.incomplete && !m.member.deleted
                     && m.member instanceof Node)
                     {
@@ -382 +382 @@
         for (RelationMember m : r.members)
         {
-            if(m.member.incomplete)
-                incomplete = true;
+            if(m.member == null) /* Should not happen, must be a bug elsewhere */
+                r.putError(tr("Empty member in relation."), true);
             else if(m.member.deleted)
                 r.putError(tr("Deleted member ''{0}'' in relation.",
                 m.member.getName()), true);
+            else if(m.member.incomplete)
+                incomplete = true;
             else
             {