Changeset 5053 in josm

Timestamp:

Mar 8, 2012 10:31:34 AM (15 months ago)

Author:

akks

Message:

style fix, removed one patch committed by mistake

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/mapmode/DrawAction.java (modified) (4 diffs)
• gui/history/VersionInfoPanel.java (modified) (1 diff)

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

@@ -12 +12 @@
 import java.awt.BasicStroke;
 import java.awt.Color;
-import java.awt.Component;
 import java.awt.Cursor;
 import java.awt.Graphics2D;
-import java.awt.KeyboardFocusManager;
 import java.awt.MenuItem;
 import java.awt.Point;
@@ -39 +37 @@
 import java.util.Map;
 import java.util.Set;
-
 import java.util.TreeSet;
-import javax.swing.*;
+import javax.swing.AbstractAction;
+import javax.swing.JOptionPane;
+import javax.swing.JPopupMenu;
+import javax.swing.Timer;
+
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
@@ -222 +223 @@
             return;
         if (event instanceof KeyEvent) {
-            Component focused = KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner();
-            Component wantedFocus = Main.map.mapView.getParent();
-            boolean foundMapViewAncestor=false;
-            while (focused!=null) {
-                if (focused==wantedFocus) {
-                    foundMapViewAncestor=true;
-                }
-                focused = focused.getParent();
-            }
-            // we accept only events that come from map or toggle dialogs, not from menu and dialogs
-            if (!foundMapViewAncestor) return;
             processKeyEvent((KeyEvent) event);
         } //  toggle angle snapping
@@ -247 +237 @@
     private Timer timer;
     void processKeyEvent(KeyEvent e) {
-        if (!snappingShortcut.isEvent(e) && !getShortcut().isEvent(e))
+        if (!snappingShortcut.isEvent(e))
             return;
 

trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.history;
 
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.GridLayout;
+
 import static org.openstreetmap.josm.tools.I18n.tr;