/[classpath]/classpath/java/awt/DefaultKeyboardFocusManager.java
ViewVC logotype

Diff of /classpath/java/awt/DefaultKeyboardFocusManager.java

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.4 by mark, Sat Jul 31 16:31:35 2004 UTC revision 1.5 by mark, Sat Jul 31 16:39:15 2004 UTC
# Line 285  public class DefaultKeyboardFocusManager Line 285  public class DefaultKeyboardFocusManager
285      // Check if this event represents a menu shortcut.      // Check if this event represents a menu shortcut.
286    
287      // MenuShortcuts are activated by Ctrl- KeyEvents, only on KEY_PRESSED.      // MenuShortcuts are activated by Ctrl- KeyEvents, only on KEY_PRESSED.
288      int modifiers = e.getModifiers ();      int modifiers = e.getModifiersEx ();
289      if (e.getID() == KeyEvent.KEY_PRESSED      if (e.getID() == KeyEvent.KEY_PRESSED
290          && ((modifiers & KeyEvent.CTRL_MASK) != 0          && (modifiers & KeyEvent.CTRL_DOWN_MASK) != 0)
             || (modifiers & KeyEvent.CTRL_DOWN_MASK) != 0))  
291        {        {
292          Window focusedWindow = getGlobalFocusedWindow ();          Window focusedWindow = getGlobalFocusedWindow ();
293          if (focusedWindow instanceof Frame)          if (focusedWindow instanceof Frame)
# Line 324  public class DefaultKeyboardFocusManager Line 323  public class DefaultKeyboardFocusManager
323                              //        modifier.                              //        modifier.
324                              if (shortcut.getKey () == e.getKeyCode ()                              if (shortcut.getKey () == e.getKeyCode ()
325                                  && ((shortcut.usesShiftModifier ()                                  && ((shortcut.usesShiftModifier ()
326                                       && ((modifiers & KeyEvent.SHIFT_MASK) != 0                                       && (modifiers & KeyEvent.SHIFT_DOWN_MASK) != 0)
                                          || (modifiers & KeyEvent.SHIFT_DOWN_MASK) != 0))  
327                                      || (! shortcut.usesShiftModifier ()                                      || (! shortcut.usesShiftModifier ()
                                         && (modifiers & KeyEvent.SHIFT_MASK) == 0  
328                                          && (modifiers & KeyEvent.SHIFT_DOWN_MASK) == 0)))                                          && (modifiers & KeyEvent.SHIFT_DOWN_MASK) == 0)))
329                                {                                {
330                                  item.dispatchEvent (new ActionEvent (item,                                  item.dispatchEvent (new ActionEvent (item,
# Line 354  public class DefaultKeyboardFocusManager Line 351  public class DefaultKeyboardFocusManager
351      // KEY_PRESSED TAB is a focus traversal keystroke, we also need to      // KEY_PRESSED TAB is a focus traversal keystroke, we also need to
352      // consume KEY_RELEASED and KEY_TYPED TAB key events).      // consume KEY_RELEASED and KEY_TYPED TAB key events).
353      AWTKeyStroke oppositeKeystroke = AWTKeyStroke.getAWTKeyStroke (e.getKeyCode (),      AWTKeyStroke oppositeKeystroke = AWTKeyStroke.getAWTKeyStroke (e.getKeyCode (),
354                                                                     e.getModifiers (),                                                                     e.getModifiersEx (),
355                                                                     !(e.id == KeyEvent.KEY_RELEASED));                                                                     !(e.id == KeyEvent.KEY_RELEASED));
356    
357      Set forwardKeystrokes = comp.getFocusTraversalKeys (KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS);      Set forwardKeystrokes = comp.getFocusTraversalKeys (KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS);

Legend:
Removed from v.1.4  
changed lines
  Added in v.1.5

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26