From 31a1eb685aadc18e90aaa45bfc509b60e8847e72 Mon Sep 17 00:00:00 2001 From: Ray Greenwell Date: Thu, 31 Mar 2005 17:26:01 +0000 Subject: [PATCH] requestFocus() -> requestFocusInWindow() git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3450 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- src/java/com/threerings/micasa/client/ChatPanel.java | 4 ++-- src/java/com/threerings/micasa/client/LogonPanel.java | 6 +++--- src/java/com/threerings/puzzle/client/PuzzlePanel.java | 4 ++-- src/java/com/threerings/stage/tools/editor/EditorFrame.java | 2 +- .../threerings/stage/tools/editor/ObjectEditorDialog.java | 2 +- .../com/threerings/stage/tools/editor/PortalDialog.java | 2 +- src/java/com/threerings/util/KeyDispatcher.java | 6 +++--- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/java/com/threerings/micasa/client/ChatPanel.java b/src/java/com/threerings/micasa/client/ChatPanel.java index 4326cca0c..bdebb5208 100644 --- a/src/java/com/threerings/micasa/client/ChatPanel.java +++ b/src/java/com/threerings/micasa/client/ChatPanel.java @@ -117,7 +117,7 @@ public class ChatPanel addAncestorListener(new AncestorAdapter() { public void ancestorAdded (AncestorEvent e) { if (_focus) { - _entry.requestFocus(); + _entry.requestFocusInWindow(); } } }); @@ -291,7 +291,7 @@ public class ChatPanel _entry.setEnabled(true); _send.setEnabled(true); if (_focus) { - _entry.requestFocus(); + _entry.requestFocusInWindow(); } } diff --git a/src/java/com/threerings/micasa/client/LogonPanel.java b/src/java/com/threerings/micasa/client/LogonPanel.java index f67dc97e2..3034295c9 100644 --- a/src/java/com/threerings/micasa/client/LogonPanel.java +++ b/src/java/com/threerings/micasa/client/LogonPanel.java @@ -1,5 +1,5 @@ // -// $Id: LogonPanel.java,v 1.11 2004/08/27 02:12:49 mdb Exp $ +// $Id$ // // Narya library - tools for developing networked games // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved @@ -131,14 +131,14 @@ public class LogonPanel extends JPanel _ctx.getClient().addClientObserver(this); // start with focus in the username field - _username.requestFocus(); + _username.requestFocusInWindow(); } public void actionPerformed (ActionEvent e) { String cmd = e.getActionCommand(); if (cmd.equals("skipToPassword")) { - _password.requestFocus(); + _password.requestFocusInWindow(); } else if (cmd.equals("logon")) { logon(); diff --git a/src/java/com/threerings/puzzle/client/PuzzlePanel.java b/src/java/com/threerings/puzzle/client/PuzzlePanel.java index 08c1cc9f4..6a6fe534b 100644 --- a/src/java/com/threerings/puzzle/client/PuzzlePanel.java +++ b/src/java/com/threerings/puzzle/client/PuzzlePanel.java @@ -1,5 +1,5 @@ // -// $Id: PuzzlePanel.java,v 1.9 2004/10/29 00:48:37 eric Exp $ +// $Id$ // // Narya library - tools for developing networked games // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved @@ -171,7 +171,7 @@ public abstract class PuzzlePanel extends JPanel // enable or disable the key manager appropriately _ctx.getKeyboardManager().setEnabled(puzgrabs); if (puzgrabs) { - getBoardView().requestFocus(); + getBoardView().requestFocusInWindow(); } } diff --git a/src/java/com/threerings/stage/tools/editor/EditorFrame.java b/src/java/com/threerings/stage/tools/editor/EditorFrame.java index 1c032e5c2..a6a588145 100644 --- a/src/java/com/threerings/stage/tools/editor/EditorFrame.java +++ b/src/java/com/threerings/stage/tools/editor/EditorFrame.java @@ -513,7 +513,7 @@ public class EditorFrame extends ManagedJFrame // event queue to flush before we can transfer focus EventQueue.invokeLater(new Runnable() { public void run () { - _sceneInfoPanel.requestFocus(); + _sceneInfoPanel.requestFocusInWindow(); } }); } diff --git a/src/java/com/threerings/stage/tools/editor/ObjectEditorDialog.java b/src/java/com/threerings/stage/tools/editor/ObjectEditorDialog.java index 49a8d0288..5f291701a 100644 --- a/src/java/com/threerings/stage/tools/editor/ObjectEditorDialog.java +++ b/src/java/com/threerings/stage/tools/editor/ObjectEditorDialog.java @@ -137,7 +137,7 @@ public class ObjectEditorDialog extends JInternalFrame // select the text edit field and focus it _action.setCaretPosition(0); _action.moveCaretPosition(atext.length()); - _action.requestFocus(); + _action.requestFocusInWindow(); } protected Object[] computeZations (String[] zations, int index) diff --git a/src/java/com/threerings/stage/tools/editor/PortalDialog.java b/src/java/com/threerings/stage/tools/editor/PortalDialog.java index 732c0b34e..357f3018c 100644 --- a/src/java/com/threerings/stage/tools/editor/PortalDialog.java +++ b/src/java/com/threerings/stage/tools/editor/PortalDialog.java @@ -97,7 +97,7 @@ public class PortalDialog extends JInternalFrame // request the keyboard focus so that the destination scene // name can be typed immediately - _portalText.requestFocus(); + _portalText.requestFocusInWindow(); } /** diff --git a/src/java/com/threerings/util/KeyDispatcher.java b/src/java/com/threerings/util/KeyDispatcher.java index f1bc4b05c..c667c1940 100644 --- a/src/java/com/threerings/util/KeyDispatcher.java +++ b/src/java/com/threerings/util/KeyDispatcher.java @@ -1,5 +1,5 @@ // -// $Id: KeyDispatcher.java,v 1.3 2004/09/30 23:35:13 ray Exp $ +// $Id$ // // Narya library - tools for developing networked games // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved @@ -106,7 +106,7 @@ public class KeyDispatcher // and request to give the new component the focus since that's a // sensible thing to do as it's aiming to nab all key events // henceforth - comp.requestFocus(); + comp.requestFocusInWindow(); } /** @@ -161,7 +161,7 @@ public class KeyDispatcher !isTypableTarget(target)) { // focus our grabby component, and redirect this // key event there - _curChatGrabber.requestFocus(); + _curChatGrabber.requestFocusInWindow(); KeyboardFocusManager.getCurrentKeyboardFocusManager(). redispatchEvent(_curChatGrabber, e); return true;