diff options
| author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2015-06-15 12:40:52 +0300 |
|---|---|---|
| committer | Teemu Suo-Anttila <teemusa@vaadin.com> | 2015-06-15 13:25:56 +0300 |
| commit | 3065d80e1826bcacd53df1a4a214318253697272 (patch) | |
| tree | f35b28f7d577aa4fe0aefeaa76b87077b57eea44 /shared/src | |
| parent | 1b67d65d9718745edc69a51c082e917a2bbee2e0 (diff) | |
| parent | 684e619dd79e233ba798aa116810dd6585df3e7c (diff) | |
| download | vaadin-framework-3065d80e1826bcacd53df1a4a214318253697272.tar.gz vaadin-framework-3065d80e1826bcacd53df1a4a214318253697272.zip | |
Merge remote-tracking branch 'origin/master' into grid-unbuffered-editor
Change-Id: Iabd10ff91e7aef1f5df5435c56d3decfd4d39610
Diffstat (limited to 'shared/src')
4 files changed, 19 insertions, 5 deletions
diff --git a/shared/src/com/vaadin/shared/ui/MarginInfo.java b/shared/src/com/vaadin/shared/ui/MarginInfo.java index 7119ce2f90..a8979b36cf 100644 --- a/shared/src/com/vaadin/shared/ui/MarginInfo.java +++ b/shared/src/com/vaadin/shared/ui/MarginInfo.java @@ -182,4 +182,10 @@ public class MarginInfo implements Serializable { return bitMask; } + @Override + public String toString() { + return "MarginInfo(" + hasTop() + ", " + hasRight() + ", " + + hasBottom() + ", " + hasLeft() + ")"; + + } } diff --git a/shared/src/com/vaadin/shared/ui/checkbox/CheckBoxServerRpc.java b/shared/src/com/vaadin/shared/ui/checkbox/CheckBoxServerRpc.java index 0041da4dfa..f4124100e0 100644 --- a/shared/src/com/vaadin/shared/ui/checkbox/CheckBoxServerRpc.java +++ b/shared/src/com/vaadin/shared/ui/checkbox/CheckBoxServerRpc.java @@ -16,8 +16,10 @@ package com.vaadin.shared.ui.checkbox; import com.vaadin.shared.MouseEventDetails; +import com.vaadin.shared.annotations.Delayed; import com.vaadin.shared.communication.ServerRpc; public interface CheckBoxServerRpc extends ServerRpc { + @Delayed public void setChecked(boolean checked, MouseEventDetails mouseEventDetails); } diff --git a/shared/src/com/vaadin/shared/ui/grid/GridColumnState.java b/shared/src/com/vaadin/shared/ui/grid/GridColumnState.java index 5aa9ea9b65..547a4a84ca 100644 --- a/shared/src/com/vaadin/shared/ui/grid/GridColumnState.java +++ b/shared/src/com/vaadin/shared/ui/grid/GridColumnState.java @@ -85,4 +85,7 @@ public class GridColumnState implements Serializable { /** The caption for the column hiding toggle. */ public String hidingToggleCaption; + + /** Column header caption */ + public String headerCaption; } diff --git a/shared/src/com/vaadin/shared/ui/ui/Transport.java b/shared/src/com/vaadin/shared/ui/ui/Transport.java index 1aae57e266..54d0f08434 100644 --- a/shared/src/com/vaadin/shared/ui/ui/Transport.java +++ b/shared/src/com/vaadin/shared/ui/ui/Transport.java @@ -29,7 +29,10 @@ public enum Transport { WEBSOCKET("websocket"), /** * HTTP streaming + * + * @deprecated Use the more reliable {@link Transport#LONG_POLLING} instead. */ + @Deprecated STREAMING("streaming"), /** * HTTP long polling @@ -47,11 +50,11 @@ public enum Transport { } /** - * Returns a Transport by its identifier. Returns null if no value is found - * for the given identifier. - * - * @since 7.3.10 - */ + * Returns a Transport by its identifier. Returns null if no value is found + * for the given identifier. + * + * @since 7.3.10 + */ public static Transport getByIdentifier(String identifier) { for (Transport t : values()) { if (t.getIdentifier().equals(identifier)) { |