tn5250j/src/org/tn5250j TN5250jConstants.java,1.50,1.51 GuiGraphicBuffer.java,1.25,1.26

"Kenneth J. Pouncey" <[email protected]> Sun, 11 Jul 2004 09:59:21 +0000
Newsgroups gmane.comp.java.tn5250j.cvs
Message-ID <[email protected]>
Update of /cvsroot/tn5250j/tn5250j/src/org/tn5250j
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10715/src/org/tn5250j

Modified Files:
	TN5250jConstants.java GuiGraphicBuffer.java 
Log Message:
Use local reference of variables instead of from other objects.
Added constants

Index: TN5250jConstants.java
===================================================================
RCS file: /cvsroot/tn5250j/tn5250j/src/org/tn5250j/TN5250jConstants.java,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** TN5250jConstants.java	11 Jul 2004 09:17:58 -0000	1.50
--- TN5250jConstants.java	11 Jul 2004 09:59:18 -0000	1.51
***************
*** 459,462 ****
     public static final int BUTTON_SB_THUMB = 31;
     public static final int BUTTON_LAST = 31;
!    
  }
--- 459,462 ----
     public static final int BUTTON_SB_THUMB = 31;
     public static final int BUTTON_LAST = 31;
! 
  }

Index: GuiGraphicBuffer.java
===================================================================
RCS file: /cvsroot/tn5250j/tn5250j/src/org/tn5250j/GuiGraphicBuffer.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** GuiGraphicBuffer.java	11 Jul 2004 09:17:58 -0000	1.25
--- GuiGraphicBuffer.java	11 Jul 2004 09:59:18 -0000	1.26
***************
*** 57,64 ****
     private int height;
     private Rectangle2D cursor = new Rectangle2D.Float();
-    public final static byte STATUS_SYSTEM       = 1;
-    public final static byte STATUS_ERROR_CODE   = 2;
-    public final static byte STATUS_VALUE_ON     = 1;
-    public final static byte STATUS_VALUE_OFF    = 2;
     private final static String xSystem = "X - System";
     private final static String xError = "X - II";
--- 57,60 ----
***************
*** 73,76 ****
--- 69,76 ----
     private Screen5250 screen;
     private Data updateRect;
+    private int columnWidth;
+    private int rowHeight;
+ 	LineMetrics lm;
+ 	Font font;
     
     private TN5250jLogger log = TN5250jLogFactory.getLogger ("GFX");
***************
*** 79,82 ****
--- 79,88 ----
  
        this.screen = screen;
+       
+       columnWidth = screen.fmWidth;
+       rowHeight = screen.fmHeight;
+       font = screen.font;
+       lm = screen.lm;
+       
        screen.getOIA().addOIAListener(this);
        screen.addScreenListener(this);
***************
*** 102,105 ****
--- 108,115 ----
              this.height = height;
              resized = true;
+             columnWidth = screen.fmWidth;
+             rowHeight = screen.fmHeight;
+             font = screen.font;
+             lm = screen.lm;
              // tell waiting threads to wake up
              lock.notifyAll();
***************
*** 146,171 ****
           g2d.setRenderingHint(RenderingHints.KEY_RENDERING,
                 RenderingHints.VALUE_RENDER_SPEED);
!          g2d.setFont(screen.font);
  
  
           g2d.setColor(screen.colorBg);
           g2d.fillRect(0,0,bi.getWidth(null),bi.getHeight(null));
!          tArea.setRect(0,0,bi.getWidth(null),(screen.fmHeight * (numRows)));
!          cArea.setRect(0,screen.fmHeight * (numRows + 1),bi.getWidth(null),screen.fmHeight * (numRows + 1));
           aArea.setRect(0,0,bi.getWidth(null),bi.getHeight(null));
