summaryrefslogtreecommitdiffstats
path: root/src/jrummikub/control/network/ConnectionControl.java
diff options
context:
space:
mode:
authorJannis Harder <harder@informatik.uni-luebeck.de>2011-06-18 02:34:07 +0200
committerJannis Harder <harder@informatik.uni-luebeck.de>2011-06-18 02:34:07 +0200
commit626f4bd9ab6f9143851768b3b2f0a756a9d45f01 (patch)
tree99ff752cb55c9680e17c410a4d6ebdc4d8e03380 /src/jrummikub/control/network/ConnectionControl.java
parentfbf5cc3572d9117b18c32c677bc030ab8a8c20ce (diff)
downloadJRummikub-626f4bd9ab6f9143851768b3b2f0a756a9d45f01.tar
JRummikub-626f4bd9ab6f9143851768b3b2f0a756a9d45f01.zip
Implemented color changing in game begin panels
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@455 72836036-5685-4462-b002-a69064685172
Diffstat (limited to 'src/jrummikub/control/network/ConnectionControl.java')
-rw-r--r--src/jrummikub/control/network/ConnectionControl.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/jrummikub/control/network/ConnectionControl.java b/src/jrummikub/control/network/ConnectionControl.java
index 21d2c8b..6dc1bb5 100644
--- a/src/jrummikub/control/network/ConnectionControl.java
+++ b/src/jrummikub/control/network/ConnectionControl.java
@@ -9,12 +9,10 @@ import jrummikub.model.GameSettings;
import jrummikub.util.Event;
import jrummikub.util.Event1;
import jrummikub.util.Event2;
-import jrummikub.util.Event3;
import jrummikub.util.GameData;
import jrummikub.util.IEvent;
import jrummikub.util.IEvent1;
import jrummikub.util.IEvent2;
-import jrummikub.util.IEvent3;
import jrummikub.util.LoginData;
import org.jivesoftware.smack.Connection;
@@ -307,7 +305,7 @@ class ConnectionControl {
} else if (messageType.equals("game_join_ack")) {
gameJoinAckEvent
.emit(Boolean.valueOf(extension.getValue("ack")));
- } else if (messageType.equals("changeColor")) {
+ } else if (messageType.equals("change_color")) {
changeColorEvent.emit(sender, (Color) Base64
.decodeToObject(extension.getValue("color")));
} else {