Renamed ComponentState to AbstractComponentState (#9032)

Change-Id: Ida6e0cb7064580be36627fd735d79b82ee69356d

11 files changed, 28 insertions, 28 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";