Renamed @Component to @Connect

@Component is not good as the server side does not have to be a Component

diff --git a/src/com/vaadin/terminal/gwt/client/ui/Component.java b/src/com/vaadin/terminal/gwt/client/ui/Component.java
deleted file mode 100644 (file)
index 56477e6..0000000
--- a/src/com/vaadin/terminal/gwt/client/ui/Component.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
-@VaadinApache2LicenseForJavaFiles@
- */
-package com.vaadin.terminal.gwt.client.ui;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.Connector;
-import com.vaadin.terminal.gwt.widgetsetutils.CustomWidgetMapGenerator;
-import com.vaadin.terminal.gwt.widgetsetutils.EagerWidgetMapGenerator;
-import com.vaadin.terminal.gwt.widgetsetutils.LazyWidgetMapGenerator;
-import com.vaadin.terminal.gwt.widgetsetutils.WidgetMapGenerator;
-
-/**
- * Annotation defining the default server side counterpart in GWT terminal for
- * {@link ComponentConnector}.
- * <p>
- * With this annotation client side Vaadin connector is marked to have a server
- * side counterpart. The value of the annotation is the class of server side
- * implementation.
- * 
- * @since 7.0
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-public @interface Component {
-
-    /**
-     * @return the server side counterpart for the annotated component connector
-     */
-    Class<? extends Connector> value();
-
-    /**
-     * Depending on the used WidgetMap generator, these optional hints may be
-     * used to define how the client side components are loaded by the browser.
-     * The default is to eagerly load all widgets
-     * {@link EagerWidgetMapGenerator}, but if the {@link WidgetMapGenerator} is
-     * used by the widgetset, these load style hints are respected.
-     * <p>
-     * Lazy loading of a widget implementation means the client side component
-     * is not included in the initial JavaScript application loaded when the
-     * application starts. Instead the implementation is loaded to the client
-     * when it is first needed. Lazy loaded widget can be achieved by giving
-     * {@link LoadStyle#LAZY} value in {@link Component} annotation.
-     * <p>
-     * Lazy loaded widgets don't stress the size and startup time of the client
-     * side as much as eagerly loaded widgets. On the other hand there is a
-     * slight latency when lazy loaded widgets are first used as the client side
-     * needs to visit the server to fetch the client side implementation.
-     * <p>
-     * The {@link LoadStyle#DEFERRED} will also not stress the initially loaded
-     * JavaScript file. If this load style is defined, the widget implementation
-     * is preemptively loaded to the browser after the application is started
-     * and the communication to server idles. This load style kind of combines
-     * the best of both worlds.
-     * <p>
-     * Fine tunings to widget loading can also be made by overriding
-     * {@link WidgetMapGenerator} in the GWT module. Tunings might be helpful if
-     * the end users have slow connections and especially if they have high
-     * latency in their network. The {@link CustomWidgetMapGenerator} is an
-     * abstract generator implementation for easy customization. Vaadin package
-     * also includes {@link LazyWidgetMapGenerator} that makes as many widgets
-     * lazily loaded as possible.
-     * 
-     * @since 6.4
-     * 
-     * @return the hint for the widget set generator how the client side
-     *         implementation should be loaded to the browser
-     */
-    LoadStyle loadStyle() default LoadStyle.DEFERRED;
-
-    public enum LoadStyle {
-        /**
-         * The widget is included in the initial JS sent to the client.
-         */
-        EAGER,
-        /**
-         * Not included in the initial set of widgets, but added to queue from
-         * which it will be loaded when network is not busy or the
-         * implementation is required.
-         */
-        DEFERRED,
-        /**
-         * Loaded to the client only if needed.
-         */
-        LAZY
-    }
-}

diff --git a/src/com/vaadin/terminal/gwt/client/ui/Connect.java b/src/com/vaadin/terminal/gwt/client/ui/Connect.java
new file mode 100644 (file)
index 0000000..0581bdb
--- /dev/null
+++ b/src/com/vaadin/terminal/gwt/client/ui/Connect.java
@@ -0,0 +1,93 @@
+/*
+@VaadinApache2LicenseForJavaFiles@
+ */
+package com.vaadin.terminal.gwt.client.ui;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import com.vaadin.terminal.gwt.client.Connector;
+import com.vaadin.terminal.gwt.server.ClientConnector;
+import com.vaadin.terminal.gwt.widgetsetutils.CustomWidgetMapGenerator;
+import com.vaadin.terminal.gwt.widgetsetutils.EagerWidgetMapGenerator;
+import com.vaadin.terminal.gwt.widgetsetutils.LazyWidgetMapGenerator;
+import com.vaadin.terminal.gwt.widgetsetutils.WidgetMapGenerator;
+
+/**
+ * Annotation defining the server side connector that this ClientSideConnector
+ * should connect to. The value must always by a class extending
+ * {@link ClientConnector}.
+ * <p>
+ * With this annotation client side Vaadin connector is marked to have a server
+ * side counterpart. The value of the annotation is the class of server side
+ * implementation.
+ * 
+ * @since 7.0
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface Connect {
+
+    /**
+     * @return the server side counterpart for the annotated component connector
+     */
+    Class<? extends Connector> value();
+
+    /**
+     * Depending on the used WidgetMap generator, these optional hints may be
+     * used to define how the client side components are loaded by the browser.
+     * The default is to eagerly load all widgets
+     * {@link EagerWidgetMapGenerator}, but if the {@link WidgetMapGenerator} is
+     * used by the widgetset, these load style hints are respected.
+     * <p>
+     * Lazy loading of a widget implementation means the client side component
+     * is not included in the initial JavaScript application loaded when the
+     * application starts. Instead the implementation is loaded to the client
+     * when it is first needed. Lazy loaded widget can be achieved by giving
+     * {@link LoadStyle#LAZY} value in {@link Connect} annotation.
+     * <p>
+     * Lazy loaded widgets don't stress the size and startup time of the client
+     * side as much as eagerly loaded widgets. On the other hand there is a
+     * slight latency when lazy loaded widgets are first used as the client side
+     * needs to visit the server to fetch the client side implementation.
+     * <p>
+     * The {@link LoadStyle#DEFERRED} will also not stress the initially loaded
+     * JavaScript file. If this load style is defined, the widget implementation
+     * is preemptively loaded to the browser after the application is started
+     * and the communication to server idles. This load style kind of combines
+     * the best of both worlds.
+     * <p>
+     * Fine tunings to widget loading can also be made by overriding
+     * {@link WidgetMapGenerator} in the GWT module. Tunings might be helpful if
+     * the end users have slow connections and especially if they have high
+     * latency in their network. The {@link CustomWidgetMapGenerator} is an
+     * abstract generator implementation for easy customization. Vaadin package
+     * also includes {@link LazyWidgetMapGenerator} that makes as many widgets
+     * lazily loaded as possible.
+     * 
+     * @since 6.4
+     * 
+     * @return the hint for the widget set generator how the client side
+     *         implementation should be loaded to the browser
+     */
+    LoadStyle loadStyle() default LoadStyle.DEFERRED;
+
+    public enum LoadStyle {
+        /**
+         * The widget is included in the initial JS sent to the client.
+         */
+        EAGER,
+        /**
+         * Not included in the initial set of widgets, but added to queue from
+         * which it will be loaded when network is not busy or the
+         * implementation is required.
+         */
+        DEFERRED,
+        /**
+         * Loaded to the client only if needed.
+         */
+        LAZY
+    }
+}

diff --git a/src/com/vaadin/terminal/gwt/client/ui/absolutelayout/AbsoluteLayoutConnector.java b/src/com/vaadin/terminal/gwt/client/ui/absolutelayout/AbsoluteLayoutConnector.java
index f33d582ef158d8753042d4338fcf97a6366fcfee..2307f67ac59acbfb0a613b212278d0f4cb53d1bf 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/absolutelayout/AbsoluteLayoutConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/absolutelayout/AbsoluteLayoutConnector.java
@@ -19,13 +19,13 @@ import com.vaadin.terminal.gwt.client.VCaption;
 import com.vaadin.terminal.gwt.client.communication.RpcProxy;
 import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
 import com.vaadin.terminal.gwt.client.ui.AbstractComponentContainerConnector;