!          sArea.setRect(screen.fmWidth * 9,screen.fmHeight * (numRows + 1),screen.fmWidth * 20,screen.fmHeight);
!          pArea.setRect(bi.getWidth(null) - screen.fmWidth * 6,screen.fmHeight * (numRows + 1),screen.fmWidth * 6,screen.fmHeight);
!          mArea.setRect((float)(sArea.getX()+ sArea.getWidth()) + screen.fmWidth + screen.fmWidth,
!                screen.fmHeight * (numRows + 1),
!                screen.fmWidth + screen.fmWidth,
!                screen.fmHeight);
!          kbArea.setRect((float)(sArea.getX()+ sArea.getWidth()) + (20 * screen.fmWidth),
!                screen.fmHeight * (numRows + 1),
!                screen.fmWidth + screen.fmWidth,
!                screen.fmHeight);
!          scriptArea.setRect((float)(sArea.getX()+ sArea.getWidth()) + (16 * screen.fmWidth),
!                screen.fmHeight * (numRows + 1),
!                screen.fmWidth + screen.fmWidth,
!                screen.fmHeight);
  //         cArea = new Rectangle2D.Float(0,fmHeight * (numRows + 1),bi.getWidth(null),fmHeight * (numRows + 1));
  //         aArea = new Rectangle2D.Float(0,0,bi.getWidth(null),bi.getHeight(null));
--- 156,181 ----
           g2d.setRenderingHint(RenderingHints.KEY_RENDERING,
                 RenderingHints.VALUE_RENDER_SPEED);
!          g2d.setFont(font);
  
  
           g2d.setColor(screen.colorBg);
           g2d.fillRect(0,0,bi.getWidth(null),bi.getHeight(null));
!          tArea.setRect(0,0,bi.getWidth(null),(rowHeight * (numRows)));
!          cArea.setRect(0,rowHeight * (numRows + 1),bi.getWidth(null),rowHeight * (numRows + 1));
           aArea.setRect(0,0,bi.getWidth(null),bi.getHeight(null));
!          sArea.setRect(columnWidth * 9,rowHeight * (numRows + 1),columnWidth * 20,rowHeight);
!          pArea.setRect(bi.getWidth(null) - columnWidth * 6,rowHeight * (numRows + 1),columnWidth * 6,rowHeight);
!          mArea.setRect((float)(sArea.getX()+ sArea.getWidth()) + columnWidth + columnWidth,
!                rowHeight * (numRows + 1),
!                columnWidth + columnWidth,
!                rowHeight);
!          kbArea.setRect((float)(sArea.getX()+ sArea.getWidth()) + (20 * columnWidth),
!                rowHeight * (numRows + 1),
!                columnWidth + columnWidth,
!                rowHeight);
!          scriptArea.setRect((float)(sArea.getX()+ sArea.getWidth()) + (16 * columnWidth),
!                rowHeight * (numRows + 1),
!                columnWidth + columnWidth,
!                rowHeight);
  //         cArea = new Rectangle2D.Float(0,fmHeight * (numRows + 1),bi.getWidth(null),fmHeight * (numRows + 1));
  //         aArea = new Rectangle2D.Float(0,0,bi.getWidth(null),bi.getHeight(null));
***************
*** 178,184 ****
  
           separatorLine.setLine(0,
!                (screen.fmHeight * (numRows + 1)) - (screen.fmHeight / 2),
                 bi.getWidth(null),
!                (screen.fmHeight * (numRows + 1)) - (screen.fmHeight / 2));
  
           g2d.setColor(screen.colorBlue);
--- 188,194 ----
  
           separatorLine.setLine(0,
!                (rowHeight * (numRows + 1)) - (rowHeight / 2),
                 bi.getWidth(null),
!                (rowHeight * (numRows + 1)) - (rowHeight / 2));
  
           g2d.setColor(screen.colorBlue);
***************
*** 201,206 ****
        	int col = screen.getCol(screen.getLastPos());
  
!       	int fmHeight = screen.fmHeight;
!       	int fmWidth = screen.fmWidth;
        	int botOffset = screen.cursorBottOffset;
        	int cursorSize = screen.cursorSize;
--- 211,216 ----
        	int col = screen.getCol(screen.getLastPos());
  
