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

diff --git a/client/src/main/java/com/vaadin/client/ui/customfield/CustomFieldConnector.java b/client/src/main/java/com/vaadin/client/ui/customfield/CustomFieldConnector.java
index 0b5a30149e8d27af5c7a8aabf5b87e43fa435965..079a9350389fbb51db56229a0c45100b37eb0b54 100644 (file)
--- a/client/src/main/java/com/vaadin/client/ui/customfield/CustomFieldConnector.java
+++ b/client/src/main/java/com/vaadin/client/ui/customfield/CustomFieldConnector.java
@@ -30,7 +30,6 @@ import com.vaadin.client.communication.StateChangeEvent;
 import com.vaadin.client.ui.AbstractFieldConnector;
 import com.vaadin.client.ui.VCustomField;
 import com.vaadin.shared.ui.Connect;
-import com.vaadin.shared.ui.customfield.CustomFieldState;
 import com.vaadin.ui.CustomField;
 
 @Connect(value = CustomField.class)
@@ -46,11 +45,6 @@ public class CustomFieldConnector extends AbstractFieldConnector
         addConnectorHierarchyChangeHandler(this);
     }
 
-    @Override
-    public CustomFieldState getState() {
-        return (CustomFieldState) super.getState();
-    }
-
     @Override
     public VCustomField getWidget() {
         return (VCustomField) super.getWidget();

diff --git a/server/src/main/java/com/vaadin/ui/CustomField.java b/server/src/main/java/com/vaadin/ui/CustomField.java
index 04c00aaf477ff3da08fb3db995170f3f412cc2cc..c69f6475da3f67bac667950d6e7860977561ba5c 100644 (file)
--- 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
      */

diff --git a/shared/src/main/java/com/vaadin/shared/AbstractFieldState.java b/shared/src/main/java/com/vaadin/shared/AbstractFieldState.java
index 3f06fba4b3cc5beaf62a03ffd2eb71960178d83b..22cb625f98d46e6d82dd6a10ed3647e797056880 100644 (file)
--- a/shared/src/main/java/com/vaadin/shared/AbstractFieldState.java
+++ b/shared/src/main/java/com/vaadin/shared/AbstractFieldState.java
@@ -29,4 +29,13 @@ public class AbstractFieldState extends TabIndexState {
     public boolean hideErrors = false;
     public boolean required = false;
     public boolean modified = false;
+
+    /**
+     * The component which should receive focus events instead of the custom
+     * field wrapper.
+     * <p>
+     * This is not used in all fields, but needs to be here for the time being
+     * (#20468).
+     */
+    public Connector focusDelegate;
 }

diff --git a/shared/src/main/java/com/vaadin/shared/ui/customfield/CustomFieldState.java b/shared/src/main/java/com/vaadin/shared/ui/customfield/CustomFieldState.java
deleted file mode 100644 (file)
index 3f9640c..0000000
--- a/shared/src/main/java/com/vaadin/shared/ui/customfield/CustomFieldState.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2000-2014 Vaadin Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.vaadin.shared.ui.customfield;
-
-import com.vaadin.shared.AbstractFieldState;
-import com.vaadin.shared.Connector;
-
-public class CustomFieldState extends AbstractFieldState {
-
-    /**
-     * The component which should receive focus events instead of the custom
-     * field wrapper.
-     */
-    public Connector focusDelegate;
-
-}