rails-commits

[Erik V. <ev...@us...>]

Update of /cvsroot/rails/18xx/rails/ui/swing/elements
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4550/rails/ui/swing/elements

Modified Files:
	GUIStockSpace.java 
Log Message:
Fixed price token display

Index: GUIStockSpace.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/elements/GUIStockSpace.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** GUIStockSpace.java	13 Dec 2009 16:39:49 -0000	1.8
--- GUIStockSpace.java	19 Dec 2009 18:32:34 -0000	1.9
***************
*** 27,30 ****
--- 27,35 ----
  
      private static final Color LIGHT_GRAY = new Color(200, 200, 200);
+     
+     private static final int TOKEN_ORIGIN_X = 12;
+     private static final int TOKEN_ORIGIN_Y = 10;
+     private static final int TOKEN_INCREMENT_Y = 6;
+     private static final int TOKEN_DIAMETER = 20;
  
      protected static Logger log =
***************
*** 87,90 ****
--- 92,98 ----
      private void placeToken(List<PublicCompanyI> tokenList) {
  
+         int xCenter = TOKEN_ORIGIN_X;
+         int yCenter = TOKEN_ORIGIN_Y;
+         int diameter = TOKEN_DIAMETER;
          Point origin = new Point(16, 0);
          Dimension size = new Dimension(40, 40);
***************
*** 99,107 ****
              fgColour = co.getFgColour();
  
!             token = new GUIToken(fgColour, bgColour, co.getName());
              token.setBounds(origin.x, origin.y, size.width, size.height);
  
              add(token, new Integer(0), 0);
!             origin.y += 6;
          }
      }
--- 107,115 ----
              fgColour = co.getFgColour();
  
!             token = new GUIToken(fgColour, bgColour, co.getName(), xCenter, yCenter, diameter);
              token.setBounds(origin.x, origin.y, size.width, size.height);
  
              add(token, new Integer(0), 0);
!             yCenter += TOKEN_INCREMENT_Y;
          }
      }