summaryrefslogtreecommitdiffstats
path: root/mock/jrummikub
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2011-06-20 03:59:04 +0200
committerMatthias Schiffer <mschiffer@universe-factory.net>2011-06-20 03:59:04 +0200
commitf3f8ffe4621e91d33732bba9e103ff790a16c7b3 (patch)
treea4663053ea570c7a077a244de9f4f884294208d1 /mock/jrummikub
parente79295f271062f2186c2ce0f9b69f1ddfc964abf (diff)
downloadJRummikub-f3f8ffe4621e91d33732bba9e103ff790a16c7b3.tar
JRummikub-f3f8ffe4621e91d33732bba9e103ff790a16c7b3.zip
Added NetworkGameControl
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@503 72836036-5685-4462-b002-a69064685172
Diffstat (limited to 'mock/jrummikub')
-rw-r--r--mock/jrummikub/control/network/MockConnectionControl.java13
-rw-r--r--mock/jrummikub/model/MockRoundState.java13
2 files changed, 23 insertions, 3 deletions
diff --git a/mock/jrummikub/control/network/MockConnectionControl.java b/mock/jrummikub/control/network/MockConnectionControl.java
index d0bb1fa..32c22c4 100644
--- a/mock/jrummikub/control/network/MockConnectionControl.java
+++ b/mock/jrummikub/control/network/MockConnectionControl.java
@@ -37,6 +37,8 @@ public class MockConnectionControl implements IConnectionControl {
/** */
public MockEvent gameStartEvent = new MockEvent();
/** */
+ public MockEvent roundStartEvent = new MockEvent();
+ /** */
public MockEvent1<ITable> tableUpdateEvent = new MockEvent1<ITable>();
/** */
public MockEvent1<ITable> turnEndEvent = new MockEvent1<ITable>();
@@ -125,6 +127,11 @@ public class MockConnectionControl implements IConnectionControl {
}
@Override
+ public IEvent getRoundStartEvent() {
+ return roundStartEvent;
+ }
+
+ @Override
public IEvent1<ITable> getTableUpdateEvent() {
return tableUpdateEvent;
}
@@ -203,4 +210,10 @@ public class MockConnectionControl implements IConnectionControl {
public void startTurn(IRoundState state) {
turnStarted = true;
}
+
+ @Override
+ public void startRound() {
+ // TODO Auto-generated method stub
+
+ }
}
diff --git a/mock/jrummikub/model/MockRoundState.java b/mock/jrummikub/model/MockRoundState.java
index c387396..9b36906 100644
--- a/mock/jrummikub/model/MockRoundState.java
+++ b/mock/jrummikub/model/MockRoundState.java
@@ -26,14 +26,16 @@ public class MockRoundState implements IRoundState {
/** */
public int turnNumber;
/** */
-
+ public GameState gameState;
+
+ /** */
public MockRoundState() {
table = new MockTable();
players = new ArrayList<MockPlayer>();
players.add(new MockPlayer(new PlayerSettings("Player 1", Color.RED),
gameSettings));
- players.add(new MockPlayer(
- new PlayerSettings("Player 2", Color.YELLOW), gameSettings));
+ players.add(new MockPlayer(new PlayerSettings("Player 2", Color.YELLOW),
+ gameSettings));
players.add(new MockPlayer(new PlayerSettings("Player 3", Color.GREEN),
gameSettings));
players.add(new MockPlayer(new PlayerSettings("Player 4", Color.BLACK),
@@ -126,4 +128,9 @@ public class MockRoundState implements IRoundState {
public void nextTurn() {
turnNumber++;
}
+
+ @Override
+ public GameState getGameState() {
+ return gameState;
+ }
}