tn5250j/src/org/tn5250j/framework/tn5250 ScreenPlanes.java,1.5,1.6

"Kenneth J. Pouncey" <[email protected]> Sun, 01 Aug 2004 14:21:32 +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-serv4665/src/org/tn5250j/framework/tn5250

Modified Files:
	ScreenPlanes.java 
Log Message:
set up the attributes as static variables and now using those

Index: ScreenPlanes.java
===================================================================
RCS file: /cvsroot/tn5250j/tn5250j/src/org/tn5250j/framework/tn5250/ScreenPlanes.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ScreenPlanes.java	1 Aug 2004 13:58:00 -0000	1.5
--- ScreenPlanes.java	1 Aug 2004 14:21:29 -0000	1.6
***************
*** 234,271 ****
        switch(attr) {
           case 32: // green normal
!             c = (COLOR_BG_BLACK << 8 & 0xff00) |
!             (COLOR_FG_GREEN & 0xff);
              break;
  
           case 33: // green/revers
!             c = (COLOR_BG_GREEN << 8 & 0xff00) |
!             (COLOR_FG_BLACK & 0xff);
              break;
  
           case 34: // white normal
!             c = (COLOR_BG_BLACK << 8 & 0xff00) |
!             (COLOR_FG_WHITE & 0xff);
              break;
  
           case 35: // white/reverse
!             c = (COLOR_BG_WHITE << 8 & 0xff00) |
!             (COLOR_FG_BLACK & 0xff);
              break;
  
           case 36: // green/underline
!             c = (COLOR_BG_BLACK << 8 & 0xff00) |
!             (COLOR_FG_GREEN & 0xff);
              ul = EXTENDED_5250_UNDERLINE;
              break;
  
           case 37: // green/reverse/underline
!             c = (COLOR_BG_GREEN << 8 & 0xff00) |
!             (COLOR_FG_BLACK & 0xff);
              ul = EXTENDED_5250_UNDERLINE;
              break;
  
           case 38: // white/underline
!             c = (COLOR_BG_BLACK << 8 & 0xff00) |
!             (COLOR_FG_WHITE & 0xff);
              ul = EXTENDED_5250_UNDERLINE;
              break;
--- 234,264 ----
        switch(attr) {
           case 32: // green normal
!             c = ATTR_32;
              break;
  
           case 33: // green/revers
!             c = ATTR_33;
              break;
  
           case 34: // white normal
!             c = ATTR_34;
              break;
  
           case 35: // white/reverse
!             c = ATTR_35;
              break;
  
           case 36: // green/underline
!             c = ATTR_36;
              ul = EXTENDED_5250_UNDERLINE;
              break;
  
           case 37: // green/reverse/underline
!             c = ATTR_37;
              ul = EXTENDED_5250_UNDERLINE;
              break;
  
           case 38: // white/underline
!             c = ATTR_38;
              ul = EXTENDED_5250_UNDERLINE;
              break;
***************
*** 277,300 ****
           case 40:
           case 42: // red/normal
!             c = (COLOR_BG_BLACK << 8 & 0xff00) |
!             (COLOR_FG_RED & 0xff);
              break;
  
           case 41:
           case 43: // red/reverse
!             c = (COLOR_BG_RED << 8 & 0xff00) |
!             (COLOR_FG_BLACK & 0xff);
              break;
  
           case 44:
           case 46: // red/underline
!             c = (COLOR_BG_BLACK << 8 & 0xff00) |
!             (COLOR_FG_RED & 0xff);
              ul = EXTENDED_5250_UNDERLINE;
              break;
  
           case 45: // red/reverse/underline
!             c = ( COLOR_BG_RED << 8 & 0xff00) |
!             ( COLOR_FG_BLACK & 0xff);
              ul = EXTENDED_5250_UNDERLINE;
              break;
--- 270,289 ----
           case 40:
           case 42: // red/normal
!             c = ATTR_40;
              break;
  
           case 41:
           case 43: // red/reverse
!             c = ATTR_41;
              break;
  
           case 44:
           case 46: // red/underline
!             c = ATTR_44;
              ul = EXTENDED_5250_UNDERLINE;
              break;
  
           case 45: // red/reverse/underline
!             c = ATTR_45;
              ul = EXTENDED_5250_UNDERLINE;
              break;
***************
*** 305,334 ****
  
           case 48:
!             c = (COLOR_BG_BLACK << 8 & 0xff00) |
!             (COLOR_FG_CYAN & 0xff);
              cs = EXTENDED_5250_COL_SEP;
              break;
  
           case 49:
!             c = (COLOR_BG_CYAN << 8 & 0xff00) |
!             (COLOR_FG_BLACK & 0xff);
              cs = EXTENDED_5250_COL_SEP;
              break;
  
           case 50:
!             c = (COLOR_BG_BLACK << 8 & 0xff00) |
!             (COLOR_FG_YELLOW & 0xff);
              cs = EXTENDED_5250_COL_SEP;
              break;
  
           case 51:
!             c = (COLOR_BG_YELLOW << 8 & 0xff00) |
!             (COLOR_FG_BLACK & 0xff);
              cs = EXTENDED_5250_COL_SEP;
              break;
  
           case 52:
!             c = ( COLOR_BG_BLACK << 8 & 0xff00) |
!             ( COLOR_FG_CYAN & 0xff);
  //            colSep = true;
              ul = EXTENDED_5250_UNDERLINE;
--- 294,318 ----
  
           case 48:
!             c = ATTR_48;
              cs = EXTENDED_5250_COL_SEP;
              break;
  
           case 49:
!             c = ATTR_49;
              cs = EXTENDED_5250_COL_SEP;
              break;
  
           case 50:
!             c = ATTR_50;
              cs = EXTENDED_5250_COL_SEP;
              break;
  
           case 51:
!             c = ATTR_51;
              cs = EXTENDED_5250_COL_SEP;
              break;
  
           case 52:
!             c = ATTR_52;
  //            colSep = true;
              ul = EXTENDED_5250_UNDERLINE;
***************
*** 336,341 ****
  
           case 53:
!             c = ( COLOR_BG_CYAN << 8 & 0xff00) |
!             ( COLOR_FG_BLACK & 0xff);
  //            colSep = true;
              ul = EXTENDED_5250_UNDERLINE;
--- 320,324 ----
  
           case 53:
!             c = ATTR_53;
  //            colSep = true;
              ul = EXTENDED_5250_UNDERLINE;
***************
*** 343,348 ****
  
           case 54:
!             c = ( COLOR_BG_BLACK << 8 & 0xff00) |
!             ( COLOR_FG_YELLOW & 0xff);
  //            colSep = true;
              ul = EXTENDED_5250_UNDERLINE;
--- 326,330 ----
  
           case 54:
!             c = ATTR_54;
  //            colSep = true;
              ul = EXTENDED_5250_UNDERLINE;
***************
*** 354,391 ****
  
           case 56: // pink
!             c = ( COLOR_BG_BLACK << 8 & 0xff00) |
!             ( COLOR_FG_MAGENTA & 0xff);
              break;
  
           case 57: // pink/reverse
!             c = ( COLOR_BG_MAGENTA << 8 & 0xff00) |
!             ( COLOR_FG_BLACK & 0xff);
              break;
  
           case 58: // blue/reverse
!             c = ( COLOR_BG_BLACK << 8 & 0xff00) |
!             ( COLOR_FG_BLUE & 0xff);
              break;
  
           case 59: // blue
!             c = ( COLOR_BG_BLUE << 8 & 0xff00) |
!             ( COLOR_FG_BLACK & 0xff);
              break;
  
           case 60: // pink/underline
!             c = ( COLOR_BG_BLACK << 8 & 0xff00) |
!             ( COLOR_FG_MAGENTA & 0xff);
              ul = EXTENDED_5250_UNDERLINE;
              break;
  
           case 61: // pink/reverse/underline
!             c = ( COLOR_BG_MAGENTA << 8 & 0xff00) |
!             ( COLOR_FG_BLACK & 0xff);
              ul = EXTENDED_5250_UNDERLINE;
              break;
  
           case 62: // blue/underline
!             c = ( COLOR_BG_BLACK << 8 & 0xff00) |
!             ( COLOR_FG_BLUE & 0xff);
              ul = EXTENDED_5250_UNDERLINE;
              break;
--- 336,366 ----
  
           case 56: // pink
!             c = ATTR_56;
              break;
  
           case 57: // pink/reverse
!             c = ATTR_57;
              break;
  
           case 58: // blue/reverse
!             c = ATTR_58;
              break;
  
           case 59: // blue
!             c = ATTR_59;
              break;
  
           case 60: // pink/underline
!             c = ATTR_60;
              ul = EXTENDED_5250_UNDERLINE;
              break;
  
           case 61: // pink/reverse/underline
!             c = ATTR_61;
              ul = EXTENDED_5250_UNDERLINE;
              break;
  
           case 62: // blue/underline
!             c = ATTR_62;
              ul = EXTENDED_5250_UNDERLINE;
              break;



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