Make StonePanel emit Stone click events

git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@80 72836036-5685-4462-b002-a69064685172

1 files changed, 53 insertions, 36 deletions

diff --git a/src/jrummikub/JRummikub.java b/src/jrummikub/JRummikub.java
index 6b76af6..54566d5 100644
--- a/src/jrummikub/JRummikub.java
+++ b/src/jrummikub/JRummikub.java
@@ -13,6 +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;
 
@@ -70,82 +71,98 @@ public class JRummikub {
     view.getPlayerPanel().getHandPanel().setStones(stones);
 
     view.getPlayerPanel().getHandPanel().getClickEvent()
-        .add(new IListener2<Position, Boolean>() {
+        .add(new IListener1<Position>() {
           @Override
-          public void fire(Position p, Boolean collect) {
-            System.out.println("Board clicked at " + p
+          public void fire(Position p) {
+            System.out.println("Hand clicked at " + p);
+          }
+        });
+    view.getPlayerPanel().getHandPanel().getStoneClickEvent()
+        .add(new IListener2<Stone, Boolean>() {
+          @Override
+          public void fire(Stone s, Boolean collect) {
+            System.out.println("Hand clicked on " + s
                 + (collect ? ", collect" : ""));
 
           }
         });
     view.getPlayerPanel().getHandPanel().getRangeClickEvent()
-        .add(new IListener2<Position, Boolean>() {
+        .add(new IListener2<Stone, Boolean>() {
           @Override
-          public void fire(Position p, Boolean collect) {
-            System.out.println("Board range-clicked at " + p
+          public void fire(Stone s, Boolean collect) {
+            System.out.println("Hand range-clicked on " + s
                 + (collect ? ", collect" : ""));
 
           }
         });
     view.getPlayerPanel().getHandPanel().getSetClickEvent()
-        .add(new IListener2<Position, Boolean>() {
+        .add(new IListener2<Stone, Boolean>() {
           @Override
-          public void fire(Position p, Boolean collect) {
-            System.out.println("Board set-clicked at " + p
+          public void fire(Stone s, Boolean collect) {
+            System.out.println("Hand set-clicked at " + s
                 + (collect ? ", collect" : ""));
 
           }
         });
 
-    view.getTablePanel().getClickEvent().add(new IListener2<Position, Boolean>() {
-      @Override
-      public void fire(Position p, Boolean collect) {
-        System.out.println("Table clicked at " + p
-            + (collect ? ", collect" : ""));
+    view.getTablePanel().getClickEvent()
+        .add(new IListener1<Position>() {
+          @Override
+          public void fire(Position p) {
+            System.out.println("Table clicked at " + p);
+          }
+        });
+    view.getTablePanel().getStoneClickEvent()
+        .add(new IListener2<Stone, Boolean>() {
+          @Override
+          public void fire(Stone s, Boolean collect) {
+            System.out.println("Table clicked on " + s
+                + (collect ? ", collect" : ""));
 
-      }
-    });
+          }
+        });
     view.getTablePanel().getRangeClickEvent()
-        .add(new IListener2<Position, Boolean>() {
+        .add(new IListener2<Stone, Boolean>() {
           @Override
-          public void fire(Position p, Boolean collect) {
-            System.out.println("Table range-clicked at " + p
+          public void fire(Stone s, Boolean collect) {
+            System.out.println("Table range-clicked on " + s
                 + (collect ? ", collect" : ""));
 
           }
         });
-    view.getTablePanel().getSetClickEvent().add(new IListener2<Position, Boolean>() {
-      @Override
-      public void fire(Position p, Boolean collect) {
-        System.out.println("Table set-clicked at " + p
-            + (collect ? ", collect" : ""));
+    view.getTablePanel().getSetClickEvent()
+        .add(new IListener2<Stone, Boolean>() {
+          @Override
+          public void fire(Stone s, Boolean collect) {
+            System.out.println("Table set-clicked at " + s
+                + (collect ? ", collect" : ""));
 
-      }
-    });
+          }
+        });
 
-    view.getTablePanel().getStoneCollectionPanel().getClickEvent()
-        .add(new IListener2<Position, Boolean>() {
+    view.getTablePanel().getStoneCollectionPanel().getStoneClickEvent()
+        .add(new IListener2<Stone, Boolean>() {
           @Override
-          public void fire(Position p, Boolean collect) {
-            System.out.println("Collection clicked at " + p
+          public void fire(Stone s, Boolean collect) {
+            System.out.println("Collection clicked on " + s
                 + (collect ? ", collect" : ""));
 
           }
         });
     view.getTablePanel().getStoneCollectionPanel().getRangeClickEvent()
-        .add(new IListener2<Position, Boolean>() {
+        .add(new IListener2<Stone, Boolean>() {
           @Override
-          public void fire(Position p, Boolean collect) {
-            System.out.println("Collection range-clicked at " + p
+          public void fire(Stone s, Boolean collect) {
+            System.out.println("Collection range-clicked on " + s
                 + (collect ? ", collect" : ""));
 
           }
         });
     view.getTablePanel().getStoneCollectionPanel().getSetClickEvent()
-        .add(new IListener2<Position, Boolean>() {
+        .add(new IListener2<Stone, Boolean>() {
           @Override
-          public void fire(Position p, Boolean collect) {
-            System.out.println("Collection set-clicked at " + p
+          public void fire(Stone s, Boolean collect) {
+            System.out.println("Collection set-clicked at " + s
                 + (collect ? ", collect" : ""));
 
           }