Changeset 1187 for trunk/src/org/expeditee/gio/swing/SwingInputManager.java

Timestamp:

10/31/18 10:20:25 (6 years ago)

Author:

bln4

Message:

Updated how the SwingInputManager deals with popups so that the call to focus can be re-enabled.

File:

• trunk/src/org/expeditee/gio/swing/SwingInputManager.java (modified) (7 diffs)

trunk/src/org/expeditee/gio/swing/SwingInputManager.java

@@ -21 +21 @@
 import java.awt.event.WindowListener;
 import java.awt.event.WindowStateListener;
+import java.util.List;
 
 import javax.swing.SwingUtilities;
@@ -348 +349 @@
         @Override
         public void keyTyped(KeyEvent e) {
+                //System.err.println("SwingInputManager::keyTyped::KeyEvent: " + e.getKeyChar());
                 // Give widgets first whack at input
                 distributeNativeInput(e);
                 if (e.isConsumed()) {
+                        //System.err.println("SwingInputManager::keyTyped::Widget/Popup Consumed KeyEvent");
                         return;
                 }
@@ -383 +386 @@
         /** Handles key pressed/released events. */
         private void keyAction(KeyEvent e, boolean down) {
+                //System.err.println("SwingInputManager::keyAction::KeyEvent: " + e.getKeyChar());
                 // Give widgets first whack at input
                 distributeNativeInput(e);
                 if (e.isConsumed()) {
-                        return;
-                }
+                        //System.err.println("SwingInputManager::keyAction::Was consumed: " + e.isConsumed());
+                        return;
+                }
+                //System.err.println("SwingInputManager::keyAction::Was consumed: " + e.isConsumed());
 
                 KBMInputEvent.Key key = SwingConversions.fromSwingVirtualKey(e.getKeyCode());
@@ -418 +424 @@
         /** Forwards the given input event to the listener if it is listening for it. */
         private void forwardNativeInputToListener(Object listener, java.awt.event.InputEvent event) {
+                //System.err.println("SwingInputManager::forwardNativeInputToListener");
                 if (listener == null || event == null) {
                         return;
                 }
-
+                //System.err.println("SwingInputManager::forwardNativeInputToListener::Recieving input: " + event.toString());
                 if (listener instanceof KeyListener && event instanceof KeyEvent) {
 
@@ -435 +442 @@
                                 return;
                         case KeyEvent.KEY_TYPED:
+                                //System.err.println("SwingInputManager::forwardNativeInputToListener::Recieving key typed: " + event.toString());
                                 keyListener.keyTyped(ke);
                                 return;
@@ -505 +513 @@
                         return;
                 }
-
-                for (Popup popup : PopupManager.getInstance().getPopups()) {
+                final List<Popup> popups = PopupManager.getInstance().getPopups();
+                for (Popup popup : popups) {
                         forwardNativeInputToListener(popup, event);
 
@@ -520 +528 @@
                         return;
                 }
-
                 for (Widget iw : _widgets) {
                         java.awt.event.InputEvent e = respecInputEventForWidget(event, iw);