Change-Id: Idfb1e782c6d544765f8ebad0f9c9969358f1e5fetags/7.0.0.beta10
@@ -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) { |
@@ -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(); |
@@ -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 |
@@ -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, |
@@ -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, |
@@ -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 { | |||
@@ -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, |
@@ -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) { |
@@ -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) { |