summaryrefslogtreecommitdiffstats
path: root/src/jrummikub/control/SettingsControl.java
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2011-06-15 19:02:13 +0200
committerMatthias Schiffer <mschiffer@universe-factory.net>2011-06-15 19:02:13 +0200
commit1b9c7c47783a0872ca3bedfad6fb120f611d354b (patch)
treecb7568ba1c9c5822008fd2eafa93e4d98a5013b5 /src/jrummikub/control/SettingsControl.java
parent3ffad8597290f91d21c2a2ba7657bbbc16ab1582 (diff)
downloadJRummikub-1b9c7c47783a0872ca3bedfad6fb120f611d354b.tar
JRummikub-1b9c7c47783a0872ca3bedfad6fb120f611d354b.zip
Start implementing color changing over network
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@442 72836036-5685-4462-b002-a69064685172
Diffstat (limited to 'src/jrummikub/control/SettingsControl.java')
-rw-r--r--src/jrummikub/control/SettingsControl.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/jrummikub/control/SettingsControl.java b/src/jrummikub/control/SettingsControl.java
index 4659828..e54fa6d 100644
--- a/src/jrummikub/control/SettingsControl.java
+++ b/src/jrummikub/control/SettingsControl.java
@@ -1,20 +1,21 @@
package jrummikub.control;
+import java.awt.Color;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
+import java.util.HashSet;
import java.util.List;
import jrummikub.model.GameSettings;
import jrummikub.model.PlayerSettings;
import jrummikub.model.PlayerSettings.Type;
-import jrummikub.util.Connection;
import jrummikub.util.Event1;
import jrummikub.util.IEvent1;
import jrummikub.util.IListener;
import jrummikub.view.ISettingsPanel;
-import jrummikub.view.IView;
import jrummikub.view.ISettingsPanel.SettingsMode;
+import jrummikub.view.IView;
/**
* The settings control controls the settings panel
@@ -35,6 +36,7 @@ public class SettingsControl extends AbstractSettingsControl {
view.getSettingsPanel().setSettingsMode(SettingsMode.DEFAULT);
view.getSettingsPanel().setPlayerNamesEditable(
Collections.<Boolean> emptyList());
+ view.getSettingsPanel().setPlayerColors(new HashSet<Color>(Arrays.asList(ISettingsPanel.PLAYER_COLORS)));
addPlayer();
addPlayer();