Changeset 4408 in josm for trunk/src/org/openstreetmap/josm/actions/InfoAction.java

Timestamp:

08.09.2011 00:08:02 (9 months ago)

Author:

simon04

Message:

fix #6773 - shortcuts for History and Advanced info dialog

File:

• trunk/src/org/openstreetmap/josm/actions/InfoAction.java (modified) (3 diffs)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.actions;
 
+import java.awt.event.ActionEvent;
 import static org.openstreetmap.josm.tools.I18n.tr;
 import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
@@ -7 +8 @@
 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.data.osm.OsmPrimitiveType;
+import org.openstreetmap.josm.gui.dialogs.InspectPrimitiveDialog;
 import org.openstreetmap.josm.tools.Shortcut;
 
-public class InfoAction extends AbstractInfoAction {
+public class InfoAction extends JosmAction {
 
     public InfoAction() {
-        super(tr("Info about Element"), "about",
-                tr("Display object information about OSM nodes, ways, or relations."),
-                Shortcut.registerShortcut("core:information",
-                        tr("Info about Element"), KeyEvent.VK_I, Shortcut.GROUP_HOTKEY), false);
+        super(tr("Advanced info"), "about",
+                tr("Display advanced object information about OSM nodes, ways, or relations."),
+                Shortcut.registerShortcut("core:info",
+                tr("Advanced info"), KeyEvent.VK_I, Shortcut.GROUP_HOTKEY), false);
         putValue("help", ht("/Action/InfoAboutElements"));
         putValue("toolbar", "action/info");
@@ -25 +28 @@
 
     @Override
-    protected  String createInfoUrl(Object infoObject) {
-        OsmPrimitive primitive = (OsmPrimitive)infoObject;
-        return getBaseBrowseUrl() + "/" + OsmPrimitiveType.from(primitive).getAPIName() + "/" + primitive.getId();
+    public void actionPerformed(ActionEvent ae) {
+        DataSet set = getCurrentDataSet();
+                if (set != null) {
+                        new InspectPrimitiveDialog(set.getSelected(), Main.map.mapView.getEditLayer()).showDialog();
+                }
+    }
+
+    @Override
+    public void updateEnabledState() {
+        if (getCurrentDataSet() == null) {
+            setEnabled(false);
+        } else {
+            updateEnabledState(getCurrentDataSet().getSelected());
+        }
+    }
+
+    @Override
+    protected void updateEnabledState(Collection<? extends OsmPrimitive> selection) {
+        setEnabled(!selection.isEmpty());
     }
 }