Changeset 1935 in josm for trunk

Timestamp:

2009-08-08T15:59:57+02:00 (15 years ago)

Author:

Gubaer

Message:

fixed #3203: pressing DEL deletes Layer instead of objects
Enabled DEL in layer list again, should not interfere with DEL on map view anymore.

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/JosmAction.java (modified) (1 diff)
• actions/mapmode/DeleteAction.java (modified) (1 diff)
• actions/mapmode/DrawAction.java (modified) (1 diff)
• actions/mapmode/SelectAction.java (modified) (1 diff)
• gui/dialogs/LayerListDialog.java (modified) (3 diffs)

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

@@ -56 +56 @@
      * Use this super constructor to setup your action. It takes 5 parameters:
      *
-     * name - the action's text as displayed on the menu (if it is added to a menu)
-     * iconName - the filename of the icon to use
-     * tooltip - a longer description of the action that will be displayed in the tooltip. Please note
-     *           that html is not supported for menu action on some platforms
-     * shortcut - a ready-created shortcut object or null if you don't want a shortcut. But you always
-     *            do want a shortcut, remember you can alway register it with group=none, so you
-     *            won't be assigned a shurtcut unless the user configures one. If you pass null here,
+     * @param name the action's text as displayed on the menu (if it is added to a menu)
+     * @param iconName the filename of the icon to use
+     * @param tooltip  a longer description of the action that will be displayed in the tooltip. Please note
+     *           that html is not supported for menu actions on some platforms.
+     * @param shortcut a ready-created shortcut object or null if you don't want a shortcut. But you always
+     *            do want a shortcut, remember you can always register it with group=none, so you
+     *            won't be assigned a shortcut unless the user configures one. If you pass null here,
      *            the user CANNOT configure a shortcut for your action.
-     * register - register this action for the toolbar preferences?
+     * @param register register this action for the toolbar preferences?
      */
     public JosmAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean register) {

trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java

@@ -102 +102 @@
         if(!Main.map.mapView.isActiveLayerVisible())
             return;
+
+        // request focus in order to enable the expected keyboard shortcuts
+        //
+        Main.map.mapView.requestFocus();
+
         boolean ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0;
         boolean shift = (e.getModifiers() & ActionEvent.SHIFT_MASK) != 0;

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -307 +307 @@
         if(!Main.map.mapView.isActiveLayerDrawable())
             return;
+        // request focus in order to enable the expected keyboard shortcuts
+        //
+        Main.map.mapView.requestFocus();
 
         if(e.getClickCount() > 1 && mousePos != null && mousePos.equals(oldMousePos)) {

trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

@@ -351 +351 @@
         if(!Main.map.mapView.isActiveLayerVisible())
             return;
+        // request focus in order to enable the expected keyboard shortcuts
+        //
+        Main.map.mapView.requestFocus();
 
         cancelDrawMode = false;

trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

@@ -9 +9 @@
 import java.awt.Point;
 import java.awt.event.ActionEvent;
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseAdapter;
@@ -21 +23 @@
 
 import javax.swing.AbstractAction;
+import javax.swing.Action;
 import javax.swing.DefaultListCellRenderer;
 import javax.swing.DefaultListModel;
@@ -131 +134 @@
         //-- delete layer action
         DeleteLayerAction deleteLayerAction = new DeleteLayerAction();
-        // #3203: grabs DELETE even for primitives on the map
-        // FIXME: disabling for now, don't understand yet what's going on
-        //        layerList.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(
-        //                KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0),"deleteLayer"
-        //        );
-        //        layerList.getActionMap().put("deleteLayer", deleteLayerAction);
+        layerList.getInputMap(JComponent.WHEN_FOCUSED).put(
+                KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0),"deleteLayer"
+        );
+        layerList.getActionMap().put("deleteLayer", deleteLayerAction);
         adaptTo(deleteLayerAction, selectionModel);
         buttonPanel.add(new SideButton(deleteLayerAction, "delete"));