!       	int fmHeight = rowHeight;
!       	int fmWidth = columnWidth;
        	int botOffset = screen.cursorBottOffset;
        	int cursorSize = screen.cursorSize;
***************
*** 214,220 ****
              case 0:
                 cursor.setRect(
!                      fmWidth * (col),
!                            (fmHeight * (row + 1)) - botOffset,
!                            fmWidth,
                             1
                             );
--- 224,230 ----
              case 0:
                 cursor.setRect(
!                      columnWidth * (col),
!                            (rowHeight * (row + 1)) - botOffset,
!                            columnWidth,
                             1
                             );
***************
*** 222,237 ****
              case 1:
                 cursor.setRect(
!                      fmWidth * (col),
!                            (fmHeight * (row + 1) - fmHeight / 2),
!                            fmWidth,
!                            (fmHeight / 2) - botOffset
                             );
                 break;
              case 2:
                 cursor.setRect(
!                      fmWidth * (col),
!                            (fmHeight * row),
!                            fmWidth,
!                            fmHeight - botOffset
                             );
                 break;
--- 232,247 ----
              case 1:
                 cursor.setRect(
!                      columnWidth * (col),
!                            (rowHeight * (row + 1) - rowHeight / 2),
!                            columnWidth,
!                            (rowHeight / 2) - botOffset
                             );
                 break;
              case 2:
                 cursor.setRect(
!                      columnWidth * (col),
!                            (rowHeight * row),
!                            columnWidth,
!                            rowHeight - botOffset
                             );
                 break;
***************
*** 240,247 ****
           if (insertMode && cursorSize != 1) {
                 cursor.setRect(
!                      fmWidth * (col),
!                            (fmHeight * (row + 1) - fmHeight / 2),
!                            fmWidth,
!                            (fmHeight / 2) - botOffset
                             );
           }
--- 250,257 ----
           if (insertMode && cursorSize != 1) {
                 cursor.setRect(
!                      columnWidth * (col),
!                            (rowHeight * (row + 1) - rowHeight / 2),
!                            columnWidth,
!                            (rowHeight / 2) - botOffset
                             );
           }
***************
*** 272,294 ****
           switch (crossHair) {
              case 1:  // horizontal
!                g2.drawLine(0,(fmHeight * (crossRow + 1))- botOffset,
                             bi.getWidth(null),
!                            (fmHeight * (crossRow + 1))- botOffset);
!                screen.updateImage(0,fmHeight * (crossRow + 1)- botOffset,
                                bi.getWidth(null),1);
                 break;
              case 2:  // vertical
!                g2.drawLine(crossRect.x,0,crossRect.x,bi.getHeight(null) - fmHeight - fmHeight);
!                screen.updateImage(crossRect.x,0,1,bi.getHeight(null) - fmHeight - fmHeight);
                 break;
  
              case 3:  // horizontal & vertical
!                g2.drawLine(0,(fmHeight * (crossRow + 1))- botOffset,
                             bi.getWidth(null),
!                            (fmHeight * (crossRow + 1))- botOffset);
!                g2.drawLine(crossRect.x,0,crossRect.x,bi.getHeight(null) - fmHeight - fmHeight);
!                screen.updateImage(0,fmHeight * (crossRow + 1)- botOffset,
                                bi.getWidth(null),1);
!                screen.updateImage(crossRect.x,0,1,bi.getHeight(null) - fmHeight - fmHeight);
                 break;
           }
