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

Timestamp:

2011-11-20T20:47:15+01:00 (12 years ago)

Author:

bastiK

Message:

upgrade historic users to real users, so their CT status can be shown in the history panel

File:

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

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

@@ -17 +17 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
+import org.openstreetmap.josm.data.osm.User;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -29 +30 @@
     private long id;
     private boolean visible;
-    private String user;
-    private long uid;
+    private User user;
     private long changesetId;
     private Date timestamp;
@@ -54 +54 @@
      * @throws IllegalArgumentException thrown if preconditions are violated
      */
-    public HistoryOsmPrimitive(long id, long version, boolean visible, String user, long uid, long changesetId, Date timestamp) throws IllegalArgumentException {
+    public HistoryOsmPrimitive(long id, long version, boolean visible, User user, long changesetId, Date timestamp) throws IllegalArgumentException {
         ensurePositiveLong(id, "id");
         ensurePositiveLong(version, "version");
-        if(uid != -1) {
-            ensurePositiveLong(uid, "uid");
-        }
         CheckParameterUtil.ensureParameterNotNull(user, "user");
         CheckParameterUtil.ensureParameterNotNull(timestamp, "timestamp");
@@ -66 +63 @@
         this.visible = visible;
         this.user = user;
-        this.uid = uid;
         // FIXME: restrict to IDs > 0 as soon as OsmPrimitive holds the
         // changeset id too
@@ -76 +72 @@
     public HistoryOsmPrimitive(OsmPrimitive p) {
         this(p.getId(), p.getVersion(), p.isVisible(),
-                p.getUser() == null ? null : p.getUser().getName(),
-                p.getUser() == null ? 0 : p.getUser().getId(),
+                p.getUser(),
                 p.getChangesetId(), p.getTimestamp());
     }
@@ -104 +99 @@
         return visible;
     }
-    public String getUser() {
+    public User getUser() {
         return user;
-    }
-    public long getUid() {
-        return uid;
     }
     public long getChangesetId() {