Changeset 11878 in josm for trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java

Timestamp:

2017-04-10T00:14:42+02:00 (7 years ago)

Author:

Don-vip

Message:

findbugs - EI_EXPOSE_REP2 + javadoc

File:

• trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java (modified) (8 diffs)

trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java

@@ -13 +13 @@
 import java.util.Objects;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.Changeset;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
+import org.openstreetmap.josm.data.osm.PrimitiveData;
 import org.openstreetmap.josm.data.osm.PrimitiveId;
 import org.openstreetmap.josm.data.osm.Relation;
@@ -24 +26 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.date.DateUtils;
 
 /**
@@ -85 +88 @@
         this.user = user;
         this.changesetId = changesetId;
-        this.timestamp = timestamp;
-        tags = new HashMap<>();
+        this.timestamp = DateUtils.cloneDate(timestamp);
+        this.tags = new HashMap<>();
     }
 
@@ -159 +162 @@
      */
     public Date getTimestamp() {
-        return timestamp;
+        return DateUtils.cloneDate(timestamp);
     }
 
@@ -170 +173 @@
     }
 
+    /**
+     * Checks that value is positive.
+     * @param value value to check
+     * @param name parameter name for error message
+     * @throws IllegalArgumentException if {@code value <= 0}
+     */
     protected final void ensurePositiveLong(long value, String name) {
         if (value <= 0) {
@@ -176 +185 @@
     }
 
+    /**
+     * Determines if this history matches given id and version.
+     * @param id Primitive identifier
+     * @param version Primitive version
+     * @return {@code true} if this history matches given id and version
+     */
     public boolean matches(long id, long version) {
         return this.id == id && this.version == version;
     }
 
+    /**
+     * Determines if this history matches given id.
+     * @param id Primitive identifier
+     * @return {@code true} if this history matches given id
+     */
     public boolean matches(long id) {
         return this.id == id;
@@ -325 +345 @@
     }
 
+    /**
+     * Fills the attributes common to all primitives with values from this history.
+     * @param data primitive data to fill
+     */
+    protected void fillPrimitiveCommonData(PrimitiveData data) {
+        data.setUser(user);
+        try {
+            data.setVisible(visible);
+        } catch (IllegalStateException e) {
+            Main.error(e, "Cannot change visibility for "+data+':');
+        }
+        data.setTimestamp(timestamp);
+        data.setKeys(tags);
+        data.setOsmId(id, (int) version);
+    }
+
     @Override
     public int hashCode() {
@@ -335 +371 @@
         if (obj == null || getClass() != obj.getClass()) return false;
         HistoryOsmPrimitive that = (HistoryOsmPrimitive) obj;
-        return id == that.id &&
-                version == that.version;
+        return id == that.id && version == that.version;
     }