diff options
Diffstat (limited to 'src/jrummikub/control')
-rw-r--r-- | src/jrummikub/control/GameControl.java | 4 | ||||
-rw-r--r-- | src/jrummikub/control/RoundControl.java | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/jrummikub/control/GameControl.java b/src/jrummikub/control/GameControl.java index ae50b3c..14e5adc 100644 --- a/src/jrummikub/control/GameControl.java +++ b/src/jrummikub/control/GameControl.java @@ -1,6 +1,6 @@ package jrummikub.control; -import jrummikub.model.GameState; +import jrummikub.model.RoundState; import jrummikub.util.IListener; import jrummikub.view.IView; @@ -46,7 +46,7 @@ public class GameControl { return; } - GameState gameState = new GameState(); + RoundState gameState = new RoundState(); roundControl = new RoundControl(gameState, view); roundControl.getEndRoundEvent().add(new IListener() { diff --git a/src/jrummikub/control/RoundControl.java b/src/jrummikub/control/RoundControl.java index c46d402..07adb99 100644 --- a/src/jrummikub/control/RoundControl.java +++ b/src/jrummikub/control/RoundControl.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.Set; import jrummikub.model.Hand; -import jrummikub.model.IGameState; +import jrummikub.model.IRoundState; import jrummikub.model.IHand; import jrummikub.model.ITable; import jrummikub.model.Position; @@ -23,7 +23,7 @@ import jrummikub.view.IView; * Controller that manages a single round of rummikub */ public class RoundControl { - private IGameState gameState; + private IRoundState gameState; private IView view; private ITable clonedTable; private Event endRoundEvent = new Event(); @@ -37,7 +37,7 @@ public class RoundControl { * @param view * view used for user interaction */ - public RoundControl(IGameState gameState, IView view) { + public RoundControl(IRoundState gameState, IView view) { this.gameState = gameState; this.view = view; } |