Ticket #4083: CopyIncompleteNodesException.patch

src/org/openstreetmap/josm/data/osm/Node.java

@@ -135 +135 @@
     @Override public NodeData save() {
         NodeData data = new NodeData();
         saveCommonAttributes(data);
-        data.setCoor(getCoor());
+        if (!isIncomplete()) {
+            data.setCoor(getCoor());
+        }
         return data;
     }
 

src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

@@ -102 +102 @@
     private static final int FLAG_FILTERED = 1 << 4;
     private static final int FLAG_HAS_DIRECTIONS = 1 << 5;
     private static final int FLAG_TAGGED = 1 << 6;
+    private static final int FLAG_INCOMPLETE = 1 << 7;
 
     /**
      * Replies the sub-collection of {@see OsmPrimitive}s of type <code>type</code> present in
@@ -225 +226 @@
     private User user = null;
 
     /**
-     * If set to true, this object is incomplete, which means only the id
-     * and type is known (type is the objects instance class)
-     */
-    private boolean incomplete = false;
-
-    /**
      * Contains the version number as returned by the API. Needed to
      * ensure update consistency
      */
@@ -390 +385 @@
     }
 
     /**
+     * Sets whether this primitive is incomplete (e.g. only id and type are known) or not.
+     *
+     * @param incomplete true, if this primitive is incomplete; false, otherwise
+     */
+    public void setIncomplete(boolean incomplete) {
+        if (incomplete) {
+            flags |= FLAG_INCOMPLETE;
+        } else {
+            flags &= ~FLAG_INCOMPLETE;
+        }
+    }
+
+    /**
+     * Returns <code>true</code>, if the object is incomplete (e.g. only id and type are known).
+     *
+     * @return <code>true</code>, if the object is incomplete.
+     * @see #setDeleted(boolean)
+     */
+    public boolean isIncomplete() {
+        return (flags & FLAG_INCOMPLETE) != 0;
+    }
+
+    /**
      * Replies the version number as returned by the API. The version is 0 if the id is 0 or
      * if this primitive is incomplete.
      *
@@ -915 +933 @@
         id = osm.id;
         timestamp = osm.timestamp;
         version = osm.version;
-        setIncomplete(osm.isIncomplete());
         flags = osm.flags;
         user= osm.user;
         clearCached();
@@ -942 +959 @@
         setKeys(other.getKeys());
         timestamp = other.timestamp;
         version = other.version;
-        setIncomplete(other.isIncomplete());
         flags = other.flags;
         user= other.user;
     }
@@ -1095 +1111 @@
         setDeleted(data.isDeleted());
         setModified(data.isModified());
         setVisible(data.isVisible());
+        setIncomplete(data.isIncomplete());
     }
 
     /**
@@ -1112 +1129 @@
         data.setDeleted(isDeleted());
         data.setModified(isModified());
         data.setVisible(isVisible());
+        data.setIncomplete(isIncomplete());
     }
 
     protected String getFlagsAsString() {
@@ -1157 +1175 @@
         return new SimplePrimitiveId(getUniqueId(), getType());
     }
 
-    //TODO This method should not be necessary, incomplete state should be handled internally by OsmPrimitive
-    public void setIncomplete(boolean incomplete) {
-        this.incomplete = incomplete;
-    }
 
-    public boolean isIncomplete() {
-        return incomplete;
-    }
+
+
+
+
+
+
+
 }

src/org/openstreetmap/josm/data/osm/PrimitiveData.java

@@ -35 +35 @@
         this.user = data.user;
         this.version = data.version;
         this.timestamp = data.timestamp;
+        this.incomplete = data.incomplete;
     }
 
     private final Map<String, String> keys = new HashMap<String, String>();
     private boolean modified;
     private boolean visible = true;
     private boolean deleted;
+    private boolean incomplete;
     private long id;
     private User user;
     private int version;
@@ -91 +93 @@
     public Map<String, String> getKeys() {
         return keys;
     }
+    public boolean isIncomplete() {
+        return incomplete;
+    }
+    public void setIncomplete(boolean incomplete) {
+        this.incomplete = incomplete;
+    }
 
     public void clearOsmId() {
         id = OsmPrimitive.generateUniqueId();
@@ -112 +120 @@
         if (deleted) {
             builder.append("D");
         }
+        if (incomplete) {
+            builder.append("I");
+        }
 
         return builder.toString();
     }