--- 282,304 ----
           switch (crossHair) {
              case 1:  // horizontal
!                g2.drawLine(0,(rowHeight * (crossRow + 1))- botOffset,
                             bi.getWidth(null),
!                            (rowHeight * (crossRow + 1))- botOffset);
!                screen.updateImage(0,rowHeight * (crossRow + 1)- botOffset,
                                bi.getWidth(null),1);
                 break;
              case 2:  // vertical
!                g2.drawLine(crossRect.x,0,crossRect.x,bi.getHeight(null) - rowHeight - rowHeight);
!                screen.updateImage(crossRect.x,0,1,bi.getHeight(null) - rowHeight - rowHeight);
                 break;
  
              case 3:  // horizontal & vertical
!                g2.drawLine(0,(rowHeight * (crossRow + 1))- botOffset,
                             bi.getWidth(null),
!                            (rowHeight * (crossRow + 1))- botOffset);
!                g2.drawLine(crossRect.x,0,crossRect.x,bi.getHeight(null) - rowHeight - rowHeight);
!                screen.updateImage(0,rowHeight * (crossRow + 1)- botOffset,
                                bi.getWidth(null),1);
!                screen.updateImage(crossRect.x,0,1,bi.getHeight(null) - rowHeight - rowHeight);
                 break;
           }
***************
*** 303,307 ****
           g2.drawString((row + 1) + "/" + (col + 1)
                          ,(float)pArea.getX(),
!                         (float)pArea.getY() + fmHeight);
           screen.updateImage(pArea.getBounds());
           g2.dispose();
--- 313,317 ----
           g2.drawString((row + 1) + "/" + (col + 1)
                          ,(float)pArea.getX(),
!                         (float)pArea.getY() + rowHeight);
           screen.updateImage(pArea.getBounds());
           g2.dispose();
***************
*** 489,493 ****
           g2d.fill(sArea);
  
!          float Y = ((int)sArea.getY() + screen.fmHeight)- (screen.lm.getLeading() + screen.lm.getDescent());
  
           switch (attr) {
--- 499,503 ----
           g2d.fill(sArea);
  
!          float Y = ((int)sArea.getY() + rowHeight)- (lm.getLeading() + lm.getDescent());
  
           switch (attr) {
***************
*** 564,568 ****
              if (changedOIA.isKeysBuffered()) {
                 Graphics2D g2d = getWritingArea(screen.font);
!                float Y = (screen.fmHeight * (screen.getRows() + 2))
                       - (screen.lm.getLeading() + screen.lm.getDescent());
                 g2d.setColor(screen.colorYellow);
--- 574,578 ----
              if (changedOIA.isKeysBuffered()) {
                 Graphics2D g2d = getWritingArea(screen.font);
!                float Y = (rowHeight * (screen.getRows() + 2))
                       - (screen.lm.getLeading() + screen.lm.getDescent());
                 g2d.setColor(screen.colorYellow);
***************
*** 593,597 ****
           case ScreenOIA.OIA_LEVEL_MESSAGE_LIGHT_ON:
              g2d = getWritingArea(screen.font);
!             float Y = (screen.fmHeight * (screen.getRows() + 2))
                    - (screen.lm.getLeading() + screen.lm.getDescent());
              g2d.setColor(screen.colorBlue);
--- 603,607 ----
           case ScreenOIA.OIA_LEVEL_MESSAGE_LIGHT_ON:
              g2d = getWritingArea(screen.font);
!             float Y = (rowHeight * (screen.getRows() + 2))
                    - (screen.lm.getLeading() + screen.lm.getDescent());
              g2d.setColor(screen.colorBlue);
***************
*** 745,750 ****
  
     public final Rectangle modelToView(int row, int col, Rectangle r) {
-       int columnWidth = screen.fmWidth;
-       int rowHeight = screen.fmHeight;
        
        // right now row and column is 1,1 offset based.  This will need
--- 755,758 ----
***************
*** 781,785 ****
        int x = csArea.x;
        int y = csArea.y;
!       int cy = (int)(y + s.fmHeight - (s.lm.getDescent() + s.lm.getLeading()));
  
  //      int x = sc.x;
--- 789,793 ----
        int x = csArea.x;
        int y = csArea.y;
!       int cy = (int)(y + rowHeight - (s.lm.getDescent() + s.lm.getLeading()));
  
  //      int x = sc.x;
***************
*** 795,801 ****
           g.setColor(s.colorHexAttr);
           char[] a = Integer.toHexString(attr).toCharArray();
!          g.drawChars(a, 0, 1, x, y + (int)(s.fmHeight /2));
!          g.drawChars(a, 1, 1, x+(int)(s.fmWidth/2),
!             (int)(y + s.fmHeight - (s.lm.getDescent() + s.lm.getLeading())-2));
           g.setFont(f);
  //return;
--- 803,809 ----
           g.setColor(s.colorHexAttr);
           char[] a = Integer.toHexString(attr).toCharArray();
!          g.drawChars(a, 0, 1, x, y + (int)(rowHeight /2));
!          g.drawChars(a, 1, 1, x+(int)(columnWidth/2),
!             (int)(y + rowHeight - (s.lm.getDescent() + s.lm.getLeading())-2));
           g.setFont(f);
  //return;
***************
*** 832,836 ****
                                               GUIGraphicsUtils.WINDOW_GRAPHIC,
                                               s.colorBlue,
!                                              x,y,s.fmWidth,s.fmHeight);
  
                       }
--- 840,844 ----
                                               GUIGraphicsUtils.WINDOW_GRAPHIC,
                                               s.colorBlue,
!                                              x,y,columnWidth,rowHeight);
  
                       }
***************
*** 840,844 ****
                                               GUIGraphicsUtils.WINDOW_NORMAL,
                                               fg,
!                                              x,y,s.fmWidth,s.fmHeight);
  
                       }
