ServerConnector is no longer a Paintable, components using updateFromUidl are

diff --git a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
index 640e362e32ddbb1ac3a6fff481060f2b558e1f23..14e85f708ebbe132e7a48ad406b8b6e599fe4e1f 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
+++ b/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) {

diff --git a/src/com/vaadin/terminal/gwt/client/Paintable.java b/src/com/vaadin/terminal/gwt/client/Paintable.java
new file mode 100755 (executable)
index 0000000..d2f6624
--- /dev/null
+++ b/src/com/vaadin/terminal/gwt/client/Paintable.java
@@ -0,0 +1,19 @@
+/*\r
+@VaadinApache2LicenseForJavaFiles@\r
+ */\r
+\r
+package com.vaadin.terminal.gwt.client;\r
+\r
+/**\r
+ * An interface used by client-side widgets or paintable parts to receive\r
+ * updates from the corresponding server-side components in the form of\r
+ * {@link UIDL}.\r
+ * \r
+ * Updates can be sent back to the server using the\r
+ * {@link ApplicationConnection#updateVariable()} methods.\r
+ */\r
+@Deprecated\r
+public interface Paintable {\r
+\r
+    public void updateFromUIDL(UIDL uidl, ApplicationConnection client);\r
+}\r

diff --git a/src/com/vaadin/terminal/gwt/client/ServerConnector.java b/src/com/vaadin/terminal/gwt/client/ServerConnector.java
index 3aab3f8454f69f36f78f92f679dd6c926c27d9e0..33026215ed872f810ba970158b8f6260b720fe39 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ServerConnector.java
+++ b/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.

diff --git a/src/com/vaadin/terminal/gwt/client/ui/AbstractComponentConnector.java b/src/com/vaadin/terminal/gwt/client/ui/AbstractComponentConnector.java
index 35f9bccbfeb258aa4f48da3886e517e004e33ae1..6f0f1e5ae2cc37ed05caa37c1954f173e092a47c 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/AbstractComponentConnector.java
+++ b/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();

diff --git a/src/com/vaadin/terminal/gwt/client/ui/AbstractDateFieldConnector.java b/src/com/vaadin/terminal/gwt/client/ui/AbstractDateFieldConnector.java
index 6aa5bf2fff93aa00071442870b487ba1fac66e8c..7497dc3d351e6102ed9862b12d46cbdc3d70ba54 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/AbstractDateFieldConnector.java
+++ b/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;
         }

diff --git a/src/com/vaadin/terminal/gwt/client/ui/AbstractOrderedLayoutConnector.java b/src/com/vaadin/terminal/gwt/client/ui/AbstractOrderedLayoutConnector.java
index 29f65b6ed9dee28e93f8d4a3e11774031a66b75d..fd2c92dec75e21a376fca735229026750d521ffe 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/AbstractOrderedLayoutConnector.java
+++ b/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;
         }

diff --git a/src/com/vaadin/terminal/gwt/client/ui/ButtonConnector.java b/src/com/vaadin/terminal/gwt/client/ui/ButtonConnector.java
index 4ad7804709e3a546b1789ff963cbb05b8943a186..b905af3d443c762b1fa6f4f48d030338637dc9d1 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/ButtonConnector.java
+++ b/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;
         }

diff --git a/src/com/vaadin/terminal/gwt/client/ui/CheckBoxConnector.java b/src/com/vaadin/terminal/gwt/client/ui/CheckBoxConnector.java
index fb80f539e989de3058e548739488f49fef7b08bf..2c7f43fede4319befa31e93c66768012b9a8fd51 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/CheckBoxConnector.java
+++ b/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;
         }

diff --git a/src/com/vaadin/terminal/gwt/client/ui/ComboBoxConnector.java b/src/com/vaadin/terminal/gwt/client/ui/ComboBoxConnector.java
index 6199ec98b58cb7cf2b1024d652ab5dfc8b702a1e..bc73146965017cf51c9b8e4ed656aa2bf56bbe21 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/ComboBoxConnector.java
+++ b/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;
         }

diff --git a/src/com/vaadin/terminal/gwt/client/ui/CssLayoutConnector.java b/src/com/vaadin/terminal/gwt/client/ui/CssLayoutConnector.java
index b45e238825eb755d0f8f0fd16ff5f4c344e5e784..0da7f21627c35644ed331e04806aa125265cf371 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/CssLayoutConnector.java
+++ b/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;
         }

diff --git a/src/com/vaadin/terminal/gwt/client/ui/CustomLayoutConnector.java b/src/com/vaadin/terminal/gwt/client/ui/CustomLayoutConnector.java
index e9555989e3a2550ad6d22a088d4ba172181b2c0e..a8196f6705373622131a6a0f31b73e1be3d365cd 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/CustomLayoutConnector.java
+++ b/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;
         }

