tn5250j/src/org/tn5250j ScreenOIA.java,1.2,1.3 tnvt.java,1.46,1.47 Screen5250.java,1.65,1.66

Update of /cvsroot/tn5250j/tn5250j/src/org/tn5250j
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21016/src/org/tn5250j

Modified Files:
	ScreenOIA.java tnvt.java Screen5250.java 
Log Message:
Tak out some methods not used and moved some to use the new OIA.

Index: ScreenOIA.java
===================================================================
RCS file: /cvsroot/tn5250j/tn5250j/src/org/tn5250j/ScreenOIA.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ScreenOIA.java	5 Jul 2004 18:59:08 -0000	1.2
--- ScreenOIA.java	6 Jul 2004 05:39:28 -0000	1.3
***************
*** 126,129 ****
--- 126,136 ----
        boolean oldLocked = locked;
        locked = lockIt;
+ 		if (!lockIt) {
+ 
+ 			if (isKeysBuffered()) {
+ 				source.sendKeys("");
+ 			}
+ 		}      
+ 		
        if (locked != oldLocked)
           fireOIAChanged();

Index: tnvt.java
===================================================================
RCS file: /cvsroot/tn5250j/tn5250j/src/org/tn5250j/tnvt.java,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** tnvt.java	5 Jul 2004 18:59:08 -0000	1.46
--- tnvt.java	6 Jul 2004 05:39:28 -0000	1.47
***************
*** 367,371 ****
  		screen52.setStatus(Screen5250.STATUS_SYSTEM,
  				Screen5250.STATUS_VALUE_ON, "X - Disconnected");
! 		screen52.setKeyboardLocked(false);
  		pendingUnlock = false;
  
--- 367,371 ----
  		screen52.setStatus(Screen5250.STATUS_SYSTEM,
  				Screen5250.STATUS_VALUE_ON, "X - Disconnected");
! 		screen52.getOIA().setKeyBoardLocked(false);
  		pendingUnlock = false;
  
***************
*** 460,464 ****
  				Screen5250.STATUS_VALUE_ON, null);
  
! 		screen52.setKeyboardLocked(true);
  		pendingUnlock = false;
  		invited = false;
--- 460,464 ----
  				Screen5250.STATUS_VALUE_ON, null);
  
! 		screen52.getOIA().setKeyBoardLocked(true);
  		pendingUnlock = false;
  		invited = false;
***************
*** 492,496 ****
  				Screen5250.STATUS_VALUE_ON, null);
  
! 		screen52.setKeyboardLocked(true);
  		pendingUnlock = false;
  		invited = false;
--- 492,496 ----
  				Screen5250.STATUS_VALUE_ON, null);
  
! 		screen52.getOIA().setKeyBoardLocked(true);
  		pendingUnlock = false;
  		invited = false;
***************
*** 1151,1155 ****
  
  			if (pendingUnlock && !screen52.isStatusErrorCode()) {
! 				screen52.setKeyboardLocked(false);
  				pendingUnlock = false;
  			}
--- 1151,1155 ----
  
  			if (pendingUnlock && !screen52.isStatusErrorCode()) {
! 				screen52.getOIA().setKeyBoardLocked(false);
  				pendingUnlock = false;
  			}
***************
*** 2116,2120 ****
  
  		if (lockKeyboard) {
! 			screen52.setKeyboardLocked(true);
  			pendingUnlock = false;
  		} else
--- 2116,2120 ----
  
  		if (lockKeyboard) {
! 			screen52.getOIA().setKeyBoardLocked(true);
  			pendingUnlock = false;
  		} else

Index: Screen5250.java
===================================================================
RCS file: /cvsroot/tn5250j/tn5250j/src/org/tn5250j/Screen5250.java,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** Screen5250.java	5 Jul 2004 19:38:29 -0000	1.65
--- Screen5250.java	6 Jul 2004 05:39:28 -0000	1.66
***************
*** 505,508 ****
--- 505,511 ----
  	}
  
+ 	/**
+ 	 * This is for blinking cursor but should be moved out
+ 	 */
  	public void actionPerformed(ActionEvent actionevent) {
  		if (actionevent.getSource() instanceof javax.swing.Timer) {
***************
*** 862,869 ****
  	}
  
- 	public Color getBackground() {
- 		return colorBg;
- 	}
- 
  	/**
  	 *
--- 865,868 ----
***************
*** 1410,1416 ****
  		statusErrorCode = setErrorCode;
  		if (oia.isKeyBoardLocked() && unlockIfLocked)
! 			setKeyboardLocked(false);
  		else
! 			setKeyboardLocked(lockKeyboard);
  		bufferedKeys = null;
        oia.setKeysBuffered(false);
--- 1409,1415 ----
  		statusErrorCode = setErrorCode;
  		if (oia.isKeyBoardLocked() && unlockIfLocked)
! 			oia.setKeyBoardLocked(false);
  		else
! 			oia.setKeyBoardLocked(lockKeyboard);
  		bufferedKeys = null;
        oia.setKeysBuffered(false);
***************
*** 3297,3320 ****
  
  	/**
- 	 * Set the keyboard as locked or not depending on the value passed
- 	 *
- 	 * @param k
- 	 *            true of false
- 	 */
- 	public void setKeyboardLocked(boolean k) {
- 
- //		keyboardLocked = k;
- 
-       oia.setKeyBoardLocked(k);
- 
- 		if (!k) {
- 
- 			if (oia.isKeysBuffered()) {
- 				sendKeys("");
- 			}
- 		}
- 	}
- 
- 	/**
  	 * This routine is based on offset 1,1 not 0,0 it will translate to offset
  	 * 0,0 and call the goto_XY(int pos) it is mostly used from external classes
--- 3296,3299 ----
***************
*** 3775,3779 ****
  			break;
  		default:
! 			System.err.println(" Invalid roll parameter - please report this");
  		}
  		//      System.out.println(" end roll");
--- 3754,3758 ----
  			break;
  		default:
! 			log.warn(" Invalid roll parameter - please report this");
  		}
  		//      System.out.println(" end roll");
***************
*** 4480,4484 ****
  	public void clearTable() {
  
! 		setKeyboardLocked(true);
  		screenFields.clearFFT();
  		pendingInsert = false;
--- 4459,4463 ----
  	public void clearTable() {
  
! 		oia.setKeyBoardLocked(true);
  		screenFields.clearFFT();
  		pendingInsert = false;
***************
*** 4533,4546 ****
  	}
  
- 	/**
- 	 * Returns a pointer to the graphics area that we can write on
- 	 *
- 	 * @return Graphics2D pointer of graphics buffer
- 	 */
- 	public Graphics2D getWritingArea() {
- 
- 		return bi.getWritingArea(font);
- 	}
- 
  	protected synchronized void updateImage(int x, int y, int width, int height) {
  		if (gg2d == null) {
--- 4512,4515 ----



-------------------------------------------------------
This SF.Net email sponsored by Black Hat Briefings & Training.
Attend Black Hat Briefings & Training, Las Vegas July 24-29 - 
digital self defense, top technical experts, no vendor pitches, 
unmatched networking opportunities. Visit www.blackhat.com