Refak listeners com.vaadin package

1 files changed, 21 insertions, 2 deletions

diff --git a/server/src/com/vaadin/Application.java b/server/src/com/vaadin/Application.java
index 7c80ce654a..164f04bb79 100644
--- a/server/src/com/vaadin/Application.java
+++ b/server/src/com/vaadin/Application.java
@@ -813,7 +813,7 @@ public class Application implements Terminal.ErrorListener, Serializable {
      * @param listener
      *            the user change listener to add.
      */
-    public void addListener(UserChangeListener listener) {
+    public void addUserChangeListener(UserChangeListener listener) {
         if (userChangeListeners == null) {
             userChangeListeners = new LinkedList<UserChangeListener>();
         }
@@ -821,12 +821,22 @@ public class Application implements Terminal.ErrorListener, Serializable {
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addUserChangeListener(UserChangeListener)}
+     **/
+    @Deprecated
+    public void addListener(UserChangeListener listener) {
+        addUserChangeListener(listener);
+    }
+
+    /**
      * Removes the user change listener.
      * 
      * @param listener
      *            the user change listener to remove.
      */
-    public void removeListener(UserChangeListener listener) {
+
+    public void removeUserChangeListener(UserChangeListener listener) {
         if (userChangeListeners == null) {
             return;
         }
@@ -837,6 +847,15 @@ public class Application implements Terminal.ErrorListener, Serializable {
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeUserChangeListener(UserChangeListener)}
+     **/
+    @Deprecated
+    public void removeListener(UserChangeListener listener) {
+        removeUserChangeListener(listener);
+    }
+
+    /**
      * Window detach event.
      * 
      * This event is sent each time a window is removed from the application