From fadb44821a5b686b61d7ef4667b141947e85fa67 Mon Sep 17 00:00:00 2001 From: Johannes Dahlström Date: Wed, 29 Aug 2012 14:32:08 +0300 Subject: Rename Vaadin6Component to LegacyComponent (#9434) --- .../server/AbstractCommunicationManager.java | 12 ++-- server/src/com/vaadin/server/LegacyComponent.java | 66 ++++++++++++++++++++++ server/src/com/vaadin/server/LegacyPaint.java | 4 +- server/src/com/vaadin/server/Vaadin6Component.java | 66 ---------------------- server/src/com/vaadin/server/VariableOwner.java | 2 +- server/src/com/vaadin/ui/AbstractSelect.java | 4 +- server/src/com/vaadin/ui/AbstractTextField.java | 4 +- server/src/com/vaadin/ui/CustomLayout.java | 4 +- server/src/com/vaadin/ui/DateField.java | 4 +- server/src/com/vaadin/ui/DragAndDropWrapper.java | 6 +- server/src/com/vaadin/ui/Embedded.java | 6 +- server/src/com/vaadin/ui/Form.java | 4 +- server/src/com/vaadin/ui/GridLayout.java | 6 +- server/src/com/vaadin/ui/Link.java | 6 +- server/src/com/vaadin/ui/MenuBar.java | 4 +- server/src/com/vaadin/ui/Panel.java | 6 +- server/src/com/vaadin/ui/PopupView.java | 4 +- server/src/com/vaadin/ui/ProgressIndicator.java | 6 +- server/src/com/vaadin/ui/RichTextArea.java | 4 +- server/src/com/vaadin/ui/TabSheet.java | 4 +- server/src/com/vaadin/ui/UI.java | 4 +- server/src/com/vaadin/ui/Upload.java | 4 +- server/src/com/vaadin/ui/Window.java | 4 +- 23 files changed, 117 insertions(+), 117 deletions(-) create mode 100644 server/src/com/vaadin/server/LegacyComponent.java delete mode 100644 server/src/com/vaadin/server/Vaadin6Component.java (limited to 'server') diff --git a/server/src/com/vaadin/server/AbstractCommunicationManager.java b/server/src/com/vaadin/server/AbstractCommunicationManager.java index acbbebea78..2d60c6e587 100644 --- a/server/src/com/vaadin/server/AbstractCommunicationManager.java +++ b/server/src/com/vaadin/server/AbstractCommunicationManager.java @@ -1331,18 +1331,18 @@ public abstract class AbstractCommunicationManager implements Serializable { private void legacyPaint(PaintTarget paintTarget, ArrayList dirtyVisibleConnectors) throws PaintException { - List legacyComponents = new ArrayList(); + List legacyComponents = new ArrayList(); for (Connector connector : dirtyVisibleConnectors) { // All Components that want to use paintContent must implement - // Vaadin6Component - if (connector instanceof Vaadin6Component) { - legacyComponents.add((Vaadin6Component) connector); + // LegacyComponent + if (connector instanceof LegacyComponent) { + legacyComponents.add((LegacyComponent) connector); } } sortByHierarchy((List) legacyComponents); - for (Vaadin6Component c : legacyComponents) { + for (LegacyComponent c : legacyComponents) { getLogger().fine( - "Painting Vaadin6Component " + c.getClass().getName() + "@" + "Painting LegacyComponent " + c.getClass().getName() + "@" + Integer.toHexString(c.hashCode())); paintTarget.startTag("change"); final String pid = c.getConnectorId(); diff --git a/server/src/com/vaadin/server/LegacyComponent.java b/server/src/com/vaadin/server/LegacyComponent.java new file mode 100644 index 0000000000..b6e620f920 --- /dev/null +++ b/server/src/com/vaadin/server/LegacyComponent.java @@ -0,0 +1,66 @@ +/* + * Copyright 2011 Vaadin Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.vaadin.server; + +import java.util.EventListener; + +import com.vaadin.ui.Component; + +/** + * Interface provided to ease porting of Vaadin 6 components to Vaadin 7. By + * implementing this interface your Component will be able to use + * {@link #paintContent(PaintTarget)} and + * {@link #changeVariables(Object, java.util.Map)} just like in Vaadin 6. + * + * @author Vaadin Ltd + * @since 7.0.0 + * + */ +public interface LegacyComponent extends VariableOwner, Component, + EventListener { + + /** + *

+ * Paints the Paintable into a UIDL stream. This method creates the UIDL + * sequence describing it and outputs it to the given UIDL stream. + *

+ * + *

+ * It is called when the contents of the component should be painted in + * response to the component first being shown or having been altered so + * that its visual representation is changed. + *

+ * + * @param target + * the target UIDL stream where the component should paint itself + * to. + * @throws PaintException + * if the paint operation failed. + */ + public void paintContent(PaintTarget target) throws PaintException; + + /** + * (non-Javadoc) {@inheritDoc} + *

+ * For a LegacyComponent, markAsDirty will also cause + * {@link #paintContent(PaintTarget)} to be called before sending changes to + * the client. + * + * @see com.vaadin.server.ClientConnector#markAsDirty() + */ + @Override + public void markAsDirty(); +} diff --git a/server/src/com/vaadin/server/LegacyPaint.java b/server/src/com/vaadin/server/LegacyPaint.java index a5e16bb24b..c39e0e8247 100644 --- a/server/src/com/vaadin/server/LegacyPaint.java +++ b/server/src/com/vaadin/server/LegacyPaint.java @@ -61,8 +61,8 @@ public class LegacyPaint implements Serializable { target.addAttribute("cached", true); } else { // Paint the contents of the component - if (component instanceof Vaadin6Component) { - ((Vaadin6Component) component).paintContent(target); + if (component instanceof LegacyComponent) { + ((LegacyComponent) component).paintContent(target); } } diff --git a/server/src/com/vaadin/server/Vaadin6Component.java b/server/src/com/vaadin/server/Vaadin6Component.java deleted file mode 100644 index ce37d375f9..0000000000 --- a/server/src/com/vaadin/server/Vaadin6Component.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright 2011 Vaadin Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ -package com.vaadin.server; - -import java.util.EventListener; - -import com.vaadin.ui.Component; - -/** - * Interface provided to ease porting of Vaadin 6 components to Vaadin 7. By - * implementing this interface your Component will be able to use - * {@link #paintContent(PaintTarget)} and - * {@link #changeVariables(Object, java.util.Map)} just like in Vaadin 6. - * - * @author Vaadin Ltd - * @since 7.0.0 - * - */ -public interface Vaadin6Component extends VariableOwner, Component, - EventListener { - - /** - *

- * Paints the Paintable into a UIDL stream. This method creates the UIDL - * sequence describing it and outputs it to the given UIDL stream. - *

- * - *

- * It is called when the contents of the component should be painted in - * response to the component first being shown or having been altered so - * that its visual representation is changed. - *

- * - * @param target - * the target UIDL stream where the component should paint itself - * to. - * @throws PaintException - * if the paint operation failed. - */ - public void paintContent(PaintTarget target) throws PaintException; - - /** - * (non-Javadoc) {@inheritDoc} - *

- * For a Vaadin6Component, markAsDirty will also cause - * {@link #paintContent(PaintTarget)} to be called before sending changes to - * the client. - * - * @see com.vaadin.server.ClientConnector#markAsDirty() - */ - @Override - public void markAsDirty(); -} diff --git a/server/src/com/vaadin/server/VariableOwner.java b/server/src/com/vaadin/server/VariableOwner.java index 4c6c86669c..c917996e6b 100644 --- a/server/src/com/vaadin/server/VariableOwner.java +++ b/server/src/com/vaadin/server/VariableOwner.java @@ -31,7 +31,7 @@ import java.util.Map; * @author Vaadin Ltd. * @since 3.0 * @deprecated in 7.0. Only provided to ease porting of Vaadin 6 components. Do - * not implement this directly, implement {@link Vaadin6Component}. + * not implement this directly, implement {@link LegacyComponent}. */ @Deprecated public interface VariableOwner extends Serializable { diff --git a/server/src/com/vaadin/ui/AbstractSelect.java b/server/src/com/vaadin/ui/AbstractSelect.java index 05169552d7..677aeee50f 100644 --- a/server/src/com/vaadin/ui/AbstractSelect.java +++ b/server/src/com/vaadin/ui/AbstractSelect.java @@ -43,7 +43,7 @@ import com.vaadin.server.KeyMapper; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; import com.vaadin.server.Resource; -import com.vaadin.server.Vaadin6Component; +import com.vaadin.server.LegacyComponent; import com.vaadin.shared.ui.dd.VerticalDropLocation; import com.vaadin.ui.AbstractSelect.ItemCaptionMode; @@ -68,7 +68,7 @@ import com.vaadin.ui.AbstractSelect.ItemCaptionMode; public abstract class AbstractSelect extends AbstractField implements Container, Container.Viewer, Container.PropertySetChangeListener, Container.PropertySetChangeNotifier, Container.ItemSetChangeNotifier, - Container.ItemSetChangeListener, Vaadin6Component { + Container.ItemSetChangeListener, LegacyComponent { public enum ItemCaptionMode { /** diff --git a/server/src/com/vaadin/ui/AbstractTextField.java b/server/src/com/vaadin/ui/AbstractTextField.java index 94a32dac96..907ac629b9 100644 --- a/server/src/com/vaadin/ui/AbstractTextField.java +++ b/server/src/com/vaadin/ui/AbstractTextField.java @@ -29,12 +29,12 @@ import com.vaadin.event.FieldEvents.TextChangeListener; import com.vaadin.event.FieldEvents.TextChangeNotifier; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; -import com.vaadin.server.Vaadin6Component; +import com.vaadin.server.LegacyComponent; import com.vaadin.shared.ui.textfield.AbstractTextFieldState; import com.vaadin.shared.ui.textfield.TextFieldConstants; public abstract class AbstractTextField extends AbstractField implements - BlurNotifier, FocusNotifier, TextChangeNotifier, Vaadin6Component { + BlurNotifier, FocusNotifier, TextChangeNotifier, LegacyComponent { /** * Null representation. diff --git a/server/src/com/vaadin/ui/CustomLayout.java b/server/src/com/vaadin/ui/CustomLayout.java index e78f0dcc20..f747b6ff3b 100644 --- a/server/src/com/vaadin/ui/CustomLayout.java +++ b/server/src/com/vaadin/ui/CustomLayout.java @@ -27,7 +27,7 @@ import java.util.Set; import com.vaadin.server.JsonPaintTarget; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; -import com.vaadin.server.Vaadin6Component; +import com.vaadin.server.LegacyComponent; import com.vaadin.shared.ui.customlayout.CustomLayoutState; /** @@ -58,7 +58,7 @@ import com.vaadin.shared.ui.customlayout.CustomLayoutState; * @since 3.0 */ @SuppressWarnings("serial") -public class CustomLayout extends AbstractLayout implements Vaadin6Component { +public class CustomLayout extends AbstractLayout implements LegacyComponent { private static final int BUFFER_SIZE = 10000; diff --git a/server/src/com/vaadin/ui/DateField.java b/server/src/com/vaadin/ui/DateField.java index b4bf93b5b0..d3458c3cb6 100644 --- a/server/src/com/vaadin/ui/DateField.java +++ b/server/src/com/vaadin/ui/DateField.java @@ -38,7 +38,7 @@ import com.vaadin.event.FieldEvents.FocusEvent; import com.vaadin.event.FieldEvents.FocusListener; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; -import com.vaadin.server.Vaadin6Component; +import com.vaadin.server.LegacyComponent; import com.vaadin.shared.ui.datefield.DateFieldConstants; /** @@ -61,7 +61,7 @@ import com.vaadin.shared.ui.datefield.DateFieldConstants; */ @SuppressWarnings("serial") public class DateField extends AbstractField implements - FieldEvents.BlurNotifier, FieldEvents.FocusNotifier, Vaadin6Component { + FieldEvents.BlurNotifier, FieldEvents.FocusNotifier, LegacyComponent { /** * Resolutions for DateFields diff --git a/server/src/com/vaadin/ui/DragAndDropWrapper.java b/server/src/com/vaadin/ui/DragAndDropWrapper.java index fcd0b95015..d3f3e23448 100644 --- a/server/src/com/vaadin/ui/DragAndDropWrapper.java +++ b/server/src/com/vaadin/ui/DragAndDropWrapper.java @@ -32,7 +32,7 @@ import com.vaadin.event.dd.TargetDetailsImpl; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; import com.vaadin.server.StreamVariable; -import com.vaadin.server.Vaadin6Component; +import com.vaadin.server.LegacyComponent; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.dd.HorizontalDropLocation; import com.vaadin.shared.ui.dd.VerticalDropLocation; @@ -40,7 +40,7 @@ import com.vaadin.shared.ui.draganddropwrapper.DragAndDropWrapperConstants; @SuppressWarnings("serial") public class DragAndDropWrapper extends CustomComponent implements DropTarget, - DragSource, Vaadin6Component { + DragSource, LegacyComponent { public class WrapperTransferable extends TransferableImpl { @@ -212,7 +212,7 @@ public class DragAndDropWrapper extends CustomComponent implements DropTarget, @Override public void changeVariables(Object source, Map variables) { - // TODO Remove once Vaadin6Component is no longer implemented + // TODO Remove once LegacyComponent is no longer implemented } @Override diff --git a/server/src/com/vaadin/ui/Embedded.java b/server/src/com/vaadin/ui/Embedded.java index 6a1fceed93..a5175fbf7c 100644 --- a/server/src/com/vaadin/ui/Embedded.java +++ b/server/src/com/vaadin/ui/Embedded.java @@ -25,7 +25,7 @@ import com.vaadin.event.MouseEvents.ClickListener; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; import com.vaadin.server.Resource; -import com.vaadin.server.Vaadin6Component; +import com.vaadin.server.LegacyComponent; import com.vaadin.shared.EventId; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.embedded.EmbeddedConstants; @@ -42,7 +42,7 @@ import com.vaadin.shared.ui.embedded.EmbeddedServerRpc; * @since 3.0 */ @SuppressWarnings("serial") -public class Embedded extends AbstractComponent implements Vaadin6Component { +public class Embedded extends AbstractComponent implements LegacyComponent { /** * General object type. @@ -545,7 +545,7 @@ public class Embedded extends AbstractComponent implements Vaadin6Component { @Override public void changeVariables(Object source, Map variables) { - // TODO Remove once Vaadin6Component is no longer implemented + // TODO Remove once LegacyComponent is no longer implemented } } diff --git a/server/src/com/vaadin/ui/Form.java b/server/src/com/vaadin/ui/Form.java index 8bf46ed198..7e77117acb 100644 --- a/server/src/com/vaadin/ui/Form.java +++ b/server/src/com/vaadin/ui/Form.java @@ -42,7 +42,7 @@ import com.vaadin.server.ErrorMessage; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; import com.vaadin.server.UserError; -import com.vaadin.server.Vaadin6Component; +import com.vaadin.server.LegacyComponent; import com.vaadin.shared.ui.form.FormState; /** @@ -79,7 +79,7 @@ import com.vaadin.shared.ui.form.FormState; @Deprecated public class Form extends AbstractField implements Item.Editor, Buffered, Item, Validatable, Action.Notifier, HasComponents, - Vaadin6Component { + LegacyComponent { private Object propertyValue; diff --git a/server/src/com/vaadin/ui/GridLayout.java b/server/src/com/vaadin/ui/GridLayout.java index 27a25699ba..1efe41d653 100644 --- a/server/src/com/vaadin/ui/GridLayout.java +++ b/server/src/com/vaadin/ui/GridLayout.java @@ -30,7 +30,7 @@ import com.vaadin.event.LayoutEvents.LayoutClickNotifier; import com.vaadin.server.LegacyPaint; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; -import com.vaadin.server.Vaadin6Component; +import com.vaadin.server.LegacyComponent; import com.vaadin.shared.Connector; import com.vaadin.shared.EventId; import com.vaadin.shared.MouseEventDetails; @@ -65,7 +65,7 @@ import com.vaadin.shared.ui.gridlayout.GridLayoutState; @SuppressWarnings("serial") public class GridLayout extends AbstractLayout implements Layout.AlignmentHandler, Layout.SpacingHandler, Layout.MarginHandler, - LayoutClickNotifier, Vaadin6Component { + LayoutClickNotifier, LegacyComponent { private GridLayoutServerRpc rpc = new GridLayoutServerRpc() { @@ -447,7 +447,7 @@ public class GridLayout extends AbstractLayout implements @Override public void changeVariables(Object source, Map variables) { - // TODO Remove once Vaadin6Component is no longer implemented + // TODO Remove once LegacyComponent is no longer implemented } /** diff --git a/server/src/com/vaadin/ui/Link.java b/server/src/com/vaadin/ui/Link.java index cb6b643c33..e98b558dbe 100644 --- a/server/src/com/vaadin/ui/Link.java +++ b/server/src/com/vaadin/ui/Link.java @@ -21,7 +21,7 @@ import java.util.Map; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; import com.vaadin.server.Resource; -import com.vaadin.server.Vaadin6Component; +import com.vaadin.server.LegacyComponent; import com.vaadin.shared.ui.BorderStyle; /** @@ -31,7 +31,7 @@ import com.vaadin.shared.ui.BorderStyle; * @since 3.0 */ @SuppressWarnings("serial") -public class Link extends AbstractComponent implements Vaadin6Component { +public class Link extends AbstractComponent implements LegacyComponent { /* Target window border type constant: No window border */ @Deprecated @@ -246,6 +246,6 @@ public class Link extends AbstractComponent implements Vaadin6Component { @Override public void changeVariables(Object source, Map variables) { - // TODO Remove once Vaadin6Component is no longer implemented + // TODO Remove once LegacyComponent is no longer implemented } } diff --git a/server/src/com/vaadin/ui/MenuBar.java b/server/src/com/vaadin/ui/MenuBar.java index 4414bef9aa..d948ef813a 100644 --- a/server/src/com/vaadin/ui/MenuBar.java +++ b/server/src/com/vaadin/ui/MenuBar.java @@ -25,7 +25,7 @@ import java.util.Stack; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; import com.vaadin.server.Resource; -import com.vaadin.server.Vaadin6Component; +import com.vaadin.server.LegacyComponent; import com.vaadin.shared.ui.menubar.MenuBarConstants; /** @@ -36,7 +36,7 @@ import com.vaadin.shared.ui.menubar.MenuBarConstants; *

*/ @SuppressWarnings("serial") -public class MenuBar extends AbstractComponent implements Vaadin6Component { +public class MenuBar extends AbstractComponent implements LegacyComponent { // Items of the top-level menu private final List menuItems; diff --git a/server/src/com/vaadin/ui/Panel.java b/server/src/com/vaadin/ui/Panel.java index d076e4d612..07ea099981 100644 --- a/server/src/com/vaadin/ui/Panel.java +++ b/server/src/com/vaadin/ui/Panel.java @@ -28,7 +28,7 @@ import com.vaadin.event.MouseEvents.ClickListener; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; import com.vaadin.server.Scrollable; -import com.vaadin.server.Vaadin6Component; +import com.vaadin.server.LegacyComponent; import com.vaadin.shared.EventId; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.panel.PanelServerRpc; @@ -45,7 +45,7 @@ import com.vaadin.ui.Component.Focusable; public class Panel extends AbstractComponentContainer implements Scrollable, ComponentContainer.ComponentAttachListener, ComponentContainer.ComponentDetachListener, Action.Notifier, Focusable, - Vaadin6Component { + LegacyComponent { /** * Content of the panel. @@ -195,7 +195,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable, /* * (non-Javadoc) * - * @see com.vaadin.server.Vaadin6Component#paintContent(com.vaadin.server + * @see com.vaadin.server.LegacyComponent#paintContent(com.vaadin.server * .PaintTarget) */ @Override diff --git a/server/src/com/vaadin/ui/PopupView.java b/server/src/com/vaadin/ui/PopupView.java index a4832a013f..4dee1cfcd3 100644 --- a/server/src/com/vaadin/ui/PopupView.java +++ b/server/src/com/vaadin/ui/PopupView.java @@ -23,7 +23,7 @@ import java.util.Map; import com.vaadin.server.LegacyPaint; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; -import com.vaadin.server.Vaadin6Component; +import com.vaadin.server.LegacyComponent; /** * @@ -36,7 +36,7 @@ import com.vaadin.server.Vaadin6Component; */ @SuppressWarnings("serial") public class PopupView extends AbstractComponentContainer implements - Vaadin6Component { + LegacyComponent { private Content content; private boolean hideOnMouseOut; diff --git a/server/src/com/vaadin/ui/ProgressIndicator.java b/server/src/com/vaadin/ui/ProgressIndicator.java index 4ad441a949..7558ff0e43 100644 --- a/server/src/com/vaadin/ui/ProgressIndicator.java +++ b/server/src/com/vaadin/ui/ProgressIndicator.java @@ -22,7 +22,7 @@ import com.vaadin.data.Property; import com.vaadin.data.util.ObjectProperty; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; -import com.vaadin.server.Vaadin6Component; +import com.vaadin.server.LegacyComponent; /** * ProgressIndicator is component that shows user state of a @@ -38,7 +38,7 @@ import com.vaadin.server.Vaadin6Component; */ @SuppressWarnings("serial") public class ProgressIndicator extends AbstractField implements - Property.Viewer, Property.ValueChangeListener, Vaadin6Component { + Property.Viewer, Property.ValueChangeListener, LegacyComponent { /** * Content mode, where the label contains only plain text. The getValue() @@ -260,7 +260,7 @@ public class ProgressIndicator extends AbstractField implements @Override public void changeVariables(Object source, Map variables) { - // TODO Remove once Vaadin6Component is no longer implemented + // TODO Remove once LegacyComponent is no longer implemented } diff --git a/server/src/com/vaadin/ui/RichTextArea.java b/server/src/com/vaadin/ui/RichTextArea.java index e2beace1be..261701b835 100644 --- a/server/src/com/vaadin/ui/RichTextArea.java +++ b/server/src/com/vaadin/ui/RichTextArea.java @@ -21,7 +21,7 @@ import java.util.Map; import com.vaadin.data.Property; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; -import com.vaadin.server.Vaadin6Component; +import com.vaadin.server.LegacyComponent; /** * A simple RichTextArea to edit HTML format text. @@ -31,7 +31,7 @@ import com.vaadin.server.Vaadin6Component; * into length of field. */ public class RichTextArea extends AbstractField implements - Vaadin6Component { + LegacyComponent { /** * Null representation. diff --git a/server/src/com/vaadin/ui/TabSheet.java b/server/src/com/vaadin/ui/TabSheet.java index f84e6f52ad..37badd993e 100644 --- a/server/src/com/vaadin/ui/TabSheet.java +++ b/server/src/com/vaadin/ui/TabSheet.java @@ -36,7 +36,7 @@ import com.vaadin.server.LegacyPaint; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; import com.vaadin.server.Resource; -import com.vaadin.server.Vaadin6Component; +import com.vaadin.server.LegacyComponent; import com.vaadin.shared.ui.tabsheet.TabsheetBaseConstants; import com.vaadin.shared.ui.tabsheet.TabsheetConstants; import com.vaadin.ui.Component.Focusable; @@ -71,7 +71,7 @@ import com.vaadin.ui.themes.Runo; * @since 3.0 */ public class TabSheet extends AbstractComponentContainer implements Focusable, - FocusNotifier, BlurNotifier, Vaadin6Component { + FocusNotifier, BlurNotifier, LegacyComponent { /** * List of component tabs (tab contents). In addition to being on this list, diff --git a/server/src/com/vaadin/ui/UI.java b/server/src/com/vaadin/ui/UI.java index a7529c9328..f3797252db 100644 --- a/server/src/com/vaadin/ui/UI.java +++ b/server/src/com/vaadin/ui/UI.java @@ -39,7 +39,7 @@ import com.vaadin.server.Page; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; import com.vaadin.server.Resource; -import com.vaadin.server.Vaadin6Component; +import com.vaadin.server.LegacyComponent; import com.vaadin.server.WrappedRequest; import com.vaadin.server.Page.BrowserWindowResizeEvent; import com.vaadin.server.Page.BrowserWindowResizeListener; @@ -90,7 +90,7 @@ import com.vaadin.tools.ReflectTools; * @since 7.0 */ public abstract class UI extends AbstractComponentContainer implements - Action.Container, Action.Notifier, Vaadin6Component { + Action.Container, Action.Notifier, LegacyComponent { /** * Helper class to emulate the main window from Vaadin 6 using UIs. This diff --git a/server/src/com/vaadin/ui/Upload.java b/server/src/com/vaadin/ui/Upload.java index d5104a27c4..765a52e542 100644 --- a/server/src/com/vaadin/ui/Upload.java +++ b/server/src/com/vaadin/ui/Upload.java @@ -28,7 +28,7 @@ import com.vaadin.server.NoInputStreamException; import com.vaadin.server.NoOutputStreamException; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; -import com.vaadin.server.Vaadin6Component; +import com.vaadin.server.LegacyComponent; import com.vaadin.server.StreamVariable.StreamingProgressEvent; /** @@ -71,7 +71,7 @@ import com.vaadin.server.StreamVariable.StreamingProgressEvent; */ @SuppressWarnings("serial") public class Upload extends AbstractComponent implements Component.Focusable, - Vaadin6Component { + LegacyComponent { /** * Should the field be focused on next repaint? diff --git a/server/src/com/vaadin/ui/Window.java b/server/src/com/vaadin/ui/Window.java index af85439e23..388c003a52 100644 --- a/server/src/com/vaadin/ui/Window.java +++ b/server/src/com/vaadin/ui/Window.java @@ -33,7 +33,7 @@ import com.vaadin.event.ShortcutAction.ModifierKey; import com.vaadin.event.ShortcutListener; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; -import com.vaadin.server.Vaadin6Component; +import com.vaadin.server.LegacyComponent; import com.vaadin.shared.MouseEventDetails; import com.vaadin.shared.ui.window.WindowServerRpc; import com.vaadin.shared.ui.window.WindowState; @@ -65,7 +65,7 @@ import com.vaadin.shared.ui.window.WindowState; */ @SuppressWarnings("serial") public class Window extends Panel implements FocusNotifier, BlurNotifier, - Vaadin6Component { + LegacyComponent { private WindowServerRpc rpc = new WindowServerRpc() { -- cgit v1.2.3