merge master

1 files changed, 6 insertions, 1 deletions

diff --git a/src/com/vaadin/ui/CustomLayout.java b/src/com/vaadin/ui/CustomLayout.java
index 97cea1c49d..d7830603f0 100644
--- a/src/com/vaadin/ui/CustomLayout.java
+++ b/src/com/vaadin/ui/CustomLayout.java
@@ -12,10 +12,10 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
+import com.vaadin.shared.ui.customlayout.CustomLayoutState;
 import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.PaintTarget;
 import com.vaadin.terminal.Vaadin6Component;
-import com.vaadin.terminal.gwt.client.ui.customlayout.CustomLayoutState;
 import com.vaadin.terminal.gwt.server.JsonPaintTarget;
 
 /**
@@ -185,6 +185,7 @@ public class CustomLayout extends AbstractLayout implements Vaadin6Component {
      * 
      * @return the Iterator of the components inside the container.
      */
+    @Override
     public Iterator<Component> getComponentIterator() {
         return slots.values().iterator();
     }
@@ -195,6 +196,7 @@ public class CustomLayout extends AbstractLayout implements Vaadin6Component {
      * 
      * @return the number of contained components
      */
+    @Override
     public int getComponentCount() {
         return slots.values().size();
     }
@@ -212,6 +214,7 @@ public class CustomLayout extends AbstractLayout implements Vaadin6Component {
     }
 
     /* Documented in superclass */
+    @Override
     public void replaceComponent(Component oldComponent, Component newComponent) {
 
         // Gets the locations
@@ -305,10 +308,12 @@ public class CustomLayout extends AbstractLayout implements Vaadin6Component {
                 "CustomLayout does not support margins.");
     }
 
+    @Override
     public void changeVariables(Object source, Map<String, Object> variables) {
         // Nothing to see here
     }
 
+    @Override
     public void paintContent(PaintTarget target) throws PaintException {
         // Workaround to make the CommunicationManager read the template file
         // and send it to the client