tn5250j/src/org/tn5250j/keyboard KeyboardHandler.java,1.2,1.3 DefaultKeyboardHandler.java,1.4,1.5

Update of /cvsroot/tn5250j/tn5250j/src/org/tn5250j/keyboard
In directory sc8-pr-cvs1:/tmp/cvs-serv3569/src/org/tn5250j/keyboard

Modified Files:
	KeyboardHandler.java DefaultKeyboardHandler.java 
Log Message:
Fix for static related errors

Index: KeyboardHandler.java
===================================================================
RCS file: /cvsroot/tn5250j/tn5250j/src/org/tn5250j/keyboard/KeyboardHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** KeyboardHandler.java	13 Mar 2003 20:41:48 -0000	1.2
--- KeyboardHandler.java	11 Nov 2003 13:58:48 -0000	1.3
***************
*** 65,71 ****
  
        keyMap = new KeyMapper();
!       keyMap.init();
  
!       keyMap.addKeyChangeListener(this);
  
        // initialize the keybingings of the components InputMap
--- 65,71 ----
  
        keyMap = new KeyMapper();
!       KeyMapper.init();
  
!       KeyMapper.addKeyChangeListener(this);
  
        // initialize the keybingings of the components InputMap

Index: DefaultKeyboardHandler.java
===================================================================
RCS file: /cvsroot/tn5250j/tn5250j/src/org/tn5250j/keyboard/DefaultKeyboardHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DefaultKeyboardHandler.java	9 Jul 2003 18:55:41 -0000	1.4
--- DefaultKeyboardHandler.java	11 Nov 2003 13:58:48 -0000	1.5
***************
*** 48,56 ****
     public boolean isKeyStrokeDefined(String accelKey) {
  
!       return keyMap.isKeyStrokeDefined(accelKey);
     }
  
     public KeyStroke getKeyStroke(String accelKey) {
!       return keyMap.getKeyStroke(accelKey);
     }
  
--- 48,56 ----
     public boolean isKeyStrokeDefined(String accelKey) {
  
!       return KeyMapper.isKeyStrokeDefined(accelKey);
     }
  
     public KeyStroke getKeyStroke(String accelKey) {
!       return KeyMapper.getKeyStroke(accelKey);
     }
  
***************
*** 184,188 ****
        int keyCode = e.getKeyCode();
  
!       if (isLinux && keyCode == e.VK_ALT_GRAPH) {
  
           isAltGr = true;
--- 184,188 ----
        int keyCode = e.getKeyCode();
  
!       if (isLinux && keyCode == KeyEvent.VK_ALT_GRAPH) {
  
           isAltGr = true;
***************
*** 197,204 ****
  //      }
  
!       if (      keyCode == e.VK_CAPS_LOCK ||
!             keyCode == e.VK_SHIFT ||
!             keyCode == e.VK_ALT ||
!             keyCode == e.VK_ALT_GRAPH
           ) {
  //         displayInfo(e,"Pressed ");
--- 197,204 ----
  //      }
  
!       if (      keyCode == KeyEvent.VK_CAPS_LOCK ||
!             keyCode == KeyEvent.VK_SHIFT ||
!             keyCode == KeyEvent.VK_ALT ||
!             keyCode == KeyEvent.VK_ALT_GRAPH
           ) {
  //         displayInfo(e,"Pressed ");
***************
*** 217,223 ****
  
        if (isLinux)
!          lastKeyStroke = keyMap.getKeyStrokeText(e,isAltGr);
        else
!          lastKeyStroke = keyMap.getKeyStrokeText(e);
  
        //System.out.println("lastKeyStroke " + lastKeyStroke);
--- 217,223 ----
  
        if (isLinux)
!          lastKeyStroke = KeyMapper.getKeyStrokeText(e,isAltGr);
        else
!          lastKeyStroke = KeyMapper.getKeyStrokeText(e);
  
        //System.out.println("lastKeyStroke " + lastKeyStroke);
***************
*** 301,305 ****
  
  
!       if (isLinux && e.getKeyCode() == e.VK_ALT_GRAPH) {
  
           isAltGr = false;
--- 301,305 ----
  
  
!       if (isLinux && e.getKeyCode() == KeyEvent.VK_ALT_GRAPH) {
  
           isAltGr = false;
***************
*** 311,315 ****
  //      displayInfo(e,"Released " + keyProcessed);
  
!       String s = keyMap.getKeyStrokeText(e);
  
        if (s != null) {
--- 311,315 ----
  //      displayInfo(e,"Released " + keyProcessed);
  
!       String s = KeyMapper.getKeyStrokeText(e);
  
        if (s != null) {




-------------------------------------------------------
This SF.Net email sponsored by: ApacheCon 2003,
16-19 November in Las Vegas. Learn firsthand the latest
developments in Apache, PHP, Perl, XML, Java, MySQL,
WebDAV, and more! http://www.apachecon.com/