From bc96d13c542efbb056c10583e13d53613a1c123e Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Tue, 20 Nov 2012 08:47:00 +0200
Subject: [PATCH] Removed deprecation as EventRouter will not be replaced for
 7.0 (#10247)

Change-Id: I14cc9c837bb966ff7ed5c396cedce0f6d75aaeb4
---
 server/src/com/vaadin/event/EventRouter.java  |  3 ---
 .../src/com/vaadin/event/ListenerMethod.java  |  3 ---
 .../server/AbstractClientConnector.java       | 21 ++++++-------------
 3 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/server/src/com/vaadin/event/EventRouter.java b/server/src/com/vaadin/event/EventRouter.java
index 18f13b0ea2..80c6e5294d 100644
--- a/server/src/com/vaadin/event/EventRouter.java
+++ b/server/src/com/vaadin/event/EventRouter.java
@@ -31,11 +31,8 @@ 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 199c02e091..2c43b31390 100644
--- a/server/src/com/vaadin/event/ListenerMethod.java
+++ b/server/src/com/vaadin/event/ListenerMethod.java
@@ -49,10 +49,7 @@ 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/server/AbstractClientConnector.java b/server/src/com/vaadin/server/AbstractClientConnector.java
index a9007916f0..2e0b72b08a 100644
--- a/server/src/com/vaadin/server/AbstractClientConnector.java
+++ b/server/src/com/vaadin/server/AbstractClientConnector.java
@@ -87,11 +87,7 @@ public abstract class AbstractClientConnector implements ClientConnector,
 
     /**
      * 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;
 
     /**
@@ -675,10 +671,7 @@ public abstract class AbstractClientConnector implements ClientConnector,
      *            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) {
@@ -764,11 +757,8 @@ public abstract class AbstractClientConnector implements ClientConnector,
      * @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();
@@ -809,8 +799,9 @@ public abstract class AbstractClientConnector implements ClientConnector,
      *            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.
+     * @deprecated This method should be avoided. Use
+     *             {@link #addListener(Class, Object, Method)} or
+     *             {@link #addListener(String, Class, Object, Method)} instead.
      */
     @Override
     @Deprecated
@@ -864,11 +855,8 @@ public abstract class AbstractClientConnector implements ClientConnector,
      * @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);
@@ -902,7 +890,10 @@ public abstract class AbstractClientConnector implements ClientConnector,
      * @param methodName
      *            the name of the method owned by <code>target</code> that's
      *            registered to listen to events of type <code>eventType</code>.
+     * @deprecated This method should be avoided. Use
+     *             {@link #removeListener(Class, Object, Method)} instead.
      */
+    @Deprecated
     @Override
     public void removeListener(Class<?> eventType, Object target,
             String methodName) {
-- 
2.39.5