diff options
Diffstat (limited to 'src/jrummikub/JRummikub.java')
| -rw-r--r-- | src/jrummikub/JRummikub.java | 40 |
1 files changed, 31 insertions, 9 deletions
diff --git a/src/jrummikub/JRummikub.java b/src/jrummikub/JRummikub.java index c9047a1..de270f6 100644 --- a/src/jrummikub/JRummikub.java +++ b/src/jrummikub/JRummikub.java @@ -13,7 +13,7 @@ import jrummikub.model.Stone; import jrummikub.model.StoneColor; import jrummikub.model.StoneSet; import jrummikub.util.IListener; -import jrummikub.util.IListener1; +import jrummikub.util.IListener2; import jrummikub.view.IView; public class JRummikub { @@ -66,19 +66,41 @@ public class JRummikub { view.getPlayerPanel().getBoard().setStones(stones); - view.getPlayerPanel().getBoard().getClickEvent().add(new IListener1<Position>(){ - + view.getPlayerPanel().getBoard().getClickEvent().add(new IListener2<Position, Boolean>(){ + @Override + public void fire(Position p, Boolean collect) { + System.out.println("Board clicked at "+p+(collect?", collect":"")); + + }}); + view.getPlayerPanel().getBoard().getRangeClickEvent().add(new IListener2<Position, Boolean>(){ + @Override + public void fire(Position p, Boolean collect) { + System.out.println("Board range-clicked at "+p+(collect?", collect":"")); + + }}); + view.getPlayerPanel().getBoard().getSetClickEvent().add(new IListener2<Position, Boolean>(){ @Override - public void fire(Position value) { - System.out.println("Board clicked at "+value); + public void fire(Position p, Boolean collect) { + System.out.println("Board set-clicked at "+p+(collect?", collect":"")); }}); - view.getTable().getClickEvent().add(new IListener1<Position>(){ - + view.getTable().getClickEvent().add(new IListener2<Position, Boolean>(){ + @Override + public void fire(Position p, Boolean collect) { + System.out.println("Table clicked at "+p+(collect?", collect":"")); + + }}); + view.getTable().getRangeClickEvent().add(new IListener2<Position, Boolean>(){ + @Override + public void fire(Position p, Boolean collect) { + System.out.println("Table range-clicked at "+p+(collect?", collect":"")); + + }}); + view.getTable().getSetClickEvent().add(new IListener2<Position, Boolean>(){ @Override - public void fire(Position value) { - System.out.println("Table clicked at "+value); + public void fire(Position p, Boolean collect) { + System.out.println("Table set-clicked at "+p+(collect?", collect":"")); }}); |