--- 848,852 ----
                                               GUIGraphicsUtils.WINDOW_NORMAL,
                                               fg,
!                                              x,y,columnWidth,rowHeight);
  
                       }
***************
*** 852,856 ****
                                               GUIGraphicsUtils.WINDOW_GRAPHIC,
                                               s.colorBlue,
!                                              x,y,s.fmWidth,s.fmHeight);
  
  
--- 860,864 ----
                                               GUIGraphicsUtils.WINDOW_GRAPHIC,
                                               s.colorBlue,
!                                              x,y,columnWidth,rowHeight);
  
  
***************
*** 861,865 ****
                                               GUIGraphicsUtils.WINDOW_NORMAL,
                                               fg,
!                                              x,y,s.fmWidth,s.fmHeight);
                       }
                    }
--- 869,873 ----
                                               GUIGraphicsUtils.WINDOW_NORMAL,
                                               fg,
!                                              x,y,columnWidth,rowHeight);
                       }
                    }
***************
*** 872,876 ****
                                               GUIGraphicsUtils.WINDOW_GRAPHIC,
                                               s.colorBlue,
!                                              x,y,s.fmWidth,s.fmHeight);
  
  
--- 880,884 ----
                                               GUIGraphicsUtils.WINDOW_GRAPHIC,
                                               s.colorBlue,
!                                              x,y,columnWidth,rowHeight);
  
  
***************
*** 881,885 ****
                                               GUIGraphicsUtils.WINDOW_NORMAL,
                                               fg,
!                                              x,y,s.fmWidth,s.fmHeight);
  
                       }
--- 889,893 ----
                                               GUIGraphicsUtils.WINDOW_NORMAL,
                                               fg,
!                                              x,y,columnWidth,rowHeight);
  
                       }
***************
*** 892,896 ****
                                               GUIGraphicsUtils.WINDOW_GRAPHIC,
                                               bg,
!                                              x,y,s.fmWidth,s.fmHeight);
  
  
--- 900,904 ----
                                               GUIGraphicsUtils.WINDOW_GRAPHIC,
                                               bg,
!                                              x,y,columnWidth,rowHeight);
  
  
***************
*** 901,910 ****
                                               GUIGraphicsUtils.WINDOW_NORMAL,
                                               fg,
!                                              x,y,s.fmWidth,s.fmHeight);
  
!                         g.drawLine(x + s.fmWidth / 2,
                                      y,
!                                     x + s.fmWidth / 2,
!                                     y + s.fmHeight);
                       }
                    }
--- 909,918 ----
                                               GUIGraphicsUtils.WINDOW_NORMAL,
                                               fg,
!                                              x,y,columnWidth,rowHeight);
  
