From f5cff88ec9177b23dc8979aa9645a427a78c6f46 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 21 Jun 2011 00:04:16 +0200 Subject: Major refactoring of RoundControl and TurnControl git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@516 72836036-5685-4462-b002-a69064685172 --- .../jrummikub/control/network/MockConnectionControl.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'mock/jrummikub') 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 tableUpdateEvent = new MockEvent1(); /** */ - public MockEvent3 turnEndEvent = new MockEvent3(); + public MockEvent2 turnEndEvent = new MockEvent2(); /** */ - public MockEvent1 turnStartEvent = new MockEvent1(); + public MockEvent turnStartEvent = new MockEvent(); /** */ public GameData currentGame; /** */ @@ -140,12 +138,12 @@ public class MockConnectionControl implements IConnectionControl { } @Override - public IEvent3 getTurnEndEvent() { + public IEvent2 getTurnEndEvent() { return turnEndEvent; } @Override - public IEvent1 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; } -- cgit v1.2.3