summaryrefslogtreecommitdiffstats
path: root/mock/jrummikub
diff options
context:
space:
mode:
authorIda Massow <massow@informatik.uni-luebeck.de>2011-06-19 02:45:49 +0200
committerIda Massow <massow@informatik.uni-luebeck.de>2011-06-19 02:45:49 +0200
commit4ddf87fc9638a7a099c57d650ed878571d0b0954 (patch)
tree50f5754c83dd556af6fcc81b1d64823f8b69b9b9 /mock/jrummikub
parentf641b76bcac15871458e649cdde02331c2cef882 (diff)
downloadJRummikub-4ddf87fc9638a7a099c57d650ed878571d0b0954.tar
JRummikub-4ddf87fc9638a7a099c57d650ed878571d0b0954.zip
Test für game join control
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@478 72836036-5685-4462-b002-a69064685172
Diffstat (limited to 'mock/jrummikub')
-rw-r--r--mock/jrummikub/control/network/MockConnectionControl.java5
-rw-r--r--mock/jrummikub/view/MockSettingsPanel.java4
2 files changed, 6 insertions, 3 deletions
diff --git a/mock/jrummikub/control/network/MockConnectionControl.java b/mock/jrummikub/control/network/MockConnectionControl.java
index 7d97c78..1f68d65 100644
--- a/mock/jrummikub/control/network/MockConnectionControl.java
+++ b/mock/jrummikub/control/network/MockConnectionControl.java
@@ -41,6 +41,8 @@ public class MockConnectionControl implements IConnectionControl {
public boolean failOnConnect;
/** */
public GameData joinedGame;
+ /** */
+ public Color playerColor;
@Override
public String getNickname() {
@@ -142,7 +144,6 @@ public class MockConnectionControl implements IConnectionControl {
@Override
public void changeColor(Color color) {
- // TODO Auto-generated method stub
-
+ playerColor = color;
}
}
diff --git a/mock/jrummikub/view/MockSettingsPanel.java b/mock/jrummikub/view/MockSettingsPanel.java
index 594a3b3..16c183c 100644
--- a/mock/jrummikub/view/MockSettingsPanel.java
+++ b/mock/jrummikub/view/MockSettingsPanel.java
@@ -76,7 +76,9 @@ public class MockSettingsPanel implements ISettingsPanel {
public int highestValue;
/** */
public Set<StoneColor> stoneColors;
- private MockEvent backEvent = new MockEvent();
+ /** */
+ public MockEvent backEvent = new MockEvent();
+ /** */
public SettingsMode settingsMode;
@Override