[Rails-commits] SF.net SVN: rails:[1486] trunk/18xx/rails

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

Revision: 1486
          http://rails.svn.sourceforge.net/rails/?rev=1486&view=rev
Author:   evos
Date:     2011-02-13 19:57:47 +0000 (Sun, 13 Feb 2011)

Log Message:
-----------
Initial commit for 1830 Coalfields (fixed)

Modified Paths:
--------------
    trunk/18xx/rails/game/Tile.java
    trunk/18xx/rails/game/TileI.java
    trunk/18xx/rails/game/correct/MapCorrectionManager.java
    trunk/18xx/rails/ui/swing/UpgradesPanel.java
    trunk/18xx/rails/util/Tag.java

Modified: trunk/18xx/rails/game/Tile.java
===================================================================
--- trunk/18xx/rails/game/Tile.java	2011-02-13 18:07:34 UTC (rev 1485)
+++ trunk/18xx/rails/game/Tile.java	2011-02-13 19:57:47 UTC (rev 1486)
@@ -18,7 +18,7 @@
      * The 'external id', which is shown in the UI. Usually equal to the
      * internal id, but different in case of duplicates.
      */
-    private int externalId;
+    private String externalId;
     /**
      * The 'picture id', identifying the picture number to be loaded. Usually
      * equal to the internal id, but different in case of graphical variants
@@ -90,7 +90,8 @@
 
     public Tile(Integer id) {
         this.id = id;
-        externalId = pictureId = id;
+        pictureId = id;
+        externalId = String.valueOf(id);
         name = "" + this.id;
 
         for (int i = 0; i < 6; i++)
@@ -201,7 +202,7 @@
         }
 
         /* External (printed) id */
-        externalId = setTag.getAttributeAsInteger("extId", externalId);
+        externalId = setTag.getAttributeAsString("extId", externalId);
         /* Picture id */
         pictureId = setTag.getAttributeAsInteger("pic", pictureId);
         /* Quantity */
@@ -323,7 +324,7 @@
         return id;
     }
 
-    public int getExternalId() {
+    public String getExternalId() {
         return externalId;
     }
 
@@ -520,7 +521,7 @@
         Integer colour = this.getColourNumber();
         int result = colour.compareTo(anotherTile.getColourNumber());
         if (result == 0) { 
-            Integer externalId  = this.getExternalId();
+            //String externalId  = this.getExternalId();
             result = externalId.compareTo(anotherTile.getExternalId());
         }
         return result;

Modified: trunk/18xx/rails/game/TileI.java
===================================================================
--- trunk/18xx/rails/game/TileI.java	2011-02-13 18:07:34 UTC (rev 1485)
+++ trunk/18xx/rails/game/TileI.java	2011-02-13 19:57:47 UTC (rev 1486)
@@ -23,7 +23,7 @@
      */
     public int getId();
 
-    public int getExternalId();
+    public String getExternalId();
 
     public int getPictureId();
 

Modified: trunk/18xx/rails/game/correct/MapCorrectionManager.java
===================================================================
--- trunk/18xx/rails/game/correct/MapCorrectionManager.java	2011-02-13 18:07:34 UTC (rev 1485)
+++ trunk/18xx/rails/game/correct/MapCorrectionManager.java	2011-02-13 19:57:47 UTC (rev 1486)
@@ -15,6 +15,7 @@
 import rails.game.TileManager;
 import rails.game.TokenI;
 import rails.util.LocalText;
+import tools.Util;
 
 public class MapCorrectionManager extends CorrectionManager {
     
@@ -70,7 +71,8 @@
         String errMsg = null;
         while (true) {
             // check if chosenTile is still available (not for preprinted)
-            if (chosenTile != null && chosenTile.getExternalId() > 0 && chosenTile != hex.getCurrentTile()
+            if (chosenTile != null && Util.hasValue(chosenTile.getExternalId()) 
+                    && chosenTile != hex.getCurrentTile()
                     && chosenTile.countFreeTiles() == 0) {
                 errMsg =
                     LocalText.getText("TileNotAvailable",

Modified: trunk/18xx/rails/ui/swing/UpgradesPanel.java
===================================================================
--- trunk/18xx/rails/ui/swing/UpgradesPanel.java	2011-02-13 18:07:34 UTC (rev 1485)
+++ trunk/18xx/rails/ui/swing/UpgradesPanel.java	2011-02-13 19:57:47 UTC (rev 1486)
@@ -21,6 +21,7 @@
 import rails.ui.swing.hexmap.GUIHex;
 import rails.ui.swing.hexmap.HexMap;
 import rails.util.LocalText;
+import tools.Util;
 
 public class UpgradesPanel extends Box implements MouseListener, ActionListener {
     private static final long serialVersionUID = 1L;
@@ -505,7 +506,7 @@
 
         void setTextFromTile(TileI tile) {
             StringBuffer text = new StringBuffer();
-            if (tile.getExternalId() > 0) {
+            if (Util.hasValue(tile.getExternalId())) {
                 text.append("<HTML><BODY>" + tile.getExternalId());
                 if (tile.countFreeTiles() != -1) {
                     text.append("<BR> (" + tile.countFreeTiles() + ")");

Modified: trunk/18xx/rails/util/Tag.java
===================================================================
--- trunk/18xx/rails/util/Tag.java	2011-02-13 18:07:34 UTC (rev 1485)
+++ trunk/18xx/rails/util/Tag.java	2011-02-13 19:57:47 UTC (rev 1486)
@@ -266,7 +266,6 @@
         Node attribute;
         String name, value;
         List<String> valueList;
-        String[] valueArray;
         StringBuffer textBuffer = new StringBuffer();
 
         for (int i = 0; i < childNodes.getLength(); i++) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.