diff options
9 files changed, 35 insertions, 28 deletions
diff --git a/server/src/com/vaadin/data/validator/DoubleValidator.java b/server/src/com/vaadin/data/validator/DoubleValidator.java index df5a3ca292..c382271e34 100644 --- 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 4525546f6d..4c5122c338 100644 --- 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 b82c0e2ff8..19a63802b2 100644 --- 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 94505658c3..13dbd006a4 100644 --- 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 cbedeabf51..7807128462 100644 --- 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 8a664f22c0..4b7c91d870 100644 --- 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 69eb3d4f02..cae3642592 100644 --- 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 f97ba6e729..38813ec212 100644 --- 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 100b873ef7..aaa2ce327e 100644 --- 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) { |