Changeset 6140 in josm

Timestamp:

2013-08-11T21:09:08+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #8951 - fix clearing of primitive metadata

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/PasteAction.java (modified) (1 diff)
• data/osm/AbstractPrimitive.java (modified) (2 diffs)
• data/osm/Node.java (modified) (1 diff)
• data/osm/OsmPrimitive.java (modified) (1 diff)
• data/osm/Relation.java (modified) (2 diffs)
• data/osm/Way.java (modified) (1 diff)

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

@@ -111 +111 @@
             }
             PrimitiveData copy = data.makeCopy();
-            copy.clearOsmId();
+            copy.clearOsmMetadata();
             if (data instanceof NodeData) {
                 newNodeIds.put(data.getUniqueId(), copy.getUniqueId());

trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java

@@ -200 +200 @@
 
     /**
-     * Clears the id and version known to the OSM API. The id and the version is set to 0.
-     * incomplete is set to false. It's preferred to use copy constructor with clearId set to true instead
+     * Clears the metadata, including id and version known to the OSM API.
+     * The id is a new unique id. The version, changeset and timestamp are set to 0.
+     * incomplete and deleted are set to false. It's preferred to use copy constructor with clearMetadata set to true instead
      * of calling this method.
-     */
-    public void clearOsmId() {
+     * @since 6140
+     */
+    public void clearOsmMetadata() {
         // Not part of dataset - no lock necessary
         this.id = generateUniqueId();
@@ -210 +212 @@
         this.user = null;
         this.changesetId = 0; // reset changeset id on a new object
+        this.timestamp = 0;
         this.setIncomplete(false);
+        this.setDeleted(false);
+        this.setVisible(true);
     }
 

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

@@ -152 +152 @@
      * Constructs an identical clone of the argument.
      * @param clone The node to clone
-     * @param clearId If true, set version to 0 and id to new unique value
-     */
-    public Node(Node clone, boolean clearId) {
+     * @param clearMetadata If {@code true}, clears the OSM id and other metadata as defined by {@link #clearOsmMetadata}. If {@code false}, does nothing
+     */
+    public Node(Node clone, boolean clearMetadata) {
         super(clone.getUniqueId(), true /* allow negative IDs */);
         cloneFrom(clone);
-        if (clearId) {
-            clearOsmId();
+        if (clearMetadata) {
+            clearOsmMetadata();
         }
     }

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

@@ -383 +383 @@
 
     /**
-     * Clears the id and version known to the OSM API. The id and the version is set to 0.
-     * incomplete is set to false. It's preferred to use copy constructor with clearId set to true instead
-     * of calling this method.
+     * Clears the metadata, including id and version known to the OSM API.
+     * The id is a new unique id. The version, changeset and timestamp are set to 0.
+     * incomplete and deleted are set to false. It's preferred to use copy constructor with clearMetadata set to true instead
      *
      * <strong>Caution</strong>: Do not use this method on primitives which are already added to a {@link DataSet}.
      *
      * @throws DataIntegrityProblemException If primitive was already added to the dataset
-     */
-    @Override
-    public void clearOsmId() {
+     * @since 6140
+     */
+    @Override
+    public void clearOsmMetadata() {
         if (dataSet != null)
             throw new DataIntegrityProblemException("Method cannot be called after primitive was added to the dataset");
-        super.clearOsmId();
+        super.clearOsmMetadata();
     }
 

trunk/src/org/openstreetmap/josm/data/osm/Relation.java

@@ -183 +183 @@
     }
 
-    public Relation(Relation clone, boolean clearId) {
+    /**
+     * Constructs an identical clone of the argument.
+     * @param clone The relation to clone
+     * @param clearMetadata If {@code true}, clears the OSM id and other metadata as defined by {@link #clearOsmMetadata}. If {@code false}, does nothing
+     */
+    public Relation(Relation clone, boolean clearMetadata) {
         super(clone.getUniqueId(), true);
         cloneFrom(clone);
-        if (clearId) {
-            clearOsmId();
+        if (clearMetadata) {
+            clearOsmMetadata();
         }
     }
@@ -193 +198 @@
     /**
      * Create an identical clone of the argument (including the id)
+     * @param clone The relation to clone, including its id
      */
     public Relation(Relation clone) {

trunk/src/org/openstreetmap/josm/data/osm/Way.java

@@ -232 +232 @@
      * Contructs a new {@code Way} from an existing {@code Way}.
      * @param original The original {@code Way} to be identically cloned. Must not be null
-     * @param clearId If true, clears the OSM id as defined by {@link #clearOsmId}. If false, does nothing
+     * @param clearMetadata If {@code true}, clears the OSM id and other metadata as defined by {@link #clearOsmMetadata}. If {@code false}, does nothing
      * @since 2410
      */
-    public Way(Way original, boolean clearId) {
+    public Way(Way original, boolean clearMetadata) {
         super(original.getUniqueId(), true);
         cloneFrom(original);
-        if (clearId) {
-            clearOsmId();
+        if (clearMetadata) {
+            clearOsmMetadata();
         }
     }