Renamed ComponentState to AbstractComponentState (#9032)

Change-Id: Ida6e0cb7064580be36627fd735d79b82ee69356d

34 files changed, 82 insertions, 81 deletions

diff --git a/client/src/com/vaadin/client/ApplicationConnection.java b/client/src/com/vaadin/client/ApplicationConnection.java
index 9133e3dfc5..48815a3d8d 100644
--- a/client/src/com/vaadin/client/ApplicationConnection.java
+++ b/client/src/com/vaadin/client/ApplicationConnection.java
@@ -84,7 +84,7 @@ import com.vaadin.client.ui.dd.VDragAndDropManager;
 import com.vaadin.client.ui.ui.UIConnector;
 import com.vaadin.client.ui.window.WindowConnector;
 import com.vaadin.shared.ApplicationConstants;
-import com.vaadin.shared.ComponentState;
+import com.vaadin.shared.AbstractComponentState;
 import com.vaadin.shared.Version;
 import com.vaadin.shared.communication.LegacyChangeVariablesInvocation;
 import com.vaadin.shared.communication.MethodInvocation;
@@ -2890,7 +2890,7 @@ public class ApplicationConnection {
      * @return true if at least one listener has been registered on server side
      *         for the event identified by eventIdentifier.
      * @deprecated as of Vaadin 7. Use
-     *             {@link ComponentState#hasEventListener(String)} instead
+     *             {@link AbstractComponentState#hasEventListener(String)} instead
      */
     @Deprecated
     public boolean hasEventListeners(ComponentConnector paintable,
@@ -2990,7 +2990,7 @@ public class ApplicationConnection {
 
     /**
      * @deprecated as of Vaadin 7. Use
-     *             {@link ComponentState#hasEventListener(String)} instead
+     *             {@link AbstractComponentState#hasEventListener(String)} instead
      */
     @Deprecated
     public boolean hasEventListeners(Widget widget, String eventIdentifier) {
diff --git a/client/src/com/vaadin/client/ComponentConnector.java b/client/src/com/vaadin/client/ComponentConnector.java
index 9858ff6abd..ae889c1dbd 100644
--- a/client/src/com/vaadin/client/ComponentConnector.java
+++ b/client/src/com/vaadin/client/ComponentConnector.java
@@ -18,7 +18,7 @@ package com.vaadin.client;
 
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.user.client.ui.Widget;
-import com.vaadin.shared.ComponentState;
+import com.vaadin.shared.AbstractComponentState;
 
 /**
  * An interface used by client-side widgets or paintable parts to receive
@@ -36,7 +36,7 @@ public interface ComponentConnector extends ServerConnector {
      * @see com.vaadin.client.VPaintable#getState()
      */
     @Override
-    public ComponentState getState();
+    public AbstractComponentState getState();
 
     /**
      * Returns the widget for this {@link ComponentConnector}
diff --git a/client/src/com/vaadin/client/ComponentLocator.java b/client/src/com/vaadin/client/ComponentLocator.java
index 99f973c467..854c8535c4 100644
--- a/client/src/com/vaadin/client/ComponentLocator.java
+++ b/client/src/com/vaadin/client/ComponentLocator.java
@@ -34,7 +34,7 @@ import com.vaadin.client.ui.VTabsheetPanel;
 import com.vaadin.client.ui.VUI;
 import com.vaadin.client.ui.VWindow;
 import com.vaadin.client.ui.window.WindowConnector;
-import com.vaadin.shared.ComponentState;
+import com.vaadin.shared.AbstractComponentState;
 import com.vaadin.shared.Connector;
 import com.vaadin.shared.communication.SharedState;
 
@@ -694,8 +694,8 @@ public class ComponentLocator {
 
     private ServerConnector findConnectorById(ServerConnector root, String id) {
         SharedState state = root.getState();
-        if (state instanceof ComponentState
-                && id.equals(((ComponentState) state).id)) {
+        if (state instanceof AbstractComponentState
+                && id.equals(((AbstractComponentState) state).id)) {
             return root;
         }
         for (ServerConnector child : root.getChildren()) {
diff --git a/client/src/com/vaadin/client/Util.java b/client/src/com/vaadin/client/Util.java
index d111bd3093..7548cfe42a 100644
--- a/client/src/com/vaadin/client/Util.java
+++ b/client/src/com/vaadin/client/Util.java
@@ -45,7 +45,7 @@ import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.client.RenderInformation.FloatSize;
 import com.vaadin.client.ui.VOverlay;
 import com.vaadin.shared.ApplicationConstants;
-import com.vaadin.shared.ComponentState;
+import com.vaadin.shared.AbstractComponentState;
 import com.vaadin.shared.communication.MethodInvocation;
 import com.vaadin.shared.ui.ComponentStateUtil;
 
@@ -523,7 +523,7 @@ public class Util {
      * @param state
      * @return
      */
-    public static FloatSize parseRelativeSize(ComponentState state) {
+    public static FloatSize parseRelativeSize(AbstractComponentState state) {
         if (ComponentStateUtil.isUndefinedHeight(state)
                 && ComponentStateUtil.isUndefinedWidth(state)) {
             return null;
diff --git a/client/src/com/vaadin/client/VCaption.java b/client/src/com/vaadin/client/VCaption.java
index aadc7b88ad..a662ef4a7b 100644
--- a/client/src/com/vaadin/client/VCaption.java
+++ b/client/src/com/vaadin/client/VCaption.java
@@ -24,7 +24,7 @@ import com.vaadin.client.ui.AbstractFieldConnector;
 import com.vaadin.client.ui.Icon;
 import com.vaadin.shared.AbstractFieldState;
 import com.vaadin.shared.ComponentConstants;
-import com.vaadin.shared.ComponentState;
+import com.vaadin.shared.AbstractComponentState;
 import com.vaadin.shared.ui.ComponentStateUtil;
 
 public class VCaption extends HTML {
@@ -393,7 +393,7 @@ public class VCaption extends HTML {
         }
     }
 
-    public static boolean isNeeded(ComponentState state) {
+    public static boolean isNeeded(AbstractComponentState state) {
         if (state.caption != null) {
             return true;
         }
diff --git a/client/src/com/vaadin/client/ui/AbstractComponentConnector.java b/client/src/com/vaadin/client/ui/AbstractComponentConnector.java
index 8b6c4fb8aa..49e879a681 100644
--- a/client/src/com/vaadin/client/ui/AbstractComponentConnector.java
+++ b/client/src/com/vaadin/client/ui/AbstractComponentConnector.java
@@ -41,7 +41,7 @@ import com.vaadin.client.metadata.TypeData;
 import com.vaadin.client.ui.datefield.PopupDateFieldConnector;
 import com.vaadin.client.ui.ui.UIConnector;
 import com.vaadin.shared.ComponentConstants;
-import com.vaadin.shared.ComponentState;
+import com.vaadin.shared.AbstractComponentState;
 import com.vaadin.shared.Connector;
 import com.vaadin.shared.ui.ComponentStateUtil;
 import com.vaadin.shared.ui.TabIndexState;
@@ -116,8 +116,8 @@ public abstract class AbstractComponentConnector extends AbstractConnector
     }
 
     @Override
-    public ComponentState getState() {
-        return (ComponentState) super.getState();
+    public AbstractComponentState getState() {
+        return (AbstractComponentState) super.getState();
     }
 
     @Override
@@ -267,7 +267,7 @@ public abstract class AbstractComponentConnector extends AbstractConnector
      * </p>
      */
     protected void updateWidgetStyleNames() {
-        ComponentState state = getState();
+        AbstractComponentState state = getState();
 
         String primaryStyleName = getWidget().getStylePrimaryName();
         if (state.primaryStyleName != null) {
diff --git a/client/src/com/vaadin/client/ui/VFilterSelect.java b/client/src/com/vaadin/client/ui/VFilterSelect.java
index 54498c432f..bca68a86f3 100644
--- a/client/src/com/vaadin/client/ui/VFilterSelect.java
+++ b/client/src/com/vaadin/client/ui/VFilterSelect.java
@@ -68,7 +68,7 @@ import com.vaadin.client.Util;
 import com.vaadin.client.VConsole;
 import com.vaadin.client.ui.menubar.MenuBar;
 import com.vaadin.client.ui.menubar.MenuItem;
-import com.vaadin.shared.ComponentState;
+import com.vaadin.shared.AbstractComponentState;
 import com.vaadin.shared.EventId;
 import com.vaadin.shared.ui.ComponentStateUtil;
 import com.vaadin.shared.ui.combobox.FilteringMode;
@@ -598,7 +598,7 @@ public class VFilterSelect extends Composite implements Field, KeyDownHandler,
          * @param componentState
          *            shared state of the combo box
          */
-        public void updateStyleNames(UIDL uidl, ComponentState componentState) {
+        public void updateStyleNames(UIDL uidl, AbstractComponentState componentState) {
             setStyleName(VFilterSelect.this.getStylePrimaryName()
                     + "-suggestpopup");
             menu.setStyleName(VFilterSelect.this.getStylePrimaryName()
diff --git a/client/src/com/vaadin/client/ui/VFormLayout.java b/client/src/com/vaadin/client/ui/VFormLayout.java
index a46a0a41c8..49c991b39c 100644
--- a/client/src/com/vaadin/client/ui/VFormLayout.java
+++ b/client/src/com/vaadin/client/ui/VFormLayout.java
@@ -35,7 +35,7 @@ import com.vaadin.client.Focusable;
 import com.vaadin.client.StyleConstants;
 import com.vaadin.client.VTooltip;
 import com.vaadin.shared.ComponentConstants;
-import com.vaadin.shared.ComponentState;
+import com.vaadin.shared.AbstractComponentState;
 import com.vaadin.shared.ui.ComponentStateUtil;
 import com.vaadin.shared.ui.MarginInfo;
 
@@ -65,7 +65,7 @@ public class VFormLayout extends SimplePanel {
      * @param enabled
      * @return An array of stylenames
      */
-    private String[] getStylesFromState(ComponentState state, boolean enabled) {
+    private String[] getStylesFromState(AbstractComponentState state, boolean enabled) {
         List<String> styles = new ArrayList<String>();
         if (ComponentStateUtil.hasStyles(state)) {
             for (String name : state.styles) {
@@ -188,7 +188,7 @@ public class VFormLayout extends SimplePanel {
 
         }
 
-        public void updateCaption(Widget widget, ComponentState state,
+        public void updateCaption(Widget widget, AbstractComponentState state,
                 boolean enabled) {
             final Caption c = widgetToCaption.get(widget);
             if (c != null) {
@@ -249,7 +249,7 @@ public class VFormLayout extends SimplePanel {
             setStyleName(styleName);
         }
 
-        public void updateCaption(ComponentState state, boolean enabled) {
+        public void updateCaption(AbstractComponentState state, boolean enabled) {
             // Update styles as they might have changed when the caption changed
             setStyles(getStylesFromState(state, enabled));
 
diff --git a/client/src/com/vaadin/client/ui/VScrollTable.java b/client/src/com/vaadin/client/ui/VScrollTable.java
index 601c93428c..9b06b711cb 100644
--- a/client/src/com/vaadin/client/ui/VScrollTable.java
+++ b/client/src/com/vaadin/client/ui/VScrollTable.java
@@ -92,7 +92,7 @@ import com.vaadin.client.ui.dd.VDragAndDropManager;
 import com.vaadin.client.ui.dd.VDragEvent;
 import com.vaadin.client.ui.dd.VHasDropHandler;
 import com.vaadin.client.ui.dd.VTransferable;
-import com.vaadin.shared.ComponentState;
+import com.vaadin.shared.AbstractComponentState;
 import com.vaadin.shared.MouseEventDetails;
 import com.vaadin.shared.ui.dd.VerticalDropLocation;
 import com.vaadin.shared.ui.table.TableConstants;
@@ -1113,7 +1113,7 @@ public class VScrollTable extends FlowPanel implements HasWidgets,
     }
 
     /** For internal use only. May be removed or replaced in the future. */
-    public void updateSelectionProperties(UIDL uidl, ComponentState state,
+    public void updateSelectionProperties(UIDL uidl, AbstractComponentState state,
             boolean readOnly) {
         setMultiSelectMode(uidl.hasAttribute("multiselectmode") ? uidl
                 .getIntAttribute("multiselectmode") : MULTISELECT_MODE_DEFAULT);
diff --git a/client/src/com/vaadin/client/ui/VTabsheet.java b/client/src/com/vaadin/client/ui/VTabsheet.java
index d74665bb6d..63aeaa2fc7 100644
--- a/client/src/com/vaadin/client/ui/VTabsheet.java
+++ b/client/src/com/vaadin/client/ui/VTabsheet.java
@@ -55,7 +55,7 @@ import com.vaadin.client.TooltipInfo;
 import com.vaadin.client.UIDL;
 import com.vaadin.client.Util;
 import com.vaadin.client.VCaption;
-import com.vaadin.shared.ComponentState;
+import com.vaadin.shared.AbstractComponentState;
 import com.vaadin.shared.EventId;
 import com.vaadin.shared.ui.ComponentStateUtil;
 import com.vaadin.shared.ui.tabsheet.TabsheetBaseConstants;
@@ -743,7 +743,7 @@ public class VTabsheet extends VTabsheetBase implements Focusable,
     }
 
     /** For internal use only. May be removed or replaced in the future. */
-    public void handleStyleNames(UIDL uidl, ComponentState state) {
+    public void handleStyleNames(UIDL uidl, AbstractComponentState state) {
         // Add proper stylenames for all elements (easier to prevent unwanted
         // style inheritance)
         if (ComponentStateUtil.hasStyles(state)) {
diff --git a/client/src/com/vaadin/client/ui/layout/LayoutDependencyTree.java b/client/src/com/vaadin/client/ui/layout/LayoutDependencyTree.java
index b94488896e..67555e8331 100644
--- a/client/src/com/vaadin/client/ui/layout/LayoutDependencyTree.java
+++ b/client/src/com/vaadin/client/ui/layout/LayoutDependencyTree.java
@@ -28,7 +28,7 @@ import com.vaadin.client.ServerConnector;
 import com.vaadin.client.Util;
 import com.vaadin.client.VConsole;
 import com.vaadin.client.ui.ManagedLayout;
-import com.vaadin.shared.ComponentState;
+import com.vaadin.shared.AbstractComponentState;
 
 public class LayoutDependencyTree {
     private class LayoutDependency {
@@ -309,7 +309,7 @@ public class LayoutDependencyTree {
             } else {
                 s += "Horizontal";
             }
-            ComponentState state = connector.getState();
+            AbstractComponentState state = connector.getState();
             s += " sizing: "
                     + getSizeDefinition(direction == VERTICAL ? state.height
                             : state.width) + "\n";
diff --git a/server/src/com/vaadin/ui/AbstractComponent.java b/server/src/com/vaadin/ui/AbstractComponent.java
index 57032f58a8..fc6f176e2a 100644
--- a/server/src/com/vaadin/ui/AbstractComponent.java
+++ b/server/src/com/vaadin/ui/AbstractComponent.java
@@ -35,7 +35,7 @@ import com.vaadin.server.Resource;
 import com.vaadin.server.Terminal;
 import com.vaadin.server.VaadinSession;
 import com.vaadin.shared.ComponentConstants;
-import com.vaadin.shared.ComponentState;
+import com.vaadin.shared.AbstractComponentState;
 import com.vaadin.shared.ui.ComponentStateUtil;
 import com.vaadin.util.ReflectTools;
 
@@ -617,8 +617,8 @@ public abstract class AbstractComponent extends AbstractClientConnector
      * @return updated component shared state
      */
     @Override
-    protected ComponentState getState() {
-        return (ComponentState) super.getState();
+    protected AbstractComponentState getState() {
+        return (AbstractComponentState) super.getState();
     }
 
     @Override
diff --git a/shared/src/com/vaadin/shared/ComponentState.java b/shared/src/com/vaadin/shared/AbstractComponentState.java
index d8b5fec587..e1f7916874 100644
--- a/shared/src/com/vaadin/shared/ComponentState.java
+++ b/shared/src/com/vaadin/shared/AbstractComponentState.java
@@ -19,15 +19,16 @@ package com.vaadin.shared;
 import java.util.List;
 
 import com.vaadin.shared.communication.SharedState;
+import com.vaadin.ui.AbstractComponent;
 
 /**
- * Default shared state implementation for UI components.
+ * Default shared state implementation for {@link AbstractComponent}.
  * 
- * State classes of concrete components should extend this class.
+ * State classes of components should typically extend this class.
  * 
  * @since 7.0
  */
-public class ComponentState extends SharedState {
+public class AbstractComponentState extends SharedState {
     public String height = "";
     public String width = "";
     public boolean readOnly = false;
diff --git a/shared/src/com/vaadin/shared/ui/AbstractEmbeddedState.java b/shared/src/com/vaadin/shared/ui/AbstractEmbeddedState.java
index 608152cc54..b7e689f8bc 100644
--- a/shared/src/com/vaadin/shared/ui/AbstractEmbeddedState.java
+++ b/shared/src/com/vaadin/shared/ui/AbstractEmbeddedState.java
@@ -1,8 +1,8 @@
 package com.vaadin.shared.ui;
 
-import com.vaadin.shared.ComponentState;
+import com.vaadin.shared.AbstractComponentState;
 
-public class AbstractEmbeddedState extends ComponentState {
+public class AbstractEmbeddedState extends AbstractComponentState {
 
     public static final String SOURCE_RESOURCE = "source";
 
diff --git a/shared/src/com/vaadin/shared/ui/AbstractLayoutState.java b/shared/src/com/vaadin/shared/ui/AbstractLayoutState.java
index 4fc865626c..cbb02ceaa4 100644
--- a/shared/src/com/vaadin/shared/ui/AbstractLayoutState.java
+++ b/shared/src/com/vaadin/shared/ui/AbstractLayoutState.java
@@ -15,8 +15,8 @@
  */
 package com.vaadin.shared.ui;
 
-import com.vaadin.shared.ComponentState;
+import com.vaadin.shared.AbstractComponentState;
 
-public class AbstractLayoutState extends ComponentState {
+public class AbstractLayoutState extends AbstractComponentState {
 
 }
\ No newline at end of file
diff --git a/shared/src/com/vaadin/shared/ui/AbstractMediaState.java b/shared/src/com/vaadin/shared/ui/AbstractMediaState.java
index 76d4e1b000..56c1989d5b 100644
--- a/shared/src/com/vaadin/shared/ui/AbstractMediaState.java
+++ b/shared/src/com/vaadin/shared/ui/AbstractMediaState.java
@@ -18,10 +18,10 @@ package com.vaadin.shared.ui;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.vaadin.shared.ComponentState;
+import com.vaadin.shared.AbstractComponentState;
 import com.vaadin.shared.communication.URLReference;
 
-public class AbstractMediaState extends ComponentState {
+public class AbstractMediaState extends AbstractComponentState {
     public boolean showControls;
 
     public String altText;
diff --git a/shared/src/com/vaadin/shared/ui/BrowserPopupExtensionState.java b/shared/src/com/vaadin/shared/ui/BrowserPopupExtensionState.java
index a9ca6841d8..199de54f8f 100644
--- a/shared/src/com/vaadin/shared/ui/BrowserPopupExtensionState.java
+++ b/shared/src/com/vaadin/shared/ui/BrowserPopupExtensionState.java
@@ -16,9 +16,9 @@
 
 package com.vaadin.shared.ui;
 
-import com.vaadin.shared.ComponentState;
+import com.vaadin.shared.AbstractComponentState;
 
-public class BrowserPopupExtensionState extends ComponentState {
+public class BrowserPopupExtensionState extends AbstractComponentState {
 
     public String target = "_blank";
 
diff --git a/shared/src/com/vaadin/shared/ui/ComponentStateUtil.java b/shared/src/com/vaadin/shared/ui/ComponentStateUtil.java
index 33f841fa09..8106e8af98 100644
--- a/shared/src/com/vaadin/shared/ui/ComponentStateUtil.java
+++ b/shared/src/com/vaadin/shared/ui/ComponentStateUtil.java
@@ -2,7 +2,7 @@ package com.vaadin.shared.ui;
 
 import java.util.HashSet;
 
-import com.vaadin.shared.ComponentState;
+import com.vaadin.shared.AbstractComponentState;
 import com.vaadin.shared.communication.SharedState;
 
 public final class ComponentStateUtil {
@@ -11,27 +11,27 @@ public final class ComponentStateUtil {
         // Util class is not instantiable
     }
 
-    public static final boolean isUndefinedWidth(ComponentState state) {
+    public static final boolean isUndefinedWidth(AbstractComponentState state) {
         return state.width == null || "".equals(state.width);
     }
 
-    public static final boolean isUndefinedHeight(ComponentState state) {
+    public static final boolean isUndefinedHeight(AbstractComponentState state) {
         return state.height == null || "".equals(state.height);
     }
 
-    public static final boolean hasDescription(ComponentState state) {
+    public static final boolean hasDescription(AbstractComponentState state) {
         return state.description != null && !"".equals(state.description);
     }
 
-    public static final boolean hasStyles(ComponentState state) {
+    public static final boolean hasStyles(AbstractComponentState state) {
         return state.styles != null && !state.styles.isEmpty();
     }
 
-    public static final boolean isRelativeWidth(ComponentState state) {
+    public static final boolean isRelativeWidth(AbstractComponentState state) {
         return state.width != null && state.width.endsWith("%");
     }
 
-    public static final boolean isRelativeHeight(ComponentState state) {
+    public static final boolean isRelativeHeight(AbstractComponentState state) {
         return state.height != null && state.height.endsWith("%");
     }
 
diff --git a/shared/src/com/vaadin/shared/ui/JavaScriptComponentState.java b/shared/src/com/vaadin/shared/ui/JavaScriptComponentState.java
index 7a2eedd95d..1252b7f235 100644
--- a/shared/src/com/vaadin/shared/ui/JavaScriptComponentState.java
+++ b/shared/src/com/vaadin/shared/ui/JavaScriptComponentState.java
@@ -21,10 +21,10 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import com.vaadin.shared.ComponentState;
+import com.vaadin.shared.AbstractComponentState;
 import com.vaadin.shared.JavaScriptConnectorState;
 
-public class JavaScriptComponentState extends ComponentState implements
+public class JavaScriptComponentState extends AbstractComponentState implements
         JavaScriptConnectorState {
 
     private Set<String> callbackNames = new HashSet<String>();
diff --git a/shared/src/com/vaadin/shared/ui/TabIndexState.java b/shared/src/com/vaadin/shared/ui/TabIndexState.java
index a9cb56e5ed..bb446829be 100644
--- a/shared/src/com/vaadin/shared/ui/TabIndexState.java
+++ b/shared/src/com/vaadin/shared/ui/TabIndexState.java
@@ -15,7 +15,7 @@
  */
 package com.vaadin.shared.ui;
 
-import com.vaadin.shared.ComponentState;
+import com.vaadin.shared.AbstractComponentState;
 
 /**
  * Interface implemented by state classes that support tab indexes.
@@ -24,7 +24,7 @@ import com.vaadin.shared.ComponentState;
  * @since 7.0.0
  * 
  */
-public class TabIndexState extends ComponentState {
+public class TabIndexState extends AbstractComponentState {
 
     /**
      * The <i>tabulator index</i> of the field.
diff --git a/shared/src/com/vaadin/shared/ui/button/ButtonState.java b/shared/src/com/vaadin/shared/ui/button/ButtonState.java
index e7272379bb..48feb596dc 100644
--- a/shared/src/com/vaadin/shared/ui/button/ButtonState.java
+++ b/shared/src/com/vaadin/shared/ui/button/ButtonState.java
@@ -16,14 +16,14 @@
 
 package com.vaadin.shared.ui.button;
 
-import com.vaadin.shared.ComponentState;
+import com.vaadin.shared.AbstractComponentState;
 import com.vaadin.shared.ui.TabIndexState;
 
 /**
  * Shared state for {@link com.vaadin.ui.Button} and
  * {@link com.vaadin.ui.NativeButton}.
  * 
- * @see ComponentState
+ * @see AbstractComponentState
  * 
  * @since 7.0
  */
diff --git a/shared/src/com/vaadin/shared/ui/label/LabelState.java b/shared/src/com/vaadin/shared/ui/label/LabelState.java
index 2cccc310aa..72cdcaad62 100644
--- a/shared/src/com/vaadin/shared/ui/label/LabelState.java
+++ b/shared/src/com/vaadin/shared/ui/label/LabelState.java
@@ -15,9 +15,9 @@
  */
 package com.vaadin.shared.ui.label;
 
-import com.vaadin.shared.ComponentState;
+import com.vaadin.shared.AbstractComponentState;
 
-public class LabelState extends ComponentState {
+public class LabelState extends AbstractComponentState {
     {
         primaryStyleName = "v-label";
     }
diff --git a/shared/src/com/vaadin/shared/ui/link/LinkState.java b/shared/src/com/vaadin/shared/ui/link/LinkState.java
index 96b4600000..3e4436f5e3 100644
--- a/shared/src/com/vaadin/shared/ui/link/LinkState.java
+++ b/shared/src/com/vaadin/shared/ui/link/LinkState.java
@@ -1,8 +1,8 @@
 package com.vaadin.shared.ui.link;
 
-import com.vaadin.shared.ComponentState;
+import com.vaadin.shared.AbstractComponentState;
 
-public class LinkState extends ComponentState {
+public class LinkState extends AbstractComponentState {
     {
         primaryStyleName = "v-link";
     }
diff --git a/shared/src/com/vaadin/shared/ui/menubar/MenuBarState.java b/shared/src/com/vaadin/shared/ui/menubar/MenuBarState.java
index cf1ef99c06..192dfa2e0f 100644
--- a/shared/src/com/vaadin/shared/ui/menubar/MenuBarState.java
+++ b/shared/src/com/vaadin/shared/ui/menubar/MenuBarState.java
@@ -1,8 +1,8 @@
 package com.vaadin.shared.ui.menubar;
 
-import com.vaadin.shared.ComponentState;
+import com.vaadin.shared.AbstractComponentState;
 
-public class MenuBarState extends ComponentState {
+public class MenuBarState extends AbstractComponentState {
     {
         primaryStyleName = "v-menubar";
     }
diff --git a/shared/src/com/vaadin/shared/ui/panel/PanelState.java b/shared/src/com/vaadin/shared/ui/panel/PanelState.java
index 9d502df8fe..433bef72a5 100644
--- a/shared/src/com/vaadin/shared/ui/panel/PanelState.java
+++ b/shared/src/com/vaadin/shared/ui/panel/PanelState.java
@@ -15,9 +15,9 @@
  */
 package com.vaadin.shared.ui.panel;
 
-import com.vaadin.shared.ComponentState;
+import com.vaadin.shared.AbstractComponentState;
 
-public class PanelState extends ComponentState {
+public class PanelState extends AbstractComponentState {
     {
         primaryStyleName = "v-panel";
     }
diff --git a/shared/src/com/vaadin/shared/ui/popupview/PopupViewState.java b/shared/src/com/vaadin/shared/ui/popupview/PopupViewState.java
index 0f83d0fcd4..2af516daac 100644
--- a/shared/src/com/vaadin/shared/ui/popupview/PopupViewState.java
+++ b/shared/src/com/vaadin/shared/ui/popupview/PopupViewState.java
@@ -1,8 +1,8 @@
 package com.vaadin.shared.ui.popupview;
 
-import com.vaadin.shared.ComponentState;
+import com.vaadin.shared.AbstractComponentState;
 
-public class PopupViewState extends ComponentState {
+public class PopupViewState extends AbstractComponentState {
 
     public String html;
     public boolean hideOnMouseOut;
diff --git a/shared/src/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelState.java b/shared/src/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelState.java
index 8bddffdfd6..fb1b4c1262 100644
--- a/shared/src/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelState.java
+++ b/shared/src/com/vaadin/shared/ui/splitpanel/AbstractSplitPanelState.java
@@ -17,10 +17,10 @@ package com.vaadin.shared.ui.splitpanel;
 
 import java.io.Serializable;
 
-import com.vaadin.shared.ComponentState;
+import com.vaadin.shared.AbstractComponentState;
 import com.vaadin.shared.Connector;
 
-public class AbstractSplitPanelState extends ComponentState {
+public class AbstractSplitPanelState extends AbstractComponentState {
     public Connector firstChild = null;
     public Connector secondChild = null;
     public SplitterState splitterState = new SplitterState();
diff --git a/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetState.java b/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetState.java
index a36acca9dc..c89a20bb22 100644
--- a/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetState.java
+++ b/shared/src/com/vaadin/shared/ui/tabsheet/TabsheetState.java
@@ -1,8 +1,8 @@
 package com.vaadin.shared.ui.tabsheet;
 
-import com.vaadin.shared.ComponentState;
+import com.vaadin.shared.AbstractComponentState;
 
-public class TabsheetState extends ComponentState {
+public class TabsheetState extends AbstractComponentState {
     {
         primaryStyleName = "v-tabsheet";
     }
diff --git a/shared/src/com/vaadin/shared/ui/ui/UIState.java b/shared/src/com/vaadin/shared/ui/ui/UIState.java
index 028218409f..59eff36435 100644
--- a/shared/src/com/vaadin/shared/ui/ui/UIState.java
+++ b/shared/src/com/vaadin/shared/ui/ui/UIState.java
@@ -15,9 +15,9 @@
  */
 package com.vaadin.shared.ui.ui;
 
-import com.vaadin.shared.ComponentState;
+import com.vaadin.shared.AbstractComponentState;
 
-public class UIState extends ComponentState {
+public class UIState extends AbstractComponentState {
     {
         primaryStyleName = "v-ui";
     }
diff --git a/uitest/src/com/vaadin/tests/minitutorials/v7b1/Addition.java b/uitest/src/com/vaadin/tests/minitutorials/v7b1/Addition.java
index a91df49508..f22e56733c 100644
--- a/uitest/src/com/vaadin/tests/minitutorials/v7b1/Addition.java
+++ b/uitest/src/com/vaadin/tests/minitutorials/v7b1/Addition.java
@@ -16,7 +16,7 @@
 
 package com.vaadin.tests.minitutorials.v7b1;
 
-import com.vaadin.shared.ComponentState;
+import com.vaadin.shared.AbstractComponentState;
 import com.vaadin.ui.AbstractComponent;
 
 public class Addition extends AbstractComponent {
@@ -63,6 +63,6 @@ public class Addition extends AbstractComponent {
     }
 }
 
-class AddResultState extends ComponentState {
+class AddResultState extends AbstractComponentState {
     public int sum;
 }
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/DelegateState.java b/uitest/src/com/vaadin/tests/widgetset/client/DelegateState.java
index e9ac8a1e61..1af0d04bf6 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/DelegateState.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/DelegateState.java
@@ -16,10 +16,10 @@
 
 package com.vaadin.tests.widgetset.client;
 
-import com.vaadin.shared.ComponentState;
+import com.vaadin.shared.AbstractComponentState;
 import com.vaadin.shared.annotations.DelegateToWidget;
 
-public class DelegateState extends ComponentState {
+public class DelegateState extends AbstractComponentState {
     @DelegateToWidget
     public String value1;
 
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/LabelState.java b/uitest/src/com/vaadin/tests/widgetset/client/LabelState.java
index 91a269e33f..9bc1397339 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/LabelState.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/LabelState.java
@@ -16,7 +16,7 @@
 
 package com.vaadin.tests.widgetset.client;
 
-import com.vaadin.shared.ComponentState;
+import com.vaadin.shared.AbstractComponentState;
 
 /**
  * State class with the same simple name as
@@ -26,7 +26,7 @@ import com.vaadin.shared.ComponentState;
  * @version @VERSION@
  * @since 7.0.0
  */
-public class LabelState extends ComponentState {
+public class LabelState extends AbstractComponentState {
 
     private String text;
 
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateState.java b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateState.java
index b64d0f0ad5..58ec6fc892 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateState.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ComponentInStateState.java
@@ -16,9 +16,9 @@
 
 package com.vaadin.tests.widgetset.client.minitutorials.v7a2;
 
-import com.vaadin.shared.ComponentState;
+import com.vaadin.shared.AbstractComponentState;
 import com.vaadin.shared.Connector;
 
-public class ComponentInStateState extends ComponentState {
+public class ComponentInStateState extends AbstractComponentState {
     public Connector otherComponent;
 }
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentState.java b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentState.java
index 948f98e756..a7a6b987fb 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentState.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/MyComponentState.java
@@ -1,8 +1,8 @@
 package com.vaadin.tests.widgetset.client.minitutorials.v7a2;
 
-import com.vaadin.shared.ComponentState;
+import com.vaadin.shared.AbstractComponentState;
 
-public class MyComponentState extends ComponentState {
+public class MyComponentState extends AbstractComponentState {
 
     public String text;