Changeset 4602 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

20.11.2011 20:47:15 (6 months ago)

Author:

bastiK

Message:

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

Location:

trunk/src/org/openstreetmap/josm/data/osm

Files:

• User.java (modified) (4 diffs)
• history/History.java (modified) (1 diff)
• history/HistoryNode.java (modified) (2 diffs)
• history/HistoryOsmPrimitive.java (modified) (6 diffs)
• history/HistoryRelation.java (modified) (3 diffs)
• history/HistoryWay.java (modified) (2 diffs)

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

@@ -1 +1 @@
 // License: GPL. Copyright 2007 by Immanuel Scholz and others
 package org.openstreetmap.josm.data.osm;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.io.BufferedReader;
@@ -35 +37 @@
     private static HashSet<Long> relicensingUsers = null;
     private static HashSet<Long> nonRelicensingUsers = null;
+    private final static User anonymous = createLocalUser(tr("<anonymous>"));
 
     private static long getNextLocalUid() {
@@ -110 +113 @@
         }
         return ret;
+    }
+
+    public static User getAnonymous() {
+        return anonymous;
     }
 
@@ -185 +192 @@
     public static final int STATUS_ANONYMOUS = 4;
 
-    /** 
+    /**
     * Finds out this user's relicensing status and saves it for quicker
     * access.

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

@@ -156 +156 @@
                 new FilterPredicate() {
                     public boolean matches(HistoryOsmPrimitive primitive) {
-                        return primitive.getUid() == uid;
+                        return primitive.getUser() != null && primitive.getUser().getId() == uid;
                     }
                 }

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

@@ -7 +7 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
+import org.openstreetmap.josm.data.osm.User;
 
 /**
@@ -18 +19 @@
     private LatLon coords;
 
-    public HistoryNode(long id, long version, boolean visible, String user, long uid, long changesetId, Date timestamp, LatLon coords) {
-        super(id, version, visible, user, uid, changesetId, timestamp);
+    public HistoryNode(long id, long version, boolean visible, User user, long changesetId, Date timestamp, LatLon coords) {
+        super(id, version, visible, user, changesetId, timestamp);
         setCoords(coords);
     }

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() {

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

@@ -10 +10 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.User;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 
@@ -34 +35 @@
      * @throws IllegalArgumentException thrown if preconditions are violated
      */
-    public HistoryRelation(long id, long version, boolean visible, String user, long uid, long changesetId,
+    public HistoryRelation(long id, long version, boolean visible, User user, long changesetId,
             Date timestamp) throws IllegalArgumentException {
-        super(id, version, visible, user, uid, changesetId, timestamp);
+        super(id, version, visible, user, changesetId, timestamp);
     }
     /**
@@ -52 +53 @@
      * @throws IllegalArgumentException thrown if preconditions are violated
      */
-    public HistoryRelation(long id, long version, boolean visible, String user, long uid, long changesetId,
+    public HistoryRelation(long id, long version, boolean visible, User user, long changesetId,
             Date timestamp, ArrayList<RelationMember> members) {
-        this(id, version, visible, user, uid, changesetId, timestamp);
+        this(id, version, visible, user, changesetId, timestamp);
         if (members != null) {
             this.members.addAll(members);

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

@@ -10 +10 @@
 
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
+import org.openstreetmap.josm.data.osm.User;
 import org.openstreetmap.josm.data.osm.Way;
+
 /**
  * Represents an immutable OSM way in the context of a historical view on
@@ -20 +22 @@
     private ArrayList<Long> nodeIds = new ArrayList<Long>();
 
-    public HistoryWay(long id, long version, boolean visible, String user, long uid, long changesetId, Date timestamp) {
-        super(id, version, visible, user, uid, changesetId, timestamp);
+    public HistoryWay(long id, long version, boolean visible, User user, long changesetId, Date timestamp) {
+        super(id, version, visible, user, changesetId, timestamp);
     }
 
-    public HistoryWay(long id, long version, boolean visible, String user, long uid, long changesetId, Date timestamp, ArrayList<Long> nodeIdList) {
-        this(id, version, visible, user, uid, changesetId, timestamp);
+    public HistoryWay(long id, long version, boolean visible, User user, long changesetId, Date timestamp, ArrayList<Long> nodeIdList) {
+        this(id, version, visible, user, changesetId, timestamp);
         this.nodeIds.addAll(nodeIdList);
     }