From fad7bf7a791db16349467ccbc508d0e472330fa0 Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Wed, 5 Jun 2013 18:21:44 +0300 Subject: Remove DEFAULT constant as an annotation enum cannot use it (#11966) Change-Id: I41630fec5c40c50a2925499d1f1ba23149ab0de1 --- shared/src/com/vaadin/shared/ui/ui/Transport.java | 10 ---------- shared/src/com/vaadin/shared/ui/ui/UIState.java | 5 +++-- 2 files changed, 3 insertions(+), 12 deletions(-) (limited to 'shared/src/com/vaadin') 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 parameters = new HashMap(); { - 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()); } } -- cgit v1.2.3