Reformatted server/src

Change-Id: Idfb1e782c6d544765f8ebad0f9c9969358f1e5fe

diff --git a/server/src/com/vaadin/data/validator/DoubleValidator.java b/server/src/com/vaadin/data/validator/DoubleValidator.java
index df5a3ca292ac1d22a9f67adcd620aacf5da5bed6..c382271e34fd6a41d7145673f851f865b2188d21 100644 (file)
--- a/server/src/com/vaadin/data/validator/DoubleValidator.java
+++ b/server/src/com/vaadin/data/validator/DoubleValidator.java
@@ -34,9 +34,9 @@ public class DoubleValidator extends AbstractStringValidator {
      * 
      * @param errorMessage
      *            the message to display in case the value does not validate.
-     * @deprecated As of 7.0. Use a Double converter on the field instead
-     *             and/or use a {@link DoubleRangeValidator} for validating that
-     *             the value is inside a given range.
+     * @deprecated As of 7.0. Use a Double converter on the field instead and/or
+     *             use a {@link DoubleRangeValidator} for validating that the
+     *             value is inside a given range.
      */
     @Deprecated
     public DoubleValidator(String errorMessage) {

diff --git a/server/src/com/vaadin/server/AbstractCommunicationManager.java b/server/src/com/vaadin/server/AbstractCommunicationManager.java
index 4525546f6de046e93870a1b6dc06acac15af4714..4c5122c338a13ec4e7d0c57972ae265f53c07b09 100644 (file)
--- a/server/src/com/vaadin/server/AbstractCommunicationManager.java
+++ b/server/src/com/vaadin/server/AbstractCommunicationManager.java
@@ -112,7 +112,8 @@ public abstract class AbstractCommunicationManager implements Serializable {
      * 
      * @author peholmst
      * 
-     * @deprecated As of 7.0. Will likely change or be removed in a future version
+     * @deprecated As of 7.0. Will likely change or be removed in a future
+     *             version
      */
     @Deprecated
     public interface Callback extends Serializable {
@@ -2334,7 +2335,8 @@ public abstract class AbstractCommunicationManager implements Serializable {
     /**
      * @return
      * 
-     * @deprecated As of 7.0. Will likely change or be removed in a future version
+     * @deprecated As of 7.0. Will likely change or be removed in a future
+     *             version
      */
     @Deprecated
     protected abstract BootstrapHandler createBootstrapHandler();

diff --git a/server/src/com/vaadin/server/ConnectorResourceHandler.java b/server/src/com/vaadin/server/ConnectorResourceHandler.java
index b82c0e2ff88d234c36ace78a12628ab7394c3a1b..19a63802b27e904e98a017d0cc2401054e63a006 100644 (file)
--- a/server/src/com/vaadin/server/ConnectorResourceHandler.java
+++ b/server/src/com/vaadin/server/ConnectorResourceHandler.java
@@ -62,8 +62,8 @@ public class ConnectorResourceHandler implements RequestHandler {
             }
 
             return true;
-        } else if (requestPath.matches('/'
-                + ApplicationConstants.APP_PATH + "(/.*)?")) {
+        } else if (requestPath.matches('/' + ApplicationConstants.APP_PATH
+                + "(/.*)?")) {
             /*
              * This should be the last request handler before we get to
              * bootstrap logic. Prevent /APP requests from reaching bootstrap

diff --git a/server/src/com/vaadin/server/GlobalResourceHandler.java b/server/src/com/vaadin/server/GlobalResourceHandler.java
index 94505658c33a7626aff8a145138fb3eac7c19fdc..13dbd006a44cf382dee473009f7c8930341814eb 100644 (file)
--- a/server/src/com/vaadin/server/GlobalResourceHandler.java
+++ b/server/src/com/vaadin/server/GlobalResourceHandler.java
@@ -61,9 +61,8 @@ public class GlobalResourceHandler implements RequestHandler {
 
     // APP/global/[uiid]/[type]/[id]
     private static final Matcher matcher = Pattern.compile(
-            "^/?" + ApplicationConstants.APP_PATH + '/'
-                    + RESOURCE_REQUEST_PATH + "(\\d+)/(([^/]+)(/.*))").matcher(
-            "");
+            "^/?" + ApplicationConstants.APP_PATH + '/' + RESOURCE_REQUEST_PATH
+                    + "(\\d+)/(([^/]+)(/.*))").matcher("");
 
     @Override
     public boolean handleRequest(VaadinSession session, VaadinRequest request,

diff --git a/server/src/com/vaadin/server/ServletPortletHelper.java b/server/src/com/vaadin/server/ServletPortletHelper.java
index cbedeabf515d7c61034d219708d0336d88801b36..7807128462bcf2c9c10e15d3907d5ca616d9f9c8 100644 (file)
--- a/server/src/com/vaadin/server/ServletPortletHelper.java
+++ b/server/src/com/vaadin/server/ServletPortletHelper.java
@@ -106,18 +106,15 @@ class ServletPortletHelper implements Serializable {
     }
 
     public static boolean isUIDLRequest(VaadinRequest request) {
-        return hasPathPrefix(request,
-                ApplicationConstants.UIDL_PATH + '/');
+        return hasPathPrefix(request, ApplicationConstants.UIDL_PATH + '/');
     }
 
     public static boolean isAppRequest(VaadinRequest request) {
-        return hasPathPrefix(request,
-                ApplicationConstants.APP_PATH + '/');
+        return hasPathPrefix(request, ApplicationConstants.APP_PATH + '/');
     }
 
     public static boolean isHeartbeatRequest(VaadinRequest request) {
-        return hasPathPrefix(request,
-                ApplicationConstants.HEARTBEAT_PATH + '/');
+        return hasPathPrefix(request, ApplicationConstants.HEARTBEAT_PATH + '/');
     }
 
     public static void initDefaultUIProvider(VaadinSession session,

diff --git a/server/src/com/vaadin/server/StreamVariable.java b/server/src/com/vaadin/server/StreamVariable.java
index 8a664f22c0f99751e49a9b1a68dd2435046a2b6b..4b7c91d870a6fd64c4c888555ded5128eb9591f3 100644 (file)
--- a/server/src/com/vaadin/server/StreamVariable.java
+++ b/server/src/com/vaadin/server/StreamVariable.java
@@ -151,8 +151,7 @@ public interface StreamVariable extends Serializable {
      * the streaming ended before the end of the input. The streaming may fail
      * due an interruption by {@link } or due an other unknown exception in
      * communication. In the latter case the exception is also passed to
-     * {@link VaadinSession#error(com.vaadin.server.Terminal.ErrorEvent)}
-     * .
+     * {@link VaadinSession#error(com.vaadin.server.Terminal.ErrorEvent)} .
      */
     public interface StreamingErrorEvent extends StreamingEvent {
 

diff --git a/server/src/com/vaadin/server/VaadinPortlet.java b/server/src/com/vaadin/server/VaadinPortlet.java
index 69eb3d4f025f57b26bc8f8aebcbcb8c05b83e64e..cae3642592276065ababce0ded54c216cb843504 100644 (file)
--- a/server/src/com/vaadin/server/VaadinPortlet.java
+++ b/server/src/com/vaadin/server/VaadinPortlet.java
@@ -64,7 +64,8 @@ import com.vaadin.util.CurrentInstance;
 public class VaadinPortlet extends GenericPortlet implements Constants {
 
     /**
-     * @deprecated As of 7.0. Will likely change or be removed in a future version
+     * @deprecated As of 7.0. Will likely change or be removed in a future
+     *             version
      */
     @Deprecated
     public static final String RESOURCE_URL_ID = "APP";
@@ -220,7 +221,8 @@ public class VaadinPortlet extends GenericPortlet implements Constants {
      * This portlet parameter is used to add styles to the main element. E.g
      * "height:500px" generates a style="height:500px" to the main element.
      * 
-     * @deprecated As of 7.0. Will likely change or be removed in a future version
+     * @deprecated As of 7.0. Will likely change or be removed in a future
+     *             version
      */
     @Deprecated
     public static final String PORTLET_PARAMETER_STYLE = "style";
@@ -229,13 +231,15 @@ public class VaadinPortlet extends GenericPortlet implements Constants {
      * This portal parameter is used to define the name of the Vaadin theme that
      * is used for all Vaadin applications in the portal.
      * 
-     * @deprecated As of 7.0. Will likely change or be removed in a future version
+     * @deprecated As of 7.0. Will likely change or be removed in a future
+     *             version
      */
     @Deprecated
     public static final String PORTAL_PARAMETER_VAADIN_THEME = "vaadin.theme";
 
     /**
-     * @deprecated As of 7.0. Will likely change or be removed in a future version
+     * @deprecated As of 7.0. Will likely change or be removed in a future
+     *             version
      */
     @Deprecated
     public static final String WRITE_AJAX_PAGE_SCRIPT_WIDGETSET_SHOULD_WRITE = "writeAjaxPageScriptWidgetsetShouldWrite";
@@ -295,7 +299,8 @@ public class VaadinPortlet extends GenericPortlet implements Constants {
     /**
      * @author Vaadin Ltd
      * 
-     * @deprecated As of 7.0. Will likely change or be removed in a future version
+     * @deprecated As of 7.0. Will likely change or be removed in a future
+     *             version
      */
     @Deprecated
     protected enum RequestType {
@@ -306,7 +311,8 @@ public class VaadinPortlet extends GenericPortlet implements Constants {
      * @param vaadinRequest
      * @return
      * 
-     * @deprecated As of 7.0. Will likely change or be removed in a future version
+     * @deprecated As of 7.0. Will likely change or be removed in a future
+     *             version
      */
     @Deprecated
     protected RequestType getRequestType(VaadinPortletRequest vaadinRequest) {
@@ -357,7 +363,8 @@ public class VaadinPortlet extends GenericPortlet implements Constants {
      * @throws PortletException
      * @throws IOException
      * 
-     * @deprecated As of 7.0. Will likely change or be removed in a future version
+     * @deprecated As of 7.0. Will likely change or be removed in a future
+     *             version
      */
     @Deprecated
     protected void handleRequest(PortletRequest request,
@@ -684,7 +691,8 @@ public class VaadinPortlet extends GenericPortlet implements Constants {
      * @throws IOException
      *             if the writing failed due to input/output error.
      * 
-     * @deprecated As of 7.0. Will likely change or be removed in a future version
+     * @deprecated As of 7.0. Will likely change or be removed in a future
+     *             version
      */
     @Deprecated
     void criticalNotification(VaadinPortletRequest request,

diff --git a/server/src/com/vaadin/server/VaadinPortletService.java b/server/src/com/vaadin/server/VaadinPortletService.java
index f97ba6e72939a0f9e6ee8d224898ce267a06e197..38813ec212d30b1e42d22317c4776d6ce93341ea 100644 (file)
--- a/server/src/com/vaadin/server/VaadinPortletService.java
+++ b/server/src/com/vaadin/server/VaadinPortletService.java
@@ -167,7 +167,8 @@ public class VaadinPortletService extends VaadinService {
      *            the request to get a request type for
      * @return the request type
      * 
-     * @deprecated As of 7.0. Will likely change or be removed in a future version
+     * @deprecated As of 7.0. Will likely change or be removed in a future
+     *             version
      */
     @Deprecated
     protected RequestType getRequestType(VaadinRequest request) {

diff --git a/server/src/com/vaadin/server/VaadinServletService.java b/server/src/com/vaadin/server/VaadinServletService.java
index 100b873ef7c80f3cbd32d818d1d047ac510a4292..aaa2ce327e72032267d9c6c99d253f10cd437341 100644 (file)
--- a/server/src/com/vaadin/server/VaadinServletService.java
+++ b/server/src/com/vaadin/server/VaadinServletService.java
@@ -139,7 +139,8 @@ public class VaadinServletService extends VaadinService {
      *            the request to get a request type for
      * @return the request type
      * 
-     * @deprecated As of 7.0. Will likely change or be removed in a future version
+     * @deprecated As of 7.0. Will likely change or be removed in a future
+     *             version
      */
     @Deprecated
     protected RequestType getRequestType(VaadinRequest request) {