/[classpath]/classpath/java/awt/event/KeyEvent.java
ViewVC logotype

Diff of /classpath/java/awt/event/KeyEvent.java

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

revision 1.8 by mkoch, Sun Mar 2 19:28:14 2003 UTC revision 1.9 by fitzsim, Wed Aug 6 15:05:29 2003 UTC
# Line 1503  public class KeyEvent extends InputEvent Line 1503  public class KeyEvent extends InputEvent
1503        case VK_NUMPAD7:        case VK_NUMPAD7:
1504        case VK_NUMPAD8:        case VK_NUMPAD8:
1505        case VK_NUMPAD9:        case VK_NUMPAD9:
1506          return "NumPad-" + (char) (keyCode - VK_NUMPAD0);          return "NumPad-" + (keyCode - VK_NUMPAD0);
1507        case VK_F1:        case VK_F1:
1508        case VK_F2:        case VK_F2:
1509        case VK_F3:        case VK_F3:
# Line 1642  public class KeyEvent extends InputEvent Line 1642  public class KeyEvent extends InputEvent
1642    }    }
1643    
1644    /**    /**
1645     * Returns a string identifying the event. This is formatted as the field     * Returns a string identifying the event.  This is formatted as the
1646     * name of the id type, followed by the keyCode, then the keyChar (if     * field name of the id type, followed by the keyCode, then the
1647     * available), modifiers (if any), extModifiers (if any), and keyLocation.     * keyChar, modifiers (if any), extModifiers (if any), and
1648     * The keyChar is available unless the keyCode is Backspace, Tab, Enter,     * keyLocation.
    * Escape, Numpad-[0-9], Delete, or a keyCode which is an action.  
1649     *     *
1650     * @return a string identifying the event     * @return a string identifying the event
1651     */     */
# Line 1656  public class KeyEvent extends InputEvent Line 1655  public class KeyEvent extends InputEvent
1655      switch (id)      switch (id)
1656        {        {
1657        case KEY_PRESSED:        case KEY_PRESSED:
1658          s.append("KEY_PRESSED,keyCode=");          s.append("KEY_PRESSED");
1659          break;          break;
1660        case KEY_RELEASED:        case KEY_RELEASED:
1661          s.append("KEY_RELEASED,keyCode=");          s.append("KEY_RELEASED");
1662          break;          break;
1663        case KEY_TYPED:        case KEY_TYPED:
1664          s.append("KEY_TYPED,keyCode=");          s.append("KEY_TYPED");
1665          break;          break;
1666        default:        default:
1667          s.append("unknown type,keyCode=");          s.append("unknown type");
       }  
     s.append(keyCode);  
     switch (keyCode)  
       {  
       default:  
         if (! isActionKey())  
           {  
             s.append(",keyChar='").append(keyChar).append('\'');  
             break;  
1668            }            }
1669          // Fallthrough.  
1670        case VK_BACK_SPACE:      s.append(",keyCode=").append(keyCode);
1671        case VK_TAB:  
1672        case VK_ENTER:      s.append(",keyText=").append(getKeyText(keyCode));
1673        case VK_ESCAPE:  
1674        case VK_NUMPAD0:      s.append(",keyChar=");
1675        case VK_NUMPAD1:      if (isActionKey()
1676        case VK_NUMPAD2:          || keyCode == VK_SHIFT
1677        case VK_NUMPAD3:          || keyCode == VK_CONTROL
1678        case VK_NUMPAD4:          || keyCode == VK_ALT)
1679        case VK_NUMPAD5:        s.append("Undefined keyChar");
1680        case VK_NUMPAD6:      else
1681        case VK_NUMPAD7:        {
1682        case VK_NUMPAD8:          /* This output string must be selected by examining keyChar
1683        case VK_NUMPAD9:           * rather than keyCode, because key code information is not
1684        case VK_DELETE:           * included in KEY_TYPED events.
1685          s.append(',').append(getKeyText(keyCode));           */
1686            if (keyChar == VK_BACK_SPACE
1687                || keyChar == VK_TAB
1688                || keyChar == VK_ENTER
1689                || keyChar == VK_ESCAPE
1690                || keyChar == VK_DELETE)
1691              s.append(getKeyText(keyChar));
1692            else
1693              s.append("'").append(keyChar).append("'");
1694        }        }
1695    
1696      if ((modifiers & CONVERT_MASK) != 0)      if ((modifiers & CONVERT_MASK) != 0)
1697        s.append(",modifiers=").append(getModifiersExText(modifiers        s.append(",modifiers=").append(getModifiersExText(modifiers
1698                                                          & CONVERT_MASK));                                                          & CONVERT_MASK));

Legend:
Removed from v.1.8  
changed lines
  Added in v.1.9

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