[Rails-commits] 18xx/rails/ui/swing ORPanel.java, 1.29, 1.30 GameStatus.java, 1.23, 1.24

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

Update of /cvsroot/rails/18xx/rails/ui/swing
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv29002/rails/ui/swing

Modified Files:
	ORPanel.java GameStatus.java 
Log Message:
Split off new class PublicCompany_State for 1856 CGR

Index: GameStatus.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/GameStatus.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** GameStatus.java	15 Jan 2009 20:53:28 -0000	1.23
--- GameStatus.java	28 Aug 2009 20:27:38 -0000	1.24
***************
*** 403,407 ****
              }
              if (hasCompanyLoans) {
!                 f = compLoans[i] = new Field (c.getLoanValueModel());
                  addField (f, compLoansXOffset, compLoansYOffset+i, 1, 1, 0);
              }
--- 403,411 ----
              }
              if (hasCompanyLoans) {
!             	if (c.getLoanValueModel() != null) {
!             		f = compLoans[i] = new Field (c.getLoanValueModel());
!             	} else {
!             		f = compLoans[i] = new Field ("");
!             	}
                  addField (f, compLoansXOffset, compLoansYOffset+i, 1, 1, 0);
              }

Index: ORPanel.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/ORPanel.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** ORPanel.java	21 Jan 2009 20:18:23 -0000	1.29
--- ORPanel.java	28 Aug 2009 20:27:38 -0000	1.30
***************
*** 418,422 ****
  
              if (hasCompanyLoans) {
!                 f = compLoans[i] = new Field (c.getLoanValueModel());
                  addField (f, loansXOffset, loansYOffset + i, 1, 1, WIDE_RIGHT);
              }
--- 418,426 ----
  
              if (hasCompanyLoans) {
!                 if (c.canLoan()) {
!                     f = compLoans[i] = new Field (c.getLoanValueModel());
!                 } else {
!                     f = compLoans[i] = new Field ("");
!                 }
                  addField (f, loansXOffset, loansYOffset + i, 1, 1, WIDE_RIGHT);
              }