From 3145ab0ce717da5997eb73a742c30e42db687792 Mon Sep 17 00:00:00 2001
From: Pekka Hyvönen <pekka@vaadin.com>
Date: Tue, 22 Nov 2016 09:08:45 +0200
Subject: 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
---
 server/src/main/java/com/vaadin/ui/CustomField.java | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

(limited to 'server')

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
      */
-- 
cgit v1.2.3