diff options
| author | Henrik Paul <henrik@vaadin.com> | 2015-03-31 14:44:23 +0300 |
|---|---|---|
| committer | Henrik Paul <henrik@vaadin.com> | 2015-03-31 14:44:23 +0300 |
| commit | 844b2c6c41d57d4db1238eb6096f225c9fdb8314 (patch) | |
| tree | ffdd57cd35da2df500fbfae5981de381439d1f5c /shared | |
| parent | 2080f86e03552c56d52f488e4dcd72282cd64f62 (diff) | |
| parent | 3ab82ace45827365e87f9540fad3dffaed0679b5 (diff) | |
| download | vaadin-framework-844b2c6c41d57d4db1238eb6096f225c9fdb8314.tar.gz vaadin-framework-844b2c6c41d57d4db1238eb6096f225c9fdb8314.zip | |
Merge remote-tracking branch 'origin/master' into grid-7.5
Change-Id: Ife8c6d2a5f6c134a6e28e862f524b6e687199cc8
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/src/com/vaadin/shared/ApplicationConstants.java | 12 | ||||
| -rw-r--r-- | shared/src/com/vaadin/shared/ui/ui/UIState.java | 1 |
2 files changed, 7 insertions, 6 deletions
diff --git a/shared/src/com/vaadin/shared/ApplicationConstants.java b/shared/src/com/vaadin/shared/ApplicationConstants.java index 990564a6b8..d7aaee6267 100644 --- a/shared/src/com/vaadin/shared/ApplicationConstants.java +++ b/shared/src/com/vaadin/shared/ApplicationConstants.java @@ -28,6 +28,8 @@ public class ApplicationConstants implements Serializable { public static final String HEARTBEAT_PATH = "HEARTBEAT"; + public static final String PUSH_PATH = "PUSH"; + public static final String PUBLISHED_FILE_PATH = APP_PATH + '/' + "PUBLISHED"; @@ -74,7 +76,7 @@ public class ApplicationConstants implements Serializable { /** * The name of the javascript containing the bootstrap code. The file is * located in the VAADIN directory. - * + * * @since 7.3 */ public static final String VAADIN_BOOTSTRAP_JS = "vaadinBootstrap.js"; @@ -88,7 +90,7 @@ public class ApplicationConstants implements Serializable { /** * The name of the debug version of the javascript containing push support. * The file is located in the VAADIN directory. - * + * * @since 7.1.6 */ public static final String VAADIN_PUSH_DEBUG_JS = "vaadinPush.debug.js"; @@ -100,14 +102,14 @@ public class ApplicationConstants implements Serializable { /** * The name of the parameter used to transmit RPC invocations - * + * * @since 7.2 */ public static final String RPC_INVOCATIONS = "rpc"; /** * The name of the parameter used to transmit the CSRF token - * + * * @since 7.2 */ public static final String CSRF_TOKEN = "csrfToken"; @@ -116,7 +118,7 @@ public class ApplicationConstants implements Serializable { * The name of the parameter used to transmit the sync id. The value can be * set to -1 e.g. when testing with pre-recorded requests to make the * framework ignore the sync id. - * + * * @see com.vaadin.ui.ConnectorTracker#getCurrentSyncId() * @since 7.2 */ diff --git a/shared/src/com/vaadin/shared/ui/ui/UIState.java b/shared/src/com/vaadin/shared/ui/ui/UIState.java index 04e182c5d4..2f51fef6ee 100644 --- a/shared/src/com/vaadin/shared/ui/ui/UIState.java +++ b/shared/src/com/vaadin/shared/ui/ui/UIState.java @@ -110,7 +110,6 @@ public class UIState extends TabIndexState { public static final String FALLBACK_TRANSPORT_PARAM = "fallbackTransport"; public PushMode mode = PushMode.DISABLED; - public String pushPath; public Map<String, String> parameters = new HashMap<String, String>(); { parameters |