tn5250j/src/org/tn5250j/framework/tn5250 Screen5250.java,1.4,1.5 tnvt.java,1.3,1.4 WTDSFParser.java,1.3,1.4

"Kenneth J. Pouncey" <[email protected]> Sat, 31 Jul 2004 10:16:30 +0000
Newsgroups gmane.comp.java.tn5250j.cvs
Message-ID <[email protected]>
Update of /cvsroot/tn5250j/tn5250j/src/org/tn5250j/framework/tn5250
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29828/src/org/tn5250j/framework/tn5250

Modified Files:
	Screen5250.java tnvt.java WTDSFParser.java 
Log Message:
rename gotoRowCol to setCursor

Index: tnvt.java
===================================================================
RCS file: /cvsroot/tn5250j/tn5250j/src/org/tn5250j/framework/tn5250/tnvt.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tnvt.java	31 Jul 2004 10:10:28 -0000	1.3
--- tnvt.java	31 Jul 2004 10:16:28 -0000	1.4
***************
*** 1826,1830 ****
  					if (saRow >= 0 && saRow <= screen52.getRows() && saCol >= 0
  							&& saCol <= screen52.getCols()) {
! 						screen52.gotoRowCol(saRow, saCol); // now set screen
  														// position for output
  
--- 1826,1830 ----
  					if (saRow >= 0 && saRow <= screen52.getRows() && saCol >= 0
  							&& saCol <= screen52.getCols()) {
! 						screen52.setCursor(saRow, saCol); // now set screen
  														// position for output
  
***************
*** 2796,2800 ****
  
  	private final void writeErrorCode() throws Exception {
! 		screen52.gotoRowCol(screen52.getErrorLine(), 1); // Skip the control byte
  		screen52.setStatus(Screen5250.STATUS_ERROR_CODE,
  				Screen5250.STATUS_VALUE_ON, null);
--- 2796,2800 ----
  
  	private final void writeErrorCode() throws Exception {
! 		screen52.setCursor(screen52.getErrorLine(), 1); // Skip the control byte
  		screen52.setStatus(Screen5250.STATUS_ERROR_CODE,
  				Screen5250.STATUS_VALUE_ON, null);
***************
*** 2807,2811 ****
  		int fromCol = bk.getNextByte() & 0xff; // from column
  		int toCol = bk.getNextByte() & 0xff; // to column
! 		screen52.gotoRowCol(screen52.getErrorLine(), fromCol); // Skip the control
  															// byte
  		screen52.setStatus(Screen5250.STATUS_ERROR_CODE,
--- 2807,2811 ----
  		int fromCol = bk.getNextByte() & 0xff; // from column
  		int toCol = bk.getNextByte() & 0xff; // to column
! 		screen52.setCursor(screen52.getErrorLine(), fromCol); // Skip the control
  															// byte
  		screen52.setStatus(Screen5250.STATUS_ERROR_CODE,

Index: WTDSFParser.java
===================================================================
RCS file: /cvsroot/tn5250j/tn5250j/src/org/tn5250j/framework/tn5250/WTDSFParser.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** WTDSFParser.java	31 Jul 2004 10:10:28 -0000	1.3
--- WTDSFParser.java	31 Jul 2004 10:16:28 -0000	1.4
***************
*** 516,520 ****
                 case 0x10:  // Choice Text minor structure
  
!                   screen52.gotoRowCol(chcRowStart++,chcColStart);
                    cnt = 5;
                    int flagCT1 = segment[pos++];
--- 516,520 ----
                 case 0x10:  // Choice Text minor structure
  
!                   screen52.setCursor(chcRowStart++,chcColStart);
                    cnt = 5;
                    int flagCT1 = segment[pos++];

Index: Screen5250.java
===================================================================
RCS file: /cvsroot/tn5250j/tn5250j/src/org/tn5250j/framework/tn5250/Screen5250.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Screen5250.java	31 Jul 2004 10:10:28 -0000	1.4
--- Screen5250.java	31 Jul 2004 10:16:28 -0000	1.5
***************
*** 132,136 ****
  		numCols = 80;
  
! 		gotoRowCol(1, 1); // set initial cursor position
  
  		restriction = new Rectangle(0, 0);
--- 132,136 ----
  		numCols = 80;
  
! 		setCursor(1, 1); // set initial cursor position
  
  		restriction = new Rectangle(0, 0);
***************
*** 411,415 ****
  			updateDirty();
  
! 			gotoRowCol(lr + 1, lc + 1);
  
  			setCursorActive(true);
--- 411,415 ----
  			updateDirty();
  
! 			setCursor(lr + 1, lc + 1);
  
  			setCursorActive(true);
***************
*** 1463,1467 ****
  						.startPos(), true);
  				if (where > 0) {
! 					gotoRowCol((where / numCols) + 1, (where % numCols) + 1);
  				}
  				simulated = true;
--- 1463,1467 ----
  						.startPos(), true);
  				if (where > 0) {
! 					setCursor((where / numCols) + 1, (where % numCols) + 1);
  				}
  				simulated = true;
***************
*** 1780,1784 ****
  					startRow = 0;
  
! 				gotoRowCol(++startRow, 1);
  
  				if (!isInField() && screenFields.getCurrentField() != null
--- 1780,1784 ----
  					startRow = 0;
  
! 				setCursor(++startRow, 1);
  
  				if (!isInField() && screenFields.getCurrentField() != null
***************
*** 1930,1934 ****
  
  						} else
! 							gotoRowCol(screenFields.getCurrentField()
  									.getCursorRow() + 1, screenFields
  									.getCurrentField().getCursorCol() + 1);
--- 1930,1934 ----
  
  						} else
! 							setCursor(screenFields.getCurrentField()
  									.getCursorRow() + 1, screenFields
  									.getCurrentField().getCursorCol() + 1);
***************
*** 2782,2786 ****
  	 * @param col
  	 */
! 	public void gotoRowCol(int row, int col) {
  		goto_XY(((row - 1) * numCols) + (col - 1));
  	}
--- 2782,2786 ----
  	 * @param col
  	 */
! 	public void setCursor(int row, int col) {
  		goto_XY(((row - 1) * numCols) + (col - 1));
  	}
***************
*** 3765,3774 ****
  
  		if (pendingInsert && homePos > 0) {
! 			gotoRowCol(getRow(homePos), getCol(homePos));
  			isInField(); // we now check if we are in a field
  		} else {
  			if (!gotoField(1)) {
  				homePos = getPos(1, 1);
! 				gotoRowCol(1, 1);
  				isInField(0, 0); // we now check if we are in a field
  			} else {
--- 3765,3774 ----
  
  		if (pendingInsert && homePos > 0) {
! 			setCursor(getRow(homePos), getCol(homePos));
  			isInField(); // we now check if we are in a field
  		} else {
  			if (!gotoField(1)) {
  				homePos = getPos(1, 1);
! 				setCursor(1, 1);
  				isInField(0, 0); // we now check if we are in a field
  			} else {
***************
*** 3785,3789 ****
  
  		if (!isStatusErrorCode()) {
! 			gotoRowCol(icX, icY);
  		}
  	}
--- 3785,3789 ----
  
  		if (!isStatusErrorCode()) {
! 			setCursor(icX, icY);
  		}
  	}



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