summaryrefslogtreecommitdiffstats
path: root/mock
diff options
context:
space:
mode:
authorIda Massow <massow@informatik.uni-luebeck.de>2011-05-30 20:16:48 +0200
committerIda Massow <massow@informatik.uni-luebeck.de>2011-05-30 20:16:48 +0200
commit1660736239d9f437f0ffa336d3f3bb8ed7ae407f (patch)
tree96185492c79b33ec3354b61550edff3f81c90aa1 /mock
parentc398c081ed4d83660ec867cabfb0ee9bc56b90ad (diff)
downloadJRummikub-1660736239d9f437f0ffa336d3f3bb8ed7ae407f.tar
JRummikub-1660736239d9f437f0ffa336d3f3bb8ed7ae407f.zip
Man kann jetzt die Anzahl der Steinsätze einstellen
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@328 72836036-5685-4462-b002-a69064685172
Diffstat (limited to 'mock')
-rw-r--r--mock/jrummikub/view/MockSettingsPanel.java22
1 files changed, 3 insertions, 19 deletions
diff --git a/mock/jrummikub/view/MockSettingsPanel.java b/mock/jrummikub/view/MockSettingsPanel.java
index a159524..f296286 100644
--- a/mock/jrummikub/view/MockSettingsPanel.java
+++ b/mock/jrummikub/view/MockSettingsPanel.java
@@ -35,8 +35,6 @@ public class MockSettingsPanel implements ISettingsPanel {
public boolean addPlayerButtonEnabled = true;
/** */
public boolean removePlayerButtonsEnabled = false;
- /** */
- public GameSettings gameSettings = new GameSettings();
/** */
public MockEvent1<Integer> changeInitialMeldThresholdEvent = new MockEvent1<Integer>();
@@ -107,13 +105,9 @@ public class MockSettingsPanel implements ISettingsPanel {
@Override
public void setGameSettings(GameSettings gameSettings) {
- this.gameSettings = gameSettings;
-
- }
-
- @Override
- public void setInitialMeldThreshold(int value) {
- initialMeldThreshold = value;
+ initialMeldThreshold = gameSettings.getInitialMeldThreshold();
+ jokerNumber = gameSettings.getJokerNumber();
+ stoneSetNumber = gameSettings.getStoneSetNumber();
}
@Override
@@ -122,11 +116,6 @@ public class MockSettingsPanel implements ISettingsPanel {
}
@Override
- public void setJokerNumber(int jokerNumber) {
- this.jokerNumber = jokerNumber;
- }
-
- @Override
public IEvent2<Integer, Type> getChangePlayerTypeEvent() {
return changePlayerTypeEvent;
}
@@ -136,9 +125,4 @@ public class MockSettingsPanel implements ISettingsPanel {
return changeStoneSetNumberEvent;
}
- @Override
- public void setStoneSetNumber(int number) {
- stoneSetNumber = number;
- }
-
}