tn5250j/src/org/tn5250j/framework/tn5250 Screen5250.java,1.7,1.8 tnvt.java,1.4,1.5 ScreenPlanes.java,1.3,1.4

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

Modified Files:
	Screen5250.java tnvt.java ScreenPlanes.java 
Log Message:
Fixed plane field on restore of screen.

Index: ScreenPlanes.java
===================================================================
RCS file: /cvsroot/tn5250j/tn5250j/src/org/tn5250j/framework/tn5250/ScreenPlanes.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ScreenPlanes.java	1 Aug 2004 12:14:22 -0000	1.3
--- ScreenPlanes.java	1 Aug 2004 12:34:24 -0000	1.4
***************
*** 50,53 ****
--- 50,55 ----
     protected boolean[] screenIsChanged;
  
+    protected static char[] initArray;   
+ 
     protected char[] errorLine;
     protected char[] errorLineAttr;
***************
*** 91,94 ****
--- 93,98 ----
        screenField = new char[screenSize];
  
+       initArray = null;
+       
        initalizePlanes();
     }
***************
*** 230,237 ****
        }
        
!       // here we will just copy a plane that has already been initialized
!       //   onto the other planes using arraycopy which will be faster.  I hope.
!       System.arraycopy(screen,0,fieldExtended,0,screenSize);
!       System.arraycopy(screen,0,screenField,0,screenSize);
     }
  
--- 234,252 ----
        }
        
!       if (initArray == null) {
!          initArray = new char[screenSize];
!          System.arraycopy(screen,0,initArray,0,screenSize);
!         
!       }
!       // here we will just copy the initialized plane onto the other planes 
!       // using arraycopy which will be faster.  I hope.
!       
!       System.arraycopy(initArray,0,fieldExtended,0,screenSize);
!       System.arraycopy(initArray,0,screenField,0,screenSize);
!    }
! 
!    protected void initalizeFieldPlanes () {
!       System.arraycopy(initArray,0,fieldExtended,0,screenSize);
!       System.arraycopy(initArray,0,screenField,0,screenSize);
     }
  
***************
*** 336,348 ****
  
  
-    private void fillExtendedFieldPlane(char[] plane,int start,int len) {
- 
-       for (int x = 0; x < len; x++ ) {
-          plane[x] = (char)fieldExtended[start + x];
-       }
- 
- 
-    }
- 
     /**
      * <p>
--- 351,354 ----

Index: tnvt.java
===================================================================
RCS file: /cvsroot/tn5250j/tn5250j/src/org/tn5250j/framework/tn5250/tnvt.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** tnvt.java	31 Jul 2004 10:16:28 -0000	1.4
--- tnvt.java	1 Aug 2004 12:34:24 -0000	1.5
***************
*** 1412,1417 ****
  				b = bk.getNextByte();
  				if (isAttribute(b)) {
- //					screen52.screen[y].setCharAndAttr(screen52.screen[y]
- //							.getChar(), b, true);
  					planes.setScreenCharAndAttr(y, planes.getChar(y), b, true);
  					la = b;
--- 1412,1415 ----
***************
*** 1469,1472 ****
--- 1467,1477 ----
  							ffw1, ffw2, fcw1, fcw2);
  
+ 					while (fLen-- > 0) {
+ 
+ 						// now we set the field plane attributes
+ 						planes.setScreenFieldAttr(fPos++,ffw1);
+ 						
+ 					}
+ 
  					if (mdt) {
  						sf.setMDT();

Index: Screen5250.java
===================================================================
RCS file: /cvsroot/tn5250j/tn5250j/src/org/tn5250j/framework/tn5250/Screen5250.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Screen5250.java	1 Aug 2004 12:14:22 -0000	1.7
--- Screen5250.java	1 Aug 2004 12:34:24 -0000	1.8
***************
*** 3769,3772 ****
--- 3769,3773 ----
  		oia.setKeyBoardLocked(true);
  		screenFields.clearFFT();
+ 		planes.initalizeFieldPlanes();
  		pendingInsert = false;
  		homePos = -1;



-------------------------------------------------------
This SF.Net email is sponsored by OSTG. Have you noticed the changes on
Linux.com, ITManagersJournal and NewsForge in the past few weeks? Now,
one more big change to announce. We are now OSTG- Open Source Technology
Group. Come see the changes on the new OSTG site. www.ostg.com