[Rails-commits] 18xx/rails/ui/swing StatusWindow.java, 1.33, 1.34 ORWindow.java, 1.31, 1.32 GameStatus.java, 1.36, 1.37 GameSetupWindow.java, 1.19, 1.20 ORPanel.java, 1.38, 1.39

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

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

Modified Files:
	StatusWindow.java ORWindow.java GameStatus.java 
	GameSetupWindow.java ORPanel.java 
Log Message:
Defs->GuiDef name change

Index: StatusWindow.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/StatusWindow.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** StatusWindow.java	11 Jan 2010 23:06:08 -0000	1.33
--- StatusWindow.java	14 Jan 2010 20:50:08 -0000	1.34
***************
*** 12,16 ****
  import org.apache.log4j.Logger;
  
! import rails.common.Defs;
  import rails.game.*;
  import rails.game.action.*;
--- 12,16 ----
  import org.apache.log4j.Logger;
  
! import rails.common.GuiDef;
  import rails.game.*;
  import rails.game.action.*;
***************
*** 215,219 ****
          this.gameUIManager = gameUIManager;
  
!         String gameStatusClassName = gameUIManager.getClassName(Defs.ClassName.GAME_STATUS);
          try {
              Class<? extends GameStatus> gameStatusClass =
--- 215,219 ----
          this.gameUIManager = gameUIManager;
  
!         String gameStatusClassName = gameUIManager.getClassName(GuiDef.ClassName.GAME_STATUS);
          try {
              Class<? extends GameStatus> gameStatusClass =

Index: GameSetupWindow.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/GameSetupWindow.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** GameSetupWindow.java	30 Dec 2009 18:38:28 -0000	1.19
--- GameSetupWindow.java	14 Jan 2010 20:50:08 -0000	1.20
***************
*** 12,16 ****
  import org.apache.log4j.Logger;
  
! import rails.common.Defs;
  import rails.game.*;
  import rails.util.Config;
--- 12,16 ----
  import org.apache.log4j.Logger;
  
! import rails.common.GuiDef;
  import rails.game.*;
  import rails.util.Config;
***************
*** 391,395 ****
      private void startGameUIManager(Game game) {
          GameManagerI gameManager = game.getGameManager();
!         String gameUIManagerClassName = gameManager.getClassName(Defs.ClassName.GAME_UI_MANAGER);
          try {
              Class<? extends GameUIManager> gameUIManagerClass =
--- 391,395 ----
      private void startGameUIManager(Game game) {
          GameManagerI gameManager = game.getGameManager();
!         String gameUIManagerClassName = gameManager.getClassName(GuiDef.ClassName.GAME_UI_MANAGER);
          try {
              Class<? extends GameUIManager> gameUIManagerClass =

Index: GameStatus.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/GameStatus.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** GameStatus.java	11 Jan 2010 23:06:15 -0000	1.36
--- GameStatus.java	14 Jan 2010 20:50:08 -0000	1.37
***************
*** 11,15 ****
  import org.apache.log4j.Logger;
  
! import rails.common.Defs;
  import rails.game.*;
  import rails.game.action.*;
--- 11,15 ----
  import org.apache.log4j.Logger;
  
! import rails.common.GuiDef;
  import rails.game.*;
  import rails.game.action.*;
***************
*** 138,145 ****
          nc = companies.length;
  
!         hasParPrices = gameUIManager.getGameParameterAsBoolean(Defs.Parm.HAS_ANY_PAR_PRICE);
!         compCanBuyPrivates = gameUIManager.getGameParameterAsBoolean(Defs.Parm.CAN_ANY_COMPANY_BUY_PRIVATES);
!         compCanHoldOwnShares = gameUIManager.getGameParameterAsBoolean(Defs.Parm.CAN_ANY_COMPANY_HOLD_OWN_SHARES);
!         hasCompanyLoans = gameUIManager.getGameParameterAsBoolean(Defs.Parm.HAS_ANY_COMPANY_LOANS);
  
          ipo = bank.getIpo();
--- 138,145 ----
          nc = companies.length;
  
!         hasParPrices = gameUIManager.getGameParameterAsBoolean(GuiDef.Parm.HAS_ANY_PAR_PRICE);
!         compCanBuyPrivates = gameUIManager.getGameParameterAsBoolean(GuiDef.Parm.CAN_ANY_COMPANY_BUY_PRIVATES);
!         compCanHoldOwnShares = gameUIManager.getGameParameterAsBoolean(GuiDef.Parm.CAN_ANY_COMPANY_HOLD_OWN_SHARES);
!         hasCompanyLoans = gameUIManager.getGameParameterAsBoolean(GuiDef.Parm.HAS_ANY_COMPANY_LOANS);
  
          ipo = bank.getIpo();

Index: ORWindow.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/ORWindow.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** ORWindow.java	31 Dec 2009 09:58:18 -0000	1.31
--- ORWindow.java	14 Jan 2010 20:50:08 -0000	1.32
***************
*** 14,18 ****
  import org.apache.log4j.Logger;
  
! import rails.common.Defs;
  import rails.game.*;
  import rails.game.action.*;
--- 14,18 ----
  import org.apache.log4j.Logger;
  
! import rails.common.GuiDef;
  import rails.game.*;
  import rails.game.action.*;
***************
*** 46,50 ****
          this.gameUIManager = gameUIManager;
  
!         String orUIManagerClassName = gameUIManager.getClassName(Defs.ClassName.OR_UI_MANAGER);
          try {
              Class<? extends ORUIManager> orUIManagerClass =
--- 46,50 ----
          this.gameUIManager = gameUIManager;
  
!         String orUIManagerClassName = gameUIManager.getClassName(GuiDef.ClassName.OR_UI_MANAGER);
          try {
              Class<? extends ORUIManager> orUIManagerClass =

Index: ORPanel.java
===================================================================
RCS file: /cvsroot/rails/18xx/rails/ui/swing/ORPanel.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** ORPanel.java	5 Jan 2010 20:54:05 -0000	1.38
--- ORPanel.java	14 Jan 2010 20:50:08 -0000	1.39
***************
*** 10,14 ****
  import org.apache.log4j.Logger;
  
! import rails.common.Defs;
  import rails.game.*;
  import rails.game.action.*;
--- 10,14 ----
  import org.apache.log4j.Logger;
  
! import rails.common.GuiDef;
  import rails.game.*;
  import rails.game.action.*;
***************
*** 122,128 ****
  
          round = gameUIManager.getCurrentRound();
!         privatesCanBeBought = gameUIManager.getGameParameterAsBoolean(Defs.Parm.CAN_ANY_COMPANY_BUY_PRIVATES);
!         bonusTokensExist = gameUIManager.getGameParameterAsBoolean(Defs.Parm.DO_BONUS_TOKENS_EXIST);
!         hasCompanyLoans = gameUIManager.getGameParameterAsBoolean(Defs.Parm.HAS_ANY_COMPANY_LOANS);
  
          initButtonPanel();
--- 122,128 ----
  
          round = gameUIManager.getCurrentRound();
!         privatesCanBeBought = gameUIManager.getGameParameterAsBoolean(GuiDef.Parm.CAN_ANY_COMPANY_BUY_PRIVATES);
!         bonusTokensExist = gameUIManager.getGameParameterAsBoolean(GuiDef.Parm.DO_BONUS_TOKENS_EXIST);
!         hasCompanyLoans = gameUIManager.getGameParameterAsBoolean(GuiDef.Parm.HAS_ANY_COMPANY_LOANS);
  
          initButtonPanel();
***************
*** 439,443 ****
              addField(f, revXOffset, revYOffset + i, 1, 1, 0, visible);
              f = revenueSelect[i] = new Spinner(0, 0, 0, 10);
!             addField(f, revXOffset, revYOffset + i, 1, 1, 0,  visible);
  
              f = decision[i] = new Field(c.getLastRevenueAllocationModel());
--- 439,444 ----
              addField(f, revXOffset, revYOffset + i, 1, 1, 0, visible);
              f = revenueSelect[i] = new Spinner(0, 0, 0, 10);
!             addField(f, revXOffset, revYOffset + i, 1, 1, 0,  false);
!             revenue[i].addDependent(revenueSelect[i]);
  
              f = decision[i] = new Field(c.getLastRevenueAllocationModel());
***************
*** 467,474 ****
          redoButton.setEnabled(false);
  
-         round = orUIManager.gameUIManager.getCurrentRound();
-         if (!(round instanceof ShareSellingRound)) {
-             orUIManager.setORCompanyTurn(-1);
-         }
      }
  
--- 468,471 ----