From 09aa507e3b3d08cc168077c093c6ad264bdc4e8f Mon Sep 17 00:00:00 2001
From: Jannis Harder <harder@informatik.uni-luebeck.de>
Date: Sun, 29 May 2011 15:32:00 +0200
Subject: Test initial meld threshold in settings control

git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@295 72836036-5685-4462-b002-a69064685172
---
 src/jrummikub/control/ApplicationControl.java | 2 +-
 src/jrummikub/control/SettingsControl.java    | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/jrummikub/control')

diff --git a/src/jrummikub/control/ApplicationControl.java b/src/jrummikub/control/ApplicationControl.java
index 8e09853..7a3113f 100644
--- a/src/jrummikub/control/ApplicationControl.java
+++ b/src/jrummikub/control/ApplicationControl.java
@@ -25,7 +25,7 @@ public class ApplicationControl {
 	 * Starts the application by showing the game settings dialog panel
 	 */
 	public void startApplication() {
-		SettingsControl settingsControl = new SettingsControl(view);
+		SettingsControl settingsControl = new SettingsControl(view, new GameSettings());
 		settingsControl.getStartGameEvent().add(new IListener1<GameSettings>() {
 
 			@Override
diff --git a/src/jrummikub/control/SettingsControl.java b/src/jrummikub/control/SettingsControl.java
index 7def918..b294cae 100644
--- a/src/jrummikub/control/SettingsControl.java
+++ b/src/jrummikub/control/SettingsControl.java
@@ -19,17 +19,19 @@ public class SettingsControl {
 	private IView view;
 	private Event1<GameSettings> startGameEvent = new Event1<GameSettings>();
 
-	private GameSettings settings = new GameSettings();
+	private GameSettings settings;
 
 	/**
 	 * Create a new settings control
 	 * 
 	 * @param view
 	 *          the view to use
+	 * @param settings
+	 * 			initial game settings
 	 */
-	public SettingsControl(IView view) {
+	public SettingsControl(IView view, GameSettings settings) {
 		this.view = view;
-
+		this.settings = settings;
 		addPlayer();
 		addPlayer();
 	}
-- 
cgit v1.2.3