diff options
Diffstat (limited to 'mock/jrummikub/control/network/MockConnectionControl.java')
-rw-r--r-- | mock/jrummikub/control/network/MockConnectionControl.java | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/mock/jrummikub/control/network/MockConnectionControl.java b/mock/jrummikub/control/network/MockConnectionControl.java index 94a5e27..61c6a37 100644 --- a/mock/jrummikub/control/network/MockConnectionControl.java +++ b/mock/jrummikub/control/network/MockConnectionControl.java @@ -3,18 +3,16 @@ 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.util.MockEvent; import jrummikub.util.MockEvent1; import jrummikub.util.MockEvent2; -import jrummikub.util.MockEvent3; import jrummikub.view.LoginError; /** */ @@ -44,9 +42,9 @@ public class MockConnectionControl implements IConnectionControl { /** */ public MockEvent1<ITable> tableUpdateEvent = new MockEvent1<ITable>(); /** */ - public MockEvent3<IHand, ITable, ITable> turnEndEvent = new MockEvent3<IHand, ITable, ITable>(); + public MockEvent2<IRoundState, InvalidTurnInfo> turnEndEvent = new MockEvent2<IRoundState, InvalidTurnInfo>(); /** */ - public MockEvent1<IRoundState> turnStartEvent = new MockEvent1<IRoundState>(); + public MockEvent turnStartEvent = new MockEvent(); /** */ public GameData currentGame; /** */ @@ -140,12 +138,12 @@ public class MockConnectionControl implements IConnectionControl { } @Override - public IEvent3<IHand, ITable, ITable> getTurnEndEvent() { + public IEvent2<IRoundState, InvalidTurnInfo> getTurnEndEvent() { return turnEndEvent; } @Override - public IEvent1<IRoundState> getTurnStartEvent() { + public IEvent getTurnStartEvent() { return turnStartEvent; } @@ -205,12 +203,12 @@ public class MockConnectionControl implements IConnectionControl { } @Override - public void endTurn(IHand oldHand, ITable oldTable, ITable newTable) { + public void endTurn(IRoundState state, InvalidTurnInfo invalidTurnInfo) { turnEnded = true; } @Override - public void startTurn(IRoundState state) { + public void startTurn() { turnStarted = true; } |