Changeset 2273 in josm for trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java

Timestamp:

2009-10-11T16:37:08+02:00 (15 years ago)

Author:

jttt

Message:

Replace testing for id <= 0 with isNew() method

File:

• trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java (modified) (3 diffs)

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

@@ -51 +51 @@
         if (primitive == null)
             throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "primitive"));
-        if (primitive.getId() == 0)
+        if (primitive.isNew())
             throw new IllegalArgumentException(tr("ID parameter ''{0}'' > 0 expected. Got ''{1}''.", "primitive", primitive.getId()));
         this.id = primitive.getId();
@@ -222 +222 @@
             if (isReadFull() ||primitiveType.equals(OsmPrimitiveType.NODE)) {
                 for (Way way: waysToCheck) {
-                    if (way.getId() > 0 && way.incomplete) {
+                    if (!way.isNew() && way.incomplete) {
                         OsmServerObjectReader reader = new OsmServerObjectReader(way.getId(), OsmPrimitiveType.from(way), true /* read full */);
                         DataSet wayDs = reader.parseOsm(progressMonitor.createSubTaskMonitor(1, false));
@@ -233 +233 @@
                 Collection<Relation> relationsToCheck  = new ArrayList<Relation>(ds.relations);
                 for (Relation relation: relationsToCheck) {
-                    if (relation.getId() > 0 && relation.incomplete) {
+                    if (!relation.isNew() && relation.incomplete) {
                         OsmServerObjectReader reader = new OsmServerObjectReader(relation.getId(), OsmPrimitiveType.from(relation), true /* read full */);
                         DataSet wayDs = reader.parseOsm(progressMonitor.createSubTaskMonitor(1, false));