[Rails-commits] 18xx/rails/ui/swing ORUIManager.java, 1.31, 1.32 UpgradesPanel.java, 1.18, 1.19

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

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

Modified Files:
	ORUIManager.java UpgradesPanel.java 
Log Message:
Fixed some bugs:
- 1830: free D&H token wasn't free
- 18EU: only one 8-train buyable
Also added Rails version and date in saved files and reportng in the log of same.
Bulld date included in BuildInfo, which is rewritten on each build via a new build.xml Ant script.

Index: UpgradesPanel.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/UpgradesPanel.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** UpgradesPanel.java	30 Oct 2009 21:53:04 -0000	1.18
--- UpgradesPanel.java	5 Nov 2009 22:50:38 -0000	1.19
***************
*** 119,122 ****
--- 119,125 ----
                      bgColour = comp.getBgColour();
                      description = text = comp.getName();
+                     if (action.getSpecialProperty() != null) {
+                     	description += " (" + action.getSpecialProperty().getCompany().getName()+")";
+                     }
                  } else if (action instanceof LayBonusToken) {
                      fgColour = Color.BLACK;

Index: ORUIManager.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/ORUIManager.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** ORUIManager.java	2 Nov 2009 23:30:35 -0000	1.31
--- ORUIManager.java	5 Nov 2009 22:50:38 -0000	1.32
***************
*** 594,606 ****
      }
  
!     public void layBaseToken() {
  
          GUIHex selectedHex = map.getSelectedHex();
  
          if (selectedHex != null) {
!             List<LayBaseToken> allowances =
                      map.getBaseTokenAllowanceForHex(selectedHex.getHexModel());
!             // Pick the first one (unknown if we will ever need more than one)
!             LayBaseToken allowance = allowances.get(0);
              int station;
              List<City> stations = selectedHex.getHexModel().getCities();
--- 594,611 ----
      }
  
!     public void layBaseToken(LayBaseToken action) {
  
          GUIHex selectedHex = map.getSelectedHex();
+         LayBaseToken allowance;
  
          if (selectedHex != null) {
!             if (action != null) {
!                 allowance = action;
!             } else {
!                 List<LayBaseToken> allowances =
                      map.getBaseTokenAllowanceForHex(selectedHex.getHexModel());
!                 // Pick the first one (unknown if we will ever need more than one)
!                 allowance = allowances.get(0);
!             }
              int station;
              List<City> stations = selectedHex.getHexModel().getCities();
***************
*** 978,982 ****
      public void executeUpgrade() {
          GUIHex selectedHex = map.getSelectedHex();
- 
          if (tileLayingEnabled) {
              if (selectedHex == null) {
--- 983,986 ----
***************
*** 993,997 ****
                  orWindow.displayORUIMessage(LocalText.getText("SelectAToken"));
              } else if (selectedTokenAllowance instanceof LayBaseToken) {
!                 layBaseToken();
              } else {
                  layBonusToken(selectedTokenAllowance);
--- 997,1001 ----
                  orWindow.displayORUIMessage(LocalText.getText("SelectAToken"));
              } else if (selectedTokenAllowance instanceof LayBaseToken) {
!                 layBaseToken((LayBaseToken)selectedTokenAllowance);
              } else {
                  layBonusToken(selectedTokenAllowance);