[cp-patches] fix AWTKeyStroke.getAWTKeyStroke

[Thomas Fitzsimmons]

Hi,

This patch fixes the remaining failures in
gnu.testlet.java.awt.AWTKeyStroke.getAWTKeyStroke.

Tom

2005-08-20  Thomas Fitzsimmons  <address@hidden>

        * java/awt/AWTKeyStroke.java (getAWTKeyStroke): Include old-style
        modifiers in returned AWTKeyStroke's modifier mask.

Index: java/awt/AWTKeyStroke.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/AWTKeyStroke.java,v
retrieving revision 1.11
diff -u -r1.11 AWTKeyStroke.java
--- java/awt/AWTKeyStroke.java  6 Jul 2005 08:15:16 -0000       1.11
+++ java/awt/AWTKeyStroke.java  21 Aug 2005 02:03:42 -0000
@@ -412,13 +412,25 @@
       {
         token = t.nextToken();
         if ("shift".equals(token))
-          modifiers |= KeyEvent.SHIFT_DOWN_MASK;
+         {
+           modifiers |= KeyEvent.SHIFT_MASK;
+           modifiers |= KeyEvent.SHIFT_DOWN_MASK;
+         }
         else if ("ctrl".equals(token) || "control".equals(token))
-          modifiers |= KeyEvent.CTRL_DOWN_MASK;
+         {
+           modifiers |= KeyEvent.CTRL_MASK;
+           modifiers |= KeyEvent.CTRL_DOWN_MASK;
+         }
         else if ("meta".equals(token))
-          modifiers |= KeyEvent.META_DOWN_MASK;
+         {
+           modifiers |= KeyEvent.META_MASK;
+           modifiers |= KeyEvent.META_DOWN_MASK;
+         }
         else if ("alt".equals(token))
-          modifiers |= KeyEvent.ALT_DOWN_MASK;
+         {
+           modifiers |= KeyEvent.ALT_MASK;
+           modifiers |= KeyEvent.ALT_DOWN_MASK;
+         }
         else if ("button1".equals(token))
           modifiers |= KeyEvent.BUTTON1_DOWN_MASK;
         else if ("button2".equals(token))