summaryrefslogtreecommitdiffstats
path: root/shared
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2013-06-05 18:21:44 +0300
committerArtur Signell <artur@vaadin.com>2013-06-05 18:21:44 +0300
commitfad7bf7a791db16349467ccbc508d0e472330fa0 (patch)
treeb4b9d72527b482577413049b8f7f2dd2ac8a9a3c /shared
parent9100cfc70255f95982f230f29ef72dffe46027d5 (diff)
downloadvaadin-framework-fad7bf7a791db16349467ccbc508d0e472330fa0.tar.gz
vaadin-framework-fad7bf7a791db16349467ccbc508d0e472330fa0.zip
Remove DEFAULT constant as an annotation enum cannot use it (#11966)
Change-Id: I41630fec5c40c50a2925499d1f1ba23149ab0de1
Diffstat (limited to 'shared')
-rw-r--r--shared/src/com/vaadin/shared/ui/ui/Transport.java10
-rw-r--r--shared/src/com/vaadin/shared/ui/ui/UIState.java5
2 files changed, 3 insertions, 12 deletions
diff --git a/shared/src/com/vaadin/shared/ui/ui/Transport.java b/shared/src/com/vaadin/shared/ui/ui/Transport.java
index 69d713bcca..ea641c0a3c 100644
--- a/shared/src/com/vaadin/shared/ui/ui/Transport.java
+++ b/shared/src/com/vaadin/shared/ui/ui/Transport.java
@@ -32,16 +32,6 @@ public enum Transport {
*/
STREAMING("streaming");
- /**
- * The default transport mechanism for push
- */
- public static final Transport DEFAULT = Transport.WEBSOCKET;
-
- /**
- * The default fallback transport mechanism for push
- */
- public static final Transport DEFAULT_FALLBACK = Transport.STREAMING;
-
private String identifier;
private Transport(String identifier) {
diff --git a/shared/src/com/vaadin/shared/ui/ui/UIState.java b/shared/src/com/vaadin/shared/ui/ui/UIState.java
index e19a87ada9..8d042a835f 100644
--- a/shared/src/com/vaadin/shared/ui/ui/UIState.java
+++ b/shared/src/com/vaadin/shared/ui/ui/UIState.java
@@ -55,9 +55,10 @@ public class UIState extends TabIndexState {
public PushMode mode = PushMode.DISABLED;
public Map<String, String> parameters = new HashMap<String, String>();
{
- parameters.put(TRANSPORT_PARAM, Transport.DEFAULT.getIdentifier());
+ parameters
+ .put(TRANSPORT_PARAM, Transport.WEBSOCKET.getIdentifier());
parameters.put(FALLBACK_TRANSPORT_PARAM,
- Transport.DEFAULT_FALLBACK.getIdentifier());
+ Transport.STREAMING.getIdentifier());
}
}