ServerConnector is no longer a Paintable, components using updateFromUidl are

src/com/vaadin/terminal/gwt/client/ApplicationConnection.java

@@ -1214,16 +1214,18 @@ public class ApplicationConnection {
 
                         final ComponentConnector legacyConnector = (ComponentConnector) connectorMap
                                 .getConnector(connectorId);
-                        if (legacyConnector != null
-                                && legacyConnector instanceof Paintable) {
+                        if (legacyConnector instanceof Paintable) {
                             ((Paintable) legacyConnector).updateFromUIDL(uidl,
                                     ApplicationConnection.this);
-                        } else {
+                        } else if (legacyConnector == null) {
                             VConsole.error("Received update for "
                                     + uidl.getTag()
                                     + ", but there is no such paintable ("
                                     + connectorId + ") rendered.");
-
+                        } else {
+                            VConsole.error("Server sent Vaadin 6 style updates for "
+                                    + Util.getConnectorString(legacyConnector)
+                                    + " but this is not a Vaadin 6 Paintable");
                         }
 
                     } catch (final Throwable e) {

src/com/vaadin/terminal/gwt/client/Paintable.java

@@ -0,0 +1,19 @@
+/*
+@VaadinApache2LicenseForJavaFiles@
+ */
+
+package com.vaadin.terminal.gwt.client;
+
+/**
+ * An interface used by client-side widgets or paintable parts to receive
+ * updates from the corresponding server-side components in the form of
+ * {@link UIDL}.
+ * 
+ * Updates can be sent back to the server using the
+ * {@link ApplicationConnection#updateVariable()} methods.
+ */
+@Deprecated
+public interface Paintable {
+
+    public void updateFromUIDL(UIDL uidl, ApplicationConnection client);
+}

src/com/vaadin/terminal/gwt/client/ServerConnector.java

@@ -20,8 +20,7 @@ import com.vaadin.terminal.gwt.client.communication.StateChangeEvent.StateChange
  * @version @VERSION@
  * @since 7.0.0
  */
-// TODO Remove "implements Paintable"
-public interface ServerConnector extends Connector, Paintable {
+public interface ServerConnector extends Connector {
 
     /**
      * Sets a new state for the connector.

src/com/vaadin/terminal/gwt/client/ui/AbstractComponentConnector.java

@@ -153,11 +153,6 @@ public abstract class AbstractComponentConnector extends AbstractConnector
         updateComponentSize();
     }
 
-    @Deprecated
-    public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
-        // TODO Remove this method
-    }
-
     private void updateComponentSize() {
         String newWidth = getState().getWidth();
         String newHeight = getState().getHeight();

src/com/vaadin/terminal/gwt/client/ui/AbstractDateFieldConnector.java

@@ -9,15 +9,14 @@ import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.LocaleNotLoadedException;
+import com.vaadin.terminal.gwt.client.Paintable;
 import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.VConsole;
 
-public class AbstractDateFieldConnector extends AbstractFieldConnector {
+public class AbstractDateFieldConnector extends AbstractFieldConnector
+        implements Paintable {
 
-    @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
-        // Ensure correct implementation and let layout manage caption
-        super.updateFromUIDL(uidl, client);
         if (!isRealUpdate(uidl)) {
             return;
         }

src/com/vaadin/terminal/gwt/client/ui/AbstractOrderedLayoutConnector.java

@@ -12,6 +12,7 @@ import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.ComponentConnector;
 import com.vaadin.terminal.gwt.client.DirectionalManagedLayout;
 import com.vaadin.terminal.gwt.client.LayoutManager;
+import com.vaadin.terminal.gwt.client.Paintable;
 import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.Util;
 import com.vaadin.terminal.gwt.client.VCaption;
@@ -22,7 +23,8 @@ import com.vaadin.terminal.gwt.client.ui.layout.ComponentConnectorLayoutSlot;
 import com.vaadin.terminal.gwt.client.ui.layout.VLayoutSlot;
 
 public abstract class AbstractOrderedLayoutConnector extends
-        AbstractComponentContainerConnector implements DirectionalManagedLayout {
+        AbstractComponentContainerConnector implements Paintable,
+        DirectionalManagedLayout {
 
     public interface AbstractOrderedLayoutServerRPC extends LayoutClickRPC,
             ServerRpc {
@@ -79,9 +81,7 @@ public abstract class AbstractOrderedLayoutConnector extends
         return (VMeasuringOrderedLayout) super.getWidget();
     }
 
-    @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
-        super.updateFromUIDL(uidl, client);
         if (!isRealUpdate(uidl)) {
             return;
         }

src/com/vaadin/terminal/gwt/client/ui/ButtonConnector.java

@@ -10,6 +10,7 @@ import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.EventHelper;
 import com.vaadin.terminal.gwt.client.MouseEventDetails;
+import com.vaadin.terminal.gwt.client.Paintable;
 import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.communication.RpcProxy;
 import com.vaadin.terminal.gwt.client.communication.ServerRpc;
@@ -17,7 +18,8 @@ import com.vaadin.terminal.gwt.client.ui.Component.LoadStyle;
 import com.vaadin.ui.Button;
 
 @Component(value = Button.class, loadStyle = LoadStyle.EAGER)
-public class ButtonConnector extends AbstractComponentConnector {
+public class ButtonConnector extends AbstractComponentConnector implements
+        Paintable {
 
     /**
      * RPC interface for calls from client to server.
@@ -52,12 +54,10 @@ public class ButtonConnector extends AbstractComponentConnector {
                 this);
     }
 
-    @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
 
         // Ensure correct implementation,
         // but don't let container manage caption etc.
-        super.updateFromUIDL(uidl, client);
         if (!isRealUpdate(uidl)) {
             return;
         }

src/com/vaadin/terminal/gwt/client/ui/CheckBoxConnector.java

@@ -9,26 +9,25 @@ import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.EventHelper;
+import com.vaadin.terminal.gwt.client.Paintable;
 import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.VTooltip;
 import com.vaadin.ui.CheckBox;
 
 @Component(CheckBox.class)
-public class CheckBoxConnector extends AbstractFieldConnector {
+public class CheckBoxConnector extends AbstractFieldConnector implements
+        Paintable {
 
     @Override
     protected boolean delegateCaptionHandling() {
         return false;
     }
 
-    @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
         // Save details
         getWidget().client = client;
         getWidget().id = uidl.getId();
 
-        // Ensure correct implementation
-        super.updateFromUIDL(uidl, client);
         if (!isRealUpdate(uidl)) {
             return;
         }

src/com/vaadin/terminal/gwt/client/ui/ComboBoxConnector.java

@@ -8,6 +8,7 @@ import java.util.Iterator;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.Paintable;
 import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.Util;
 import com.vaadin.terminal.gwt.client.ui.VFilterSelect.FilterSelectSuggestion;
@@ -15,7 +16,7 @@ import com.vaadin.ui.Select;
 
 @Component(Select.class)
 public class ComboBoxConnector extends AbstractFieldConnector implements
-        SimpleManagedLayout {
+        Paintable, SimpleManagedLayout {
 
     /*
      * (non-Javadoc)
@@ -24,8 +25,6 @@ public class ComboBoxConnector extends AbstractFieldConnector implements
      * com.vaadin.terminal.gwt.client.Paintable#updateFromUIDL(com.vaadin.terminal
      * .gwt.client.UIDL, com.vaadin.terminal.gwt.client.ApplicationConnection)
      */
-    @Override
-    @SuppressWarnings("deprecation")
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
         // Save details
         getWidget().client = client;
@@ -37,7 +36,6 @@ public class ComboBoxConnector extends AbstractFieldConnector implements
         getWidget().tb.setEnabled(getWidget().enabled);
         getWidget().updateReadOnly();
 
-        super.updateFromUIDL(uidl, client);
         if (!isRealUpdate(uidl)) {
             return;
         }

src/com/vaadin/terminal/gwt/client/ui/CssLayoutConnector.java

@@ -8,13 +8,15 @@ import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.ComponentConnector;
+import com.vaadin.terminal.gwt.client.Paintable;
 import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.communication.RpcProxy;
 import com.vaadin.terminal.gwt.client.communication.ServerRpc;
 import com.vaadin.ui.CssLayout;
 
 @Component(CssLayout.class)
-public class CssLayoutConnector extends AbstractComponentContainerConnector {
+public class CssLayoutConnector extends AbstractComponentContainerConnector
+        implements Paintable {
 
     private LayoutClickEventHandler clickEventHandler = new LayoutClickEventHandler(
             this) {
@@ -42,10 +44,8 @@ public class CssLayoutConnector extends AbstractComponentContainerConnector {
         rpc = RpcProxy.create(CssLayoutServerRPC.class, this);
     }
 
-    @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
 
-        super.updateFromUIDL(uidl, client);
         if (!isRealUpdate(uidl)) {
             return;
         }

src/com/vaadin/terminal/gwt/client/ui/CustomLayoutConnector.java

@@ -12,19 +12,16 @@ import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.ComponentConnector;
+import com.vaadin.terminal.gwt.client.Paintable;
 import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.ui.CustomLayout;
 
 @Component(CustomLayout.class)
 public class CustomLayoutConnector extends AbstractComponentContainerConnector
-        implements SimpleManagedLayout {
+        implements Paintable, SimpleManagedLayout {
 
-    /** Update the layout from UIDL */
-    @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
         getWidget().client = client;
-        // ApplicationConnection manages generic component features
-        super.updateFromUIDL(uidl, client);
         if (!isRealUpdate(uidl)) {
             return;
         }

src/com/vaadin/terminal/gwt/client/ui/DragAndDropWrapperConnector.java

@@ -9,16 +9,16 @@ import java.util.Set;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.Paintable;
 import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.ui.DragAndDropWrapper;
 
 @Component(DragAndDropWrapper.class)
-public class DragAndDropWrapperConnector extends CustomComponentConnector {
+public class DragAndDropWrapperConnector extends CustomComponentConnector
+        implements Paintable {
 
-    @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
         getWidget().client = client;
-        super.updateFromUIDL(uidl, client);
         if (isRealUpdate(uidl) && !uidl.hasAttribute("hidden")) {
             UIDL acceptCrit = uidl.getChildByTagName("-ac");
             if (acceptCrit == null) {

src/com/vaadin/terminal/gwt/client/ui/EmbeddedConnector.java

@@ -19,6 +19,7 @@ import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.MouseEventDetails;
+import com.vaadin.terminal.gwt.client.Paintable;
 import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.VConsole;
 import com.vaadin.terminal.gwt.client.VTooltip;
@@ -27,7 +28,8 @@ import com.vaadin.terminal.gwt.client.communication.ServerRpc;
 import com.vaadin.ui.Embedded;
 
 @Component(Embedded.class)
-public class EmbeddedConnector extends AbstractComponentConnector {
+public class EmbeddedConnector extends AbstractComponentConnector implements
+        Paintable {
 
     public interface EmbeddedServerRPC extends ClickRPC, ServerRpc {
     }
@@ -42,9 +44,7 @@ public class EmbeddedConnector extends AbstractComponentConnector {
         rpc = RpcProxy.create(EmbeddedServerRPC.class, this);
     }
 
-    @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
-        super.updateFromUIDL(uidl, client);
         if (!isRealUpdate(uidl)) {
             return;
         }

src/com/vaadin/terminal/gwt/client/ui/FormConnector.java

@@ -12,12 +12,13 @@ import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.ComponentConnector;
 import com.vaadin.terminal.gwt.client.ConnectorMap;
 import com.vaadin.terminal.gwt.client.LayoutManager;
+import com.vaadin.terminal.gwt.client.Paintable;
 import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.ui.Form;
 
 @Component(Form.class)
 public class FormConnector extends AbstractComponentContainerConnector
-        implements SimpleManagedLayout {
+        implements Paintable, SimpleManagedLayout {
 
     @Override
     public void init() {
@@ -30,12 +31,10 @@ public class FormConnector extends AbstractComponentContainerConnector
         return false;
     }
 
-    @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
         getWidget().client = client;
         getWidget().id = uidl.getId();
 
-        super.updateFromUIDL(uidl, client);
         if (!isRealUpdate(uidl)) {
             return;
         }

src/com/vaadin/terminal/gwt/client/ui/FormLayoutConnector.java

@@ -7,18 +7,18 @@ import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.ComponentConnector;
+import com.vaadin.terminal.gwt.client.Paintable;
 import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.ui.VFormLayout.Caption;
 import com.vaadin.terminal.gwt.client.ui.VFormLayout.ErrorFlag;
 import com.vaadin.ui.FormLayout;
 
 @Component(FormLayout.class)
-public class FormLayoutConnector extends AbstractComponentContainerConnector {
-    @Override
+public class FormLayoutConnector extends AbstractComponentContainerConnector
+        implements Paintable {
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
         getWidget().client = client;
 
-        super.updateFromUIDL(uidl, client);
         if (!isRealUpdate(uidl)) {
             return;
         }

src/com/vaadin/terminal/gwt/client/ui/GridLayoutConnector.java

@@ -14,6 +14,7 @@ import com.vaadin.terminal.gwt.client.ComponentConnector;
 import com.vaadin.terminal.gwt.client.ComponentState;
 import com.vaadin.terminal.gwt.client.ConnectorMap;
 import com.vaadin.terminal.gwt.client.DirectionalManagedLayout;
+import com.vaadin.terminal.gwt.client.Paintable;
 import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.VCaption;
 import com.vaadin.terminal.gwt.client.communication.RpcProxy;
@@ -25,7 +26,7 @@ import com.vaadin.ui.GridLayout;
 
 @Component(GridLayout.class)
 public class GridLayoutConnector extends AbstractComponentContainerConnector
-        implements DirectionalManagedLayout {
+        implements Paintable, DirectionalManagedLayout {
 
     public static class GridLayoutState extends ComponentState {
         private boolean spacing = false;
@@ -99,12 +100,10 @@ public class GridLayoutConnector extends AbstractComponentContainerConnector
 
     }
 
-    @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
         VGridLayout layout = getWidget();
         layout.client = client;
 
-        super.updateFromUIDL(uidl, client);
         if (!isRealUpdate(uidl)) {
             return;
         }

src/com/vaadin/terminal/gwt/client/ui/LinkConnector.java

@@ -8,23 +8,21 @@ import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.Paintable;
 import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.ui.Link;
 
 @Component(Link.class)
-public class LinkConnector extends AbstractComponentConnector {
+public class LinkConnector extends AbstractComponentConnector implements
+        Paintable {
 
     @Override
     protected boolean delegateCaptionHandling() {
         return false;
     }
 
-    @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
 
-        // Ensure correct implementation,
-        // but don't let container manage caption etc.
-        super.updateFromUIDL(uidl, client);
         if (!isRealUpdate(uidl)) {
             return;
         }

src/com/vaadin/terminal/gwt/client/ui/MediaBaseConnector.java

@@ -4,11 +4,13 @@
 package com.vaadin.terminal.gwt.client.ui;
 
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.Paintable;
 import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.Util;
 import com.vaadin.terminal.gwt.client.communication.ClientRpc;
 
-public abstract class MediaBaseConnector extends AbstractComponentConnector {
+public abstract class MediaBaseConnector extends AbstractComponentConnector
+        implements Paintable {
 
     public static final String TAG_SOURCE = "src";
 
@@ -52,9 +54,7 @@ public abstract class MediaBaseConnector extends AbstractComponentConnector {
         });
     }
 
-    @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
-        super.updateFromUIDL(uidl, client);
         if (!isRealUpdate(uidl)) {
             return;
         }

src/com/vaadin/terminal/gwt/client/ui/MenuBarConnector.java

@@ -10,6 +10,7 @@ import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.Command;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.Paintable;
 import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.Util;
 import com.vaadin.terminal.gwt.client.ui.Component.LoadStyle;
@@ -17,7 +18,7 @@ import com.vaadin.terminal.gwt.client.ui.VMenuBar.CustomMenuItem;
 
 @Component(value = com.vaadin.ui.MenuBar.class, loadStyle = LoadStyle.LAZY)
 public class MenuBarConnector extends AbstractComponentConnector implements
-        SimpleManagedLayout {
+        Paintable, SimpleManagedLayout {
     /**
      * This method must be implemented to update the client-side component from
      * UIDL data received from server.
@@ -25,11 +26,7 @@ public class MenuBarConnector extends AbstractComponentConnector implements
      * This method is called when the page is loaded for the first time, and
      * every time UI changes in the component are received from the server.
      */
-    @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
-        // This call should be made first. Ensure correct implementation,
-        // and let the containing layout manage caption, etc.
-        super.updateFromUIDL(uidl, client);
         if (!isRealUpdate(uidl)) {
             return;
         }

src/com/vaadin/terminal/gwt/client/ui/NativeButtonConnector.java

@@ -8,13 +8,15 @@ import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.EventHelper;
+import com.vaadin.terminal.gwt.client.Paintable;
 import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.communication.RpcProxy;
 import com.vaadin.terminal.gwt.client.ui.ButtonConnector.ButtonServerRpc;
 import com.vaadin.ui.NativeButton;
 
 @Component(NativeButton.class)
-public class NativeButtonConnector extends AbstractComponentConnector {
+public class NativeButtonConnector extends AbstractComponentConnector implements
+        Paintable {
 
     @Override
     public void init() {
@@ -29,12 +31,8 @@ public class NativeButtonConnector extends AbstractComponentConnector {
         return false;
     }
 
-    @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
 
-        // Ensure correct implementation,
-        // but don't let container manage caption etc.
-        super.updateFromUIDL(uidl, client);
         if (!isRealUpdate(uidl)) {
             return;
         }

src/com/vaadin/terminal/gwt/client/ui/OptionGroupBaseConnector.java

@@ -5,18 +5,18 @@
 package com.vaadin.terminal.gwt.client.ui;
 
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.Paintable;
 import com.vaadin.terminal.gwt.client.UIDL;
 
-public abstract class OptionGroupBaseConnector extends AbstractFieldConnector {
+public abstract class OptionGroupBaseConnector extends AbstractFieldConnector
+        implements Paintable {
 
-    @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
 
         // Save details
         getWidget().client = client;
         getWidget().paintableId = uidl.getId();
 
-        super.updateFromUIDL(uidl, client);
         if (!isRealUpdate(uidl)) {
             return;
         }

src/com/vaadin/terminal/gwt/client/ui/PanelConnector.java

@@ -14,6 +14,7 @@ import com.vaadin.terminal.gwt.client.ComponentState;
 import com.vaadin.terminal.gwt.client.ConnectorHierarchyChangeEvent;
 import com.vaadin.terminal.gwt.client.LayoutManager;
 import com.vaadin.terminal.gwt.client.MouseEventDetails;
+import com.vaadin.terminal.gwt.client.Paintable;
 import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.Util;
 import com.vaadin.terminal.gwt.client.communication.RpcProxy;
@@ -22,7 +23,7 @@ import com.vaadin.ui.Panel;
 
 @Component(Panel.class)
 public class PanelConnector extends AbstractComponentContainerConnector
-        implements SimpleManagedLayout, PostLayoutListener {
+        implements Paintable, SimpleManagedLayout, PostLayoutListener {
 
     public interface PanelServerRPC extends ClickRPC, ServerRpc {
 
@@ -89,7 +90,6 @@ public class PanelConnector extends AbstractComponentContainerConnector
         return false;
     }
 
-    @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
         if (isRealUpdate(uidl)) {
 
@@ -132,8 +132,6 @@ public class PanelConnector extends AbstractComponentContainerConnector
             getWidget().contentNode.setClassName(contentClass);
             getWidget().bottomDecoration.setClassName(decoClass);
         }
-        // Ensure correct implementation
-        super.updateFromUIDL(uidl, client);
 
         if (!isRealUpdate(uidl)) {
             return;

src/com/vaadin/terminal/gwt/client/ui/PopupViewConnector.java

@@ -7,6 +7,7 @@ import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.ComponentConnector;
+import com.vaadin.terminal.gwt.client.Paintable;
 import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.VCaption;
 import com.vaadin.terminal.gwt.client.VCaptionWrapper;
@@ -14,7 +15,7 @@ import com.vaadin.ui.PopupView;
 
 @Component(PopupView.class)
 public class PopupViewConnector extends AbstractComponentContainerConnector
-        implements PostLayoutListener {
+        implements Paintable, PostLayoutListener {
 
     private boolean centerAfterLayout = false;
 
@@ -29,11 +30,7 @@ public class PopupViewConnector extends AbstractComponentContainerConnector
      * @see com.vaadin.terminal.gwt.client.ComponentConnector#updateFromUIDL(com.vaadin.terminal.gwt.client.UIDL,
      *      com.vaadin.terminal.gwt.client.ApplicationConnection)
      */
-    @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
-        // This call should be made first. Ensure correct implementation,
-        // and don't let the containing layout manage caption.
-        super.updateFromUIDL(uidl, client);
         if (!isRealUpdate(uidl)) {
             return;
         }

src/com/vaadin/terminal/gwt/client/ui/ProgressIndicatorConnector.java

@@ -8,18 +8,16 @@ import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.Paintable;
 import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.ui.ProgressIndicator;
 
 @Component(ProgressIndicator.class)
-public class ProgressIndicatorConnector extends AbstractFieldConnector {
+public class ProgressIndicatorConnector extends AbstractFieldConnector
+        implements Paintable {
 
-    @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
 
-        // Ensure correct implementation,
-        // but don't let container manage caption etc.
-        super.updateFromUIDL(uidl, client);
         if (!isRealUpdate(uidl)) {
             return;
         }

src/com/vaadin/terminal/gwt/client/ui/RootConnector.java

@@ -26,6 +26,7 @@ import com.vaadin.terminal.gwt.client.ConnectorHierarchyChangeEvent;
 import com.vaadin.terminal.gwt.client.ConnectorMap;
 import com.vaadin.terminal.gwt.client.Focusable;
 import com.vaadin.terminal.gwt.client.MouseEventDetails;
+import com.vaadin.terminal.gwt.client.Paintable;
 import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.Util;
 import com.vaadin.terminal.gwt.client.VConsole;
@@ -37,7 +38,8 @@ import com.vaadin.terminal.gwt.client.ui.Component.LoadStyle;
 import com.vaadin.ui.Root;
 
 @Component(value = Root.class, loadStyle = LoadStyle.EAGER)
-public class RootConnector extends AbstractComponentContainerConnector {
+public class RootConnector extends AbstractComponentContainerConnector
+        implements Paintable {
 
     public interface RootServerRPC extends ClickRPC, ServerRpc {
 
@@ -61,7 +63,6 @@ public class RootConnector extends AbstractComponentContainerConnector {
         rpc = RpcProxy.create(RootServerRPC.class, this);
     }
 
-    @Override
     public void updateFromUIDL(final UIDL uidl, ApplicationConnection client) {
         ConnectorMap paintableMap = ConnectorMap.get(getConnection());
         getWidget().rendering = true;

src/com/vaadin/terminal/gwt/client/ui/SliderConnector.java

@@ -8,20 +8,19 @@ import com.google.gwt.core.client.Scheduler;
 import com.google.gwt.user.client.Command;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.Paintable;
 import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.ui.Slider;
 
 @Component(Slider.class)
-public class SliderConnector extends AbstractFieldConnector {
+public class SliderConnector extends AbstractFieldConnector implements
+        Paintable {
 
-    @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
 
         getWidget().client = client;
         getWidget().id = uidl.getId();
 
-        // Ensure correct implementation
-        super.updateFromUIDL(uidl, client);
         if (!isRealUpdate(uidl)) {
             return;
         }

src/com/vaadin/terminal/gwt/client/ui/TableConnector.java

@@ -15,6 +15,7 @@ import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.BrowserInfo;
 import com.vaadin.terminal.gwt.client.ComponentConnector;
 import com.vaadin.terminal.gwt.client.DirectionalManagedLayout;
+import com.vaadin.terminal.gwt.client.Paintable;
 import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.Util;
 import com.vaadin.terminal.gwt.client.ui.VScrollTable.ContextMenuDetails;
@@ -22,7 +23,7 @@ import com.vaadin.terminal.gwt.client.ui.VScrollTable.VScrollTableBody.VScrollTa
 
 @Component(com.vaadin.ui.Table.class)
 public class TableConnector extends AbstractComponentContainerConnector
-        implements DirectionalManagedLayout, PostLayoutListener {
+        implements Paintable, DirectionalManagedLayout, PostLayoutListener {
 
     @Override
     protected void init() {
@@ -37,7 +38,6 @@ public class TableConnector extends AbstractComponentContainerConnector
      * com.vaadin.terminal.gwt.client.Paintable#updateFromUIDL(com.vaadin.terminal
      * .gwt.client.UIDL, com.vaadin.terminal.gwt.client.ApplicationConnection)
      */
-    @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
         getWidget().rendering = true;
 
@@ -66,7 +66,6 @@ public class TableConnector extends AbstractComponentContainerConnector
 
         getWidget().tFoot.setVisible(getWidget().showColFooters);
 
-        super.updateFromUIDL(uidl, client);
         if (!isRealUpdate(uidl)) {
             getWidget().rendering = false;
             return;

src/com/vaadin/terminal/gwt/client/ui/TabsheetBaseConnector.java

@@ -9,10 +9,11 @@ import java.util.Iterator;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.ComponentConnector;
+import com.vaadin.terminal.gwt.client.Paintable;
 import com.vaadin.terminal.gwt.client.UIDL;
 
 public abstract class TabsheetBaseConnector extends
-        AbstractComponentContainerConnector {
+        AbstractComponentContainerConnector implements Paintable {
 
     public static final String ATTRIBUTE_TAB_DISABLED = "disabled";
     public static final String ATTRIBUTE_TAB_DESCRIPTION = "description";
@@ -20,12 +21,9 @@ public abstract class TabsheetBaseConnector extends
     public static final String ATTRIBUTE_TAB_CAPTION = "caption";
     public static final String ATTRIBUTE_TAB_ICON = "icon";
 
-    @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
         getWidget().client = client;
 
-        // Ensure correct implementation
-        super.updateFromUIDL(uidl, client);
         if (!isRealUpdate(uidl)) {
             return;
         }

src/com/vaadin/terminal/gwt/client/ui/TextFieldConnector.java

@@ -10,6 +10,7 @@ import com.google.gwt.user.client.Command;
 import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.Paintable;
 import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.ui.Component.LoadStyle;
 import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler.BeforeShortcutActionListener;
@@ -17,15 +18,13 @@ import com.vaadin.ui.TextField;
 
 @Component(value = TextField.class, loadStyle = LoadStyle.EAGER)
 public class TextFieldConnector extends AbstractFieldConnector implements
-        BeforeShortcutActionListener {
+        Paintable, BeforeShortcutActionListener {
 
-    @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
         // Save details
         getWidget().client = client;
         getWidget().paintableId = uidl.getId();
 
-        super.updateFromUIDL(uidl, client);
         if (!isRealUpdate(uidl)) {
             return;
         }

src/com/vaadin/terminal/gwt/client/ui/TreeConnector.java

@@ -9,13 +9,15 @@ import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.AbstractFieldState;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.Paintable;
 import com.vaadin.terminal.gwt.client.TooltipInfo;
 import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.ui.VTree.TreeNode;
 import com.vaadin.ui.Tree;
 
 @Component(Tree.class)
-public class TreeConnector extends AbstractComponentConnector {
+public class TreeConnector extends AbstractComponentConnector implements
+        Paintable {
 
     public static final String ATTRIBUTE_NODE_STYLE = "style";
     public static final String ATTRIBUTE_NODE_CAPTION = "caption";
@@ -24,10 +26,7 @@ public class TreeConnector extends AbstractComponentConnector {
     public static final String ATTRIBUTE_ACTION_CAPTION = "caption";
     public static final String ATTRIBUTE_ACTION_ICON = ATTRIBUTE_NODE_ICON;
 
-    @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
-        // Ensure correct implementation and let container manage caption
-        super.updateFromUIDL(uidl, client);
         if (!isRealUpdate(uidl)) {
             return;
         }

src/com/vaadin/terminal/gwt/client/ui/UnknownComponentConnector.java

@@ -7,19 +7,19 @@ package com.vaadin.terminal.gwt.client.ui;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.Paintable;
 import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.VUIDLBrowser;
 
-public class UnknownComponentConnector extends AbstractComponentConnector {
+public class UnknownComponentConnector extends AbstractComponentConnector
+        implements Paintable {
 
     @Override
     protected boolean delegateCaptionHandling() {
         return false;
     }
 
-    @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
-        super.updateFromUIDL(uidl, client);
         if (!isRealUpdate(uidl)) {
             return;
         }

src/com/vaadin/terminal/gwt/client/ui/UploadConnector.java

@@ -7,16 +7,16 @@ package com.vaadin.terminal.gwt.client.ui;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.Paintable;
 import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.ui.Component.LoadStyle;
 import com.vaadin.ui.Upload;
 
 @Component(value = Upload.class, loadStyle = LoadStyle.LAZY)
-public class UploadConnector extends AbstractComponentConnector {
+public class UploadConnector extends AbstractComponentConnector implements
+        Paintable {
 
-    @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
-        super.updateFromUIDL(uidl, client);
         if (!isRealUpdate(uidl)) {
             return;
         }

src/com/vaadin/terminal/gwt/client/ui/WindowConnector.java

@@ -18,6 +18,7 @@ import com.vaadin.terminal.gwt.client.BrowserInfo;
 import com.vaadin.terminal.gwt.client.ComponentConnector;
 import com.vaadin.terminal.gwt.client.LayoutManager;
 import com.vaadin.terminal.gwt.client.MouseEventDetails;
+import com.vaadin.terminal.gwt.client.Paintable;
 import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.Util;
 import com.vaadin.terminal.gwt.client.communication.RpcProxy;
@@ -27,8 +28,8 @@ import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler.BeforeShortcutAct
 
 @Component(value = com.vaadin.ui.Window.class)
 public class WindowConnector extends AbstractComponentContainerConnector
-        implements BeforeShortcutActionListener, SimpleManagedLayout,
-        PostLayoutListener {
+        implements Paintable, BeforeShortcutActionListener,
+        SimpleManagedLayout, PostLayoutListener {
 
     public interface WindowServerRPC extends ClickRPC, ServerRpc {
     }
@@ -126,7 +127,6 @@ public class WindowConnector extends AbstractComponentContainerConnector
         getLayoutManager().registerDependency(this, getWidget().footer);
     }
 
-    @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
         getWidget().id = getConnectorId();
         getWidget().client = client;
@@ -162,7 +162,6 @@ public class WindowConnector extends AbstractComponentContainerConnector
         }
 
         getWidget().visibilityChangesDisabled = true;
-        super.updateFromUIDL(uidl, client);
         if (!isRealUpdate(uidl)) {
             return;
         }

src/com/vaadin/terminal/gwt/client/ui/label/LabelConnector.java

@@ -8,6 +8,7 @@ import com.google.gwt.dom.client.Document;
 import com.google.gwt.dom.client.PreElement;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.Paintable;
 import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.Util;
 import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector;
@@ -16,13 +17,10 @@ import com.vaadin.terminal.gwt.client.ui.Component.LoadStyle;
 import com.vaadin.ui.Label;
 
 @Component(value = Label.class, loadStyle = LoadStyle.EAGER)
-public class LabelConnector extends AbstractComponentConnector {
-    public LabelConnector() {
-    }
+public class LabelConnector extends AbstractComponentConnector implements
+        Paintable {
 
-    @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
-        super.updateFromUIDL(uidl, client);
         getWidget().setConnection(client);
         if (!isRealUpdate(uidl)) {
             return;

src/com/vaadin/terminal/gwt/client/ui/richtextarea/RichTextAreaConnector.java

@@ -7,6 +7,7 @@ import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.Paintable;
 import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.ui.AbstractFieldConnector;
 import com.vaadin.terminal.gwt.client.ui.Component;
@@ -16,9 +17,8 @@ import com.vaadin.ui.RichTextArea;
 
 @Component(value = RichTextArea.class, loadStyle = LoadStyle.LAZY)
 public class RichTextAreaConnector extends AbstractFieldConnector implements
-        BeforeShortcutActionListener {
+        Paintable, BeforeShortcutActionListener {
 
-    @Override
     public void updateFromUIDL(final UIDL uidl, ApplicationConnection client) {
         getWidget().client = client;
         getWidget().id = uidl.getId();
@@ -35,7 +35,6 @@ public class RichTextAreaConnector extends AbstractFieldConnector implements
             getWidget().setEnabled(isEnabled());
         }
 
-        super.updateFromUIDL(uidl, client);
         if (!isRealUpdate(uidl)) {
             return;
         }

tests/testbench/com/vaadin/tests/dd/MyDragSourceConnector.java

@@ -6,17 +6,17 @@ package com.vaadin.tests.dd;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.Paintable;
 import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector;
 import com.vaadin.terminal.gwt.client.ui.Component;
 import com.vaadin.tests.dd.CustomDDImplementation.MyDragSource;
 
 @Component(MyDragSource.class)
-public class MyDragSourceConnector extends AbstractComponentConnector {
+public class MyDragSourceConnector extends AbstractComponentConnector implements
+        Paintable {
 
-    @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
-        super.updateFromUIDL(uidl, client);
         if (!isRealUpdate(uidl)) {
             return;
         }

tests/testbench/com/vaadin/tests/dd/MyDropTargetConnector.java

@@ -6,18 +6,19 @@ package com.vaadin.tests.dd;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.Paintable;
 import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector;
 
+<<<<<<< HEAD
 import com.vaadin.terminal.gwt.client.ui.Component;
 import com.vaadin.tests.dd.CustomDDImplementation.MyDropTarget;
 
 @Component(MyDropTarget.class)
-public class MyDropTargetConnector extends AbstractComponentConnector {
+public class MyDropTargetConnector extends AbstractComponentConnector implements
+        Paintable {
 
-    @Override
     public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
-        super.updateFromUIDL(uidl, client);
         if (!isRealUpdate(uidl)) {
             return;
         }