Added prefix "v-" to internal parameters (#10156)

Change-Id: I79ac824bc19fa42b976954148e69d54fb91b77ab

7 files changed, 21 insertions, 17 deletions

diff --git a/server/src/com/vaadin/server/AbstractCommunicationManager.java b/server/src/com/vaadin/server/AbstractCommunicationManager.java
index 19b0ac2aee..0a3dff8120 100644
--- a/server/src/com/vaadin/server/AbstractCommunicationManager.java
+++ b/server/src/com/vaadin/server/AbstractCommunicationManager.java
@@ -618,7 +618,7 @@ public abstract class AbstractCommunicationManager implements Serializable {
      * @param request
      */
     private void checkWidgetsetVersion(VaadinRequest request) {
-        String widgetsetVersion = request.getParameter("wsver");
+        String widgetsetVersion = request.getParameter("v-wsver");
         if (widgetsetVersion == null) {
             // Only check when the widgetset version is reported. It is reported
             // in the first UIDL request (not the initial request as it is a
@@ -2443,7 +2443,7 @@ public abstract class AbstractCommunicationManager implements Serializable {
         // Check for an existing UI based on window.name
 
         // Special parameter sent by vaadinBootstrap.js
-        String windowName = request.getParameter("wn");
+        String windowName = request.getParameter("v-wn");
 
         Map<String, Integer> retainOnRefreshUIs = session
                 .getPreserveOnRefreshUIs();
@@ -2515,7 +2515,7 @@ public abstract class AbstractCommunicationManager implements Serializable {
         UI.setCurrent(ui);
 
         // Fire fragment change if the fragment has changed
-        String location = request.getParameter("loc");
+        String location = request.getParameter("v-loc");
         if (location != null) {
             ui.getPage().updateLocation(location);
         }
diff --git a/server/src/com/vaadin/server/Page.java b/server/src/com/vaadin/server/Page.java
index f2b5498fd1..157b91cdcd 100644
--- a/server/src/com/vaadin/server/Page.java
+++ b/server/src/com/vaadin/server/Page.java
@@ -436,9 +436,9 @@ public class Page implements Serializable {
 
     public void init(VaadinRequest request) {
         // Extract special parameter sent by vaadinBootstrap.js
-        String location = request.getParameter("loc");
-        String clientWidth = request.getParameter("cw");
-        String clientHeight = request.getParameter("ch");
+        String location = request.getParameter("v-loc");
+        String clientWidth = request.getParameter("v-cw");
+        String clientHeight = request.getParameter("v-ch");
 
         if (location != null) {
             try {
diff --git a/server/src/com/vaadin/server/PortletCommunicationManager.java b/server/src/com/vaadin/server/PortletCommunicationManager.java
index 3e0af96bf7..6a1c02b1e4 100644
--- a/server/src/com/vaadin/server/PortletCommunicationManager.java
+++ b/server/src/com/vaadin/server/PortletCommunicationManager.java
@@ -118,7 +118,7 @@ public class PortletCommunicationManager extends AbstractCommunicationManager {
                 MimeResponse portletResponse = (MimeResponse) response
                         .getPortletResponse();
                 ResourceURL resourceURL = portletResponse.createResourceURL();
-                resourceURL.setResourceID("browserDetails");
+                resourceURL.setResourceID("v-browserDetails");
                 parameters.put("browserDetailsUrl", resourceURL.toString());
 
                 // Always send path info as a query parameter
diff --git a/server/src/com/vaadin/server/VaadinPortlet.java b/server/src/com/vaadin/server/VaadinPortlet.java
index 58f7da0401..507f563289 100644
--- a/server/src/com/vaadin/server/VaadinPortlet.java
+++ b/server/src/com/vaadin/server/VaadinPortlet.java
@@ -349,7 +349,7 @@ public class VaadinPortlet extends GenericPortlet implements Constants {
 
     private boolean isBrowserDetailsRequest(ResourceRequest request) {
         return request.getResourceID() != null
-                && request.getResourceID().equals("browserDetails");
+                && request.getResourceID().equals("v-browserDetails");
     }
 
     private boolean isDummyRequest(ResourceRequest request) {
diff --git a/server/src/com/vaadin/server/VaadinRequest.java b/server/src/com/vaadin/server/VaadinRequest.java
index ebf405d4f3..58cbfdd18d 100644
--- a/server/src/com/vaadin/server/VaadinRequest.java
+++ b/server/src/com/vaadin/server/VaadinRequest.java
@@ -56,7 +56,9 @@ public interface VaadinRequest extends Serializable {
     public String getParameter(String parameter);
 
     /**
-     * Gets all the parameters of the request.
+     * Gets all the parameters of the request. Framework's internal init
+     * parameters have prefix "v-" (does not include such parameters as "theme"
+     * and "debug").
      * 
      * @see #getParameter(String)
      * 
diff --git a/server/src/com/vaadin/server/VaadinServlet.java b/server/src/com/vaadin/server/VaadinServlet.java
index 0ad4dea37d..b099767b4f 100644
--- a/server/src/com/vaadin/server/VaadinServlet.java
+++ b/server/src/com/vaadin/server/VaadinServlet.java
@@ -1124,7 +1124,7 @@ public class VaadinServlet extends HttpServlet implements Constants {
 
     private static boolean isBrowserDetailsRequest(HttpServletRequest request) {
         return "POST".equals(request.getMethod())
-                && request.getParameter("browserDetails") != null;
+                && request.getParameter("v-browserDetails") != null;
     }
 
     private boolean isStaticResourceRequest(HttpServletRequest request) {
diff --git a/server/src/com/vaadin/server/WebBrowser.java b/server/src/com/vaadin/server/WebBrowser.java
index 468b36921c..f69956e267 100644
--- a/server/src/com/vaadin/server/WebBrowser.java
+++ b/server/src/com/vaadin/server/WebBrowser.java
@@ -424,13 +424,15 @@ public class WebBrowser implements Serializable {
             browserDetails = new VBrowserDetails(agent);
         }
 
-        if (request.getParameter("sw") != null) {
-            updateClientSideDetails(request.getParameter("sw"),
-                    request.getParameter("sh"), request.getParameter("tzo"),
-                    request.getParameter("rtzo"), request.getParameter("dstd"),
-                    request.getParameter("dston"),
-                    request.getParameter("curdate"),
-                    request.getParameter("td") != null);
+        if (request.getParameter("v-sw") != null) {
+            updateClientSideDetails(request.getParameter("v-sw"),
+                    request.getParameter("v-sh"),
+                    request.getParameter("v-tzo"),
+                    request.getParameter("v-rtzo"),
+                    request.getParameter("v-dstd"),
+                    request.getParameter("v-dston"),
+                    request.getParameter("v-curdate"),
+                    request.getParameter("v-td") != null);
         }
     }