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

trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java

@@ -134 +134 @@
      *
      */
-    class UpdatePrimitivesTask extends PleaseWaitRunnable {
+    static class UpdatePrimitivesTask extends PleaseWaitRunnable {
         private DataSet ds;
         private boolean canceled;
@@ -170 +170 @@
         protected void initMultiFetchReaderWithNodes(MultiFetchServerObjectReader reader) {
             for (OsmPrimitive primitive : toUpdate) {
-                if (primitive instanceof Node && primitive.getId() > 0) {
+                if (primitive instanceof Node && !primitive.isNew()) {
                     reader.append((Node)primitive);
                 } else if (primitive instanceof Way) {
                     Way way = (Way)primitive;
                     for (Node node: way.getNodes()) {
-                        if (node.getId() > 0) {
+                        if (!node.isNew()) {
                             reader.append(node);
                         }
@@ -185 +185 @@
         protected void initMultiFetchReaderWithWays(MultiFetchServerObjectReader reader) {
             for (OsmPrimitive primitive : toUpdate) {
-                if (primitive instanceof Way && primitive.getId() > 0) {
+                if (primitive instanceof Way && !primitive.isNew()) {
                     reader.append((Way)primitive);
                 }
@@ -193 +193 @@
         protected void initMultiFetchReaderWithRelations(MultiFetchServerObjectReader reader) {
             for (OsmPrimitive primitive : toUpdate) {
-                if (primitive instanceof Relation && primitive.getId() > 0) {
+                if (primitive instanceof Relation && !primitive.isNew()) {
                     reader.append((Relation)primitive);
                 }