Man kann den Timer einstellen

git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@391 72836036-5685-4462-b002-a69064685172

1 files changed, 25 insertions, 13 deletions

diff --git a/src/jrummikub/view/impl/SettingsPanel.java b/src/jrummikub/view/impl/SettingsPanel.java
index adacd79..8864b7b 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 JSpinner highestValueSpinner;
 	private JSpinner numberOfStonesDealtSpinner;
 	private JSpinner jokerNumberSpinner;
+	private JSpinner timeSpinner;
 
 	private JPanel colorSelectionPanel;
 	private Map<StoneColor, JToggleButton> colorButtons = new HashMap<StoneColor, JToggleButton>();
@@ -91,7 +92,8 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
 	private Event1<Integer> changeNumberOfStonesDealtEvent = new Event1<Integer>();
 	private Event1<Integer> changeHighestValueEvent = new Event1<Integer>();
 	private Event1<Set<StoneColor>> changeStoneColorsEvent = new Event1<Set<StoneColor>>();
-
+	private Event1<Integer> changeTimeEvent = new Event1<Integer>();
+	
 	@Override
 	public IEvent getStartGameEvent() {
 		return startGameEvent;
@@ -136,6 +138,21 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
 	public IEvent1<Integer> getChangeHighestValueEvent() {
 		return changeHighestValueEvent;
 	}
+	
+	@Override
+	public IEvent1<Integer> getChangeJokerNumberEvent() {
+		return changeJokerNumberEvent;
+	}
+
+	@Override
+	public IEvent2<Integer, Type> getChangePlayerTypeEvent() {
+		return changePlayerTypeEvent;
+	}
+
+	@Override
+	public Event1<Integer> getChangeTimeEvent() {
+		return changeTimeEvent;
+	}
 
 	@Override
 	public IEvent1<Set<StoneColor>> getChangeStoneColorsEvent() {
@@ -214,6 +231,7 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
 		highestValueSpinner.setValue(gameSettings.getHighestValue());
 		numberOfStonesDealtSpinner.setValue(gameSettings.getNumberOfStonesDealt());
 		jokerNumberSpinner.setValue(gameSettings.getJokerNumber());
+		timeSpinner.setValue(gameSettings.getTime());
 
 		for (StoneColor color : StoneColor.values()) {
 			colorButtons.get(color).getModel()
@@ -300,13 +318,16 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
 
 		makeOptionLabel(4, "Jokeranzahl:");
 		jokerNumberSpinner = makeOptionSpinner(4, 1, 999, 1, changeJokerNumberEvent);
+		
+		makeOptionLabel(5, "Zeit für Spielzug:");
+		timeSpinner = makeOptionSpinner(5, 1, 999, 1, changeTimeEvent);
 
-		makeOptionLabel(5, "Steinfarben:");
-		createColorSelectionPanel(5);
+		makeOptionLabel(6, "Steinfarben:");
+		createColorSelectionPanel(6);
 
 		GridBagConstraints c = new GridBagConstraints();
 		c.gridx = 1;
-		c.gridy = 6;
+		c.gridy = 7;
 		c.fill = GridBagConstraints.BOTH;
 		c.weightx = 1;
 		c.weighty = 1;
@@ -601,13 +622,4 @@ class SettingsPanel extends JPanel implements ISettingsPanel {
 		}
 	}
 
-	@Override
-	public IEvent1<Integer> getChangeJokerNumberEvent() {
-		return changeJokerNumberEvent;
-	}
-
-	@Override
-	public IEvent2<Integer, Type> getChangePlayerTypeEvent() {
-		return changePlayerTypeEvent;
-	}
 }