Rename event and listener methods

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

src/jrummikub/JRummikub.java

@@ -40,19 +40,19 @@ public class JRummikub {
 
     view.getPlayerPanel().getSortByNumberEvent().add(new IListener() {
       @Override
-      public void fire() {
+      public void handle() {
         System.out.println("'Sort by number' fired");
       }
     });
     view.getPlayerPanel().getSortByColorEvent().add(new IListener() {
       @Override
-      public void fire() {
+      public void handle() {
         System.out.println("'Sort by color' fired");
       }
     });
     view.getPlayerPanel().getEndTurnEvent().add(new IListener() {
       @Override
-      public void fire() {
+      public void handle() {
         System.out.println("'End turn' fired");
       }
     });
@@ -73,14 +73,14 @@ public class JRummikub {
     view.getPlayerPanel().getHandPanel().getClickEvent()
         .add(new IListener1<Position>() {
           @Override
-          public void fire(Position p) {
+          public void handle(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) {
+          public void handle(Stone s, Boolean collect) {
             System.out.println("Hand clicked on " + s
                 + (collect ? ", collect" : ""));
 
@@ -89,7 +89,7 @@ public class JRummikub {
     view.getPlayerPanel().getHandPanel().getRangeClickEvent()
         .add(new IListener2<Stone, Boolean>() {
           @Override
-          public void fire(Stone s, Boolean collect) {
+          public void handle(Stone s, Boolean collect) {
             System.out.println("Hand range-clicked on " + s
                 + (collect ? ", collect" : ""));
 
@@ -98,7 +98,7 @@ public class JRummikub {
     view.getPlayerPanel().getHandPanel().getSetClickEvent()
         .add(new IListener2<Stone, Boolean>() {
           @Override
-          public void fire(Stone s, Boolean collect) {
+          public void handle(Stone s, Boolean collect) {
             System.out.println("Hand set-clicked at " + s
                 + (collect ? ", collect" : ""));
 
@@ -108,14 +108,14 @@ public class JRummikub {
     view.getTablePanel().getClickEvent()
         .add(new IListener1<Position>() {
           @Override
-          public void fire(Position p) {
+          public void handle(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) {
+          public void handle(Stone s, Boolean collect) {
             System.out.println("Table clicked on " + s
                 + (collect ? ", collect" : ""));
 
@@ -124,7 +124,7 @@ public class JRummikub {
     view.getTablePanel().getRangeClickEvent()
         .add(new IListener2<Stone, Boolean>() {
           @Override
-          public void fire(Stone s, Boolean collect) {
+          public void handle(Stone s, Boolean collect) {
             System.out.println("Table range-clicked on " + s
                 + (collect ? ", collect" : ""));
 
@@ -133,7 +133,7 @@ public class JRummikub {
     view.getTablePanel().getSetClickEvent()
         .add(new IListener2<Stone, Boolean>() {
           @Override
-          public void fire(Stone s, Boolean collect) {
+          public void handle(Stone s, Boolean collect) {
             System.out.println("Table set-clicked at " + s
                 + (collect ? ", collect" : ""));
 
@@ -143,7 +143,7 @@ public class JRummikub {
     view.getTablePanel().getStoneCollectionPanel().getStoneClickEvent()
         .add(new IListener2<Stone, Boolean>() {
           @Override
-          public void fire(Stone s, Boolean collect) {
+          public void handle(Stone s, Boolean collect) {
             System.out.println("Collection clicked on " + s
                 + (collect ? ", collect" : ""));
 
@@ -152,7 +152,7 @@ public class JRummikub {
     view.getTablePanel().getStoneCollectionPanel().getRangeClickEvent()
         .add(new IListener2<Stone, Boolean>() {
           @Override
-          public void fire(Stone s, Boolean collect) {
+          public void handle(Stone s, Boolean collect) {
             System.out.println("Collection range-clicked on " + s
                 + (collect ? ", collect" : ""));
 
@@ -161,7 +161,7 @@ public class JRummikub {
     view.getTablePanel().getStoneCollectionPanel().getSetClickEvent()
         .add(new IListener2<Stone, Boolean>() {
           @Override
-          public void fire(Stone s, Boolean collect) {
+          public void handle(Stone s, Boolean collect) {
             System.out.println("Collection set-clicked at " + s
                 + (collect ? ", collect" : ""));
 

src/jrummikub/util/Event.java

@@ -17,9 +17,9 @@ public class Event implements IEvent {
   }
 
   /** Generate a single event */
-	public void fire() {
+  public void emit() {
     for (IListener listener : listeners) {
-			listener.fire();
+      listener.handle();
     }
   }
 }

src/jrummikub/util/Event1.java

@@ -27,9 +27,9 @@ public class Event1<T> implements IEvent1<T> {
 	 * @param value
 	 *            the event parameter
 	 */
-	public void fire(T value) {
+  public void emit(T value) {
 		for (IListener1<T> listener : listeners) {
-			listener.fire(value);
+			listener.handle(value);
 		}
 	}
 }

src/jrummikub/util/Event2.java

@@ -31,9 +31,9 @@ public class Event2<T1, T2> implements IEvent2<T1, T2> {
 	 * @param value2
 	 *            the second event parameter
 	 */
-	public void fire(T1 value1, T2 value2) {
+  public void emit(T1 value1, T2 value2) {
 		for (IListener2<T1, T2> listener : listeners) {
-			listener.fire(value1, value2);
+			listener.handle(value1, value2);
 		}
 	}
 }

src/jrummikub/util/IListener.java

@@ -5,5 +5,5 @@ package jrummikub.util;
  */
 public interface IListener {
   /** This method is called whenever a class we're listening to emits an event */
-	public void fire();
+  public void handle();
 }

src/jrummikub/util/IListener1.java

@@ -14,5 +14,5 @@ public interface IListener1<T> {
 	 * @param value
 	 *            the event parameter
 	 */
-	public void fire(T value);
+  public void handle(T value);
 }

src/jrummikub/util/IListener2.java

@@ -18,5 +18,5 @@ public interface IListener2<T1, T2> {
 	 * @param value2
 	 *            the second event parameter
 	 */
-	public void fire(T1 value1, T2 value2);
+  public void handle(T1 value1, T2 value2);
 }

src/jrummikub/view/impl/AbstractStonePanel.java

@@ -65,7 +65,7 @@ abstract class AbstractStonePanel extends JPanel implements IStonePanel,
         Stone stone = getStoneAt(pos);
 
         if (stone == null) {
-          clickEvent.fire(pos);
+          clickEvent.emit(pos);
           return;
         }
 
@@ -76,7 +76,7 @@ abstract class AbstractStonePanel extends JPanel implements IStonePanel,
         else if (e.getClickCount() >= 2)
           event = setClickEvent;
 
-        event.fire(stone, e.isControlDown());
+        event.emit(stone, e.isControlDown());
       }
     });
   }

src/jrummikub/view/impl/PlayerPanel.java

@@ -96,7 +96,7 @@ class PlayerPanel extends JPanel implements IPlayerPanel {
     sortByNumberButton.addActionListener(new ActionListener() {
       @Override
       public void actionPerformed(ActionEvent arg0) {
-        sortByNumberEvent.fire();
+        sortByNumberEvent.emit();
       }
     });
     leftPanel.add(sortByNumberButton);
@@ -107,7 +107,7 @@ class PlayerPanel extends JPanel implements IPlayerPanel {
     sortByColorButton.addActionListener(new ActionListener() {
       @Override
       public void actionPerformed(ActionEvent arg0) {
-        sortByColorEvent.fire();
+        sortByColorEvent.emit();
       }
     });
     leftPanel.add(sortByColorButton);
@@ -131,7 +131,7 @@ class PlayerPanel extends JPanel implements IPlayerPanel {
     endTurnButton.addActionListener(new ActionListener() {
       @Override
       public void actionPerformed(ActionEvent arg0) {
-        endTurnEvent.fire();
+        endTurnEvent.emit();
       }
     });
 

test/jrummikub/util/Event1Test.java

@@ -15,15 +15,15 @@ public class Event1Test {
     testEvent.add(new IListener1<Integer>() {
 
       @Override
-      public void fire(Integer n) {
+      public void handle(Integer n) {
         fired += n;
 
       }
     });
     assertEquals(fired, 0);
-    testEvent.fire(10);
+    testEvent.emit(10);
     assertEquals(fired, 10);
-    testEvent.fire(20);
+    testEvent.emit(20);
     assertEquals(fired, 30);
   }
 
@@ -35,7 +35,7 @@ public class Event1Test {
     testEvent.add(new IListener1<Integer>() {
 
       @Override
-      public void fire(Integer n) {
+      public void handle(Integer n) {
         fired += n;
 
       }
@@ -43,14 +43,14 @@ public class Event1Test {
     testEvent.add(new IListener1<Integer>() {
 
       @Override
-      public void fire(Integer n) {
+      public void handle(Integer n) {
         fired2 -= n;
 
       }
     });
     assertEquals(fired, 0);
     assertEquals(fired2, 0);
-    testEvent.fire(5);
+    testEvent.emit(5);
     assertEquals(fired, 5);
     assertEquals(fired2, -5);
 
@@ -63,7 +63,7 @@ public class Event1Test {
     testEvent.add(new IListener1<Integer>() {
 
       @Override
-      public void fire(Integer n) {
+      public void handle(Integer n) {
         fired += n;
 
       }
@@ -71,13 +71,13 @@ public class Event1Test {
     IListener1<Integer> rem = new IListener1<Integer>() {
 
       @Override
-      public void fire(Integer n) {
+      public void handle(Integer n) {
         fail();
       }
     };
     testEvent.add(rem);
     testEvent.remove(rem);
-    testEvent.fire(10);
+    testEvent.emit(10);
     assertEquals(fired, 10);
   }
 }

test/jrummikub/util/Event2Test.java

@@ -16,17 +16,17 @@ public class Event2Test {
     testEvent.add(new IListener2<Integer, Integer>() {
 
       @Override
-      public void fire(Integer n, Integer m) {
+      public void handle(Integer n, Integer m) {
         fired += n;
         fired2 += m;
       }
     });
     assertEquals(fired, 0);
     assertEquals(fired2, 0);
-    testEvent.fire(10, 5);
+    testEvent.emit(10, 5);
     assertEquals(fired, 10);
     assertEquals(fired2, 5);
-    testEvent.fire(20, 45);
+    testEvent.emit(20, 45);
     assertEquals(fired, 30);
     assertEquals(fired2, 50);
   }
@@ -41,7 +41,7 @@ public class Event2Test {
     testEvent.add(new IListener2<Integer, Integer>() {
 
       @Override
-      public void fire(Integer n, Integer m) {
+      public void handle(Integer n, Integer m) {
         fired += n;
         fired2 += m;
       }
@@ -49,7 +49,7 @@ public class Event2Test {
     testEvent.add(new IListener2<Integer, Integer>() {
 
       @Override
-      public void fire(Integer n, Integer m) {
+      public void handle(Integer n, Integer m) {
         fired3 -= n;
         fired4 -= m;
       }
@@ -58,7 +58,7 @@ public class Event2Test {
     assertEquals(fired2, 0);
     assertEquals(fired3, 0);
     assertEquals(fired4, 0);
-    testEvent.fire(5, 10);
+    testEvent.emit(5, 10);
     assertEquals(fired, 5);
     assertEquals(fired2, 10);
     assertEquals(fired3, -5);
@@ -73,7 +73,7 @@ public class Event2Test {
     testEvent.add(new IListener2<Integer, Integer>() {
 
       @Override
-      public void fire(Integer n, Integer m) {
+      public void handle(Integer n, Integer m) {
         fired += n;
         fired2 += m;
       }
@@ -81,7 +81,7 @@ public class Event2Test {
     IListener2<Integer, Integer> rem = new IListener2<Integer, Integer>() {
 
       @Override
-      public void fire(Integer n, Integer m) {
+      public void handle(Integer n, Integer m) {
         fail();
       }
     };
@@ -89,7 +89,7 @@ public class Event2Test {
     assertEquals(fired2, 0);
     testEvent.add(rem);
     testEvent.remove(rem);
-    testEvent.fire(10, 20);
+    testEvent.emit(10, 20);
     assertEquals(fired, 10);
     assertEquals(fired2, 20);
   }

test/jrummikub/util/EventTest.java

@@ -13,16 +13,16 @@ public class EventTest {
     testEvent.add(new IListener() {
 
       @Override
-      public void fire() {
+      public void handle() {
         fired = true;
 
       }
     });
     assertFalse(fired);
-    testEvent.fire();
+    testEvent.emit();
     assertTrue(fired);
     fired = false;
-    testEvent.fire();
+    testEvent.emit();
     assertTrue(fired);
   }
 
@@ -34,7 +34,7 @@ public class EventTest {
     testEvent.add(new IListener() {
 
       @Override
-      public void fire() {
+      public void handle() {
         fired = true;
 
       }
@@ -42,14 +42,14 @@ public class EventTest {
     testEvent.add(new IListener() {
 
       @Override
-      public void fire() {
+      public void handle() {
         fired2 = true;
 
       }
     });
     assertFalse(fired);
     assertFalse(fired2);
-    testEvent.fire();
+    testEvent.emit();
     assertTrue(fired);
     assertTrue(fired2);
 
@@ -62,7 +62,7 @@ public class EventTest {
     testEvent.add(new IListener() {
 
       @Override
-      public void fire() {
+      public void handle() {
         fired = true;
 
       }
@@ -70,13 +70,13 @@ public class EventTest {
     IListener rem = new IListener() {
 
       @Override
-      public void fire() {
+      public void handle() {
         fail();
       }
     };
     testEvent.add(rem);
     testEvent.remove(rem);
-    testEvent.fire();
+    testEvent.emit();
     assertTrue(fired);
   }