From: Henri Sara <henri.sara@itmill.com>
Date: Thu, 26 Nov 2009 09:52:23 +0000 (+0000)
Subject: Visibility corrections
X-Git-Tag: 6.7.0.beta1~2242
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=90cd28cf28e332a12a4cb7eb5b01dbdc6bc0bcd5;p=vaadin-framework.git

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 b3035a7cc4..fb01e13419 100644
--- 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 9fdaac1bff..26abd0fa3e 100644
--- 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 b047556371..07b0f84338 100644
--- 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("/")) {