Changeset 5440 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2012-08-13T02:37:03+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #7716 - History shows same version number, wrong date, user, and CT for modified objects

Location:

trunk/src/org/openstreetmap/josm/gui/history

Files:

• HistoryBrowser.java (modified) (1 diff)
• HistoryBrowserModel.java (modified) (6 diffs)
• VersionInfoPanel.java (modified) (2 diffs)
• VersionTableColumnModel.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java

@@ -13 +13 @@
 import javax.swing.JTable;
 
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.history.History;

trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java

@@ -20 +20 @@
 import org.openstreetmap.josm.data.osm.RelationMemberData;
 import org.openstreetmap.josm.data.osm.User;
+import org.openstreetmap.josm.data.osm.UserInfo;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.event.AbstractDatasetChangedEvent;
@@ -36 +37 @@
 import org.openstreetmap.josm.data.osm.history.HistoryWay;
 import org.openstreetmap.josm.data.osm.visitor.AbstractVisitor;
+import org.openstreetmap.josm.gui.JosmUserIdentityManager;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
@@ -437 +439 @@
             case 4: {
                     HistoryOsmPrimitive p = getPrimitive(row);
-                    if (p != null)
+                    if (p != null && p.getTimestamp() != null)
                         return DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT).format(p.getTimestamp());
                     return null;
@@ -877 +879 @@
 
         public void visit(Node n) {
-            clone = new HistoryNode(n.getId(), n.getVersion(), n.isVisible(), n.getUser(), 0, n.getTimestamp(), n.getCoor());
+            clone = new HistoryNode(n.getId(), n.getVersion(), n.isVisible(), getCurrentUser(), 0, null, n.getCoor(), false);
             clone.setTags(n.getKeys());
         }
 
         public void visit(Relation r) {
-            clone = new HistoryRelation(r.getId(), r.getVersion(), r.isVisible(), r.getUser(), 0, r.getTimestamp());
+            clone = new HistoryRelation(r.getId(), r.getVersion(), r.isVisible(), getCurrentUser(), 0, null, false);
             clone.setTags(r.getKeys());
             HistoryRelation hr = (HistoryRelation)clone;
@@ -891 +893 @@
 
         public void visit(Way w) {
-            clone = new HistoryWay(w.getId(), w.getVersion(), w.isVisible(), w.getUser(), 0, w.getTimestamp());
+            clone = new HistoryWay(w.getId(), w.getVersion(), w.isVisible(), getCurrentUser(), 0, null, false);
             clone.setTags(w.getKeys());
             for (Node n: w.getNodes()) {
@@ -898 +900 @@
         }
 
+        private User getCurrentUser() {
+            UserInfo info = JosmUserIdentityManager.getInstance().getUserInfo();
+            return info == null ? User.getAnonymous() : User.createOsmUser(info.getId(), info.getDisplayName());
+        }
+
         public HistoryOsmPrimitive build(OsmPrimitive primitive) {
             primitive.visit(this);

trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java

@@ -20 +20 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.AbstractInfoAction;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.User;
 import org.openstreetmap.josm.data.osm.history.HistoryOsmPrimitive;
 import org.openstreetmap.josm.gui.JMultilineLabel;
+import org.openstreetmap.josm.gui.JosmUserIdentityManager;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-import org.openstreetmap.josm.io.auth.CredentialsManager;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.UrlLabel;
@@ -153 +154 @@
             lblUser.setDescription(username);
         } else {
-            String user = CredentialsManager.getInstance().getUsername();
+            String user = JosmUserIdentityManager.getInstance().getUserName();
             if (user == null) {
                 lblUser.setDescription(tr("anonymous"));
+                lblUser.setUrl(null);
             } else {
                 try {

trunk/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java

@@ -7 +7 @@
 import javax.swing.table.DefaultTableColumnModel;
 import javax.swing.table.TableColumn;
+import javax.swing.table.TableColumnModel;
 
 /**
@@ -58 +59 @@
     }
 
+    /**
+     * Creates a new {@code VersionTableColumnModel}.
+     */
     public VersionTableColumnModel() {
         createColumns();