Moved filtering for UUIDs into ConnectionControl

git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@452 72836036-5685-4462-b002-a69064685172

1 files changed, 9 insertions, 12 deletions

diff --git a/src/jrummikub/control/network/GameOfferControl.java b/src/jrummikub/control/network/GameOfferControl.java
index fd55fc1..f0dc526 100644
--- a/src/jrummikub/control/network/GameOfferControl.java
+++ b/src/jrummikub/control/network/GameOfferControl.java
@@ -14,6 +14,7 @@ import jrummikub.model.PlayerSettings.Type;
 import jrummikub.util.Connection;
 import jrummikub.util.GameData;
 import jrummikub.util.IListener;
+import jrummikub.util.IListener1;
 import jrummikub.util.IListener2;
 import jrummikub.view.ISettingsPanel;
 import jrummikub.view.ISettingsPanel.SettingsMode;
@@ -37,25 +38,21 @@ public class GameOfferControl {
 		updateSettingsPanel(settings);
 
 		connections.add(connectionControl.getGameJoinEvent().add(
-				new IListener2<UUID, String>() {
+				new IListener1<String>() {
 					@Override
-					public void handle(UUID uuid, String sender) {
-						if (!uuid.equals(gameData.getGameID())) {
-							return;
-						}
-
+					public void handle(String sender) {
 						for (PlayerSettings player : settings.getPlayerList()) {
 							if (player.getType() == Type.VACANT) {
 								player.setName(sender);
 								player.setType(Type.NETWORK);
 								updateSettingsPanel(settings);
-								connectionControl.ackJoinGame(uuid, sender, true);
+								connectionControl.ackJoinGame(sender, true);
 								connectionControl.offerGame(gameData);
 								return;
 							}
 						}
 
-						connectionControl.ackJoinGame(uuid, sender, false);
+						connectionControl.ackJoinGame(sender, false);
 					}
 				}));
 		connections.add(view.getSettingsPanel().getChangePlayerColorEvent()
@@ -71,13 +68,13 @@ public class GameOfferControl {
 						updateSettingsPanel(settings);
 					}
 				}));
-		connections.add(connectionControl.getGameLeaveEvent().add(new IListener2<UUID, String>() {
+		connections.add(connectionControl.getGameLeaveEvent().add(new IListener1<String>() {
 			@Override
-			public void handle(UUID value1, String value2) {
+			public void handle(String sender) {
 				List<PlayerSettings> players = gameData.getGameSettings().getPlayerList();
 				int index=0;
 				for(PlayerSettings s:players){
-					if (s.getName().equals(value2)){
+					if (s.getName().equals(sender)){
 						break;
 					}
 					index++;
@@ -122,6 +119,6 @@ public class GameOfferControl {
 	}
 
 	public void abort() {
-		connectionControl.withdrawGame(gameData.getGameID());
+		connectionControl.withdrawGame();
 	}
 }