rails-commits

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

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

Modified Files:
	BonusToken.java Phase.java OperatingRound.java Bonus.java 
Log Message:
Added and improved Info messages.

Index: OperatingRound.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/OperatingRound.java,v
retrieving revision 1.91
retrieving revision 1.92
diff -C2 -d -r1.91 -r1.92
*** OperatingRound.java	15 Jan 2010 20:21:28 -0000	1.91
--- OperatingRound.java	19 Jan 2010 19:54:50 -0000	1.92
***************
*** 108,112 ****
          operatingCompanyArray = super.getOperatingCompanies();
  
!         guiHints.setVisibilityHint(GuiDef.Panel.STOCK_MARKET, false);
          guiHints.setVisibilityHint(GuiDef.Panel.STATUS, true);
          guiHints.setActivePanel(GuiDef.Panel.MAP);
--- 108,112 ----
          operatingCompanyArray = super.getOperatingCompanies();
  
!        	guiHints.setVisibilityHint(GuiDef.Panel.STOCK_MARKET, false);
          guiHints.setVisibilityHint(GuiDef.Panel.STATUS, true);
          guiHints.setActivePanel(GuiDef.Panel.MAP);

Index: Bonus.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/Bonus.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Bonus.java	5 Jan 2010 20:53:17 -0000	1.5
--- Bonus.java	19 Jan 2010 19:54:53 -0000	1.6
***************
*** 110,112 ****
--- 110,115 ----
      }
  
+ 	public String getInfo() {
+ 		return toString();
+ 	}
  }

Index: Phase.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/Phase.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Phase.java	18 Jan 2010 18:47:16 -0000	1.15
--- Phase.java	19 Jan 2010 19:54:47 -0000	1.16
***************
*** 219,225 ****
      public void addObjectToClose(Closeable object) {
          if (closedObjects == null) {
!             closedObjects = new ArrayList<Closeable>();
          }
!         closedObjects.add(object);
      }
  
--- 219,225 ----
      public void addObjectToClose(Closeable object) {
          if (closedObjects == null) {
!             closedObjects = new ArrayList<Closeable>(4);
          }
!         if (!closedObjects.contains(object)) closedObjects.add(object);
      }
  
***************
*** 246,250 ****
      }
  
!     @Override
      public String toString() {
          return name;
--- 246,254 ----
      }
  
!     public List<Closeable> getClosedObjects() {
! 		return closedObjects;
! 	}
! 
! 	@Override
      public String toString() {
          return name;

Index: BonusToken.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/BonusToken.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** BonusToken.java	4 Nov 2009 20:33:22 -0000	1.12
--- BonusToken.java	19 Jan 2010 19:54:47 -0000	1.13
***************
*** 20,24 ****
   * @author Erik Vos
   */
! public class BonusToken extends Token implements Closeable {
  
      int value;
--- 20,24 ----
   * @author Erik Vos
   */
! public class BonusToken extends Token implements Closeable, ConfigurableComponentI  {
  
      int value;
***************
*** 56,59 ****
--- 56,63 ----
      }
  
+     public void finishConfiguration(GameManagerI gameManager) {
+     	prepareForRemoval (gameManager.getPhaseManager());
+     }
+ 
      /**
       * Remove the token.
***************
*** 110,112 ****
--- 114,120 ----
      }
  
+     public String getInfo () {
+     	return description;
+     }
+ 
  }