Changeset 3502 in josm for trunk/src/org

Timestamp:

2010-08-31T12:37:51+02:00 (14 years ago)

Author:

bastiK

Message:

see #3278 (redirect shortcuts in the undocked windows to the main window) - also for relation dialog

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/ToggleDialog.java (modified) (6 diffs)
• dialogs/relation/GenericRelationEditor.java (modified) (2 diffs)
• util/RedirectInputMap.java (added)

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

@@ -24 +24 @@
 import javax.swing.AbstractAction;
 import javax.swing.BorderFactory;
-import javax.swing.ComponentInputMap;
 import javax.swing.ImageIcon;
-import javax.swing.InputMap;
 import javax.swing.JButton;
 import javax.swing.JComponent;
@@ -33 +31 @@
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
-import javax.swing.KeyStroke;
 
 import org.openstreetmap.josm.Main;
@@ -40 +37 @@
 import org.openstreetmap.josm.gui.help.HelpUtil;
 import org.openstreetmap.josm.gui.help.Helpful;
+import org.openstreetmap.josm.gui.util.RedirectInputMap;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -49 +47 @@
  */
 public class ToggleDialog extends JPanel implements Helpful {
-
-    // It's not possible to simply set component input map parent to be Main.contentPane.getInputMap because
-    // there is check in setParent that InputMap is for the same component
-    // Yes, this is a hack
-    // Another possibility would be simply copy InputMap, but that would require to keep copies synchronized when some shortcut is
-    // later
-    private static class RedirectInputMap extends ComponentInputMap {
-
-        private final InputMap target;
-
-        public RedirectInputMap(JComponent component, InputMap target) {
-            super(component);
-            this.target = target;
-        }
-
-        @Override
-        public Object get(KeyStroke keyStroke) {
-            return target.get(keyStroke);
-        }
-
-        @Override
-        public KeyStroke[] keys() {
-            return target.keys();
-        }
-
-        @Override
-        public int size() {
-            return target.size();
-        }
-
-        @Override
-        public KeyStroke[] allKeys() {
-            return target.allKeys();
-        }
-
-        @Override
-        public void put(KeyStroke keyStroke, Object actionMapKey) {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public void remove(KeyStroke key) {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public void clear() {
-            throw new UnsupportedOperationException();
-        }
-
-    }
 
     /** The action to toggle this dialog */
@@ -152 +99 @@
      * @param defShow if the dialog should be shown by default, if there is no preference
      */
-    @SuppressWarnings("deprecation")
     public ToggleDialog(String name, String iconName, String tooltip, Shortcut shortcut, int preferredHeight, boolean defShow) {
         super(new BorderLayout());
@@ -180 +126 @@
         isCollapsed = Main.pref.getBoolean(preferencePrefix+".minimized", false);
 
-        InputMap lastParent = getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
-        while (lastParent.getParent() != null) {
-            lastParent = lastParent.getParent();
-        }
-        lastParent.setParent(new RedirectInputMap(this, Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW)));
-        getActionMap().setParent(Main.contentPane.getActionMap());
+        RedirectInputMap.redirectToMainContentPane(this);
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

@@ -72 +72 @@
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
+import org.openstreetmap.josm.gui.util.RedirectInputMap;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -185 +186 @@
         memberTableModel.setSelectedMembers(selectedMembers);
         HelpUtil.setHelpContext(getRootPane(),ht("/Dialog/RelationEditor"));
+        RedirectInputMap.redirectToMainContentPane(getRootPane());
     }