Deprecated EventRouter with a message that it will be replaced before 7.0.0 (#8640)

3 files changed, 23 insertions, 0 deletions

diff --git a/server/src/com/vaadin/event/EventRouter.java b/server/src/com/vaadin/event/EventRouter.java
index 80c6e5294d..18f13b0ea2 100644
--- a/server/src/com/vaadin/event/EventRouter.java
+++ b/server/src/com/vaadin/event/EventRouter.java
@@ -31,8 +31,11 @@ import java.util.List;
  * 
  * @author Vaadin Ltd.
  * @since 3.0
+ * @deprecated The EventRouter will be replaced by an EventRouter which does not
+ *             use reflection in Vaadin 7.0.0. See #8640.
  */
 @SuppressWarnings("serial")
+@Deprecated
 public class EventRouter implements MethodEventSource {
 
     /**
diff --git a/server/src/com/vaadin/event/ListenerMethod.java b/server/src/com/vaadin/event/ListenerMethod.java
index 2c43b31390..199c02e091 100644
--- a/server/src/com/vaadin/event/ListenerMethod.java
+++ b/server/src/com/vaadin/event/ListenerMethod.java
@@ -49,7 +49,10 @@ import java.util.logging.Logger;
  * 
  * @author Vaadin Ltd.
  * @since 3.0
+ * @deprecated The EventRouter will be replaced by an EventRouter which does not
+ *             use reflection in Vaadin 7.0.0. See #8640.
  */
+@Deprecated
 @SuppressWarnings("serial")
 public class ListenerMethod implements EventListener, Serializable {
 
diff --git a/server/src/com/vaadin/ui/AbstractComponent.java b/server/src/com/vaadin/ui/AbstractComponent.java
index 85938c4fe3..09b471cc36 100644
--- a/server/src/com/vaadin/ui/AbstractComponent.java
+++ b/server/src/com/vaadin/ui/AbstractComponent.java
@@ -66,7 +66,11 @@ public abstract class AbstractComponent extends AbstractClientConnector
 
     /**
      * The EventRouter used for the event model.
+     * 
+     * @deprecated The EventRouter will be replaced by an EventRouter which does
+     *             not use reflection in Vaadin 7.0.0. See #8640.
      */
+    @Deprecated
     private EventRouter eventRouter = null;
 
     /**
@@ -732,7 +736,10 @@ public abstract class AbstractComponent extends AbstractClientConnector
      *            the activation method.
      * 
      * @since 6.2
+     * @deprecated The EventRouter will be replaced by an EventRouter which does
+     *             not use reflection in Vaadin 7.0.0. See #8640.
      */
+    @Deprecated
     protected void addListener(String eventIdentifier, Class<?> eventType,
             Object target, Method method) {
         if (eventRouter == null) {
@@ -817,8 +824,12 @@ public abstract class AbstractComponent extends AbstractClientConnector
      *            the object instance who owns the activation method.
      * @param method
      *            the activation method.
+     * 
+     * @deprecated The EventRouter will be replaced by an EventRouter which does
+     *             not use reflection in Vaadin 7.0.0. See #8640.
      */
     @Override
+    @Deprecated
     public void addListener(Class<?> eventType, Object target, Method method) {
         if (eventRouter == null) {
             eventRouter = new EventRouter();
@@ -859,8 +870,11 @@ public abstract class AbstractComponent extends AbstractClientConnector
      *            the object instance who owns the activation method.
      * @param methodName
      *            the name of the activation method.
+     * @deprecated The EventRouter will be replaced by an EventRouter which does
+     *             not use reflection in Vaadin 7.0.0. See #8640.
      */
     @Override
+    @Deprecated
     public void addListener(Class<?> eventType, Object target, String methodName) {
         if (eventRouter == null) {
             eventRouter = new EventRouter();
@@ -911,8 +925,11 @@ public abstract class AbstractComponent extends AbstractClientConnector
      * @param method
      *            the method owned by <code>target</code> that's registered to
      *            listen to events of type <code>eventType</code>.
+     * @deprecated The EventRouter will be replaced by an EventRouter which does
+     *             not use reflection in Vaadin 7.0.0. See #8640.
      */
     @Override
+    @Deprecated
     public void removeListener(Class<?> eventType, Object target, Method method) {
         if (eventRouter != null) {
             eventRouter.removeListener(eventType, target, method);