From 602b6903a67cb7d2e6bc55f8fc8ec62451e3bada Mon Sep 17 00:00:00 2001 From: =?utf8?q?Johannes=20Dahlstr=C3=B6m?= Date: Wed, 31 Oct 2012 18:14:30 +0200 Subject: [PATCH] Move LegacyComponent from com.vaadin.server to com.vaadin.ui Change-Id: I482517e6f83dfed2654476f928bb7bb01c9de202 --- client/src/com/vaadin/client/ui/LegacyConnector.java | 5 +++++ .../vaadin/server/AbstractCommunicationManager.java | 1 + .../src/com/vaadin/server/GlobalResourceHandler.java | 1 + server/src/com/vaadin/server/LegacyPaint.java | 1 + server/src/com/vaadin/server/VariableOwner.java | 2 ++ server/src/com/vaadin/ui/AbstractSelect.java | 1 - server/src/com/vaadin/ui/AbstractTextField.java | 1 - server/src/com/vaadin/ui/CustomLayout.java | 1 - server/src/com/vaadin/ui/DateField.java | 1 - server/src/com/vaadin/ui/DragAndDropWrapper.java | 1 - server/src/com/vaadin/ui/Embedded.java | 1 - server/src/com/vaadin/ui/Form.java | 1 - server/src/com/vaadin/ui/GridLayout.java | 1 - .../com/vaadin/{server => ui}/LegacyComponent.java | 12 +++++++++--- server/src/com/vaadin/ui/Link.java | 1 - server/src/com/vaadin/ui/MenuBar.java | 1 - server/src/com/vaadin/ui/Panel.java | 1 - server/src/com/vaadin/ui/PopupView.java | 1 - server/src/com/vaadin/ui/RichTextArea.java | 1 - server/src/com/vaadin/ui/TabSheet.java | 1 - server/src/com/vaadin/ui/UI.java | 1 - server/src/com/vaadin/ui/Upload.java | 1 - server/src/com/vaadin/ui/Window.java | 1 - 23 files changed, 19 insertions(+), 20 deletions(-) rename server/src/com/vaadin/{server => ui}/LegacyComponent.java (86%) diff --git a/client/src/com/vaadin/client/ui/LegacyConnector.java b/client/src/com/vaadin/client/ui/LegacyConnector.java index c5a1325a69..8e97cd3ef5 100644 --- a/client/src/com/vaadin/client/ui/LegacyConnector.java +++ b/client/src/com/vaadin/client/ui/LegacyConnector.java @@ -19,6 +19,11 @@ import com.vaadin.client.ApplicationConnection; import com.vaadin.client.Paintable; import com.vaadin.client.UIDL; +/** + * @deprecated This class is only intended to ease migration and should not be + * used for new projects. + */ +@Deprecated public abstract class LegacyConnector extends AbstractComponentConnector implements Paintable { diff --git a/server/src/com/vaadin/server/AbstractCommunicationManager.java b/server/src/com/vaadin/server/AbstractCommunicationManager.java index a294d67a31..202c7cf780 100644 --- a/server/src/com/vaadin/server/AbstractCommunicationManager.java +++ b/server/src/com/vaadin/server/AbstractCommunicationManager.java @@ -82,6 +82,7 @@ import com.vaadin.ui.AbstractField; import com.vaadin.ui.Component; import com.vaadin.ui.ConnectorTracker; import com.vaadin.ui.HasComponents; +import com.vaadin.ui.LegacyComponent; import com.vaadin.ui.LegacyWindow; import com.vaadin.ui.UI; import com.vaadin.ui.Window; diff --git a/server/src/com/vaadin/server/GlobalResourceHandler.java b/server/src/com/vaadin/server/GlobalResourceHandler.java index 5b89408d01..4ba3e25e28 100644 --- a/server/src/com/vaadin/server/GlobalResourceHandler.java +++ b/server/src/com/vaadin/server/GlobalResourceHandler.java @@ -29,6 +29,7 @@ import java.util.regex.Pattern; import javax.servlet.http.HttpServletResponse; import com.vaadin.shared.ApplicationConstants; +import com.vaadin.ui.LegacyComponent; import com.vaadin.ui.UI; /** diff --git a/server/src/com/vaadin/server/LegacyPaint.java b/server/src/com/vaadin/server/LegacyPaint.java index c39e0e8247..971aec682f 100644 --- a/server/src/com/vaadin/server/LegacyPaint.java +++ b/server/src/com/vaadin/server/LegacyPaint.java @@ -20,6 +20,7 @@ import java.io.Serializable; import com.vaadin.server.PaintTarget.PaintStatus; import com.vaadin.ui.Component; import com.vaadin.ui.HasComponents; +import com.vaadin.ui.LegacyComponent; public class LegacyPaint implements Serializable { /** diff --git a/server/src/com/vaadin/server/VariableOwner.java b/server/src/com/vaadin/server/VariableOwner.java index c917996e6b..704b4cdae9 100644 --- a/server/src/com/vaadin/server/VariableOwner.java +++ b/server/src/com/vaadin/server/VariableOwner.java @@ -19,6 +19,8 @@ package com.vaadin.server; import java.io.Serializable; import java.util.Map; +import com.vaadin.ui.LegacyComponent; + /** *

* Listener interface for UI variable changes. The user communicates with the diff --git a/server/src/com/vaadin/ui/AbstractSelect.java b/server/src/com/vaadin/ui/AbstractSelect.java index d2092ceb2c..e656ef1e0a 100644 --- a/server/src/com/vaadin/ui/AbstractSelect.java +++ b/server/src/com/vaadin/ui/AbstractSelect.java @@ -41,7 +41,6 @@ import com.vaadin.event.dd.acceptcriteria.ClientSideCriterion; import com.vaadin.event.dd.acceptcriteria.ContainsDataFlavor; import com.vaadin.event.dd.acceptcriteria.TargetDetailIs; import com.vaadin.server.KeyMapper; -import com.vaadin.server.LegacyComponent; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; import com.vaadin.server.Resource; diff --git a/server/src/com/vaadin/ui/AbstractTextField.java b/server/src/com/vaadin/ui/AbstractTextField.java index e8618a33ee..5a436d92c1 100644 --- a/server/src/com/vaadin/ui/AbstractTextField.java +++ b/server/src/com/vaadin/ui/AbstractTextField.java @@ -27,7 +27,6 @@ import com.vaadin.event.FieldEvents.FocusNotifier; import com.vaadin.event.FieldEvents.TextChangeEvent; import com.vaadin.event.FieldEvents.TextChangeListener; import com.vaadin.event.FieldEvents.TextChangeNotifier; -import com.vaadin.server.LegacyComponent; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; import com.vaadin.shared.ui.textfield.AbstractTextFieldState; diff --git a/server/src/com/vaadin/ui/CustomLayout.java b/server/src/com/vaadin/ui/CustomLayout.java index 39540a3882..19bd5a54b3 100644 --- a/server/src/com/vaadin/ui/CustomLayout.java +++ b/server/src/com/vaadin/ui/CustomLayout.java @@ -25,7 +25,6 @@ import java.util.Map; import java.util.Set; import com.vaadin.server.JsonPaintTarget; -import com.vaadin.server.LegacyComponent; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; import com.vaadin.shared.ui.customlayout.CustomLayoutState; diff --git a/server/src/com/vaadin/ui/DateField.java b/server/src/com/vaadin/ui/DateField.java index 39230bf662..77f18df304 100644 --- a/server/src/com/vaadin/ui/DateField.java +++ b/server/src/com/vaadin/ui/DateField.java @@ -34,7 +34,6 @@ import com.vaadin.event.FieldEvents.BlurEvent; import com.vaadin.event.FieldEvents.BlurListener; import com.vaadin.event.FieldEvents.FocusEvent; import com.vaadin.event.FieldEvents.FocusListener; -import com.vaadin.server.LegacyComponent; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; import com.vaadin.shared.ui.datefield.DateFieldConstants; diff --git a/server/src/com/vaadin/ui/DragAndDropWrapper.java b/server/src/com/vaadin/ui/DragAndDropWrapper.java index ca4807ff5d..81efa8883e 100644 --- a/server/src/com/vaadin/ui/DragAndDropWrapper.java +++ b/server/src/com/vaadin/ui/DragAndDropWrapper.java @@ -29,7 +29,6 @@ import com.vaadin.event.dd.DropHandler; import com.vaadin.event.dd.DropTarget; import com.vaadin.event.dd.TargetDetails; import com.vaadin.event.dd.TargetDetailsImpl; -import com.vaadin.server.LegacyComponent; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; import com.vaadin.server.StreamVariable; diff --git a/server/src/com/vaadin/ui/Embedded.java b/server/src/com/vaadin/ui/Embedded.java index d61fd44292..a47989ad36 100644 --- a/server/src/com/vaadin/ui/Embedded.java +++ b/server/src/com/vaadin/ui/Embedded.java @@ -22,7 +22,6 @@ import java.util.Map; import com.vaadin.event.MouseEvents.ClickEvent; import com.vaadin.event.MouseEvents.ClickListener; -import com.vaadin.server.LegacyComponent; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; import com.vaadin.server.Resource; diff --git a/server/src/com/vaadin/ui/Form.java b/server/src/com/vaadin/ui/Form.java index 46a335669e..9668eaf914 100644 --- a/server/src/com/vaadin/ui/Form.java +++ b/server/src/com/vaadin/ui/Form.java @@ -39,7 +39,6 @@ import com.vaadin.event.ActionManager; import com.vaadin.server.AbstractErrorMessage; import com.vaadin.server.CompositeErrorMessage; import com.vaadin.server.ErrorMessage; -import com.vaadin.server.LegacyComponent; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; import com.vaadin.server.UserError; diff --git a/server/src/com/vaadin/ui/GridLayout.java b/server/src/com/vaadin/ui/GridLayout.java index 566bd812a3..39be937c01 100644 --- a/server/src/com/vaadin/ui/GridLayout.java +++ b/server/src/com/vaadin/ui/GridLayout.java @@ -27,7 +27,6 @@ import java.util.Map.Entry; import com.vaadin.event.LayoutEvents.LayoutClickEvent; import com.vaadin.event.LayoutEvents.LayoutClickListener; import com.vaadin.event.LayoutEvents.LayoutClickNotifier; -import com.vaadin.server.LegacyComponent; import com.vaadin.server.LegacyPaint; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; diff --git a/server/src/com/vaadin/server/LegacyComponent.java b/server/src/com/vaadin/ui/LegacyComponent.java similarity index 86% rename from server/src/com/vaadin/server/LegacyComponent.java rename to server/src/com/vaadin/ui/LegacyComponent.java index b6e620f920..5538c3ac5e 100644 --- a/server/src/com/vaadin/server/LegacyComponent.java +++ b/server/src/com/vaadin/ui/LegacyComponent.java @@ -13,11 +13,14 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.server; +package com.vaadin.ui; import java.util.EventListener; -import com.vaadin.ui.Component; +import com.vaadin.server.ClientConnector; +import com.vaadin.server.PaintException; +import com.vaadin.server.PaintTarget; +import com.vaadin.server.VariableOwner; /** * Interface provided to ease porting of Vaadin 6 components to Vaadin 7. By @@ -25,10 +28,13 @@ import com.vaadin.ui.Component; * {@link #paintContent(PaintTarget)} and * {@link #changeVariables(Object, java.util.Map)} just like in Vaadin 6. * + * @deprecated This class is only intended to ease migration and should not be + * used for new projects. + * * @author Vaadin Ltd * @since 7.0.0 - * */ +@Deprecated public interface LegacyComponent extends VariableOwner, Component, EventListener { diff --git a/server/src/com/vaadin/ui/Link.java b/server/src/com/vaadin/ui/Link.java index 6e286174a5..883ff40aa3 100644 --- a/server/src/com/vaadin/ui/Link.java +++ b/server/src/com/vaadin/ui/Link.java @@ -18,7 +18,6 @@ package com.vaadin.ui; import java.util.Map; -import com.vaadin.server.LegacyComponent; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; import com.vaadin.server.Resource; diff --git a/server/src/com/vaadin/ui/MenuBar.java b/server/src/com/vaadin/ui/MenuBar.java index a254f62fc8..f3b5cb0369 100644 --- a/server/src/com/vaadin/ui/MenuBar.java +++ b/server/src/com/vaadin/ui/MenuBar.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import java.util.Stack; -import com.vaadin.server.LegacyComponent; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; import com.vaadin.server.Resource; diff --git a/server/src/com/vaadin/ui/Panel.java b/server/src/com/vaadin/ui/Panel.java index f73cd5128e..8d501cd949 100644 --- a/server/src/com/vaadin/ui/Panel.java +++ b/server/src/com/vaadin/ui/Panel.java @@ -25,7 +25,6 @@ import com.vaadin.event.Action.Handler; import com.vaadin.event.ActionManager; import com.vaadin.event.MouseEvents.ClickEvent; import com.vaadin.event.MouseEvents.ClickListener; -import com.vaadin.server.LegacyComponent; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; import com.vaadin.server.Scrollable; diff --git a/server/src/com/vaadin/ui/PopupView.java b/server/src/com/vaadin/ui/PopupView.java index 182e71d6c9..97a198f73f 100644 --- a/server/src/com/vaadin/ui/PopupView.java +++ b/server/src/com/vaadin/ui/PopupView.java @@ -20,7 +20,6 @@ import java.lang.reflect.Method; import java.util.Iterator; import java.util.Map; -import com.vaadin.server.LegacyComponent; import com.vaadin.server.LegacyPaint; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; diff --git a/server/src/com/vaadin/ui/RichTextArea.java b/server/src/com/vaadin/ui/RichTextArea.java index e687c68815..81432e212d 100644 --- a/server/src/com/vaadin/ui/RichTextArea.java +++ b/server/src/com/vaadin/ui/RichTextArea.java @@ -19,7 +19,6 @@ package com.vaadin.ui; import java.util.Map; import com.vaadin.data.Property; -import com.vaadin.server.LegacyComponent; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; diff --git a/server/src/com/vaadin/ui/TabSheet.java b/server/src/com/vaadin/ui/TabSheet.java index 1293966e58..c45789ed33 100644 --- a/server/src/com/vaadin/ui/TabSheet.java +++ b/server/src/com/vaadin/ui/TabSheet.java @@ -32,7 +32,6 @@ import com.vaadin.event.FieldEvents.FocusListener; import com.vaadin.event.FieldEvents.FocusNotifier; import com.vaadin.server.ErrorMessage; import com.vaadin.server.KeyMapper; -import com.vaadin.server.LegacyComponent; import com.vaadin.server.LegacyPaint; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; diff --git a/server/src/com/vaadin/ui/UI.java b/server/src/com/vaadin/ui/UI.java index fb6ab9a0e1..4d743859da 100644 --- a/server/src/com/vaadin/ui/UI.java +++ b/server/src/com/vaadin/ui/UI.java @@ -31,7 +31,6 @@ import com.vaadin.event.ActionManager; import com.vaadin.event.MouseEvents.ClickEvent; import com.vaadin.event.MouseEvents.ClickListener; import com.vaadin.navigator.Navigator; -import com.vaadin.server.LegacyComponent; import com.vaadin.server.Page; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; diff --git a/server/src/com/vaadin/ui/Upload.java b/server/src/com/vaadin/ui/Upload.java index 624f6a3f91..47b4684c32 100644 --- a/server/src/com/vaadin/ui/Upload.java +++ b/server/src/com/vaadin/ui/Upload.java @@ -24,7 +24,6 @@ import java.util.Iterator; import java.util.LinkedHashSet; import java.util.Map; -import com.vaadin.server.LegacyComponent; import com.vaadin.server.NoInputStreamException; import com.vaadin.server.NoOutputStreamException; import com.vaadin.server.PaintException; diff --git a/server/src/com/vaadin/ui/Window.java b/server/src/com/vaadin/ui/Window.java index d7a33d742c..b09ef13497 100644 --- a/server/src/com/vaadin/ui/Window.java +++ b/server/src/com/vaadin/ui/Window.java @@ -31,7 +31,6 @@ import com.vaadin.event.ShortcutAction; import com.vaadin.event.ShortcutAction.KeyCode; import com.vaadin.event.ShortcutAction.ModifierKey; import com.vaadin.event.ShortcutListener; -import com.vaadin.server.LegacyComponent; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; import com.vaadin.shared.MouseEventDetails; -- 2.39.5