neocturne/JRummikub
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed a bunch of network synchronization bugs

Browse source 
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@510 72836036-5685-4462-b002-a69064685172
This commit is contained in:
Matthias Schiffer 2011-06-20 06:41:15 +02:00
parent 74d8205f30
commit 0c3eb9a283
15 changed files with 137 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

9
mock/jrummikub/control/network/MockConnectionControl.java
View file

@ -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;
}