diff options
author | Matthias Schiffer <mschiffer@universe-factory.net> | 2011-05-26 16:12:44 +0200 |
---|---|---|
committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2011-05-26 16:12:44 +0200 |
commit | df79c78dec6d9db0c60709fcb6728b5fab170379 (patch) | |
tree | c4f66bf52c89d11a05371cd48698c3ae2718a844 /src/jrummikub/JRummikub.java | |
parent | 3d74d1197419cde195be31de2b2d798abb171291 (diff) | |
download | JRummikub-df79c78dec6d9db0c60709fcb6728b5fab170379.tar JRummikub-df79c78dec6d9db0c60709fcb6728b5fab170379.zip |
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
Diffstat (limited to 'src/jrummikub/JRummikub.java')
-rw-r--r-- | src/jrummikub/JRummikub.java | 17 |
1 files changed, 3 insertions, 14 deletions
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(); } |