!                         g.drawLine(x + columnWidth / 2,
                                      y,
!                                     x + columnWidth / 2,
!                                     y + rowHeight);
                       }
                    }
***************
*** 916,920 ****
                                               GUIGraphicsUtils.WINDOW_GRAPHIC,
                                               bg,
!                                              x,y,s.fmWidth,s.fmHeight);
  
  
--- 924,928 ----
                                               GUIGraphicsUtils.WINDOW_GRAPHIC,
                                               bg,
!                                              x,y,columnWidth,rowHeight);
  
  
***************
*** 924,928 ****
                                               GUIGraphicsUtils.WINDOW_NORMAL,
                                               fg,
!                                              x,y,s.fmWidth,s.fmHeight);
  
                       }
--- 932,936 ----
                                               GUIGraphicsUtils.WINDOW_NORMAL,
                                               fg,
!                                              x,y,columnWidth,rowHeight);
  
                       }
***************
*** 937,941 ****
                                               GUIGraphicsUtils.WINDOW_GRAPHIC,
                                               bg,
!                                              x,y,s.fmWidth,s.fmHeight);
  
  
--- 945,949 ----
                                               GUIGraphicsUtils.WINDOW_GRAPHIC,
                                               bg,
!                                              x,y,columnWidth,rowHeight);
  
  
***************
*** 946,950 ****
                                               GUIGraphicsUtils.WINDOW_NORMAL,
                                               fg,
!                                              x,y,s.fmWidth,s.fmHeight);
                       }
                    }
--- 954,958 ----
                                               GUIGraphicsUtils.WINDOW_NORMAL,
                                               fg,
!                                              x,y,columnWidth,rowHeight);
                       }
                    }
***************
*** 959,963 ****
                                               GUIGraphicsUtils.WINDOW_GRAPHIC,
                                               bg,
!                                              x,y,s.fmWidth,s.fmHeight);
  
  
--- 967,971 ----
                                               GUIGraphicsUtils.WINDOW_GRAPHIC,
                                               bg,
!                                              x,y,columnWidth,rowHeight);
  
  
***************
*** 968,972 ****
                                               GUIGraphicsUtils.WINDOW_NORMAL,
                                               fg,
!                                              x,y,s.fmWidth,s.fmHeight);
                       }
                    }
--- 976,980 ----
                                               GUIGraphicsUtils.WINDOW_NORMAL,
                                               fg,
!                                              x,y,columnWidth,rowHeight);
                       }
                    }
***************
*** 980,984 ****
                                               GUIGraphicsUtils.WINDOW_GRAPHIC,
                                               bg,
!                                              x,y,s.fmWidth,s.fmHeight);
  
                       }
--- 988,992 ----
                                               GUIGraphicsUtils.WINDOW_GRAPHIC,
                                               bg,
!                                              x,y,columnWidth,rowHeight);
  
                       }
***************
*** 988,992 ****
                                               GUIGraphicsUtils.WINDOW_NORMAL,
                                               fg,
!                                              x,y,s.fmWidth,s.fmHeight);
  
                       }
--- 996,1000 ----
                                               GUIGraphicsUtils.WINDOW_NORMAL,
                                               fg,
!                                              x,y,columnWidth,rowHeight);
  
                       }
***************
*** 1028,1034 ****
                 if (!useGui || s.guiShowUnderline) {
                    g.setColor(fg);
! //                  g.drawLine(x, cy -2, (int)(x + s.fmWidth), cy -2);
! //                  g.drawLine(x, (int)(y + (s.fmHeight - s.lm.getLeading()-5)), (int)(x + s.fmWidth), (int)(y + (s.fmHeight - s.lm.getLeading())-5));
!                   g.drawLine(x, (int)(y + (s.fmHeight - (s.lm.getLeading() + s.lm.getDescent()))), (int)(x + s.fmWidth), (int)(y + (s.fmHeight -(s.lm.getLeading() + s.lm.getDescent()))));
  
                 }
