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, 6 insertions, 6 deletions

diff --git a/src/jrummikub/control/network/IConnectionControl.java b/src/jrummikub/control/network/IConnectionControl.java
index 38bc05c..b93748c 100644
--- a/src/jrummikub/control/network/IConnectionControl.java
+++ b/src/jrummikub/control/network/IConnectionControl.java
@@ -3,14 +3,13 @@ package jrummikub.control.network;
 import java.awt.Color;
 import java.util.UUID;
 
-import jrummikub.model.IHand;
+import jrummikub.control.RoundControl.InvalidTurnInfo;
 import jrummikub.model.IRoundState;
 import jrummikub.model.ITable;
 import jrummikub.util.GameData;
 import jrummikub.util.IEvent;
 import jrummikub.util.IEvent1;
 import jrummikub.util.IEvent2;
-import jrummikub.util.IEvent3;
 import jrummikub.view.LoginError;
 
 interface IConnectionControl {
@@ -43,9 +42,9 @@ interface IConnectionControl {
 
 	public IEvent1<ITable> getTableUpdateEvent();
 
-	public IEvent3<IHand, ITable, ITable> getTurnEndEvent();
+	public IEvent2<IRoundState, InvalidTurnInfo> getTurnEndEvent();
 
-	public IEvent1<IRoundState> getTurnStartEvent();
+	public IEvent getTurnStartEvent();
 
 	public void offerGame(GameData data);
 
@@ -69,7 +68,8 @@ interface IConnectionControl {
 
 	public void updateTable(ITable table);
 
-	public void endTurn(IHand oldHand, ITable oldTable, ITable newTable);
+	public void endTurn(IRoundState state, InvalidTurnInfo invalidTurnInfo);
+
+	public void startTurn();
 
-	public void startTurn(IRoundState state);
 }
\ No newline at end of file