Changeset 2273 in josm for trunk/src/org/openstreetmap/josm/data/APIDataSet.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/data/APIDataSet.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/data/APIDataSet.java

@@ -58 +58 @@
                 continue;
             }
-            if (osm.getId() == 0 && !osm.isDeleted()) {
+            if (osm.isNew() && !osm.isDeleted()) {
                 toAdd.addLast(osm);
             } else if (osm.isModified() && !osm.isDeleted()) {
                 toUpdate.addLast(osm);
-            } else if (osm.isDeleted() && osm.getId() != 0 && osm.isModified()) {
+            } else if (osm.isDeleted() && !osm.isNew() && osm.isModified()) {
                 toDelete.addFirst(osm);
             }
@@ -119 +119 @@
         toDelete.clear();
         for (OsmPrimitive osm: primitives) {
-            if (osm.getId() == 0 && !osm.isDeleted()) {
+            if (osm.isNew() && !osm.isDeleted()) {
                 toAdd.addLast(osm);
             } else if (osm.isModified() && !osm.isDeleted()) {
                 toUpdate.addLast(osm);
-            } else if (osm.isDeleted() && osm.getId() != 0 && osm.isModified()) {
+            } else if (osm.isDeleted() && !osm.isNew() && osm.isModified()) {
                 toDelete.addFirst(osm);
             }
@@ -216 +216 @@
             boolean refersToNewRelation = false;
             for (RelationMember m : relation.getMembers()) {
-                if (m.isRelation() && m.getMember().getId() <= 0) {
+                if (m.isRelation() && m.getMember().isNew()) {
                     refersToNewRelation = true;
                     break;
@@ -253 +253 @@
             this.relations = new HashSet<Relation>();
             for(Relation relation: relations) {
-                if (relation.getId() > 0 ) {
+                if (!relation.isNew() ) {
                     continue;
                 }
                 this.relations.add(relation);
                 for (RelationMember m: relation.getMembers()) {
-                    if (m.isRelation() && m.getMember().getId() == 0) {
+                    if (m.isRelation() && m.getMember().isNew()) {
                         addDependency(relation, (Relation)m.getMember());
                     }
@@ -306 +306 @@
                     new Comparator<Relation>() {
                         public int compare(Relation o1, Relation o2) {
-                            return new Integer(uploadOrder.indexOf(o1)).compareTo(uploadOrder.indexOf(o2));
+                            return Integer.valueOf(uploadOrder.indexOf(o1)).compareTo(uploadOrder.indexOf(o2));
                         }
                     }