From df79c78dec6d9db0c60709fcb6728b5fab170379 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Thu, 26 May 2011 16:12:44 +0200 Subject: Add application control, use game settings from settings panel git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@284 72836036-5685-4462-b002-a69064685172 --- src/jrummikub/JRummikub.java | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'src/jrummikub/JRummikub.java') diff --git a/src/jrummikub/JRummikub.java b/src/jrummikub/JRummikub.java index 9c22dc6..61da8d0 100644 --- a/src/jrummikub/JRummikub.java +++ b/src/jrummikub/JRummikub.java @@ -1,12 +1,8 @@ package jrummikub; -import java.awt.Color; - import javax.swing.UIManager; -import jrummikub.control.GameControl; -import jrummikub.model.GameSettings; -import jrummikub.model.PlayerSettings; +import jrummikub.control.ApplicationControl; import jrummikub.view.impl.View; /** @@ -28,17 +24,10 @@ public class JRummikub { } catch (Exception e) { } - GameSettings gameSettings = new GameSettings(); - gameSettings.getPlayerList().add(new PlayerSettings("Ida", Color.RED)); - gameSettings.getPlayerList().add( - new PlayerSettings("Matthias", Color.YELLOW)); - gameSettings.getPlayerList().add(new PlayerSettings("Jannis", Color.GREEN)); - gameSettings.getPlayerList().add(new PlayerSettings("Bennet", Color.BLACK)); - View view = new View(); - GameControl gameControl = new GameControl(gameSettings, view); - gameControl.startGame(); + ApplicationControl appControl = new ApplicationControl(view); + appControl.startApplication(); } -- cgit v1.2.3