Add state classes for Abstract(Single)ComponentContainer

Change-Id: I6939fbc6f7aed0897f50b19f85fb62d0b8368cc7

2 files changed, 25 insertions, 0 deletions

diff --git a/server/src/main/java/com/vaadin/ui/AbstractComponentContainer.java b/server/src/main/java/com/vaadin/ui/AbstractComponentContainer.java
index f3cfd72931..a7b1051699 100644
--- a/server/src/main/java/com/vaadin/ui/AbstractComponentContainer.java
+++ b/server/src/main/java/com/vaadin/ui/AbstractComponentContainer.java
@@ -23,6 +23,7 @@ import java.util.LinkedList;
 
 import com.vaadin.server.ComponentSizeValidator;
 import com.vaadin.shared.Registration;
+import com.vaadin.shared.ui.AbstractComponentContainerState;
 
 /**
  * Extension to {@link AbstractComponent} that defines the default
@@ -317,4 +318,14 @@ public abstract class AbstractComponentContainer extends AbstractComponent
     public Iterator<Component> getComponentIterator() {
         return iterator();
     }
+
+    @Override
+    protected AbstractComponentContainerState getState() {
+        return (AbstractComponentContainerState) super.getState();
+    }
+
+    @Override
+    protected AbstractComponentContainerState getState(boolean markAsDirty) {
+        return (AbstractComponentContainerState) super.getState(markAsDirty);
+    }
 }
diff --git a/server/src/main/java/com/vaadin/ui/AbstractSingleComponentContainer.java b/server/src/main/java/com/vaadin/ui/AbstractSingleComponentContainer.java
index fbb937e148..822ff0588c 100644
--- a/server/src/main/java/com/vaadin/ui/AbstractSingleComponentContainer.java
+++ b/server/src/main/java/com/vaadin/ui/AbstractSingleComponentContainer.java
@@ -25,6 +25,7 @@ import com.vaadin.server.ComponentSizeValidator;
 import com.vaadin.server.VaadinService;
 import com.vaadin.server.VaadinSession;
 import com.vaadin.shared.Registration;
+import com.vaadin.shared.ui.AbstractSingleComponentContainerState;
 import com.vaadin.ui.declarative.DesignContext;
 import com.vaadin.ui.declarative.DesignException;
 
@@ -352,4 +353,17 @@ public abstract class AbstractSingleComponentContainer extends AbstractComponent
             design.appendChild(childNode);
         }
     }
+
+    @Override
+    protected AbstractSingleComponentContainerState getState() {
+        return (AbstractSingleComponentContainerState) super.getState();
+    }
+
+    @Override
+    protected AbstractSingleComponentContainerState getState(
+            boolean markAsDirty) {
+        return (AbstractSingleComponentContainerState) super.getState(
+                markAsDirty);
+    }
+
 }
\ No newline at end of file