Visibility corrections

svn changeset:10063/svn branch:6.2

diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java
index b3035a7cc4429ed93482f7f61566e67de4631a3f..fb01e13419db0cde0116fd6c80be8847af53bebe 100644 (file)
--- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java
@@ -269,7 +269,7 @@ public abstract class AbstractApplicationPortlet extends GenericPortlet
      * @return The location of static resources (inside which there should be a
      *         VAADIN directory). Does not end with a slash (/).
      */
-    private String getStaticFilesLocation(PortletRequest request) {
+    protected String getStaticFilesLocation(PortletRequest request) {
         // TODO allow overriding on portlet level?
         String staticFileLocation = getPortalProperty(
                 Constants.PORTAL_PARAMETER_VAADIN_RESOURCE_PATH, request

diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
index 9fdaac1bffc707a305df7d522a3ff84d22206864..26abd0fa3e631e85536578b632d3fb803bc2fc3c 100644 (file)
--- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
@@ -1176,7 +1176,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements
      * @return The location of static resources (should contain the VAADIN
      *         directory). Never ends with a slash (/).
      */
-    private String getStaticFilesLocation(HttpServletRequest request) {
+    protected String getStaticFilesLocation(HttpServletRequest request) {
 
         // request may have an attribute explicitly telling location (portal
         // case)

diff --git a/src/com/vaadin/terminal/gwt/server/ApplicationRunnerServlet.java b/src/com/vaadin/terminal/gwt/server/ApplicationRunnerServlet.java
index b047556371eb8a985e3f0358cb3d284943c719af..07b0f84338a679cf85c627171d887903d13376ff 100644 (file)
--- a/src/com/vaadin/terminal/gwt/server/ApplicationRunnerServlet.java
+++ b/src/com/vaadin/terminal/gwt/server/ApplicationRunnerServlet.java
@@ -89,7 +89,7 @@ public class ApplicationRunnerServlet extends AbstractApplicationServlet {
 
     /**
      * Parses application runner URIs.
-     * 
+     *
      * If request URL is e.g.
      * http://localhost:8080/vaadin/run/com.vaadin.demo.Calc then
      * <ul>
@@ -97,7 +97,7 @@ public class ApplicationRunnerServlet extends AbstractApplicationServlet {
      * <li>Runner servlet=run</li>
      * <li>Vaadin application=com.vaadin.demo.Calc</li>
      * </ul>
-     * 
+     *
      * @param request
      * @return string array containing widgetset URI, application URI and
      *         context, runner, application classname
@@ -194,7 +194,7 @@ public class ApplicationRunnerServlet extends AbstractApplicationServlet {
     }
 
     @Override
-    String getStaticFilesLocation(HttpServletRequest request) {
+    protected String getStaticFilesLocation(HttpServletRequest request) {
         URIS uris = getApplicationRunnerURIs(request);
         String staticFilesPath = uris.staticFilesPath;
         if (staticFilesPath.equals("/")) {