Fixed loadStyle to be more sensible (#10746)

Default loadStyle is now eager. Only RichTextArea and ColorPicker are set as lazy.

Change-Id: Icc22ea7f861a1435f94ff74426a958c9ca32ba77

diff --git a/client/src/com/vaadin/client/ui/colorpicker/ColorPickerAreaConnector.java b/client/src/com/vaadin/client/ui/colorpicker/ColorPickerAreaConnector.java
index e8c4b1ec9a910a42356172bd3b191f677e4d055b..7377b0044b67e015a53af59ec42f0cf7fd90bb4b 100644 (file)
--- a/client/src/com/vaadin/client/ui/colorpicker/ColorPickerAreaConnector.java
+++ b/client/src/com/vaadin/client/ui/colorpicker/ColorPickerAreaConnector.java
@@ -21,7 +21,9 @@ import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.client.communication.RpcProxy;
 import com.vaadin.client.ui.VColorPickerArea;
 import com.vaadin.shared.ui.Connect;
+import com.vaadin.shared.ui.Connect.LoadStyle;
 import com.vaadin.shared.ui.colorpicker.ColorPickerServerRpc;
+import com.vaadin.ui.ColorPickerArea;
 
 /**
  * A class that defines an implementation for a color picker connector. Connects
@@ -30,7 +32,7 @@ import com.vaadin.shared.ui.colorpicker.ColorPickerServerRpc;
  * 
  * @since 7.0.0
  */
-@Connect(com.vaadin.ui.ColorPickerArea.class)
+@Connect(value = ColorPickerArea.class, loadStyle = LoadStyle.LAZY)
 public class ColorPickerAreaConnector extends AbstractColorPickerConnector {
 
     private ColorPickerServerRpc rpc = RpcProxy.create(

diff --git a/client/src/com/vaadin/client/ui/colorpicker/ColorPickerConnector.java b/client/src/com/vaadin/client/ui/colorpicker/ColorPickerConnector.java
index 95e108985efb1a767b637b02a1d2e08b43ba2246..8bf2825d68b64543ef805167ee01ca4a84b53d9c 100644 (file)
--- a/client/src/com/vaadin/client/ui/colorpicker/ColorPickerConnector.java
+++ b/client/src/com/vaadin/client/ui/colorpicker/ColorPickerConnector.java
@@ -21,7 +21,9 @@ import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.client.communication.RpcProxy;
 import com.vaadin.client.ui.VColorPicker;
 import com.vaadin.shared.ui.Connect;
+import com.vaadin.shared.ui.Connect.LoadStyle;
 import com.vaadin.shared.ui.colorpicker.ColorPickerServerRpc;
+import com.vaadin.ui.ColorPicker;
 
 /**
  * A class that defines default implementation for a color picker connector.
@@ -30,7 +32,7 @@ import com.vaadin.shared.ui.colorpicker.ColorPickerServerRpc;
  * 
  * @since 7.0.0
  */
-@Connect(com.vaadin.ui.ColorPicker.class)
+@Connect(value = ColorPicker.class, loadStyle = LoadStyle.LAZY)
 public class ColorPickerConnector extends AbstractColorPickerConnector {
 
     private ColorPickerServerRpc rpc = RpcProxy.create(

diff --git a/client/src/com/vaadin/client/ui/colorpicker/ColorPickerGradientConnector.java b/client/src/com/vaadin/client/ui/colorpicker/ColorPickerGradientConnector.java
index e9738519889b0694ccde34bac94582a0578b7ed2..e381eb0b704a05f14aa5ef6f40e4cb4d4b42b9df 100644 (file)
--- a/client/src/com/vaadin/client/ui/colorpicker/ColorPickerGradientConnector.java
+++ b/client/src/com/vaadin/client/ui/colorpicker/ColorPickerGradientConnector.java
@@ -25,8 +25,10 @@ import com.vaadin.client.communication.RpcProxy;
 import com.vaadin.client.communication.StateChangeEvent;
 import com.vaadin.client.ui.AbstractComponentConnector;
 import com.vaadin.shared.ui.Connect;
+import com.vaadin.shared.ui.Connect.LoadStyle;
 import com.vaadin.shared.ui.colorpicker.ColorPickerGradientServerRpc;
 import com.vaadin.shared.ui.colorpicker.ColorPickerGradientState;
+import com.vaadin.ui.components.colorpicker.ColorPickerGradient;
 
 /**
  * A class that defines the default implementation for a color picker gradient
@@ -36,7 +38,7 @@ import com.vaadin.shared.ui.colorpicker.ColorPickerGradientState;
  * 
  * @since 7.0.0
  */
-@Connect(com.vaadin.ui.components.colorpicker.ColorPickerGradient.class)
+@Connect(value = ColorPickerGradient.class, loadStyle = LoadStyle.LAZY)
 public class ColorPickerGradientConnector extends AbstractComponentConnector
         implements MouseUpHandler {
 

diff --git a/client/src/com/vaadin/client/ui/colorpicker/ColorPickerGridConnector.java b/client/src/com/vaadin/client/ui/colorpicker/ColorPickerGridConnector.java
index 61f43f0d0195d31171e64400537856a4aa8ffa46..53abc78b4bd35c6a688d00b99f5ad8d6703d9890 100644 (file)
--- a/client/src/com/vaadin/client/ui/colorpicker/ColorPickerGridConnector.java
+++ b/client/src/com/vaadin/client/ui/colorpicker/ColorPickerGridConnector.java
@@ -25,8 +25,10 @@ import com.vaadin.client.communication.RpcProxy;
 import com.vaadin.client.communication.StateChangeEvent;
 import com.vaadin.client.ui.AbstractComponentConnector;
 import com.vaadin.shared.ui.Connect;
+import com.vaadin.shared.ui.Connect.LoadStyle;
 import com.vaadin.shared.ui.colorpicker.ColorPickerGridServerRpc;
 import com.vaadin.shared.ui.colorpicker.ColorPickerGridState;
+import com.vaadin.ui.components.colorpicker.ColorPickerGrid;
 
 /**
  * A class that defines the default implementation for a color picker grid
@@ -36,7 +38,7 @@ import com.vaadin.shared.ui.colorpicker.ColorPickerGridState;
  * 
  * @since 7.0.0
  */
-@Connect(com.vaadin.ui.components.colorpicker.ColorPickerGrid.class)
+@Connect(value = ColorPickerGrid.class, loadStyle = LoadStyle.LAZY)
 public class ColorPickerGridConnector extends AbstractComponentConnector
         implements ClickHandler {
 

diff --git a/client/src/com/vaadin/client/ui/menubar/MenuBarConnector.java b/client/src/com/vaadin/client/ui/menubar/MenuBarConnector.java
index d024104e5b68a40ea82f148ea0df3dfea38794f7..d8ca73a401e9fea81a9af196e695f4fb3d54ab0b 100644 (file)
--- a/client/src/com/vaadin/client/ui/menubar/MenuBarConnector.java
+++ b/client/src/com/vaadin/client/ui/menubar/MenuBarConnector.java
@@ -32,11 +32,10 @@ import com.vaadin.client.ui.SimpleManagedLayout;
 import com.vaadin.client.ui.VMenuBar;
 import com.vaadin.shared.ui.ComponentStateUtil;
 import com.vaadin.shared.ui.Connect;
-import com.vaadin.shared.ui.Connect.LoadStyle;
 import com.vaadin.shared.ui.menubar.MenuBarConstants;
 import com.vaadin.shared.ui.menubar.MenuBarState;
 
-@Connect(value = com.vaadin.ui.MenuBar.class, loadStyle = LoadStyle.LAZY)
+@Connect(com.vaadin.ui.MenuBar.class)
 public class MenuBarConnector extends AbstractComponentConnector implements
         Paintable, SimpleManagedLayout {
 

diff --git a/client/src/com/vaadin/client/ui/upload/UploadConnector.java b/client/src/com/vaadin/client/ui/upload/UploadConnector.java
index 17fa68a98d677aa492655a7d549ce0aa001157f1..937ff438ac822885d317dff7a27acba6753723c2 100644 (file)
--- a/client/src/com/vaadin/client/ui/upload/UploadConnector.java
+++ b/client/src/com/vaadin/client/ui/upload/UploadConnector.java
@@ -22,10 +22,9 @@ import com.vaadin.client.UIDL;
 import com.vaadin.client.ui.AbstractComponentConnector;
 import com.vaadin.client.ui.VUpload;
 import com.vaadin.shared.ui.Connect;
-import com.vaadin.shared.ui.Connect.LoadStyle;
 import com.vaadin.ui.Upload;
 
-@Connect(value = Upload.class, loadStyle = LoadStyle.LAZY)
+@Connect(Upload.class)
 public class UploadConnector extends AbstractComponentConnector implements
         Paintable {
 

diff --git a/shared/src/com/vaadin/shared/ui/Connect.java b/shared/src/com/vaadin/shared/ui/Connect.java
index cac5a4fd4afe85c9f9a0b6a5ad8cbea3f7233045..17a8001b27ae354c77b70ccf1ae3c2c42c505f15 100644 (file)
--- a/shared/src/com/vaadin/shared/ui/Connect.java
+++ b/shared/src/com/vaadin/shared/ui/Connect.java
@@ -82,7 +82,7 @@ public @interface Connect {
      * @return the hint for the widget set generator how the client side
      *         implementation should be loaded to the browser
      */
-    LoadStyle loadStyle() default LoadStyle.DEFERRED;
+    LoadStyle loadStyle() default LoadStyle.EAGER;
 
     public enum LoadStyle {
         /**