Major refactoring of RoundControl and TurnControl

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

1 files changed, 11 insertions, 16 deletions

diff --git a/src/jrummikub/control/network/NetworkRoundControl.java b/src/jrummikub/control/network/NetworkRoundControl.java
index 81820e7..64faebb 100644
--- a/src/jrummikub/control/network/NetworkRoundControl.java
+++ b/src/jrummikub/control/network/NetworkRoundControl.java
@@ -2,10 +2,10 @@ package jrummikub.control.network;
 
 import jrummikub.control.RoundControl;
 import jrummikub.control.turn.ITurnControl;
-import jrummikub.model.IHand;
 import jrummikub.model.IRoundState;
 import jrummikub.model.ITable;
 import jrummikub.model.PlayerSettings.Type;
+import jrummikub.util.IListener;
 import jrummikub.util.IListener1;
 import jrummikub.view.IView;
 
@@ -20,17 +20,12 @@ public class NetworkRoundControl extends RoundControl {
 		this.connectionControl = connectionControl;
 		currentlyActive = startActive;
 
-		connections.add(connectionControl.getTurnStartEvent().add(
-				new IListener1<IRoundState>() {
-					@Override
-					public void handle(IRoundState state) {
-						NetworkControl.fixGameSettings(state.getGameSettings(),
-								connectionControl.getNickname());
-						setRoundState(state);
-
-						startTurn();
-					}
-				}));
+		connections.add(connectionControl.getTurnStartEvent().add(new IListener() {
+			@Override
+			public void handle() {
+				startTurn();
+			}
+		}));
 	}
 
 	@Override
@@ -68,16 +63,16 @@ public class NetworkRoundControl extends RoundControl {
 		doPrepareTurn();
 
 		if (wasActive) {
-			connectionControl.startTurn(roundState);
+			connectionControl.startTurn();
 		}
 	}
 
 	@Override
-	protected void endOfTurn(IHand oldHand, ITable oldTable, ITable newTable) {
+	protected void endOfTurn(InvalidTurnInfo invalidTurnInfo) {
 		if (currentlyActive) {
-			connectionControl.endTurn(oldHand, oldTable, newTable);
+			connectionControl.endTurn(roundState, invalidTurnInfo);
 		}
 
-		super.endOfTurn(oldHand, oldTable, newTable);
+		super.endOfTurn(invalidTurnInfo);
 	}
 }