From: Erik V. <ev...@us...> - 2008-12-23 20:02:56
|
Update of /cvsroot/rails/18xx/rails/ui/swing In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv27673/rails/ui/swing Modified Files: GameUIManager.java ReportWindow.java Log Message: Use new interface GameManagerI Index: ReportWindow.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/ui/swing/ReportWindow.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** ReportWindow.java 11 Dec 2008 20:10:25 -0000 1.9 --- ReportWindow.java 23 Dec 2008 20:02:45 -0000 1.10 *************** *** 7,11 **** import javax.swing.*; ! import rails.game.GameManager; import rails.game.ReportBuffer; import rails.util.LocalText; --- 7,11 ---- import javax.swing.*; ! import rails.game.GameManagerI; import rails.game.ReportBuffer; import rails.util.LocalText; *************** *** 23,29 **** private JPanel messagePanel; private ReportWindow messageWindow; ! private GameManager gameManager; ! public ReportWindow(GameManager gameManager) { messageWindow = this; this.gameManager = gameManager; --- 23,29 ---- private JPanel messagePanel; private ReportWindow messageWindow; ! private GameManagerI gameManager; ! public ReportWindow(GameManagerI gameManager) { messageWindow = this; this.gameManager = gameManager; Index: GameUIManager.java =================================================================== RCS file: /cvsroot/rails/18xx/rails/ui/swing/GameUIManager.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** GameUIManager.java 7 Dec 2008 19:27:08 -0000 1.14 --- GameUIManager.java 23 Dec 2008 20:02:45 -0000 1.15 *************** *** 12,26 **** import rails.common.Defs; ! import rails.game.Bank; ! import rails.game.DisplayBuffer; ! import rails.game.Game; ! import rails.game.GameManager; ! import rails.game.OperatingRound; ! import rails.game.PhaseI; ! import rails.game.Player; ! import rails.game.PublicCompanyI; ! import rails.game.RoundI; ! import rails.game.StartRound; ! import rails.game.StockRound; import rails.game.action.GameAction; import rails.game.action.PossibleAction; --- 12,16 ---- import rails.common.Defs; ! import rails.game.*; import rails.game.action.GameAction; import rails.game.action.PossibleAction; *************** *** 43,47 **** public static ImageLoader imageLoader; ! private GameManager gameManager; private PossibleAction lastAction; private ActionPerformer activeWindow = null; --- 33,37 ---- public static ImageLoader imageLoader; ! private GameManagerI gameManager; private PossibleAction lastAction; private ActionPerformer activeWindow = null; *************** *** 289,293 **** } ! public GameManager getGameManager() { return gameManager; } --- 279,283 ---- } ! public GameManagerI getGameManager() { return gameManager; } |