summaryrefslogtreecommitdiffstats
path: root/mock/jrummikub
diff options
context:
space:
mode:
authorJannis Harder <harder@informatik.uni-luebeck.de>2011-05-29 22:24:48 +0200
committerJannis Harder <harder@informatik.uni-luebeck.de>2011-05-29 22:24:48 +0200
commitf3f52956f711658f42ef753b7ff46728da67aa54 (patch)
treee6229af2028d46a9ac524a613754e0473de899ff /mock/jrummikub
parentd9b651828aedbd9eb80f534842356d5200c644ee (diff)
downloadJRummikub-f3f52956f711658f42ef753b7ff46728da67aa54.tar
JRummikub-f3f52956f711658f42ef753b7ff46728da67aa54.zip
Tested and implemented player type selection in the settings panel
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@317 72836036-5685-4462-b002-a69064685172
Diffstat (limited to 'mock/jrummikub')
-rw-r--r--mock/jrummikub/view/MockSettingsPanel.java10
1 files changed, 9 insertions, 1 deletions
diff --git a/mock/jrummikub/view/MockSettingsPanel.java b/mock/jrummikub/view/MockSettingsPanel.java
index 5e3a736..2140e05 100644
--- a/mock/jrummikub/view/MockSettingsPanel.java
+++ b/mock/jrummikub/view/MockSettingsPanel.java
@@ -2,6 +2,8 @@ package jrummikub.view;
import java.awt.Color;
+import jrummikub.control.turn.TurnControlFactory;
+import jrummikub.control.turn.TurnControlFactory.Type;
import jrummikub.model.GameSettings;
import jrummikub.util.IEvent;
import jrummikub.util.IEvent1;
@@ -21,6 +23,8 @@ public class MockSettingsPanel implements ISettingsPanel {
public MockEvent2<Integer, Color> changePlayerColorEvent = new MockEvent2<Integer, Color>();
/** */
public MockEvent2<Integer, String> changePlayerNameEvent = new MockEvent2<Integer, String>();
+ /** */
+ public MockEvent2<Integer, TurnControlFactory.Type> changePlayerTypeEvent = new MockEvent2<Integer, TurnControlFactory.Type>();
/** */
public MockEvent startGameEvent = new MockEvent();
/** */
@@ -43,7 +47,6 @@ public class MockSettingsPanel implements ISettingsPanel {
public int initialMeldThreshold;
/** */
public int jokerNumber;
-
@Override
public IEvent getAddPlayerEvent() {
return addPlayerEvent;
@@ -119,4 +122,9 @@ public class MockSettingsPanel implements ISettingsPanel {
this.jokerNumber = jokerNumber;
}
+ @Override
+ public IEvent2<Integer, Type> getChangePlayerTypeEvent() {
+ return changePlayerTypeEvent;
+ }
+
}