diff options
author | Pekka Hyvönen <pekka@vaadin.com> | 2016-11-22 09:08:45 +0200 |
---|---|---|
committer | Pekka Hyvönen <pekka@vaadin.com> | 2016-11-22 09:08:45 +0200 |
commit | 3145ab0ce717da5997eb73a742c30e42db687792 (patch) | |
tree | dc9e71212505e0603d6a8d2f56b02dd2d3bacfce /server | |
parent | 81b2113120485a3eaeadc529a054baf902fcb2ed (diff) | |
download | vaadin-framework-3145ab0ce717da5997eb73a742c30e42db687792.tar.gz vaadin-framework-3145ab0ce717da5997eb73a742c30e42db687792.zip |
Remove CustomFieldState (#20468)
Moves FocusDelegate to AbstractFieldState.
This change is done to revert backwards compatibiity breaking API
change in 7.7.4 when CustomFieldState was introduced.
Change-Id: I76212a8700463140520d5482b740fe0edbfb082c
Diffstat (limited to 'server')
-rw-r--r-- | server/src/main/java/com/vaadin/ui/CustomField.java | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/server/src/main/java/com/vaadin/ui/CustomField.java b/server/src/main/java/com/vaadin/ui/CustomField.java index 04c00aaf47..c69f6475da 100644 --- a/server/src/main/java/com/vaadin/ui/CustomField.java +++ b/server/src/main/java/com/vaadin/ui/CustomField.java @@ -20,7 +20,6 @@ import java.io.Serializable; import java.util.Iterator; import com.vaadin.data.Property; -import com.vaadin.shared.ui.customfield.CustomFieldState; /** * A {@link Field} whose UI content can be constructed by the user, enabling the @@ -128,7 +127,7 @@ public abstract class CustomField<T> extends AbstractField<T> private class ComponentIterator implements Iterator<Component>, Serializable { - boolean first = (root != null); + boolean first = root != null; @Override public boolean hasNext() { @@ -152,16 +151,6 @@ public abstract class CustomField<T> extends AbstractField<T> return new ComponentIterator(); } - @Override - protected CustomFieldState getState() { - return (CustomFieldState) super.getState(); - } - - @Override - protected CustomFieldState getState(boolean markAsDirty) { - return (CustomFieldState) super.getState(markAsDirty); - } - /** * Sets the component to which all methods from the {@link Focusable} * interface should be delegated. @@ -172,7 +161,7 @@ public abstract class CustomField<T> extends AbstractField<T> * <p> * By default, {@link Focusable} events are handled by the super class and * ultimately ignored. - * + * * @param focusDelegate * the focusable component to which focus events are redirected */ |