Changeset 3221 in josm for trunk/src

Timestamp:

2010-05-08T17:20:06+02:00 (14 years ago)

Author:

jttt

Message:

Fix #4388 JOSM told me i've found a bug while editing a relation

File:

• trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java (modified) (2 diffs)

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

@@ -871 +871 @@
         private HistoryOsmPrimitive clone;
 
+        private String getUserName(OsmPrimitive primitive) {
+            return primitive.getUser() == null?null:primitive.getUser().getName();
+        }
+
+        private long getUserId(OsmPrimitive primitive) {
+            return primitive.getUser() == null?0:primitive.getUser().getId();
+        }
+
         public void visit(Node n) {
-            clone = new HistoryNode(n.getId(), n.getVersion(), n.isVisible(),n.getUser().getName(), n.getUser().getId(), 0, n.getTimestamp(), n.getCoor());
+            clone = new HistoryNode(n.getId(), n.getVersion(), n.isVisible(), getUserName(n), getUserId(n), 0, n.getTimestamp(), n.getCoor());
             clone.setTags(n.getKeys());
         }
 
         public void visit(Relation r) {
-            clone = new HistoryRelation(r.getId(), r.getVersion(), r.isVisible(),r.getUser().getName(), r.getUser().getId(), 0, r.getTimestamp());
+            clone = new HistoryRelation(r.getId(), r.getVersion(), r.isVisible(), getUserName(r), getUserId(r), 0, r.getTimestamp());
             clone.setTags(r.getKeys());
             HistoryRelation hr = (HistoryRelation)clone;
@@ -886 +894 @@
 
         public void visit(Way w) {
-            clone = new HistoryWay(w.getId(), w.getVersion(), w.isVisible(),w.getUser().getName(), w.getUser().getId(), 0, w.getTimestamp());
+            clone = new HistoryWay(w.getId(), w.getVersion(), w.isVisible(), getUserName(w), getUserId(w), 0, w.getTimestamp());
             clone.setTags(w.getKeys());
             for (Node n: w.getNodes()) {