From 0c3eb9a28363ae697f984d9413eb187bfe2511a9 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Mon, 20 Jun 2011 06:41:15 +0200 Subject: Fixed a bunch of network synchronization bugs git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@510 72836036-5685-4462-b002-a69064685172 --- mock/jrummikub/control/network/MockConnectionControl.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'mock') diff --git a/mock/jrummikub/control/network/MockConnectionControl.java b/mock/jrummikub/control/network/MockConnectionControl.java index 32c22c4..94a5e27 100644 --- a/mock/jrummikub/control/network/MockConnectionControl.java +++ b/mock/jrummikub/control/network/MockConnectionControl.java @@ -3,15 +3,18 @@ package jrummikub.control.network; import java.awt.Color; import java.util.UUID; +import jrummikub.model.IHand; 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; /** */ @@ -41,7 +44,7 @@ public class MockConnectionControl implements IConnectionControl { /** */ public MockEvent1 tableUpdateEvent = new MockEvent1(); /** */ - public MockEvent1 turnEndEvent = new MockEvent1(); + public MockEvent3 turnEndEvent = new MockEvent3(); /** */ public MockEvent1 turnStartEvent = new MockEvent1(); /** */ @@ -137,7 +140,7 @@ public class MockConnectionControl implements IConnectionControl { } @Override - public IEvent1 getTurnEndEvent() { + public IEvent3 getTurnEndEvent() { return turnEndEvent; } @@ -202,7 +205,7 @@ public class MockConnectionControl implements IConnectionControl { } @Override - public void endTurn(ITable table) { + public void endTurn(IHand oldHand, ITable oldTable, ITable newTable) { turnEnded = true; } -- cgit v1.2.3