Clean up state hierarchy for AbstractFieldState

Change-Id: I33c8c977bf8cd2d4c637d7988586496ce963465f

7 files changed, 19 insertions, 46 deletions

diff --git a/shared/src/main/java/com/vaadin/shared/AbstractFieldState.java b/shared/src/main/java/com/vaadin/shared/AbstractFieldState.java
index e24880c3af..6ac39efe69 100644
--- a/shared/src/main/java/com/vaadin/shared/AbstractFieldState.java
+++ b/shared/src/main/java/com/vaadin/shared/AbstractFieldState.java
@@ -15,16 +15,20 @@
  */
 package com.vaadin.shared;
 
-import com.vaadin.shared.ui.RequiredIndicatorState;
+import com.vaadin.shared.ui.TabIndexState;
 
 /**
- * Shared state for {@link com.vaadin.ui.AbstractField}.
+ * State for components that can show the required indicator.
  *
  * @author Vaadin Ltd
- * @since 7.0.0
+ * @since 8.0.0
  *
  */
-public class AbstractFieldState extends RequiredIndicatorState {
-    public boolean hideErrors = false;
-    public boolean modified = false;
+public class AbstractFieldState extends TabIndexState {
+
+    /**
+     * Is the required indicator visible or not.
+     */
+    public boolean required = false;
+
 }
diff --git a/shared/src/main/java/com/vaadin/shared/ui/AbstractSingleSelectState.java b/shared/src/main/java/com/vaadin/shared/ui/AbstractSingleSelectState.java
index da4510bfdb..4cd9bdc9a2 100644
--- a/shared/src/main/java/com/vaadin/shared/ui/AbstractSingleSelectState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/AbstractSingleSelectState.java
@@ -15,6 +15,8 @@
  */
 package com.vaadin.shared.ui;
 
+import com.vaadin.shared.AbstractFieldState;
+
 /**
  * Shared state for {@code AbstractSingleSelect}.
  *
@@ -22,7 +24,7 @@ package com.vaadin.shared.ui;
  *
  * @since 8.0
  */
-public class AbstractSingleSelectState extends RequiredIndicatorState {
+public class AbstractSingleSelectState extends AbstractFieldState {
 
     /**
      * The key of the currently selected item or {@code null} if no item is
diff --git a/shared/src/main/java/com/vaadin/shared/ui/RequiredIndicatorState.java b/shared/src/main/java/com/vaadin/shared/ui/RequiredIndicatorState.java
deleted file mode 100644
index b26a8ceb2b..0000000000
--- a/shared/src/main/java/com/vaadin/shared/ui/RequiredIndicatorState.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2000-2016 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;
-
-/**
- * State for components that can show the required indicator.
- *
- * @author Vaadin Ltd
- * @since 8.0.0
- *
- */
-public class RequiredIndicatorState extends TabIndexState {
-
-    /**
-     * Is the required indicator visible or not.
-     */
-    public boolean required;
-
-}
diff --git a/shared/src/main/java/com/vaadin/shared/ui/listselect/ListSelectState.java b/shared/src/main/java/com/vaadin/shared/ui/listselect/ListSelectState.java
index 8992dc6647..f90ca79368 100644
--- a/shared/src/main/java/com/vaadin/shared/ui/listselect/ListSelectState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/listselect/ListSelectState.java
@@ -15,8 +15,8 @@
  */
 package com.vaadin.shared.ui.listselect;
 
+import com.vaadin.shared.AbstractFieldState;
 import com.vaadin.shared.annotations.DelegateToWidget;
-import com.vaadin.shared.ui.RequiredIndicatorState;
 
 /**
  * Shared state for ListSelect component.
@@ -24,7 +24,7 @@ import com.vaadin.shared.ui.RequiredIndicatorState;
  * @author Vaadin Ltd
  *
  */
-public class ListSelectState extends RequiredIndicatorState {
+public class ListSelectState extends AbstractFieldState {
     {
         primaryStyleName = "v-select";
     }
diff --git a/shared/src/main/java/com/vaadin/shared/ui/optiongroup/CheckBoxGroupState.java b/shared/src/main/java/com/vaadin/shared/ui/optiongroup/CheckBoxGroupState.java
index 82695a913c..93647c2a22 100644
--- a/shared/src/main/java/com/vaadin/shared/ui/optiongroup/CheckBoxGroupState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/optiongroup/CheckBoxGroupState.java
@@ -15,8 +15,8 @@
  */
 package com.vaadin.shared.ui.optiongroup;
 
+import com.vaadin.shared.AbstractFieldState;
 import com.vaadin.shared.annotations.DelegateToWidget;
-import com.vaadin.shared.ui.RequiredIndicatorState;
 
 /**
  * Shared state for the CheckBoxGroup component.
@@ -24,7 +24,7 @@ import com.vaadin.shared.ui.RequiredIndicatorState;
  * @author Vaadin Ltd.
  * @since 8.0
  */
-public class CheckBoxGroupState extends RequiredIndicatorState {
+public class CheckBoxGroupState extends AbstractFieldState {
 
     {
         primaryStyleName = "v-select-optiongroup";
diff --git a/shared/src/main/java/com/vaadin/shared/ui/optiongroup/RadioButtonGroupState.java b/shared/src/main/java/com/vaadin/shared/ui/optiongroup/RadioButtonGroupState.java
index bdd007613c..a7282b146d 100644
--- a/shared/src/main/java/com/vaadin/shared/ui/optiongroup/RadioButtonGroupState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/optiongroup/RadioButtonGroupState.java
@@ -15,7 +15,6 @@
  */
 package com.vaadin.shared.ui.optiongroup;
 
-import com.vaadin.shared.AbstractFieldState;
 import com.vaadin.shared.annotations.DelegateToWidget;
 import com.vaadin.shared.ui.AbstractSingleSelectState;
 
diff --git a/shared/src/main/java/com/vaadin/shared/ui/twincolselect/TwinColSelectState.java b/shared/src/main/java/com/vaadin/shared/ui/twincolselect/TwinColSelectState.java
index fe1f1fab23..b0e148e656 100644
--- a/shared/src/main/java/com/vaadin/shared/ui/twincolselect/TwinColSelectState.java
+++ b/shared/src/main/java/com/vaadin/shared/ui/twincolselect/TwinColSelectState.java
@@ -15,15 +15,15 @@
  */
 package com.vaadin.shared.ui.twincolselect;
 
+import com.vaadin.shared.AbstractFieldState;
 import com.vaadin.shared.annotations.DelegateToWidget;
-import com.vaadin.shared.ui.RequiredIndicatorState;
 
 /**
  * Shared state for the TwinColSelect component.
  *
  * @since 7.0
  */
-public class TwinColSelectState extends RequiredIndicatorState {
+public class TwinColSelectState extends AbstractFieldState {
     {
         primaryStyleName = "v-select-twincol";
     }