[Rails-commits] 18xx/rails/game/action LayTile.java,1.15,1.16

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

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

Modified Files:
	LayTile.java 
Log Message:
Cleanups, annotations, formatting.

Index: LayTile.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/game/action/LayTile.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** LayTile.java	3 Dec 2008 20:15:15 -0000	1.15
--- LayTile.java	11 Dec 2008 20:12:07 -0000	1.16
***************
*** 1,4 ****
  /* $Header$
!  * 
   * Created on 14-Sep-2006
   * Change Log:
--- 1,4 ----
  /* $Header$
!  *
   * Created on 14-Sep-2006
   * Change Log:
***************
*** 10,17 ****
  import java.util.*;
  
! import rails.game.MapHex;
! import rails.game.MapManager;
! import rails.game.TileI;
! import rails.game.TileManager;
  import rails.game.special.SpecialProperty;
  import rails.game.special.SpecialTileLay;
--- 10,14 ----
  import java.util.*;
  
! import rails.game.*;
  import rails.game.special.SpecialProperty;
  import rails.game.special.SpecialTileLay;
***************
*** 51,55 ****
      transient private SpecialTileLay specialProperty = null;
      private int specialPropertyId;
!     
      /**
       * Need base tokens be relaid?
--- 48,52 ----
      transient private SpecialTileLay specialProperty = null;
      private int specialPropertyId;
! 
      /**
       * Need base tokens be relaid?
***************
*** 69,73 ****
      /** The tile orientation */
      private int orientation;
!     
      /** Any manually assigned base token positions */
      private Map<String, Integer> relaidBaseTokens = null;
--- 66,70 ----
      /** The tile orientation */
      private int orientation;
! 
      /** Any manually assigned base token positions */
      private Map<String, Integer> relaidBaseTokens = null;
***************
*** 199,204 ****
          tileColours = map;
      }
!     
!     
      public boolean isRelayBaseTokens() {
          return relayBaseTokens;
--- 196,201 ----
          tileColours = map;
      }
! 
! 
      public boolean isRelayBaseTokens() {
          return relayBaseTokens;
***************
*** 208,212 ****
          this.relayBaseTokens = relayBaseTokens;
      }
!     
      public void addRelayBaseToken (String companyName, Integer cityNumber) {
          if (relaidBaseTokens == null) {
--- 205,209 ----
          this.relayBaseTokens = relayBaseTokens;
      }
! 
      public void addRelayBaseToken (String companyName, Integer cityNumber) {
          if (relaidBaseTokens == null) {
***************
*** 214,218 ****
          }
          relaidBaseTokens.put(companyName, cityNumber);
!         relaidBaseTokensString = Util.appendWithDelimiter(relaidBaseTokensString, 
                  Util.appendWithDelimiter(companyName, String.valueOf(cityNumber), ":"),
                  ",");
--- 211,215 ----
          }
          relaidBaseTokens.put(companyName, cityNumber);
!         relaidBaseTokensString = Util.appendWithDelimiter(relaidBaseTokensString,
                  Util.appendWithDelimiter(companyName, String.valueOf(cityNumber), ":"),
                  ",");
***************
*** 223,226 ****
--- 220,224 ----
      }
  
+     @Override
      public boolean equals(PossibleAction action) {
          if (!(action instanceof LayTile)) return false;
***************
*** 232,235 ****
--- 230,234 ----
      }
  
+     @Override
      public String toString() {
          StringBuffer b = new StringBuffer("LayTile");
***************
*** 256,259 ****
--- 255,259 ----
  
      /** Deserialize */
+     @SuppressWarnings("unchecked")
      private void readObject(ObjectInputStream in) throws IOException,
              ClassNotFoundException {
***************
*** 261,265 ****
          //in.defaultReadObject();
          // Custom reading for backwards compatibility
!         ObjectInputStream.GetField fields = in.readFields(); 
          locationNames = (String) fields.get("locationNames", locationNames);
          tileColours = (Map<String, Integer>) fields.get("tileColours", tileColours);
--- 261,265 ----
          //in.defaultReadObject();
          // Custom reading for backwards compatibility
!         ObjectInputStream.GetField fields = in.readFields();
          locationNames = (String) fields.get("locationNames", locationNames);
          tileColours = (Map<String, Integer>) fields.get("tileColours", tileColours);
***************
*** 297,301 ****
              chosenHex = MapManager.getInstance().getHex(chosenHexName);
          }
!         
      }
  
--- 297,301 ----
              chosenHex = MapManager.getInstance().getHex(chosenHexName);
          }
! 
      }