1 files changed, 20 insertions, 2 deletions
diff --git a/server/src/com/vaadin/navigator/Navigator.java b/server/src/com/vaadin/navigator/Navigator.java
index 1fa11184b9..2e2cd5ec83 100644
--- a/server/src/com/vaadin/navigator/Navigator.java
+++ b/server/src/com/vaadin/navigator/Navigator.java
@@ -651,18 +651,36 @@ public class Navigator implements Serializable {
      * @param listener
      *            Listener to invoke after view changes.
      */
-    public void addListener(ViewChangeListener listener) {
+    public void addViewChangeListener(ViewChangeListener listener) {
         listeners.add(listener);
     }
 
     /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #addViewChangeListener(ViewChangeListener)}
+     **/
+    @Deprecated
+    public void addListener(ViewChangeListener listener) {
+        addViewChangeListener(listener);
+    }
+
+    /**
      * Remove a view change listener.
      * 
      * @param listener
      *            Listener to remove.
      */
-    public void removeListener(ViewChangeListener listener) {
+    public void removeViewChangeListener(ViewChangeListener listener) {
         listeners.remove(listener);
     }
 
+    /**
+     * @deprecated Since 7.0, replaced by
+     *             {@link #removeViewChangeListener(ViewChangeListener)}
+     **/
+    @Deprecated
+    public void removeListener(ViewChangeListener listener) {
+        removeViewChangeListener(listener);
+    }
+
 }