Refactor listener registration creation to reduce boilerplate

Change-Id: I9feaad000cb16351d281d1c0037330dfb76186ff

1 files changed, 7 insertions, 2 deletions

diff --git a/server/src/main/java/com/vaadin/event/MethodEventSource.java b/server/src/main/java/com/vaadin/event/MethodEventSource.java
index 42f4902122..2ba5586eb1 100644
--- a/server/src/main/java/com/vaadin/event/MethodEventSource.java
+++ b/server/src/main/java/com/vaadin/event/MethodEventSource.java
@@ -19,6 +19,8 @@ package com.vaadin.event;
 import java.io.Serializable;
 import java.lang.reflect.Method;
 
+import com.vaadin.shared.Registration;
+
 /**
  * <p>
  * Interface for classes supporting registration of methods as event receivers.
@@ -54,13 +56,15 @@ public interface MethodEventSource extends Serializable {
      *            the object instance who owns the activation method.
      * @param method
      *            the activation method.
+     * @return a registration object for removing the listener
      * @throws java.lang.IllegalArgumentException
      *             unless <code>method</code> has exactly one match in
      *             <code>object</code>
      * @throws NullPointerException
      *             if {@code object} is {@code null}
      */
-    public void addListener(Class<?> eventType, Object object, Method method);
+    public Registration addListener(Class<?> eventType, Object object,
+            Method method);
 
     /**
      * <p>
@@ -89,13 +93,14 @@ public interface MethodEventSource extends Serializable {
      *            the object instance who owns the activation method.
      * @param methodName
      *            the name of the activation method.
+     * @return a registration object for removing the listener
      * @throws java.lang.IllegalArgumentException
      *             unless <code>method</code> has exactly one match in
      *             <code>object</code>
      * @throws NullPointerException
      *             if {@code object} is {@code null}
      */
-    public void addListener(Class<?> eventType, Object object,
+    public Registration addListener(Class<?> eventType, Object object,
             String methodName);
 
     /**