diff options
author | Matthias Schiffer <mschiffer@universe-factory.net> | 2011-06-20 06:41:15 +0200 |
---|---|---|
committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2011-06-20 06:41:15 +0200 |
commit | 0c3eb9a28363ae697f984d9413eb187bfe2511a9 (patch) | |
tree | e72cc28d72bd27c0dad9372d3b51274af9ffdeed /mock/jrummikub/control | |
parent | 74d8205f30732a8afd6aa45f859188b0a3d447e5 (diff) | |
download | JRummikub-0c3eb9a28363ae697f984d9413eb187bfe2511a9.tar JRummikub-0c3eb9a28363ae697f984d9413eb187bfe2511a9.zip |
Fixed a bunch of network synchronization bugs
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@510 72836036-5685-4462-b002-a69064685172
Diffstat (limited to 'mock/jrummikub/control')
-rw-r--r-- | mock/jrummikub/control/network/MockConnectionControl.java | 9 |
1 files changed, 6 insertions, 3 deletions
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<ITable> tableUpdateEvent = new MockEvent1<ITable>(); /** */ - public MockEvent1<ITable> turnEndEvent = new MockEvent1<ITable>(); + public MockEvent3<IHand, ITable, ITable> turnEndEvent = new MockEvent3<IHand, ITable, ITable>(); /** */ public MockEvent1<IRoundState> turnStartEvent = new MockEvent1<IRoundState>(); /** */ @@ -137,7 +140,7 @@ public class MockConnectionControl implements IConnectionControl { } @Override - public IEvent1<ITable> getTurnEndEvent() { + public IEvent3<IHand, ITable, ITable> 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; } |