diff --git a/src/com/vaadin/terminal/gwt/client/ui/DragAndDropWrapperConnector.java b/src/com/vaadin/terminal/gwt/client/ui/DragAndDropWrapperConnector.java
index dcb2ed80230b8977bdf1358ad839eb145a150d7e..d8cec83612ca7c599ee31af3fadfb9d41b60dfe6 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/DragAndDropWrapperConnector.java
+++ b/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) {

diff --git a/src/com/vaadin/terminal/gwt/client/ui/EmbeddedConnector.java b/src/com/vaadin/terminal/gwt/client/ui/EmbeddedConnector.java
index 14fe7bd74426a6bf090f984c90cc1d983f321f0c..b716b7637fdd45de91184cc1faa2e39d171eb210 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/EmbeddedConnector.java
+++ b/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;
         }

diff --git a/src/com/vaadin/terminal/gwt/client/ui/FormConnector.java b/src/com/vaadin/terminal/gwt/client/ui/FormConnector.java
index 20c19d4a231683d09c0d191a6ba40602ade14f90..2cc9c9968e8893b99dfb0434612c71679c41b0d6 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/FormConnector.java
+++ b/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;
         }

diff --git a/src/com/vaadin/terminal/gwt/client/ui/FormLayoutConnector.java b/src/com/vaadin/terminal/gwt/client/ui/FormLayoutConnector.java
index bd9feed29cc132485e38d5fc0cd5f1691fed48f2..782cfd62af651bc15dd0ce55cf2262f90801a261 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/FormLayoutConnector.java
+++ b/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;
         }

diff --git a/src/com/vaadin/terminal/gwt/client/ui/GridLayoutConnector.java b/src/com/vaadin/terminal/gwt/client/ui/GridLayoutConnector.java
index b80d85143ea0ee36d8a6ae90f6027a8ea518a01b..5e87bd83a818509620b045bc0733de7a870aa382 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/GridLayoutConnector.java
+++ b/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;
         }

diff --git a/src/com/vaadin/terminal/gwt/client/ui/LinkConnector.java b/src/com/vaadin/terminal/gwt/client/ui/LinkConnector.java
index c33676845ab668dc3aae4e02b35d830106c293c8..12fbefa80cb64bd4985589f557e088dbd6db003f 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/LinkConnector.java
+++ b/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;
         }

diff --git a/src/com/vaadin/terminal/gwt/client/ui/MediaBaseConnector.java b/src/com/vaadin/terminal/gwt/client/ui/MediaBaseConnector.java
index bd27b8244da3b7213312873b237936f7a798279d..1e067bf6fbf92ef037b85815685aae93876260a0 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/MediaBaseConnector.java
+++ b/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;
         }

diff --git a/src/com/vaadin/terminal/gwt/client/ui/MenuBarConnector.java b/src/com/vaadin/terminal/gwt/client/ui/MenuBarConnector.java
index 36cc454a038921b5d97fb3868bcd53363220fb9d..0980ea07ddff367735873c6a5668e8490c215f1f 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/MenuBarConnector.java
+++ b/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;
         }

diff --git a/src/com/vaadin/terminal/gwt/client/ui/NativeButtonConnector.java b/src/com/vaadin/terminal/gwt/client/ui/NativeButtonConnector.java
index 44da878884f412a3c4f3a26d5e9b8dca24bf21f0..991a184e57ba354e152753a844bbb78acf458316 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/NativeButtonConnector.java
+++ b/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;
         }

diff --git a/src/com/vaadin/terminal/gwt/client/ui/OptionGroupBaseConnector.java b/src/com/vaadin/terminal/gwt/client/ui/OptionGroupBaseConnector.java
index fe7abce18cfc8c7bb0c28e187220339bfaf8365f..df2e6942c1bdb88ede9cb975ad150b51060fb6e0 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/OptionGroupBaseConnector.java
+++ b/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;
         }

diff --git a/src/com/vaadin/terminal/gwt/client/ui/PanelConnector.java b/src/com/vaadin/terminal/gwt/client/ui/PanelConnector.java
index 833320eaeb640d1b9819014322de649d3c17edb7..19470da73a317f8742abbbd49937c04ddbf5b115 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/PanelConnector.java
+++ b/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;

diff --git a/src/com/vaadin/terminal/gwt/client/ui/PopupViewConnector.java b/src/com/vaadin/terminal/gwt/client/ui/PopupViewConnector.java
index d2162bdbccf70fa115187aaaace97b108f258f85..5da77c7e56654372889ecb2161071c051aaae1e4 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/PopupViewConnector.java
+++ b/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;
         }

diff --git a/src/com/vaadin/terminal/gwt/client/ui/ProgressIndicatorConnector.java b/src/com/vaadin/terminal/gwt/client/ui/ProgressIndicatorConnector.java
index 3c3a5ecbc2d8472c3311d6ebbb6bbee066c57a57..8b3bab8e6b4966e32c4d02fa8f163daec6b35841 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/ProgressIndicatorConnector.java
+++ b/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;
         }

