[Rails-commits] 18xx/rails/game/state State.java,1.9,1.10

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

Update of /cvsroot/rails/18xx/rails/game/state
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv15188/rails/game/state

Modified Files:
	State.java 
Log Message:
Implemented 1856 Bridge and Tunnel tokens

Index: State.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/state/State.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** State.java	4 Jun 2008 19:00:36 -0000	1.9
--- State.java	23 Sep 2009 21:38:57 -0000	1.10
***************
*** 46,50 ****
          } else {
              log.error("Incompatible object type " + object.getClass().getName()
!                       + "passed to " + getClassName()
                        + " wrapper for object type " + clazz.getName() + " at:",
                      new Exception(""));
--- 46,50 ----
          } else {
              log.error("Incompatible object type " + object.getClass().getName()
!                       + " passed to " + getClassName()
                        + " wrapper for object type " + clazz.getName() + " at:",
                      new Exception(""));
***************
*** 75,79 ****
      }
  
!     public String getText() {
          if (object != null) {
              return object.toString();
--- 75,80 ----
      }
  
!     @Override
! 	public String getText() {
          if (object != null) {
              return object.toString();
***************
*** 83,87 ****
      }
  
!     public String toString() {
          return name;
      }
--- 84,89 ----
      }
  
!     @Override
! 	public String toString() {
          return name;
      }