Changeset 6936 in josm

Timestamp:

2014-03-28T19:53:24+01:00 (10 years ago)

Author:

Don-vip

Message:

fix #9870 - exception when trying to view history of new nodes from their parent way history dialog

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/history/NodeListViewer.java (modified) (2 diffs)
• io/OsmReader.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/history/NodeListViewer.java

@@ -276 +276 @@
 
         public void updateEnabledState() {
-            setEnabled(primitiveId != null && primitiveId.getUniqueId() > 0);
+            setEnabled(primitiveId != null && !primitiveId.isNew());
         }
     }
@@ -314 +314 @@
             if(row <= 0) return;
             PrimitiveId pid = primitiveIdAtRow(table.getModel(), row);
-            if (pid == null)
+            if (pid == null || pid.isNew())
                 return;
             showHistoryAction.setPrimitiveId(pid);

trunk/src/org/openstreetmap/josm/io/OsmReader.java

@@ -448 +448 @@
             }
             if (ds.getVersion().equals("0.6")){
-                if (version <= 0 && current.getUniqueId() > 0) {
+                if (version <= 0 && !current.isNew()) {
                     throwException(tr("Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got {1}.", Long.toString(current.getUniqueId()), versionString));
-                } else if (version < 0 && current.getUniqueId() <= 0) {
+                } else if (version < 0 && current.isNew()) {
                     Main.warn(tr("Normalizing value of attribute ''version'' of element {0} to {2}, API version is ''{3}''. Got {1}.", current.getUniqueId(), version, 0, "0.6"));
                     version = 0;
                 }
             } else if (ds.getVersion().equals("0.5")) {
-                if (version <= 0 && current.getUniqueId() > 0) {
+                if (version <= 0 && !current.isNew()) {
                     Main.warn(tr("Normalizing value of attribute ''version'' of element {0} to {2}, API version is ''{3}''. Got {1}.", current.getUniqueId(), version, 1, "0.5"));
                     version = 1;
-                } else if (version < 0 && current.getUniqueId() <= 0) {
+                } else if (version < 0 && current.isNew()) {
                     Main.warn(tr("Normalizing value of attribute ''version'' of element {0} to {2}, API version is ''{3}''. Got {1}.", current.getUniqueId(), version, 0, "0.5"));
                     version = 0;
@@ -469 +469 @@
             // version expected for OSM primitives with an id assigned by the server (id > 0), since API 0.6
             //
-            if (current.getUniqueId() > 0 && ds.getVersion() != null && ds.getVersion().equals("0.6")) {
+            if (!current.isNew() && ds.getVersion() != null && ds.getVersion().equals("0.6")) {
                 throwException(tr("Missing attribute ''version'' on OSM primitive with ID {0}.", Long.toString(current.getUniqueId())));
-            } else if (current.getUniqueId() > 0 && ds.getVersion() != null && ds.getVersion().equals("0.5")) {
+            } else if (!current.isNew() && ds.getVersion() != null && ds.getVersion().equals("0.5")) {
                 // default version in 0.5 files for existing primitives
                 Main.warn(tr("Normalizing value of attribute ''version'' of element {0} to {2}, API version is ''{3}''. Got {1}.", current.getUniqueId(), version, 1, "0.5"));
                 version= 1;
-            } else if (current.getUniqueId() <= 0 && ds.getVersion() != null && ds.getVersion().equals("0.5")) {
+            } else if (current.isNew() && ds.getVersion() != null && ds.getVersion().equals("0.5")) {
                 // default version in 0.5 files for new primitives, no warning necessary. This is
                 // (was) legal in API 0.5
@@ -500 +500 @@
                 current.setChangesetId(Integer.parseInt(v));
             } catch(NumberFormatException e) {
-                if (current.getUniqueId() <= 0) {
+                if (current.isNew()) {
                     // for a new primitive we just log a warning
                     Main.info(tr("Illegal value for attribute ''changeset'' on new object {1}. Got {0}. Resetting to 0.", v, current.getUniqueId()));
@@ -510 +510 @@
             }
             if (current.getChangesetId() <=0) {
-                if (current.getUniqueId() <= 0) {
+                if (current.isNew()) {
                     // for a new primitive we just log a warning
                     Main.info(tr("Illegal value for attribute ''changeset'' on new object {1}. Got {0}. Resetting to 0.", v, current.getUniqueId()));