diff --git a/src/com/vaadin/terminal/gwt/client/ui/RootConnector.java b/src/com/vaadin/terminal/gwt/client/ui/RootConnector.java
index fc63eb4862e96d13dd1144f432e60652bd93af8f..8af9b39825c2623b4116a314ad9c8d07607ee122 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/RootConnector.java
+++ b/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;

diff --git a/src/com/vaadin/terminal/gwt/client/ui/SliderConnector.java b/src/com/vaadin/terminal/gwt/client/ui/SliderConnector.java
index 24832e04cea1982da820f55b3d2acf9155e19040..616e33ff7af67cee8ed2c9ca217b103d26e3b5a3 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/SliderConnector.java
+++ b/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;
         }

diff --git a/src/com/vaadin/terminal/gwt/client/ui/TableConnector.java b/src/com/vaadin/terminal/gwt/client/ui/TableConnector.java
index 8cda749fb997c781d89aa8c629a7ad929bf48589..7acdc84b5fc6bc9a35a3d732a7ca8e1c07b3ec91 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/TableConnector.java
+++ b/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;

diff --git a/src/com/vaadin/terminal/gwt/client/ui/TabsheetBaseConnector.java b/src/com/vaadin/terminal/gwt/client/ui/TabsheetBaseConnector.java
index 9f023aba675fa9510d59fcfc14b921777d741658..48d14b6b0fbb6247de8992893b94b8004837c82e 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/TabsheetBaseConnector.java
+++ b/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;
         }

diff --git a/src/com/vaadin/terminal/gwt/client/ui/TextFieldConnector.java b/src/com/vaadin/terminal/gwt/client/ui/TextFieldConnector.java
index ed46403cdf055423dbad112b3ea2fc14d36ae26d..8bd59e286e809fbb728fbca47c87989e3e919cf7 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/TextFieldConnector.java
+++ b/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;
         }

diff --git a/src/com/vaadin/terminal/gwt/client/ui/TreeConnector.java b/src/com/vaadin/terminal/gwt/client/ui/TreeConnector.java
index f0b07e9125106bb9de0995fef48e7bc9eaf04d82..e1aef7f9e2f05aa26307c8d3155eb36f27c30241 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/TreeConnector.java
+++ b/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;
         }

diff --git a/src/com/vaadin/terminal/gwt/client/ui/UnknownComponentConnector.java b/src/com/vaadin/terminal/gwt/client/ui/UnknownComponentConnector.java
index b42f5d4bb6a77c0822982dfbb3b75f7e9dae7ec1..42b6bbaf5099dbc9ca630e14176cd5a9af25196f 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/UnknownComponentConnector.java
+++ b/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;
         }

diff --git a/src/com/vaadin/terminal/gwt/client/ui/UploadConnector.java b/src/com/vaadin/terminal/gwt/client/ui/UploadConnector.java
index 6bdc067737e999618508ade9393be3f41893d3ff..72d97f953a9f599913702c3081851941e3d66770 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/UploadConnector.java
+++ b/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;
         }

diff --git a/src/com/vaadin/terminal/gwt/client/ui/WindowConnector.java b/src/com/vaadin/terminal/gwt/client/ui/WindowConnector.java
index 6647d89c63a7cb343123eca2a210725b1d9f7c36..58ae583fa6ee399f2428eff7a8667a4529df2c4b 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/WindowConnector.java
+++ b/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;
         }

diff --git a/src/com/vaadin/terminal/gwt/client/ui/label/LabelConnector.java b/src/com/vaadin/terminal/gwt/client/ui/label/LabelConnector.java
index 70cf30f003a6673b434d21b27c07def50fba3056..203845d1579f9c998f56600865ccc73ff093343a 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/label/LabelConnector.java
+++ b/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;

diff --git a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/RichTextAreaConnector.java b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/RichTextAreaConnector.java
index e618cc253c5d281b11fa7c195219f21f520884bf..d767dd9805e1123c1f6ebff0c2114baa029b2425 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/RichTextAreaConnector.java
+++ b/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;
         }

diff --git a/tests/testbench/com/vaadin/tests/dd/MyDragSourceConnector.java b/tests/testbench/com/vaadin/tests/dd/MyDragSourceConnector.java
index 05698ec195a4685c2dc43714aeb31ab2d7aef356..60766577082ced37d75c7bfe23d75372f7599e0a 100644 (file)
--- a/tests/testbench/com/vaadin/tests/dd/MyDragSourceConnector.java
+++ b/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;
         }

diff --git a/tests/testbench/com/vaadin/tests/dd/MyDropTargetConnector.java b/tests/testbench/com/vaadin/tests/dd/MyDropTargetConnector.java
index 648d5d0430c68eecb5875995f79bb6a36db050b6..6299eac14fd6db13b0bfb89d110fb7600f78b836 100644 (file)
--- a/tests/testbench/com/vaadin/tests/dd/MyDropTargetConnector.java
+++ b/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;
         }