tn5250j/src/org/tn5250j/keyboard/configure KeyConfigure.java,1.5,1.6

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

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

Index: KeyConfigure.java
===================================================================
RCS file: /cvsroot/tn5250j/tn5250j/src/org/tn5250j/keyboard/configure/KeyConfigure.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** KeyConfigure.java	9 Jul 2003 18:55:40 -0000	1.5
--- KeyConfigure.java	11 Nov 2003 14:19:10 -0000	1.6
***************
*** 94,98 ****
  
        mapper = new KeyMapper();
!       mapper.init();
  
  
--- 94,98 ----
  
        mapper = new KeyMapper();
!       KeyMapper.init();
  
  
***************
*** 300,305 ****
        }
  
!       strokeDesc.setText(mapper.getKeyStrokeDesc(keyDesc));
!       strokeDescAlt.setText(mapper.getKeyStrokeDesc(keyDesc +
                                KeyStroker.altSuffix));
  
--- 300,305 ----
        }
  
!       strokeDesc.setText(KeyMapper.getKeyStrokeDesc(keyDesc));
!       strokeDescAlt.setText(KeyMapper.getKeyStrokeDesc(keyDesc +
                                KeyStroker.altSuffix));
  
***************
*** 312,318 ****
        String locStr = LangTool.getString("key.labelLocUnknown");
  
!       if (mapper.isKeyStrokeDefined(keyDesc)) {
  
!          switch (mapper.getKeyStroker(keyDesc).getLocation()) {
  
              case KeyStroker.KEY_LOCATION_LEFT:
--- 312,318 ----
        String locStr = LangTool.getString("key.labelLocUnknown");
  
!       if (KeyMapper.isKeyStrokeDefined(keyDesc)) {
  
!          switch (KeyMapper.getKeyStroker(keyDesc).getLocation()) {
  
              case KeyStroker.KEY_LOCATION_LEFT:
***************
*** 463,468 ****
        if (e.getActionCommand().equals("DONE")) {
           if (mods) {
!             mapper.saveKeyMap();
!             mapper.fireKeyChangeEvent();
           }
           setVisible(false);
--- 463,468 ----
        if (e.getActionCommand().equals("DONE")) {
           if (mods) {
!             KeyMapper.saveKeyMap();
!             KeyMapper.fireKeyChangeEvent();
           }
           setVisible(false);
***************
*** 563,570 ****
  
        if (isLinux) {
!           exists = mapper.isKeyStrokeDefined(ke,isAltGr);
        }
        else {
!          exists = mapper.isKeyStrokeDefined(ke);
        }
  
--- 563,570 ----
  
        if (isLinux) {
!           exists = KeyMapper.isKeyStrokeDefined(ke,isAltGr);
        }
        else {
!          exists = KeyMapper.isKeyStrokeDefined(ke);
        }
  
***************
*** 592,598 ****
  
        if (isLinux)
!          desc = mapper.getKeyStrokeMnemonic(ke,isAltGr);
        else
!          desc = mapper.getKeyStrokeMnemonic(ke,isAltGr);
  
        if (desc != null && desc.length() > 1 && desc.startsWith("["))
--- 592,598 ----
  
        if (isLinux)
!          desc = KeyMapper.getKeyStrokeMnemonic(ke,isAltGr);
        else
!          desc = KeyMapper.getKeyStrokeMnemonic(ke,isAltGr);
  
        if (desc != null && desc.length() > 1 && desc.startsWith("["))
***************
*** 636,640 ****
              function += KeyStroker.altSuffix;
  
!          mapper.removeKeyStroke(function);
           setKeyInformation(function);
  
--- 636,640 ----
              function += KeyStroker.altSuffix;
  
!          KeyMapper.removeKeyStroke(function);
           setKeyInformation(function);
  
***************
*** 656,660 ****
                 name += KeyStroker.altSuffix;
  
!             mapper.removeKeyStroke(name);
              setKeyInformation(name);
           }
--- 656,660 ----
                 name += KeyStroker.altSuffix;
  
!             KeyMapper.removeKeyStroke(name);
              setKeyInformation(name);
           }
***************
*** 665,669 ****
                 k += KeyStroker.altSuffix;
  
!             mapper.removeKeyStroke(k);
              setKeyInformation(k);
           }
--- 665,669 ----
                 k += KeyStroker.altSuffix;
  
!             KeyMapper.removeKeyStroke(k);
              setKeyInformation(k);
           }
***************
*** 683,690 ****
  
           if (isLinux) {
!             mapper.setKeyStroke(stroke,ke,isAltGr);
           }
           else {
!             mapper.setKeyStroke(stroke,ke);
           }
  
--- 683,690 ----
  
           if (isLinux) {
!             KeyMapper.setKeyStroke(stroke,ke,isAltGr);
           }
           else {
!             KeyMapper.setKeyStroke(stroke,ke);
           }
  
***************
*** 706,712 ****
              System.out.println(macro);
              if (isLinux)
!                mapper.setKeyStroke(macro,ke,isAltGr);
              else
!                mapper.setKeyStroke(macro,ke);
  
              setKeyInformation(macro);
--- 706,712 ----
              System.out.println(macro);
              if (isLinux)
!                KeyMapper.setKeyStroke(macro,ke,isAltGr);
              else
!                KeyMapper.setKeyStroke(macro,ke);
  
              setKeyInformation(macro);
***************
*** 721,731 ****
                 k += KeyStroker.altSuffix;
  
!             mapper.removeKeyStroke(k);
  
              if (isLinux) {
!                mapper.setKeyStroke(k,ke,isAltGr);
              }
              else {
!                mapper.setKeyStroke(k,ke);
              }
  
--- 721,731 ----
                 k += KeyStroker.altSuffix;
  
!             KeyMapper.removeKeyStroke(k);
  
              if (isLinux) {
!                KeyMapper.setKeyStroke(k,ke,isAltGr);
              }
              else {
!                KeyMapper.setKeyStroke(k,ke);
              }
  




-------------------------------------------------------
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/