Changeset 5672 in josm for trunk/src/org/openstreetmap

Timestamp:

2013-01-26T17:42:51+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #3596 - Validator list conflicts with keyboard shortcuts

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.dialogs.validator;
 
+import java.awt.event.KeyListener;
 import java.awt.event.MouseEvent;
 import java.util.ArrayList;
@@ -11 +12 @@
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
-import java.util.Map.Entry;
 
 import javax.swing.JTree;
@@ -21 +22 @@
 import javax.swing.tree.TreeSelectionModel;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.validation.Severity;
@@ -27 +29 @@
 import org.openstreetmap.josm.gui.preferences.ValidatorPreference;
 import org.openstreetmap.josm.tools.MultiMap;
-import org.openstreetmap.josm.Main;
 
 /**
@@ -70 +71 @@
         this.getSelectionModel().setSelectionMode(TreeSelectionModel.DISCONTIGUOUS_TREE_SELECTION);
         setErrorList(errors);
+        for (KeyListener keyListener : getKeyListeners()) {
+            // Fix #3596 - Remove default keyListener to avoid conflicts with JOSM commands
+            if (keyListener.getClass().getName().equals("javax.swing.plaf.basic.BasicTreeUI$Handler")) {
+                removeKeyListener(keyListener);
+            }
+        }
     }