1 files changed, 5 insertions, 11 deletions
diff --git a/src/com/vaadin/ui/Panel.java b/src/com/vaadin/ui/Panel.java
index ad0ff4222f..7045313ce5 100644
--- a/src/com/vaadin/ui/Panel.java
+++ b/src/com/vaadin/ui/Panel.java
@@ -15,9 +15,9 @@ import com.vaadin.event.MouseEvents.ClickListener;
 import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.PaintTarget;
 import com.vaadin.terminal.Scrollable;
+import com.vaadin.terminal.Vaadin6Component;
 import com.vaadin.terminal.gwt.client.MouseEventDetails;
 import com.vaadin.terminal.gwt.client.ui.ClickEventHandler;
-import com.vaadin.terminal.gwt.client.ui.PanelConnector;
 import com.vaadin.terminal.gwt.client.ui.PanelConnector.PanelServerRPC;
 import com.vaadin.terminal.gwt.client.ui.PanelConnector.PanelState;
 import com.vaadin.ui.Component.Focusable;
@@ -33,7 +33,8 @@ import com.vaadin.ui.Component.Focusable;
 @SuppressWarnings("serial")
 public class Panel extends AbstractComponentContainer implements Scrollable,
         ComponentContainer.ComponentAttachListener,
-        ComponentContainer.ComponentDetachListener, Action.Notifier, Focusable {
+        ComponentContainer.ComponentDetachListener, Action.Notifier, Focusable,
+        Vaadin6Component {
 
     /**
      * Content of the panel.
@@ -221,14 +222,10 @@ public class Panel extends AbstractComponentContainer implements Scrollable,
      * (non-Javadoc)
      * 
      * @see
-     * com.vaadin.ui.AbstractComponent#paintContent(com.vaadin.terminal.PaintTarget
-     * )
+     * com.vaadin.terminal.Vaadin6Component#paintContent(com.vaadin.terminal
+     * .PaintTarget)
      */
-    @Override
     public void paintContent(PaintTarget target) throws PaintException {
-        // This is needed for now for paint to be ever run for the child
-        content.paint(target);
-
         if (actionManager != null) {
             actionManager.paintActions(null, target);
         }
@@ -289,10 +286,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable,
      * @see com.vaadin.terminal.VariableOwner#changeVariables(Object, Map)
      */
     @SuppressWarnings("unchecked")
-    @Override
     public void changeVariables(Object source, Map<String, Object> variables) {
-        super.changeVariables(source, variables);
-
         // Get new size
         final Integer newWidth = (Integer) variables.get("width");
         final Integer newHeight = (Integer) variables.get("height");