Changeset 6449 in josm for trunk/src

Timestamp:

2013-12-07T04:29:28+01:00 (10 years ago)

Author:

Don-vip

Message:

see #3626 - fix history of selected primitives

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/HistoryInfoAction.java (modified) (4 diffs)
• data/osm/history/HistoryDataSet.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.java

@@ -1 @@
-//License: GPL. For details, see LICENSE file.
+// License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.actions;
 
@@ -14 +14 @@
 import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 
+/**
+ * Display history information about OSM ways, nodes, or relations.
+ * @since 968
+ */
 public class HistoryInfoAction extends JosmAction {
 
+    /**
+     * Constructs a new {@code HistoryInfoAction}.
+     */
     public HistoryInfoAction() {
         super(tr("History"), "about",
@@ -40 +47 @@
     }
 
+    /**
+     * Dialog allowing to choose object id if no one is selected.
+     * @since 6448
+     */
     public static class HistoryObjectIDDialog extends OsmIdSelectionDialog {
 
+        /**
+         * Constructs a new {@code HistoryObjectIDDialog}.
+         */
         public HistoryObjectIDDialog() {
             super(Main.parent, tr("Show history"), new String[]{tr("Show history"), tr("Cancel")});
@@ -48 +62 @@
         }
     }
-
 }

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

@@ -13 +13 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.Changeset;
+import org.openstreetmap.josm.data.osm.IPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.PrimitiveId;
@@ -20 +21 @@
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
-import org.openstreetmap.josm.tools.Utils;
 
 /**
  * A data set holding histories of OSM primitives.
- *
- *
+ * @since 1670
  */
 public class HistoryDataSet implements LayerChangeListener{
@@ -163 +162 @@
         CheckParameterUtil.ensureParameterNotNull(pid, "pid");
         List<HistoryOsmPrimitive> versions = data.get(pid);
+        if (versions == null && pid instanceof IPrimitive) {
+            versions = data.get(((IPrimitive) pid).getPrimitiveId());
+        }
         if (versions == null)
             return null;