Change View.navigateTo(String) to View.enter(ViewChangeEvent) (#9055, #9056)

2 files changed, 12 insertions, 9 deletions

diff --git a/server/src/com/vaadin/navigator/Navigator.java b/server/src/com/vaadin/navigator/Navigator.java
index 8332c0e45e..bda422379c 100644
--- a/server/src/com/vaadin/navigator/Navigator.java
+++ b/server/src/com/vaadin/navigator/Navigator.java
@@ -67,7 +67,7 @@ public class Navigator implements Serializable {
         }
 
         @Override
-        public void navigateTo(String parameters) {
+        public void enter(ViewChangeEvent event) {
             // nothing to do
         }
     }
@@ -483,7 +483,7 @@ public class Navigator implements Serializable {
             }
         }
 
-        view.navigateTo(parameters);
+        view.enter(event);
         currentView = view;
 
         if (display != null) {
diff --git a/server/src/com/vaadin/navigator/View.java b/server/src/com/vaadin/navigator/View.java
index ffe9cfd0a9..53dbf01319 100644
--- a/server/src/com/vaadin/navigator/View.java
+++ b/server/src/com/vaadin/navigator/View.java
@@ -18,6 +18,7 @@ package com.vaadin.navigator;
 
 import java.io.Serializable;
 
+import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent;
 import com.vaadin.ui.Component;
 
 /**
@@ -34,13 +35,15 @@ public interface View extends Serializable {
     /**
      * This view is navigated to.
      * 
-     * This method is always called before the view is shown on screen. If there
-     * is any additional id to data what should be shown in the view, it is also
-     * optionally passed as parameter.
+     * This method is always called before the view is shown on screen.
+     * {@link ViewChangeEvent#getParameters() event.getParameters()} may contain
+     * extra parameters relevant to the view.
+     * 
+     * @param event
+     *            ViewChangeEvent representing the view change that is
+     *            occurring. {@link ViewChangeEvent#getNewView()
+     *            event.getNewView()} returns <code>this</code>.
      * 
-     * @param parameters
-     *            parameters to the view or empty string if none given. This is
-     *            the string that appears e.g. in URI after "viewname/"
      */
-    public void navigateTo(String parameters);
+    public void enter(ViewChangeEvent event);
 }
\ No newline at end of file