Changeset 6448 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2013-12-06T22:27:39+01:00 (11 years ago)

Author:

simon04

Message:

fix #3626 - Show history for any object in history dialog

If no object is selected, the objects are selected by id via dialog.

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• DownloadPrimitiveAction.java (modified) (1 diff)
• HistoryInfoAction.java (modified) (3 diffs)

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

@@ -56 +56 @@
 
         DownloadObjectDialog dialog = new DownloadObjectDialog();
-        if (dialog.showDialog().getValue() != 1) return;
+        if (dialog.showDialog().getValue() != dialog.getContinueButtonIndex()) return;
 
         processItems(dialog.isNewLayerRequested(), dialog.getOsmIds(), dialog.isReferrersRequested(), dialog.isFullRelationRequested());

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

@@ -4 +4 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
-import java.util.Collection;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.dialogs.OsmIdSelectionDialog;
 import org.openstreetmap.josm.gui.history.HistoryBrowserDialogManager;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -21 +20 @@
                 tr("Display history information about OSM ways, nodes, or relations."),
                 Shortcut.registerShortcut("core:historyinfo",
-                tr("History"), KeyEvent.VK_H, Shortcut.CTRL), false);
+                        tr("History"), KeyEvent.VK_H, Shortcut.CTRL), false);
         putValue("help", ht("/Action/ObjectHistory"));
         putValue("toolbar", "action/historyinfo");
         Main.toolbar.register(this);
+        setEnabled(true);
     }
 
@@ -30 +30 @@
     public void actionPerformed(ActionEvent ae) {
         DataSet set = getCurrentDataSet();
-        if (set != null) {
+        if (set != null && !set.getAllSelected().isEmpty()) {
             HistoryBrowserDialogManager.getInstance().showHistory(set.getAllSelected());
+        } else {
+            HistoryObjectIDDialog dialog = new HistoryObjectIDDialog();
+            if (dialog.showDialog().getValue() == dialog.getContinueButtonIndex()) {
+                HistoryBrowserDialogManager.getInstance().showHistory(dialog.getOsmIds());
+            }
         }
     }
 
-    @Override
-    public void updateEnabledState() {
-        if (getCurrentDataSet() == null) {
-            setEnabled(false);
-        } else {
-            updateEnabledState(getCurrentDataSet().getAllSelected());
+    public static class HistoryObjectIDDialog extends OsmIdSelectionDialog {
+
+        public HistoryObjectIDDialog() {
+            super(Main.parent, tr("Show history"), new String[]{tr("Show history"), tr("Cancel")});
+            setButtonIcons(new String[]{"dialogs/history.png", "cancel.png"});
+            init();
         }
     }
 
-    @Override
-    protected void updateEnabledState(Collection<? extends OsmPrimitive> selection) {
-        setEnabled(!selection.isEmpty());
-    }
 }