-import com.vaadin.terminal.gwt.client.ui.Component;
+import com.vaadin.terminal.gwt.client.ui.Connect;
 import com.vaadin.terminal.gwt.client.ui.LayoutClickEventHandler;
 import com.vaadin.terminal.gwt.client.ui.LayoutClickRPC;
 import com.vaadin.terminal.gwt.client.ui.absolutelayout.VAbsoluteLayout.AbsoluteWrapper;
 import com.vaadin.ui.AbsoluteLayout;
 
-@Component(AbsoluteLayout.class)
+@Connect(AbsoluteLayout.class)
 public class AbsoluteLayoutConnector extends
         AbstractComponentContainerConnector implements DirectionalManagedLayout {
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/accordion/AccordionConnector.java b/src/com/vaadin/terminal/gwt/client/ui/accordion/AccordionConnector.java
index 8ab33f615d0bee3ca77feb638c4d3433a26f9d6b..a03fa372144c1e964ab8805aee5e0e6850f82c61 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/accordion/AccordionConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/accordion/AccordionConnector.java
@@ -10,14 +10,14 @@ 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.UIDL;
-import com.vaadin.terminal.gwt.client.ui.Component;
+import com.vaadin.terminal.gwt.client.ui.Connect;
 import com.vaadin.terminal.gwt.client.ui.SimpleManagedLayout;
 import com.vaadin.terminal.gwt.client.ui.accordion.VAccordion.StackItem;
 import com.vaadin.terminal.gwt.client.ui.layout.MayScrollChildren;
 import com.vaadin.terminal.gwt.client.ui.tabsheet.TabsheetBaseConnector;
 import com.vaadin.ui.Accordion;
 
-@Component(Accordion.class)
+@Connect(Accordion.class)
 public class AccordionConnector extends TabsheetBaseConnector implements
         SimpleManagedLayout, MayScrollChildren {
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/audio/AudioConnector.java b/src/com/vaadin/terminal/gwt/client/ui/audio/AudioConnector.java
index bfef73d18a3615f930851e467376720e9e84a78e..d55e66dbd5f53f4c16e96fbd645865b4aec61c41 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/audio/AudioConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/audio/AudioConnector.java
@@ -10,11 +10,11 @@ import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.BrowserInfo;
 import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.ui.Component;
+import com.vaadin.terminal.gwt.client.ui.Connect;
 import com.vaadin.terminal.gwt.client.ui.MediaBaseConnector;
 import com.vaadin.ui.Audio;
 
-@Component(Audio.class)
+@Connect(Audio.class)
 public class AudioConnector extends MediaBaseConnector {
 
     @Override

diff --git a/src/com/vaadin/terminal/gwt/client/ui/button/ButtonConnector.java b/src/com/vaadin/terminal/gwt/client/ui/button/ButtonConnector.java
index a04e2482e58ae933c2df41fc2c82af5b12a22c0b..62a5e8ac8b2799f2c86fb52cfe20b572a93e3c4e 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/button/ButtonConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/button/ButtonConnector.java
@@ -21,12 +21,12 @@ import com.vaadin.terminal.gwt.client.communication.FieldRpc.FocusAndBlurServerR
 import com.vaadin.terminal.gwt.client.communication.RpcProxy;
 import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
 import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector;
-import com.vaadin.terminal.gwt.client.ui.Component;
-import com.vaadin.terminal.gwt.client.ui.Component.LoadStyle;
+import com.vaadin.terminal.gwt.client.ui.Connect;
+import com.vaadin.terminal.gwt.client.ui.Connect.LoadStyle;
 import com.vaadin.terminal.gwt.client.ui.Icon;
 import com.vaadin.ui.Button;
 
-@Component(value = Button.class, loadStyle = LoadStyle.EAGER)
+@Connect(value = Button.class, loadStyle = LoadStyle.EAGER)
 public class ButtonConnector extends AbstractComponentConnector implements
         BlurHandler, FocusHandler, ClickHandler {
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/checkbox/CheckBoxConnector.java b/src/com/vaadin/terminal/gwt/client/ui/checkbox/CheckBoxConnector.java
index 7e0c927ae439c9741726bd74fefd6664ee156f46..731838371f5d1cc07622c0cfb7488d0951495c77 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/checkbox/CheckBoxConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/checkbox/CheckBoxConnector.java
@@ -22,11 +22,11 @@ import com.vaadin.terminal.gwt.client.communication.FieldRpc.FocusAndBlurServerR
 import com.vaadin.terminal.gwt.client.communication.RpcProxy;
 import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
 import com.vaadin.terminal.gwt.client.ui.AbstractFieldConnector;
-import com.vaadin.terminal.gwt.client.ui.Component;
+import com.vaadin.terminal.gwt.client.ui.Connect;
 import com.vaadin.terminal.gwt.client.ui.Icon;
 import com.vaadin.ui.CheckBox;
 
-@Component(CheckBox.class)
+@Connect(CheckBox.class)
 public class CheckBoxConnector extends AbstractFieldConnector implements
         FocusHandler, BlurHandler, ClickHandler {
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/combobox/ComboBoxConnector.java b/src/com/vaadin/terminal/gwt/client/ui/combobox/ComboBoxConnector.java
index 4a0db6ee5b5ab7f5c12249a4d2c7dbe7f332175f..ee16d90b12d8d99915bb9b831e70d9790e4f1408 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/combobox/ComboBoxConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/combobox/ComboBoxConnector.java
@@ -12,13 +12,13 @@ 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.AbstractFieldConnector;
-import com.vaadin.terminal.gwt.client.ui.Component;
+import com.vaadin.terminal.gwt.client.ui.Connect;
 import com.vaadin.terminal.gwt.client.ui.SimpleManagedLayout;
 import com.vaadin.terminal.gwt.client.ui.combobox.VFilterSelect.FilterSelectSuggestion;
 import com.vaadin.terminal.gwt.client.ui.menubar.MenuItem;
 import com.vaadin.ui.Select;
 
-@Component(Select.class)
+@Connect(Select.class)
 public class ComboBoxConnector extends AbstractFieldConnector implements
         Paintable, SimpleManagedLayout {
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/csslayout/CssLayoutConnector.java b/src/com/vaadin/terminal/gwt/client/ui/csslayout/CssLayoutConnector.java
index 3d20e01b4b54c87a27b955c5e6bac6f3f02a4764..76fb9ab9268106a9bd8a1dff0d8f481187d1d683 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/csslayout/CssLayoutConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/csslayout/CssLayoutConnector.java
@@ -18,14 +18,14 @@ import com.vaadin.terminal.gwt.client.VCaption;
 import com.vaadin.terminal.gwt.client.communication.RpcProxy;
 import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
 import com.vaadin.terminal.gwt.client.ui.AbstractLayoutConnector;
-import com.vaadin.terminal.gwt.client.ui.Component;
+import com.vaadin.terminal.gwt.client.ui.Connect;
 import com.vaadin.terminal.gwt.client.ui.LayoutClickEventHandler;
 import com.vaadin.terminal.gwt.client.ui.LayoutClickRPC;
 import com.vaadin.terminal.gwt.client.ui.VMarginInfo;
 import com.vaadin.terminal.gwt.client.ui.csslayout.VCssLayout.FlowPane;
 import com.vaadin.ui.CssLayout;
 
-@Component(CssLayout.class)
+@Connect(CssLayout.class)
 public class CssLayoutConnector extends AbstractLayoutConnector {
 
     private LayoutClickEventHandler clickEventHandler = new LayoutClickEventHandler(

diff --git a/src/com/vaadin/terminal/gwt/client/ui/customcomponent/CustomComponentConnector.java b/src/com/vaadin/terminal/gwt/client/ui/customcomponent/CustomComponentConnector.java
index 9c48d2ead4d4e464ba17480fac413c9dde88a0d1..a65187a461ebf6009bae29957ecac9af953508d8 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/customcomponent/CustomComponentConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/customcomponent/CustomComponentConnector.java
@@ -8,11 +8,11 @@ import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ComponentConnector;
 import com.vaadin.terminal.gwt.client.ConnectorHierarchyChangeEvent;
 import com.vaadin.terminal.gwt.client.ui.AbstractComponentContainerConnector;
-import com.vaadin.terminal.gwt.client.ui.Component;
-import com.vaadin.terminal.gwt.client.ui.Component.LoadStyle;
+import com.vaadin.terminal.gwt.client.ui.Connect;
+import com.vaadin.terminal.gwt.client.ui.Connect.LoadStyle;
 import com.vaadin.ui.CustomComponent;
 
-@Component(value = CustomComponent.class, loadStyle = LoadStyle.EAGER)
+@Connect(value = CustomComponent.class, loadStyle = LoadStyle.EAGER)
 public class CustomComponentConnector extends
         AbstractComponentContainerConnector {
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/customfield/CustomFieldConnector.java b/src/com/vaadin/terminal/gwt/client/ui/customfield/CustomFieldConnector.java
index b0328d5bedeaa9834420b564440f41cc446d7114..a2ba09da4340836e36fb5afcf4fd8e5d5555ce9a 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/customfield/CustomFieldConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/customfield/CustomFieldConnector.java
@@ -5,12 +5,12 @@ package com.vaadin.terminal.gwt.client.ui.customfield;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.ui.Widget;
-import com.vaadin.terminal.gwt.client.ui.Component;
+import com.vaadin.terminal.gwt.client.ui.Connect;
 import com.vaadin.terminal.gwt.client.ui.customcomponent.CustomComponentConnector;
 import com.vaadin.terminal.gwt.client.ui.customcomponent.VCustomComponent;
 import com.vaadin.ui.CustomField;
 
-@Component(value = CustomField.class)
+@Connect(value = CustomField.class)
 public class CustomFieldConnector extends CustomComponentConnector {
 
     @Override

diff --git a/src/com/vaadin/terminal/gwt/client/ui/customlayout/CustomLayoutConnector.java b/src/com/vaadin/terminal/gwt/client/ui/customlayout/CustomLayoutConnector.java
index 9d34859cb787ddd48e67de2addf7217deef42d29..98ac83147c57ca40a6de00113a8bf4972c40db18 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/customlayout/CustomLayoutConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/customlayout/CustomLayoutConnector.java
@@ -11,11 +11,11 @@ import com.vaadin.terminal.gwt.client.ComponentConnector;
 import com.vaadin.terminal.gwt.client.ConnectorHierarchyChangeEvent;
 import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
 import com.vaadin.terminal.gwt.client.ui.AbstractLayoutConnector;
-import com.vaadin.terminal.gwt.client.ui.Component;
+import com.vaadin.terminal.gwt.client.ui.Connect;
 import com.vaadin.terminal.gwt.client.ui.SimpleManagedLayout;
 import com.vaadin.ui.CustomLayout;
 
-@Component(CustomLayout.class)
+@Connect(CustomLayout.class)
 public class CustomLayoutConnector extends AbstractLayoutConnector implements
         SimpleManagedLayout {
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/datefield/InlineDateFieldConnector.java b/src/com/vaadin/terminal/gwt/client/ui/datefield/InlineDateFieldConnector.java
index 561f6fc7b5f03855ea1380d6a2bab6adaa8c1afb..8a4840a088031aff7ce03ad7da1dd147d046cb86 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/datefield/InlineDateFieldConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/datefield/InlineDateFieldConnector.java
@@ -10,12 +10,12 @@ import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.DateTimeService;
 import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.ui.Component;
+import com.vaadin.terminal.gwt.client.ui.Connect;
 import com.vaadin.terminal.gwt.client.ui.datefield.VCalendarPanel.FocusChangeListener;
 import com.vaadin.terminal.gwt.client.ui.datefield.VCalendarPanel.TimeChangeListener;
 import com.vaadin.ui.InlineDateField;
 
-@Component(InlineDateField.class)
+@Connect(InlineDateField.class)
 public class InlineDateFieldConnector extends AbstractDateFieldConnector {
 
     @Override

diff --git a/src/com/vaadin/terminal/gwt/client/ui/datefield/PopupDateFieldConnector.java b/src/com/vaadin/terminal/gwt/client/ui/datefield/PopupDateFieldConnector.java
index b28345380e1902062c9b9da41e3727925025e7a9..1e9de1747600001e10220489acfe55781621fee8 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/datefield/PopupDateFieldConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/datefield/PopupDateFieldConnector.java
@@ -11,12 +11,12 @@ import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.DateTimeService;
 import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.ui.Component;
+import com.vaadin.terminal.gwt.client.ui.Connect;
 import com.vaadin.terminal.gwt.client.ui.datefield.VCalendarPanel.FocusChangeListener;
 import com.vaadin.terminal.gwt.client.ui.datefield.VCalendarPanel.TimeChangeListener;
 import com.vaadin.ui.DateField;
 
-@Component(DateField.class)
+@Connect(DateField.class)
 public class PopupDateFieldConnector extends TextualDateConnector {
 
     /*

diff --git a/src/com/vaadin/terminal/gwt/client/ui/draganddropwrapper/DragAndDropWrapperConnector.java b/src/com/vaadin/terminal/gwt/client/ui/draganddropwrapper/DragAndDropWrapperConnector.java
index a1ee6605aa698e7a4b2cdd5661f31c768c131434..db531ac70f83f09eac99c3c6424a9a5761b13b01 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/draganddropwrapper/DragAndDropWrapperConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/draganddropwrapper/DragAndDropWrapperConnector.java
@@ -11,11 +11,11 @@ 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;
+import com.vaadin.terminal.gwt.client.ui.Connect;
 import com.vaadin.terminal.gwt.client.ui.customcomponent.CustomComponentConnector;
 import com.vaadin.ui.DragAndDropWrapper;
 
-@Component(DragAndDropWrapper.class)
+@Connect(DragAndDropWrapper.class)
 public class DragAndDropWrapperConnector extends CustomComponentConnector
         implements Paintable {
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/embedded/EmbeddedConnector.java b/src/com/vaadin/terminal/gwt/client/ui/embedded/EmbeddedConnector.java
index 1a8a54e99d3edd79c9c6cf55fcfac5409b72ce37..423aac19744fac699a9d1b8aa910e7132cc7b2f4 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/embedded/EmbeddedConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/embedded/EmbeddedConnector.java
@@ -26,10 +26,10 @@ import com.vaadin.terminal.gwt.client.VTooltip;
 import com.vaadin.terminal.gwt.client.communication.RpcProxy;
 import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector;
 import com.vaadin.terminal.gwt.client.ui.ClickEventHandler;
-import com.vaadin.terminal.gwt.client.ui.Component;
+import com.vaadin.terminal.gwt.client.ui.Connect;
 import com.vaadin.ui.Embedded;
 
-@Component(Embedded.class)
+@Connect(Embedded.class)
 public class EmbeddedConnector extends AbstractComponentConnector implements
         Paintable {
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/form/FormConnector.java b/src/com/vaadin/terminal/gwt/client/ui/form/FormConnector.java
index 11d5385213a2b28abfb2980647c131f8952eadc5..82cbc95b2d30e06efd90b8944fa46b398d21c383 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/form/FormConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/form/FormConnector.java
@@ -13,7 +13,7 @@ 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.ui.AbstractComponentContainerConnector;
-import com.vaadin.terminal.gwt.client.ui.Component;
+import com.vaadin.terminal.gwt.client.ui.Connect;
 import com.vaadin.terminal.gwt.client.ui.Icon;
 import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler;
 import com.vaadin.terminal.gwt.client.ui.layout.ElementResizeEvent;
@@ -21,7 +21,7 @@ import com.vaadin.terminal.gwt.client.ui.layout.ElementResizeListener;
 import com.vaadin.terminal.gwt.client.ui.layout.MayScrollChildren;
 import com.vaadin.ui.Form;
 
-@Component(Form.class)
+@Connect(Form.class)
 public class FormConnector extends AbstractComponentContainerConnector
         implements Paintable, MayScrollChildren {
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/formlayout/FormLayoutConnector.java b/src/com/vaadin/terminal/gwt/client/ui/formlayout/FormLayoutConnector.java
index 258a280ea7f8fea4b3c77797220ebfe3a615e142..d7774b66ef6501681d1d6b5614290f1651a8da89 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/formlayout/FormLayoutConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/formlayout/FormLayoutConnector.java
@@ -10,7 +10,7 @@ import com.vaadin.terminal.gwt.client.ConnectorHierarchyChangeEvent;
 import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
 import com.vaadin.terminal.gwt.client.ui.AbstractFieldConnector;
 import com.vaadin.terminal.gwt.client.ui.AbstractLayoutConnector;
-import com.vaadin.terminal.gwt.client.ui.Component;
+import com.vaadin.terminal.gwt.client.ui.Connect;
 import com.vaadin.terminal.gwt.client.ui.VMarginInfo;
 import com.vaadin.terminal.gwt.client.ui.formlayout.VFormLayout.Caption;
 import com.vaadin.terminal.gwt.client.ui.formlayout.VFormLayout.ErrorFlag;
@@ -18,7 +18,7 @@ import com.vaadin.terminal.gwt.client.ui.formlayout.VFormLayout.VFormLayoutTable
 import com.vaadin.terminal.gwt.client.ui.orderedlayout.AbstractOrderedLayoutState;
 import com.vaadin.ui.FormLayout;
 
-@Component(FormLayout.class)
+@Connect(FormLayout.class)
 public class FormLayoutConnector extends AbstractLayoutConnector {
 
     @Override

diff --git a/src/com/vaadin/terminal/gwt/client/ui/gridlayout/GridLayoutConnector.java b/src/com/vaadin/terminal/gwt/client/ui/gridlayout/GridLayoutConnector.java
index 0a26fa020afb3ab4ba52422c71033a45752ea61d..70b0952d9d18ab534be3b7142467867917c9b8c7 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/gridlayout/GridLayoutConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/gridlayout/GridLayoutConnector.java
@@ -20,7 +20,7 @@ import com.vaadin.terminal.gwt.client.communication.RpcProxy;
 import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
 import com.vaadin.terminal.gwt.client.ui.AbstractComponentContainerConnector;
 import com.vaadin.terminal.gwt.client.ui.AlignmentInfo;
-import com.vaadin.terminal.gwt.client.ui.Component;
+import com.vaadin.terminal.gwt.client.ui.Connect;
 import com.vaadin.terminal.gwt.client.ui.LayoutClickEventHandler;
 import com.vaadin.terminal.gwt.client.ui.LayoutClickRPC;
 import com.vaadin.terminal.gwt.client.ui.VMarginInfo;
@@ -28,7 +28,7 @@ import com.vaadin.terminal.gwt.client.ui.gridlayout.VGridLayout.Cell;
 import com.vaadin.terminal.gwt.client.ui.layout.VLayoutSlot;
 import com.vaadin.ui.GridLayout;
 
-@Component(GridLayout.class)
+@Connect(GridLayout.class)
 public class GridLayoutConnector extends AbstractComponentContainerConnector
         implements Paintable, DirectionalManagedLayout {
 

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 203845d1579f9c998f56600865ccc73ff093343a..308a4860b5a0beafcd24f9d3d7c1d3c9aae98e7d 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/label/LabelConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/label/LabelConnector.java
@@ -12,11 +12,11 @@ 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;
-import com.vaadin.terminal.gwt.client.ui.Component;
-import com.vaadin.terminal.gwt.client.ui.Component.LoadStyle;
+import com.vaadin.terminal.gwt.client.ui.Connect;
+import com.vaadin.terminal.gwt.client.ui.Connect.LoadStyle;
 import com.vaadin.ui.Label;
 
-@Component(value = Label.class, loadStyle = LoadStyle.EAGER)
+@Connect(value = Label.class, loadStyle = LoadStyle.EAGER)
 public class LabelConnector extends AbstractComponentConnector implements
         Paintable {
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/link/LinkConnector.java b/src/com/vaadin/terminal/gwt/client/ui/link/LinkConnector.java
index 1c083d9566489256447700249716c3c19a3efeee..f74a851d0308d13274f9648e9a6fedb9cdc432c6 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/link/LinkConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/link/LinkConnector.java
@@ -11,11 +11,11 @@ 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.terminal.gwt.client.ui.Connect;
 import com.vaadin.terminal.gwt.client.ui.Icon;
 import com.vaadin.ui.Link;
 
-@Component(Link.class)
+@Connect(Link.class)
 public class LinkConnector extends AbstractComponentConnector implements
         Paintable {
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/listselect/ListSelectConnector.java b/src/com/vaadin/terminal/gwt/client/ui/listselect/ListSelectConnector.java
index 0be533f00ea7cbbfafe5e2fb33697a5f4be52a25..ddaa9595607ff0b836b14b3a133fd5cd0936196e 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/listselect/ListSelectConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/listselect/ListSelectConnector.java
@@ -6,11 +6,11 @@ package com.vaadin.terminal.gwt.client.ui.listselect;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.ui.Widget;
-import com.vaadin.terminal.gwt.client.ui.Component;
+import com.vaadin.terminal.gwt.client.ui.Connect;
 import com.vaadin.terminal.gwt.client.ui.optiongroup.OptionGroupBaseConnector;
 import com.vaadin.ui.ListSelect;
 
-@Component(ListSelect.class)
+@Connect(ListSelect.class)
 public class ListSelectConnector extends OptionGroupBaseConnector {
 
     @Override

diff --git a/src/com/vaadin/terminal/gwt/client/ui/menubar/MenuBarConnector.java b/src/com/vaadin/terminal/gwt/client/ui/menubar/MenuBarConnector.java
index ee23e886479f7b637bdf0c23b35b72c4b70aef00..abdeaae61edf36582b32a014de46353010ce501d 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/menubar/MenuBarConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/menubar/MenuBarConnector.java
@@ -14,13 +14,13 @@ 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;
-import com.vaadin.terminal.gwt.client.ui.Component;
-import com.vaadin.terminal.gwt.client.ui.Component.LoadStyle;
+import com.vaadin.terminal.gwt.client.ui.Connect;
+import com.vaadin.terminal.gwt.client.ui.Connect.LoadStyle;
 import com.vaadin.terminal.gwt.client.ui.Icon;
 import com.vaadin.terminal.gwt.client.ui.SimpleManagedLayout;
 import com.vaadin.terminal.gwt.client.ui.menubar.VMenuBar.CustomMenuItem;
 
-@Component(value = com.vaadin.ui.MenuBar.class, loadStyle = LoadStyle.LAZY)
+@Connect(value = com.vaadin.ui.MenuBar.class, loadStyle = LoadStyle.LAZY)
 public class MenuBarConnector extends AbstractComponentConnector implements
         Paintable, SimpleManagedLayout {
     /**

diff --git a/src/com/vaadin/terminal/gwt/client/ui/nativebutton/NativeButtonConnector.java b/src/com/vaadin/terminal/gwt/client/ui/nativebutton/NativeButtonConnector.java
index 042458d701ae35dea18d1efad6083d154f34e9a8..801c40582639ec6c483c51ce3424fca0150f39e6 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/nativebutton/NativeButtonConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/nativebutton/NativeButtonConnector.java
@@ -16,13 +16,13 @@ import com.vaadin.terminal.gwt.client.communication.FieldRpc.FocusAndBlurServerR
 import com.vaadin.terminal.gwt.client.communication.RpcProxy;
 import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
 import com.vaadin.terminal.gwt.client.ui.AbstractComponentConnector;
-import com.vaadin.terminal.gwt.client.ui.Component;
+import com.vaadin.terminal.gwt.client.ui.Connect;
 import com.vaadin.terminal.gwt.client.ui.Icon;
 import com.vaadin.terminal.gwt.client.ui.button.ButtonServerRpc;
 import com.vaadin.terminal.gwt.client.ui.button.ButtonState;
 import com.vaadin.ui.NativeButton;
 
-@Component(NativeButton.class)
+@Connect(NativeButton.class)
 public class NativeButtonConnector extends AbstractComponentConnector implements
         BlurHandler, FocusHandler {
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/nativeselect/NativeSelectConnector.java b/src/com/vaadin/terminal/gwt/client/ui/nativeselect/NativeSelectConnector.java
index 0bc43f3e41fe30d029672bdfd53c38fac5431024..e6264e492fe99f09e7d19e251ba2fdc0c2fadaeb 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/nativeselect/NativeSelectConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/nativeselect/NativeSelectConnector.java
@@ -6,11 +6,11 @@ package com.vaadin.terminal.gwt.client.ui.nativeselect;
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.ui.Widget;
-import com.vaadin.terminal.gwt.client.ui.Component;
+import com.vaadin.terminal.gwt.client.ui.Connect;
 import com.vaadin.terminal.gwt.client.ui.optiongroup.OptionGroupBaseConnector;
 import com.vaadin.ui.NativeSelect;
 
-@Component(NativeSelect.class)
+@Connect(NativeSelect.class)
 public class NativeSelectConnector extends OptionGroupBaseConnector {
 
     @Override

diff --git a/src/com/vaadin/terminal/gwt/client/ui/optiongroup/OptionGroupConnector.java b/src/com/vaadin/terminal/gwt/client/ui/optiongroup/OptionGroupConnector.java
index 57c98978e70047bfccef26cfeb28c5de1d06afbf..06552a2812fedba19979a475a7d3082d71790343 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/optiongroup/OptionGroupConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/optiongroup/OptionGroupConnector.java
@@ -13,10 +13,10 @@ import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.EventId;
 import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.ui.Component;
+import com.vaadin.terminal.gwt.client.ui.Connect;
 import com.vaadin.ui.OptionGroup;
 
-@Component(OptionGroup.class)
+@Connect(OptionGroup.class)
 public class OptionGroupConnector extends OptionGroupBaseConnector {
 
     @Override

diff --git a/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/HorizontalLayoutConnector.java b/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/HorizontalLayoutConnector.java
index 74f590614222cf08e8476dfa910b5e95e3b34f7c..a12b41ade79bb7ab715e4602f01f9e4dd9e38f53 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/HorizontalLayoutConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/HorizontalLayoutConnector.java
@@ -4,11 +4,11 @@
 package com.vaadin.terminal.gwt.client.ui.orderedlayout;
 
 import com.google.gwt.core.client.GWT;
-import com.vaadin.terminal.gwt.client.ui.Component;
-import com.vaadin.terminal.gwt.client.ui.Component.LoadStyle;
+import com.vaadin.terminal.gwt.client.ui.Connect;
+import com.vaadin.terminal.gwt.client.ui.Connect.LoadStyle;
 import com.vaadin.ui.HorizontalLayout;
 
-@Component(value = HorizontalLayout.class, loadStyle = LoadStyle.EAGER)
+@Connect(value = HorizontalLayout.class, loadStyle = LoadStyle.EAGER)
 public class HorizontalLayoutConnector extends AbstractOrderedLayoutConnector {
 
     @Override

diff --git a/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/VerticalLayoutConnector.java b/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/VerticalLayoutConnector.java
index 8e3677ca5fdf2dc47b2b2e6acf67eb510e05b04c..1e5651ce38aeb9199daee9a60f772b23929ca15f 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/VerticalLayoutConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/orderedlayout/VerticalLayoutConnector.java
@@ -4,11 +4,11 @@
 package com.vaadin.terminal.gwt.client.ui.orderedlayout;
 
 import com.google.gwt.core.client.GWT;
-import com.vaadin.terminal.gwt.client.ui.Component;
-import com.vaadin.terminal.gwt.client.ui.Component.LoadStyle;
+import com.vaadin.terminal.gwt.client.ui.Connect;
+import com.vaadin.terminal.gwt.client.ui.Connect.LoadStyle;
 import com.vaadin.ui.VerticalLayout;
 
-@Component(value = VerticalLayout.class, loadStyle = LoadStyle.EAGER)
+@Connect(value = VerticalLayout.class, loadStyle = LoadStyle.EAGER)
 public class VerticalLayoutConnector extends AbstractOrderedLayoutConnector {
 
     @Override

diff --git a/src/com/vaadin/terminal/gwt/client/ui/panel/PanelConnector.java b/src/com/vaadin/terminal/gwt/client/ui/panel/PanelConnector.java
index 43f58c10b897b65df8a14f300b766540820b1e11..32cf9cfb2e6d72987bb6b2b553d1211388469008 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/panel/PanelConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/panel/PanelConnector.java
@@ -18,14 +18,14 @@ import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.communication.RpcProxy;
 import com.vaadin.terminal.gwt.client.ui.AbstractComponentContainerConnector;
 import com.vaadin.terminal.gwt.client.ui.ClickEventHandler;
-import com.vaadin.terminal.gwt.client.ui.Component;
+import com.vaadin.terminal.gwt.client.ui.Connect;
 import com.vaadin.terminal.gwt.client.ui.PostLayoutListener;
 import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler;
 import com.vaadin.terminal.gwt.client.ui.SimpleManagedLayout;
 import com.vaadin.terminal.gwt.client.ui.layout.MayScrollChildren;
 import com.vaadin.ui.Panel;
 
-@Component(Panel.class)
+@Connect(Panel.class)
 public class PanelConnector extends AbstractComponentContainerConnector
         implements Paintable, SimpleManagedLayout, PostLayoutListener,
         MayScrollChildren {

diff --git a/src/com/vaadin/terminal/gwt/client/ui/passwordfield/PasswordFieldConnector.java b/src/com/vaadin/terminal/gwt/client/ui/passwordfield/PasswordFieldConnector.java
index 088e83c9cc66d97179660da33daeb48de5e02bfb..1d1ec58fbbf4bbd6288b92f9b5a085af7d83bcaa 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/passwordfield/PasswordFieldConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/passwordfield/PasswordFieldConnector.java
@@ -8,11 +8,11 @@ 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.UIDL;
-import com.vaadin.terminal.gwt.client.ui.Component;
+import com.vaadin.terminal.gwt.client.ui.Connect;
 import com.vaadin.terminal.gwt.client.ui.textfield.TextFieldConnector;
 import com.vaadin.ui.PasswordField;
 
-@Component(PasswordField.class)
+@Connect(PasswordField.class)
 public class PasswordFieldConnector extends TextFieldConnector {
 
     @Override

diff --git a/src/com/vaadin/terminal/gwt/client/ui/popupview/PopupViewConnector.java b/src/com/vaadin/terminal/gwt/client/ui/popupview/PopupViewConnector.java
index cd3b1d9f47d8078e0b2bf67f7226c2492ec75a65..4faa6cec863da0e62d17e9f0c6c6f337e09e04e8 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/popupview/PopupViewConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/popupview/PopupViewConnector.java
@@ -12,11 +12,11 @@ import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.VCaption;
 import com.vaadin.terminal.gwt.client.VCaptionWrapper;
 import com.vaadin.terminal.gwt.client.ui.AbstractComponentContainerConnector;
-import com.vaadin.terminal.gwt.client.ui.Component;
+import com.vaadin.terminal.gwt.client.ui.Connect;
 import com.vaadin.terminal.gwt.client.ui.PostLayoutListener;
 import com.vaadin.ui.PopupView;
 
-@Component(PopupView.class)
+@Connect(PopupView.class)
 public class PopupViewConnector extends AbstractComponentContainerConnector
         implements Paintable, PostLayoutListener {
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/progressindicator/ProgressIndicatorConnector.java b/src/com/vaadin/terminal/gwt/client/ui/progressindicator/ProgressIndicatorConnector.java
index 2727c0e3057089f138d9f9412f7dc4958aef6d62..09fa5fb44ed0dc1756ba784608e0299bd770bff8 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/progressindicator/ProgressIndicatorConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/progressindicator/ProgressIndicatorConnector.java
@@ -11,10 +11,10 @@ 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;
+import com.vaadin.terminal.gwt.client.ui.Connect;
 import com.vaadin.ui.ProgressIndicator;
 
-@Component(ProgressIndicator.class)
+@Connect(ProgressIndicator.class)
 public class ProgressIndicatorConnector extends AbstractFieldConnector
         implements Paintable {
 

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 d767dd9805e1123c1f6ebff0c2114baa029b2425..01e79bc1c3ed3014dda6e8efd58dfe7cbe1ebaf3 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/RichTextAreaConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/RichTextAreaConnector.java
@@ -10,12 +10,12 @@ 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;
-import com.vaadin.terminal.gwt.client.ui.Component.LoadStyle;
+import com.vaadin.terminal.gwt.client.ui.Connect;
+import com.vaadin.terminal.gwt.client.ui.Connect.LoadStyle;
 import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler.BeforeShortcutActionListener;
 import com.vaadin.ui.RichTextArea;
 
-@Component(value = RichTextArea.class, loadStyle = LoadStyle.LAZY)
+@Connect(value = RichTextArea.class, loadStyle = LoadStyle.LAZY)
 public class RichTextAreaConnector extends AbstractFieldConnector implements
         Paintable, BeforeShortcutActionListener {
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/root/RootConnector.java b/src/com/vaadin/terminal/gwt/client/ui/root/RootConnector.java
index 048e3ee94cb0a4232592c7f068824d72bf85a9d7..05b062bdfe671b61a313ffa75f7255772231a0f1 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/root/RootConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/root/RootConnector.java
@@ -35,15 +35,15 @@ import com.vaadin.terminal.gwt.client.communication.StateChangeEvent;
 import com.vaadin.terminal.gwt.client.communication.StateChangeEvent.StateChangeHandler;
 import com.vaadin.terminal.gwt.client.ui.AbstractComponentContainerConnector;
 import com.vaadin.terminal.gwt.client.ui.ClickEventHandler;
-import com.vaadin.terminal.gwt.client.ui.Component;
-import com.vaadin.terminal.gwt.client.ui.Component.LoadStyle;
+import com.vaadin.terminal.gwt.client.ui.Connect;
+import com.vaadin.terminal.gwt.client.ui.Connect.LoadStyle;
 import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler;
 import com.vaadin.terminal.gwt.client.ui.layout.MayScrollChildren;
 import com.vaadin.terminal.gwt.client.ui.notification.VNotification;
 import com.vaadin.terminal.gwt.client.ui.window.WindowConnector;
 import com.vaadin.ui.Root;
 
-@Component(value = Root.class, loadStyle = LoadStyle.EAGER)
+@Connect(value = Root.class, loadStyle = LoadStyle.EAGER)
 public class RootConnector extends AbstractComponentContainerConnector
         implements Paintable, MayScrollChildren {
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/slider/SliderConnector.java b/src/com/vaadin/terminal/gwt/client/ui/slider/SliderConnector.java
index 8b2e6501dfe9497083777c8ccb16b1f69d0287aa..9cd3c35feefda52da22139be2d0a541ec187206b 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/slider/SliderConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/slider/SliderConnector.java
@@ -11,10 +11,10 @@ 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;
+import com.vaadin.terminal.gwt.client.ui.Connect;
 import com.vaadin.ui.Slider;
 
-@Component(Slider.class)
+@Connect(Slider.class)
 public class SliderConnector extends AbstractFieldConnector implements
         Paintable {
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/splitpanel/HorizontalSplitPanelConnector.java b/src/com/vaadin/terminal/gwt/client/ui/splitpanel/HorizontalSplitPanelConnector.java
index d1a87874dcdfb1a6345990619316f495b793ac9f..7814ab8e1354346f0f85bb874964bd3614a111ee 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/splitpanel/HorizontalSplitPanelConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/splitpanel/HorizontalSplitPanelConnector.java
@@ -4,11 +4,11 @@
 package com.vaadin.terminal.gwt.client.ui.splitpanel;
 
 import com.google.gwt.core.client.GWT;
-import com.vaadin.terminal.gwt.client.ui.Component;
-import com.vaadin.terminal.gwt.client.ui.Component.LoadStyle;
+import com.vaadin.terminal.gwt.client.ui.Connect;
+import com.vaadin.terminal.gwt.client.ui.Connect.LoadStyle;
 import com.vaadin.ui.HorizontalSplitPanel;
 
-@Component(value = HorizontalSplitPanel.class, loadStyle = LoadStyle.EAGER)
+@Connect(value = HorizontalSplitPanel.class, loadStyle = LoadStyle.EAGER)
 public class HorizontalSplitPanelConnector extends AbstractSplitPanelConnector {
 
     @Override

diff --git a/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VerticalSplitPanelConnector.java b/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VerticalSplitPanelConnector.java
index a9b3e81a1b594a90e315d73b6175bfb57d5fb118..83404177c003eda370e9b8c6fb66bb394152c41f 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VerticalSplitPanelConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/splitpanel/VerticalSplitPanelConnector.java
@@ -4,11 +4,11 @@
 package com.vaadin.terminal.gwt.client.ui.splitpanel;
 
 import com.google.gwt.core.client.GWT;
-import com.vaadin.terminal.gwt.client.ui.Component;
-import com.vaadin.terminal.gwt.client.ui.Component.LoadStyle;
+import com.vaadin.terminal.gwt.client.ui.Connect;
+import com.vaadin.terminal.gwt.client.ui.Connect.LoadStyle;
 import com.vaadin.ui.VerticalSplitPanel;
 
-@Component(value = VerticalSplitPanel.class, loadStyle = LoadStyle.EAGER)
+@Connect(value = VerticalSplitPanel.class, loadStyle = LoadStyle.EAGER)
 public class VerticalSplitPanelConnector extends AbstractSplitPanelConnector {
 
     @Override

diff --git a/src/com/vaadin/terminal/gwt/client/ui/table/TableConnector.java b/src/com/vaadin/terminal/gwt/client/ui/table/TableConnector.java
index e0cd3dc4c79f64b9b71f625c838449252888f8a0..8d0cbdb448410198b1c68f571fc4b8728f5f6588 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/table/TableConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/table/TableConnector.java
@@ -20,12 +20,12 @@ 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.AbstractComponentContainerConnector;
-import com.vaadin.terminal.gwt.client.ui.Component;
+import com.vaadin.terminal.gwt.client.ui.Connect;
 import com.vaadin.terminal.gwt.client.ui.PostLayoutListener;
 import com.vaadin.terminal.gwt.client.ui.table.VScrollTable.ContextMenuDetails;
 import com.vaadin.terminal.gwt.client.ui.table.VScrollTable.VScrollTableBody.VScrollTableRow;
 
-@Component(com.vaadin.ui.Table.class)
+@Connect(com.vaadin.ui.Table.class)
 public class TableConnector extends AbstractComponentContainerConnector
         implements Paintable, DirectionalManagedLayout, PostLayoutListener {
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/tabsheet/TabsheetConnector.java b/src/com/vaadin/terminal/gwt/client/ui/tabsheet/TabsheetConnector.java
index 0518b3a480d5f3b67b62dc149c11d8e96ef8aacf..7829934f708cb97ac8738544000ef0a412c7430d 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/tabsheet/TabsheetConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/tabsheet/TabsheetConnector.java
@@ -9,12 +9,12 @@ 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.UIDL;
-import com.vaadin.terminal.gwt.client.ui.Component;
+import com.vaadin.terminal.gwt.client.ui.Connect;
 import com.vaadin.terminal.gwt.client.ui.SimpleManagedLayout;
 import com.vaadin.terminal.gwt.client.ui.layout.MayScrollChildren;
 import com.vaadin.ui.TabSheet;
 
-@Component(TabSheet.class)
+@Connect(TabSheet.class)
 public class TabsheetConnector extends TabsheetBaseConnector implements
         SimpleManagedLayout, MayScrollChildren {
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/textarea/TextAreaConnector.java b/src/com/vaadin/terminal/gwt/client/ui/textarea/TextAreaConnector.java
index f5ef93a265d3ee455b12915317f5f943c56a60c8..0f3ae0ad4f7a8c17219b098b14257400bde1b806 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/textarea/TextAreaConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/textarea/TextAreaConnector.java
@@ -9,11 +9,11 @@ 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.UIDL;
-import com.vaadin.terminal.gwt.client.ui.Component;
+import com.vaadin.terminal.gwt.client.ui.Connect;
 import com.vaadin.terminal.gwt.client.ui.textfield.TextFieldConnector;
 import com.vaadin.ui.TextArea;
 
-@Component(TextArea.class)
+@Connect(TextArea.class)
 public class TextAreaConnector extends TextFieldConnector {
 
     @Override

diff --git a/src/com/vaadin/terminal/gwt/client/ui/textfield/TextFieldConnector.java b/src/com/vaadin/terminal/gwt/client/ui/textfield/TextFieldConnector.java
index 806dc8c5dc49b9a695372c456f201746104adaa6..7e9e78667686c412d4e68ec3c3008f8b8990ea9a 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/textfield/TextFieldConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/textfield/TextFieldConnector.java
@@ -13,12 +13,12 @@ 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;
-import com.vaadin.terminal.gwt.client.ui.Component.LoadStyle;
+import com.vaadin.terminal.gwt.client.ui.Connect;
+import com.vaadin.terminal.gwt.client.ui.Connect.LoadStyle;
 import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler.BeforeShortcutActionListener;
 import com.vaadin.ui.TextField;
 
-@Component(value = TextField.class, loadStyle = LoadStyle.EAGER)
+@Connect(value = TextField.class, loadStyle = LoadStyle.EAGER)
 public class TextFieldConnector extends AbstractFieldConnector implements
         Paintable, BeforeShortcutActionListener {
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/tree/TreeConnector.java b/src/com/vaadin/terminal/gwt/client/ui/tree/TreeConnector.java
index f2f5d76d43b9443676eaf555743e4ea52ec4cb9e..ebe5d22e999659b5664c6412f492af19cf3dce30 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/tree/TreeConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/tree/TreeConnector.java
@@ -14,11 +14,11 @@ 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.AbstractComponentConnector;
-import com.vaadin.terminal.gwt.client.ui.Component;
+import com.vaadin.terminal.gwt.client.ui.Connect;
 import com.vaadin.terminal.gwt.client.ui.tree.VTree.TreeNode;
 import com.vaadin.ui.Tree;
 
-@Component(Tree.class)
+@Connect(Tree.class)
 public class TreeConnector extends AbstractComponentConnector implements
         Paintable {
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/treetable/TreeTableConnector.java b/src/com/vaadin/terminal/gwt/client/ui/treetable/TreeTableConnector.java
index aff2fafdb908c3663ef06bc01ce184d09f9fc977..f81771781b838c3855445048a7f02836445fc6b5 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/treetable/TreeTableConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/treetable/TreeTableConnector.java
@@ -7,14 +7,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.UIDL;
-import com.vaadin.terminal.gwt.client.ui.Component;
+import com.vaadin.terminal.gwt.client.ui.Connect;
 import com.vaadin.terminal.gwt.client.ui.FocusableScrollPanel;
 import com.vaadin.terminal.gwt.client.ui.table.TableConnector;
 import com.vaadin.terminal.gwt.client.ui.table.VScrollTable.VScrollTableBody.VScrollTableRow;
 import com.vaadin.terminal.gwt.client.ui.treetable.VTreeTable.PendingNavigationEvent;
 import com.vaadin.ui.TreeTable;
 
-@Component(TreeTable.class)
+@Connect(TreeTable.class)
 public class TreeTableConnector extends TableConnector {
     public static final String ATTRIBUTE_HIERARCHY_COLUMN_INDEX = "hci";
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/twincolselect/TwinColSelectConnector.java b/src/com/vaadin/terminal/gwt/client/ui/twincolselect/TwinColSelectConnector.java
index d8ad511d860710fe0386ec896380a7dc9e64694f..6f8773a4ceefd0dc3d84ab6a120cbf533d39ea2e 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/twincolselect/TwinColSelectConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/twincolselect/TwinColSelectConnector.java
@@ -9,11 +9,11 @@ import com.google.gwt.user.client.ui.Widget;
 import com.vaadin.terminal.gwt.client.ApplicationConnection;
 import com.vaadin.terminal.gwt.client.DirectionalManagedLayout;
 import com.vaadin.terminal.gwt.client.UIDL;
-import com.vaadin.terminal.gwt.client.ui.Component;
+import com.vaadin.terminal.gwt.client.ui.Connect;
 import com.vaadin.terminal.gwt.client.ui.optiongroup.OptionGroupBaseConnector;
 import com.vaadin.ui.TwinColSelect;
 
-@Component(TwinColSelect.class)
+@Connect(TwinColSelect.class)
 public class TwinColSelectConnector extends OptionGroupBaseConnector implements
         DirectionalManagedLayout {
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/upload/UploadConnector.java b/src/com/vaadin/terminal/gwt/client/ui/upload/UploadConnector.java
index c8b9fae07a0e36a71a8c18f65b87d7d6cb9c5439..0a2c0b241e2179ca7eee0d523e9ba933826d16f0 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/upload/UploadConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/upload/UploadConnector.java
@@ -10,11 +10,11 @@ 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.terminal.gwt.client.ui.Component.LoadStyle;
+import com.vaadin.terminal.gwt.client.ui.Connect;
+import com.vaadin.terminal.gwt.client.ui.Connect.LoadStyle;
 import com.vaadin.ui.Upload;
 
-@Component(value = Upload.class, loadStyle = LoadStyle.LAZY)
+@Connect(value = Upload.class, loadStyle = LoadStyle.LAZY)
 public class UploadConnector extends AbstractComponentConnector implements
         Paintable {
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/video/VideoConnector.java b/src/com/vaadin/terminal/gwt/client/ui/video/VideoConnector.java
index 318a82ddcf4f2f15056cd0bc76f8f24e212d6e21..ec763fff07b84c6de06d03a6d9895518280b43d8 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/video/VideoConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/video/VideoConnector.java
@@ -7,11 +7,11 @@ 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.UIDL;
-import com.vaadin.terminal.gwt.client.ui.Component;
+import com.vaadin.terminal.gwt.client.ui.Connect;
 import com.vaadin.terminal.gwt.client.ui.MediaBaseConnector;
 import com.vaadin.ui.Video;
 
-@Component(Video.class)
+@Connect(Video.class)
 public class VideoConnector extends MediaBaseConnector {
     public static final String ATTR_POSTER = "poster";
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/window/WindowConnector.java b/src/com/vaadin/terminal/gwt/client/ui/window/WindowConnector.java
index fbb7a3683bcadcd4ea242faf49e0e2ab1dd9fc4c..99910aae8bb33bcec7fb4bb91528c840e0333b8e 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/window/WindowConnector.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/window/WindowConnector.java
@@ -24,14 +24,14 @@ import com.vaadin.terminal.gwt.client.UIDL;
 import com.vaadin.terminal.gwt.client.communication.RpcProxy;
 import com.vaadin.terminal.gwt.client.ui.AbstractComponentContainerConnector;
 import com.vaadin.terminal.gwt.client.ui.ClickEventHandler;
-import com.vaadin.terminal.gwt.client.ui.Component;
+import com.vaadin.terminal.gwt.client.ui.Connect;
 import com.vaadin.terminal.gwt.client.ui.PostLayoutListener;
 import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler;
 import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler.BeforeShortcutActionListener;
 import com.vaadin.terminal.gwt.client.ui.SimpleManagedLayout;
 import com.vaadin.terminal.gwt.client.ui.layout.MayScrollChildren;
 
-@Component(value = com.vaadin.ui.Window.class)
+@Connect(value = com.vaadin.ui.Window.class)
 public class WindowConnector extends AbstractComponentContainerConnector
         implements Paintable, BeforeShortcutActionListener,
         SimpleManagedLayout, PostLayoutListener, MayScrollChildren {

diff --git a/src/com/vaadin/terminal/gwt/widgetsetutils/CustomWidgetMapGenerator.java b/src/com/vaadin/terminal/gwt/widgetsetutils/CustomWidgetMapGenerator.java
index 9d5f48a276ce65225428e4963ba091b858c2436f..809cf073e99f2fcb7442aae337c146f468b9336e 100644 (file)
--- a/src/com/vaadin/terminal/gwt/widgetsetutils/CustomWidgetMapGenerator.java
+++ b/src/com/vaadin/terminal/gwt/widgetsetutils/CustomWidgetMapGenerator.java
@@ -7,13 +7,13 @@ import java.util.Collection;
 import java.util.HashSet;
 
 import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.ui.Component;
-import com.vaadin.terminal.gwt.client.ui.Component.LoadStyle;
+import com.vaadin.terminal.gwt.client.ui.Connect;
+import com.vaadin.terminal.gwt.client.ui.Connect.LoadStyle;
 
 /**
  * An abstract helper class that can be used to easily build a widgetset with
  * customized load styles for each components. In three abstract methods one can
- * override the default values given in {@link Component} annotations.
+ * override the default values given in {@link Connect} annotations.
  * 
  * @see WidgetMapGenerator
  * 

diff --git a/src/com/vaadin/terminal/gwt/widgetsetutils/EagerWidgetMapGenerator.java b/src/com/vaadin/terminal/gwt/widgetsetutils/EagerWidgetMapGenerator.java
index 6e20169c3bfd1377223167222a19d6c8b1c8ee85..7a68c1971b886ce020b385e298fe3cbb7b728622 100644 (file)
--- a/src/com/vaadin/terminal/gwt/widgetsetutils/EagerWidgetMapGenerator.java
+++ b/src/com/vaadin/terminal/gwt/widgetsetutils/EagerWidgetMapGenerator.java
@@ -4,7 +4,7 @@
 package com.vaadin.terminal.gwt.widgetsetutils;
 
 import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.ui.Component.LoadStyle;
+import com.vaadin.terminal.gwt.client.ui.Connect.LoadStyle;
 
 /**
  * WidgetMap generator that builds a widgetset that packs all included widgets

diff --git a/src/com/vaadin/terminal/gwt/widgetsetutils/LazyWidgetMapGenerator.java b/src/com/vaadin/terminal/gwt/widgetsetutils/LazyWidgetMapGenerator.java
index 28f9f8a84fa81ae633e9d88741d1c19d8413fd66..9d90a5bd0f098d408e0d44633d9ed4d993096935 100644 (file)
--- a/src/com/vaadin/terminal/gwt/widgetsetutils/LazyWidgetMapGenerator.java
+++ b/src/com/vaadin/terminal/gwt/widgetsetutils/LazyWidgetMapGenerator.java
@@ -4,7 +4,7 @@
 package com.vaadin.terminal.gwt.widgetsetutils;
 
 import com.vaadin.terminal.gwt.client.ComponentConnector;
-import com.vaadin.terminal.gwt.client.ui.Component.LoadStyle;
+import com.vaadin.terminal.gwt.client.ui.Connect.LoadStyle;
 
 
 /**

diff --git a/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetMapGenerator.java b/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetMapGenerator.java
index 2db68ebca2d2d00bd13e69c3aec4f7c5f8b92b65..dff6f17667ea73a5686dfdbaf63a25aa7a24734a 100644 (file)
--- a/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetMapGenerator.java
+++ b/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetMapGenerator.java
@@ -24,15 +24,15 @@ import com.google.gwt.user.rebind.ClassSourceFileComposerFactory;
 import com.google.gwt.user.rebind.SourceWriter;
 import com.vaadin.terminal.gwt.client.ComponentConnector;
 import com.vaadin.terminal.gwt.client.Connector;
-import com.vaadin.terminal.gwt.client.ui.Component;
-import com.vaadin.terminal.gwt.client.ui.Component.LoadStyle;
+import com.vaadin.terminal.gwt.client.ui.Connect;
+import com.vaadin.terminal.gwt.client.ui.Connect.LoadStyle;
 import com.vaadin.terminal.gwt.client.ui.root.RootConnector;
 import com.vaadin.terminal.gwt.client.ui.UnknownComponentConnector;
 import com.vaadin.terminal.gwt.server.ClientConnector;
 
 /**
  * WidgetMapGenerator's are GWT generator to build WidgetMapImpl dynamically
- * based on {@link Component} annotations available in workspace. By modifying
+ * based on {@link Connect} annotations available in workspace. By modifying
  * the generator it is possible to do some fine tuning for the generated
  * widgetset (aka client side engine). The components to be included in the
  * client side engine can modified be overriding {@link #getUsedConnectors()}.
@@ -43,7 +43,7 @@ import com.vaadin.terminal.gwt.server.ClientConnector;
  * that loads all widget implementation on application initialization. This has
  * been the only option until Vaadin 6.4.
  * <p>
- * This generator uses the loadStyle hints from the {@link Component}
+ * This generator uses the loadStyle hints from the {@link Connect}
  * annotations. Depending on the {@link LoadStyle} used, the widget may be
  * included in the initially loaded JavaScript, loaded when the application has
  * started and there is no communication to server or lazy loaded when the
@@ -155,8 +155,8 @@ public class WidgetMapGenerator extends Generator {
                 .iterator();
         while (iter.hasNext()) {
             Class<? extends ComponentConnector> connectorClass = iter.next();
-            Component annotation = connectorClass
-                    .getAnnotation(Component.class);
+            Connect annotation = connectorClass
+                    .getAnnotation(Connect.class);
             if (!ClientConnector.class.isAssignableFrom(annotation.value())) {
                 logger.log(
                         Type.WARN,
@@ -215,7 +215,7 @@ public class WidgetMapGenerator extends Generator {
                 .getName());
         Collection<Class<? extends ComponentConnector>> connectors = new HashSet<Class<? extends ComponentConnector>>();
         for (JClassType jClassType : connectorType.getSubtypes()) {
-            Component annotation = jClassType.getAnnotation(Component.class);
+            Connect annotation = jClassType.getAnnotation(Connect.class);
             if (annotation != null) {
                 try {
                     Class<? extends ComponentConnector> clazz = (Class<? extends ComponentConnector>) Class
@@ -232,7 +232,7 @@ public class WidgetMapGenerator extends Generator {
     /**
      * Returns true if the widget for given component will be lazy loaded by the
      * client. The default implementation reads the information from the
-     * {@link Component} annotation.
+     * {@link Connect} annotation.
      * <p>
      * The method can be overridden to optimize the widget loading mechanism. If
      * the Widgetset is wanted to be optimized for a network with a high latency
@@ -245,7 +245,7 @@ public class WidgetMapGenerator extends Generator {
      */
     protected LoadStyle getLoadStyle(
             Class<? extends ComponentConnector> connector) {
-        Component annotation = connector.getAnnotation(Component.class);
+        Connect annotation = connector.getAnnotation(Connect.class);
         return annotation.loadStyle();
     }
 
@@ -395,7 +395,7 @@ public class WidgetMapGenerator extends Generator {
 
     private static Class<? extends ClientConnector> getClientConnectorClass(
             Class<? extends ComponentConnector> connectorClass) {
-        Component annotation = connectorClass.getAnnotation(Component.class);
+        Connect annotation = connectorClass.getAnnotation(Connect.class);
         return (Class<? extends ClientConnector>) annotation.value();
     }
 }

diff --git a/tests/testbench/com/vaadin/tests/dd/MyDragSourceConnector.java b/tests/testbench/com/vaadin/tests/dd/MyDragSourceConnector.java
index 60766577082ced37d75c7bfe23d75372f7599e0a..c94ac05ea27fd7e9db803667ee5327c72435e929 100644 (file)
--- a/tests/testbench/com/vaadin/tests/dd/MyDragSourceConnector.java
+++ b/tests/testbench/com/vaadin/tests/dd/MyDragSourceConnector.java
@@ -9,10 +9,10 @@ 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.terminal.gwt.client.ui.Connect;
 import com.vaadin.tests.dd.CustomDDImplementation.MyDragSource;
 
-@Component(MyDragSource.class)
+@Connect(MyDragSource.class)
 public class MyDragSourceConnector extends AbstractComponentConnector implements
         Paintable {
 

diff --git a/tests/testbench/com/vaadin/tests/dd/MyDropTargetConnector.java b/tests/testbench/com/vaadin/tests/dd/MyDropTargetConnector.java
index 02ed47ec05bda2acbb82d845986e3f191a2abbbb..0021cbf7eab5aa75942028c4ad10b9d7afff6507 100644 (file)
--- a/tests/testbench/com/vaadin/tests/dd/MyDropTargetConnector.java
+++ b/tests/testbench/com/vaadin/tests/dd/MyDropTargetConnector.java
@@ -9,10 +9,10 @@ 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.terminal.gwt.client.ui.Connect;
 import com.vaadin.tests.dd.CustomDDImplementation.MyDropTarget;
 
-@Component(MyDropTarget.class)
+@Connect(MyDropTarget.class)
 public class MyDropTargetConnector extends AbstractComponentConnector implements
         Paintable {