[Rails-commits] 18xx/rails/ui/swing GameStatus.java, 1.44, 1.45 ORPanel.java, 1.48, 1.49

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

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

Modified Files:
	GameStatus.java ORPanel.java 
Log Message:
1835 Prussian formation & some consequential changes

Index: GameStatus.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/GameStatus.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** GameStatus.java	14 Mar 2010 15:35:40 -0000	1.44
--- GameStatus.java	21 Mar 2010 17:43:50 -0000	1.45
***************
*** 799,803 ****
                      if (j >= 0) {
                          setPlayerCertButton(index, j, true, share);
!                     } else if (j == -1) {
                          setTreasuryCertButton(index, true, share);
                      }
--- 799,803 ----
                      if (j >= 0) {
                          setPlayerCertButton(index, j, true, share);
!                     } else if (j == -1 && compCanHoldOwnShares) {
                          setTreasuryCertButton(index, true, share);
                      }

Index: ORPanel.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/ORPanel.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** ORPanel.java	4 Mar 2010 22:08:24 -0000	1.48
--- ORPanel.java	21 Mar 2010 17:43:50 -0000	1.49
***************
*** 542,548 ****
              if (phase.getClosedObjects() != null) {
                  for (Closeable object : phase.getClosedObjects()) {
!                     appendInfoText(b, LocalText.getText("PhaseRemoves", Util.lowerCaseFirst(object.getInfo())));
                  }
              }
              item = new JMenu (LocalText.getText("PhaseX", phase.getName()));
              item.setEnabled(true);
--- 542,553 ----
              if (phase.getClosedObjects() != null) {
                  for (Closeable object : phase.getClosedObjects()) {
!                     if (Util.hasValue(object.getClosingInfo())) {
!                         appendInfoText(b, LocalText.getText("PhaseRemoves", Util.lowerCaseFirst(object.getClosingInfo())));
!                     }
                  }
              }
+             if (Util.hasValue(phase.getInfo())) {
+                 appendInfoText(b, phase.getInfo());
+             }
              item = new JMenu (LocalText.getText("PhaseX", phase.getName()));
              item.setEnabled(true);