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

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

Revision: 1594
          http://rails.svn.sourceforge.net/rails/?rev=1594&view=rev
Author:   evos
Date:     2011-06-28 17:08:29 +0000 (Tue, 28 Jun 2011)

Log Message:
-----------
Added Phase name to Game Status panel

Modified Paths:
--------------
    trunk/18xx/LocalisedText.properties
    trunk/18xx/rails/game/PhaseManager.java
    trunk/18xx/rails/ui/swing/GameStatus.java

Modified: trunk/18xx/LocalisedText.properties
===================================================================
--- trunk/18xx/LocalisedText.properties	2011-06-28 08:16:12 UTC (rev 1593)
+++ trunk/18xx/LocalisedText.properties	2011-06-28 17:08:29 UTC (rev 1594)
@@ -454,6 +454,7 @@
 PaysTo={0} pays {1} to {2} 
 Payout={0} receives {1} for {2} {3}% shares
 PaysForTokens={0} pays {1} to Bank for {2} tokens
+PHASE=Phase
 PLAYERS=Players
 POOL=Pool
 PRES_CERT_NAME={0} {1}% president share

Modified: trunk/18xx/rails/game/PhaseManager.java
===================================================================
--- trunk/18xx/rails/game/PhaseManager.java	2011-06-28 08:16:12 UTC (rev 1593)
+++ trunk/18xx/rails/game/PhaseManager.java	2011-06-28 17:08:29 UTC (rev 1594)
@@ -5,6 +5,7 @@
 
 import org.apache.log4j.Logger;
 
+import rails.game.model.ModelObject;
 import rails.game.state.State;
 import rails.util.Tag;
 
@@ -57,6 +58,10 @@
     public PhaseI getCurrentPhase() {
         return (PhaseI) currentPhase.get();
     }
+    
+    public ModelObject getCurrentPhaseModel() {
+        return currentPhase;
+    }
 
     public int getCurrentPhaseIndex() {
         return getCurrentPhase().getIndex();

Modified: trunk/18xx/rails/ui/swing/GameStatus.java
===================================================================
--- trunk/18xx/rails/ui/swing/GameStatus.java	2011-06-28 08:16:12 UTC (rev 1593)
+++ trunk/18xx/rails/ui/swing/GameStatus.java	2011-06-28 17:08:29 UTC (rev 1594)
@@ -73,6 +73,7 @@
     protected Field playerCertCount[];
     protected int playerCertCountXOffset, playerCertCountYOffset;
     protected int certLimitXOffset, certLimitYOffset;
+    protected int phaseXOffset, phaseYOffset;
     protected Field bankCash;
     protected int bankCashXOffset, bankCashYOffset;
     protected Field poolTrains;
@@ -228,6 +229,8 @@
         playerCertCountYOffset = ++lastY;
         certLimitXOffset = certInPoolXOffset;
         certLimitYOffset = playerCertCountYOffset;
+        phaseXOffset = certInPoolXOffset + 2;
+        phaseYOffset = playerCertCountYOffset;
         bankCashXOffset = certInPoolXOffset;
         bankCashYOffset = playerPrivatesYOffset;
         poolTrainsXOffset = bankCashXOffset + 2;
@@ -489,6 +492,13 @@
                 certLimitXOffset,
                 certLimitYOffset, 1, 1, WIDE_TOP, true);
 
+        // Phase
+        addField(new Caption(LocalText.getText("PHASE")), phaseXOffset - 1,
+                phaseYOffset, 1, 1, WIDE_TOP + WIDE_LEFT, true);
+        addField(new Field(gameUIManager.getGameManager().getPhaseManager().getCurrentPhaseModel()),
+                phaseXOffset,
+                phaseYOffset, 1, 1, WIDE_TOP, true);
+
         // Bank
         addField(new Caption(LocalText.getText("BANK")), bankCashXOffset - 1,
                 bankCashYOffset - 1, 1, 2, WIDE_TOP + WIDE_LEFT, true);


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