summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorIda Massow <massow@informatik.uni-luebeck.de>2011-05-30 19:50:58 +0200
committerIda Massow <massow@informatik.uni-luebeck.de>2011-05-30 19:50:58 +0200
commitc398c081ed4d83660ec867cabfb0ee9bc56b90ad (patch)
treec0d736284d4bb12f37ae3eb1d2344eedcc121a3d /src
parentad2f22636921ac5afe60f48bda08274eb00e079a (diff)
downloadJRummikub-c398c081ed4d83660ec867cabfb0ee9bc56b90ad.tar
JRummikub-c398c081ed4d83660ec867cabfb0ee9bc56b90ad.zip
Test für Änderung der StoneSet Anzahl fertig
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@327 72836036-5685-4462-b002-a69064685172
Diffstat (limited to 'src')
-rw-r--r--src/jrummikub/view/ISettingsPanel.java5
-rw-r--r--src/jrummikub/view/impl/SettingsPanel.java14
2 files changed, 17 insertions, 2 deletions
diff --git a/src/jrummikub/view/ISettingsPanel.java b/src/jrummikub/view/ISettingsPanel.java
index 8c30c78..3caa8cb 100644
--- a/src/jrummikub/view/ISettingsPanel.java
+++ b/src/jrummikub/view/ISettingsPanel.java
@@ -80,6 +80,8 @@ public interface ISettingsPanel {
* @return the event
*/
public IEvent1<Integer> getChangeInitialMeldThresholdEvent();
+
+ public IEvent1<Integer> getChangeStoneSetNumberEvent();
/**
* the start game event is emitted when the user wants to start the game
@@ -156,6 +158,8 @@ public interface ISettingsPanel {
* initial meld threshold
*/
public void setInitialMeldThreshold(int value);
+
+ public void setStoneSetNumber(int number);
/**
* Emitted when the joker number is changed
@@ -164,6 +168,7 @@ public interface ISettingsPanel {
*/
public IEvent1<Integer> getChangeJokerNumberEvent();
+
/**
* Sets the joker number in the option pane
*
diff --git a/src/jrummikub/view/impl/SettingsPanel.java b/src/jrummikub/view/impl/SettingsPanel.java
index a5792e7..1eb8e45 100644
--- a/src/jrummikub/view/impl/SettingsPanel.java
+++ b/src/jrummikub/view/impl/SettingsPanel.java
@@ -75,6 +75,7 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
private Event2<Integer, TurnControlFactory.Type> changePlayerTypeEvent = new Event2<Integer, TurnControlFactory.Type>();
private Event1<Integer> changeInitialMeldThresholdEvent = new Event1<Integer>();
private Event1<Integer> changeJokerNumberEvent = new Event1<Integer>();
+ private Event1<Integer> changeStoneSetNumberEvent = new Event1<Integer>();
@Override
public IEvent getStartGameEvent() {
@@ -107,6 +108,11 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
}
@Override
+ public IEvent1<Integer> getChangeStoneSetNumberEvent() {
+ return changeStoneSetNumberEvent;
+ }
+
+ @Override
public void setError(SettingsError error) {
switch (error) {
case NO_ERROR:
@@ -246,8 +252,6 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
c.weightx = 1;
c.weighty = 1;
optionsPanel.add(makeFiller(), c);
-
- // TODO Knöpfe für Dinge
}
private JSpinner makeOptionSpinner(int row, int min, int max, int step,
@@ -517,4 +521,10 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
public IEvent2<Integer, Type> getChangePlayerTypeEvent() {
return changePlayerTypeEvent;
}
+
+ @Override
+ public void setStoneSetNumber(int number) {
+ // TODO Auto-generated method stub
+
+ }
}