Changeset 5328 in josm

Timestamp:

Jul 12, 2012 2:34:39 PM (11 months ago)

Author:

bastiK

Message:

fix NPE as deleted nodes can have null coordinates now (see #7847)

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• DefaultNameFormatter.java (modified) (1 diff)
• dialogs/InspectPrimitiveDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java

@@ -179 +179 @@
                 preset.nameTemplate.appendText(name, node);
             }
-            name.append(" \u200E(").append(node.getCoor().latToString(CoordinateFormat.getDefaultFormat())).append(", ").append(node.getCoor().lonToString(CoordinateFormat.getDefaultFormat())).append(")");
+            if (node.getCoor() != null) {
+                name.append(" \u200E(").append(node.getCoor().latToString(CoordinateFormat.getDefaultFormat())).append(", ").append(node.getCoor().lonToString(CoordinateFormat.getDefaultFormat())).append(")");
+            }
         }
         decorateNameWithId(name, node);

trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java

@@ -273 +273 @@
 
         void addCoordinates(Node n) {
-            add(tr("Coordinates: "),
-                    Double.toString(n.getCoor().lat()), ", ",
-                    Double.toString(n.getCoor().lon()));
-            add(tr("Coordinates (projected): "),
-                    Double.toString(n.getEastNorth().east()), ", ",
-                    Double.toString(n.getEastNorth().north()));
+            if (n.getCoor() != null) {
+                add(tr("Coordinates: "),
+                        Double.toString(n.getCoor().lat()), ", ",
+                        Double.toString(n.getCoor().lon()));
+                add(tr("Coordinates (projected): "),
+                        Double.toString(n.getEastNorth().east()), ", ",
+                        Double.toString(n.getEastNorth().north()));
+            }
         }