diff options
-rw-r--r-- | mock/jrummikub/model/MockTable.java | 4 | ||||
-rw-r--r-- | mock/jrummikub/view/MockTablePanel.java | 17 |
2 files changed, 9 insertions, 12 deletions
diff --git a/mock/jrummikub/model/MockTable.java b/mock/jrummikub/model/MockTable.java index 4d7ef1a..0bbbe0a 100644 --- a/mock/jrummikub/model/MockTable.java +++ b/mock/jrummikub/model/MockTable.java @@ -15,9 +15,9 @@ public class MockTable implements ITable { public List<Pair<StoneSet, Position>> sets = new ArrayList<Pair<StoneSet, Position>>(); @Override - public void pickUpStone(Stone stone) { + public Pair<StoneSet, StoneSet> pickUpStone(Stone stone) { // TODO Auto-generated method stub - + return null; } @Override diff --git a/mock/jrummikub/view/MockTablePanel.java b/mock/jrummikub/view/MockTablePanel.java index c1d839c..0d8ccae 100644 --- a/mock/jrummikub/view/MockTablePanel.java +++ b/mock/jrummikub/view/MockTablePanel.java @@ -14,6 +14,8 @@ public class MockTablePanel implements ITablePanel { public Event2<Stone, Boolean> stoneClickEvent = new Event2<Stone, Boolean>(); public Event2<Stone, Boolean> setClickEvent = new Event2<Stone, Boolean>(); public Event2<Stone, Boolean> rangeClickEvent = new Event2<Stone, Boolean>(); + public Event1<StoneSet> leftConnectorClickEvent = new Event1<StoneSet>(); + public Event1<StoneSet> rightConnectorClickEvent = new Event1<StoneSet>(); public MockStoneCollectionPanel stoneCollectionPanel = new MockStoneCollectionPanel(); public String leftPlayerName; @@ -24,20 +26,17 @@ public class MockTablePanel implements ITablePanel { @Override public IEvent2<Stone, Boolean> getStoneClickEvent() { - // TODO Auto-generated method stub - return null; + return stoneClickEvent; } @Override public IEvent2<Stone, Boolean> getRangeClickEvent() { - // TODO Auto-generated method stub - return null; + return rangeClickEvent; } @Override public IEvent2<Stone, Boolean> getSetClickEvent() { - // TODO Auto-generated method stub - return null; + return setClickEvent; } @Override @@ -73,14 +72,12 @@ public class MockTablePanel implements ITablePanel { @Override public Event1<StoneSet> getLeftConnectorClickEvent() { - // TODO Auto-generated method stub - return null; + return leftConnectorClickEvent; } @Override public Event1<StoneSet> getRightConnectorClickEvent() { - // TODO Auto-generated method stub - return null; + return rightConnectorClickEvent; } } |