--- 1036,1042 ----
                 if (!useGui || s.guiShowUnderline) {
                    g.setColor(fg);
! //                  g.drawLine(x, cy -2, (int)(x + columnWidth), cy -2);
! //                  g.drawLine(x, (int)(y + (rowHeight - s.lm.getLeading()-5)), (int)(x + columnWidth), (int)(y + (rowHeight - s.lm.getLeading())-5));
!                   g.drawLine(x, (int)(y + (rowHeight - (s.lm.getLeading() + s.lm.getDescent()))), (int)(x + columnWidth), (int)(y + (rowHeight -(s.lm.getLeading() + s.lm.getDescent()))));
  
                 }
***************
*** 1039,1052 ****
                 switch (s.getColSepLine()) {
                    case 0:  // line
!                      g.drawLine(x, y, x, y + s.fmHeight - 1);
!                      g.drawLine(x + s.fmWidth - 1, y, x + s.fmWidth - 1, y + s.fmHeight);
                       break;
                    case 1:  // short line
!                      g.drawLine(x,  y + s.fmHeight - (int)s.lm.getLeading()-4, x, y + s.fmHeight);
!                      g.drawLine(x + s.fmWidth - 1, y + s.fmHeight - (int)s.lm.getLeading()-4, x + s.fmWidth - 1, y + s.fmHeight);
                       break;
                    case 2:  // dot
!                      g.drawLine(x,  y + s.fmHeight - (int)s.lm.getLeading()-3, x, y + s.fmHeight - (int)s.lm.getLeading()-4);
!                      g.drawLine(x + s.fmWidth - 1, y + s.fmHeight - (int)s.lm.getLeading()-3, x + s.fmWidth - 1, y + s.fmHeight - (int)s.lm.getLeading()-4);
                       break;
                    case 3:  // hide
--- 1047,1060 ----
                 switch (s.getColSepLine()) {
                    case 0:  // line
!                      g.drawLine(x, y, x, y + rowHeight - 1);
!                      g.drawLine(x + columnWidth - 1, y, x + columnWidth - 1, y + rowHeight);
                       break;
                    case 1:  // short line
!                      g.drawLine(x,  y + rowHeight - (int)s.lm.getLeading()-4, x, y + rowHeight);
!                      g.drawLine(x + columnWidth - 1, y + rowHeight - (int)s.lm.getLeading()-4, x + columnWidth - 1, y + rowHeight);
                       break;
                    case 2:  // dot
!                      g.drawLine(x,  y + rowHeight - (int)s.lm.getLeading()-3, x, y + rowHeight - (int)s.lm.getLeading()-4);
!                      g.drawLine(x + columnWidth - 1, y + rowHeight - (int)s.lm.getLeading()-3, x + columnWidth - 1, y + rowHeight - (int)s.lm.getLeading()-4);
                       break;
                    case 3:  // hide
***************
*** 1064,1082 ****
                 case FIELD_LEFT:
                    GUIGraphicsUtils.draw3DLeft(g, GUIGraphicsUtils.INSET, x,y,
!                                              s.fmWidth,s.fmHeight);
  
                 break;
                 case FIELD_MIDDLE:
                    GUIGraphicsUtils.draw3DMiddle(g, GUIGraphicsUtils.INSET, x,y,
!                                              s.fmWidth,s.fmHeight);
                 break;
                 case FIELD_RIGHT:
                    GUIGraphicsUtils.draw3DRight(g, GUIGraphicsUtils.INSET, x,y,
!                                              s.fmWidth,s.fmHeight);
                 break;
  
                 case FIELD_ONE:
                    GUIGraphicsUtils.draw3DOne(g, GUIGraphicsUtils.INSET, x,y,
!                                              s.fmWidth,s.fmHeight);
  
                 break;
--- 1072,1090 ----
                 case FIELD_LEFT:
                    GUIGraphicsUtils.draw3DLeft(g, GUIGraphicsUtils.INSET, x,y,
!                                              columnWidth,rowHeight);
  
                 break;
                 case FIELD_MIDDLE:
                    GUIGraphicsUtils.draw3DMiddle(g, GUIGraphicsUtils.INSET, x,y,
!                                              columnWidth,rowHeight);
                 break;
                 case FIELD_RIGHT:
                    GUIGraphicsUtils.draw3DRight(g, GUIGraphicsUtils.INSET, x,y,
!                                              columnWidth,rowHeight);
                 break;
  
                 case FIELD_ONE:
                    GUIGraphicsUtils.draw3DOne(g, GUIGraphicsUtils.INSET, x,y,
!                                              columnWidth,rowHeight);
  
                 break;
***************
*** 1088,1092 ****
  
                    GUIGraphicsUtils.draw3DLeft(g, GUIGraphicsUtils.RAISED, x,y,
!                                              s.fmWidth,s.fmHeight);
  
                    break;
--- 1096,1100 ----
  
                    GUIGraphicsUtils.draw3DLeft(g, GUIGraphicsUtils.RAISED, x,y,
!                                              columnWidth,rowHeight);
  
                    break;
***************
*** 1098,1102 ****
  
                    GUIGraphicsUtils.draw3DMiddle(g, GUIGraphicsUtils.RAISED, x,y,
!                                              s.fmWidth,s.fmHeight);
                    break;
  
--- 1106,1110 ----
  
                    GUIGraphicsUtils.draw3DMiddle(g, GUIGraphicsUtils.RAISED, x,y,
!                                              columnWidth,rowHeight);
                    break;
  
***************
*** 1107,1111 ****
  
                    GUIGraphicsUtils.draw3DRight(g, GUIGraphicsUtils.RAISED, x,y,
!                                              s.fmWidth,s.fmHeight);
  
                 break;
--- 1115,1119 ----
  
                    GUIGraphicsUtils.draw3DRight(g, GUIGraphicsUtils.RAISED, x,y,
!                                              columnWidth,rowHeight);
  
                 break;
***************
*** 1114,1118 ****
                 case BUTTON_SB_UP:
                    GUIGraphicsUtils.drawScrollBar(g, GUIGraphicsUtils.RAISED, 1, x,y,
!                                              s.fmWidth,s.fmHeight,
                                               s.colorWhite,s.colorBg);
                    break;
--- 1122,1126 ----
                 case BUTTON_SB_UP:
                    GUIGraphicsUtils.drawScrollBar(g, GUIGraphicsUtils.RAISED, 1, x,y,
!                                              columnWidth,rowHeight,
                                               s.colorWhite,s.colorBg);
                    break;
***************
*** 1122,1126 ****
  
                    GUIGraphicsUtils.drawScrollBar(g, GUIGraphicsUtils.RAISED, 2, x,y,
!                                              s.fmWidth,s.fmHeight,
                                               s.colorWhite,s.colorBg);
  
--- 1130,1134 ----
  
                    GUIGraphicsUtils.drawScrollBar(g, GUIGraphicsUtils.RAISED, 2, x,y,
!                                              columnWidth,rowHeight,
                                               s.colorWhite,s.colorBg);
  
***************
*** 1131,1135 ****
  
                    GUIGraphicsUtils.drawScrollBar(g, GUIGraphicsUtils.INSET, 0,x,y,
!                                              s.fmWidth,s.fmHeight,
                                               s.colorWhite,s.colorBg);
  
--- 1139,1143 ----
  
                    GUIGraphicsUtils.drawScrollBar(g, GUIGraphicsUtils.INSET, 0,x,y,
!                                              columnWidth,rowHeight,
                                               s.colorWhite,s.colorBg);
  
***************
*** 1141,1145 ****
  
                    GUIGraphicsUtils.drawScrollBar(g, GUIGraphicsUtils.INSET, 3,x,y,
!                                              s.fmWidth,s.fmHeight,
                                               s.colorWhite,s.colorBg);
  
--- 1149,1153 ----
  
                    GUIGraphicsUtils.drawScrollBar(g, GUIGraphicsUtils.INSET, 3,x,y,
!                                              columnWidth,rowHeight,
                                               s.colorWhite,s.colorBg);
  



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