diff options
39 files changed, 91 insertions, 89 deletions
diff --git a/server/src/main/java/com/vaadin/event/FieldEvents.java b/server/src/main/java/com/vaadin/event/FieldEvents.java index 364ac76ffd..f2aa2719f3 100644 --- a/server/src/main/java/com/vaadin/event/FieldEvents.java +++ b/server/src/main/java/com/vaadin/event/FieldEvents.java @@ -22,7 +22,7 @@ import java.lang.reflect.Method; import com.vaadin.shared.EventId; import com.vaadin.shared.communication.FieldRpc.FocusAndBlurServerRpc; import com.vaadin.ui.Component; -import com.vaadin.ui.Component.Event; +import com.vaadin.ui.Component.LegacyEvent; import com.vaadin.ui.Field; import com.vaadin.ui.Field.ValueChangeEvent; import com.vaadin.ui.TextField; @@ -144,7 +144,7 @@ public interface FieldEvents { * @since 6.2 */ @SuppressWarnings("serial") - public static class FocusEvent extends Component.Event { + public static class FocusEvent extends Component.LegacyEvent { /** * Identifier for event that can be used in {@link EventRouter} @@ -184,7 +184,7 @@ public interface FieldEvents { * @since 6.2 */ @SuppressWarnings("serial") - public static class BlurEvent extends Component.Event { + public static class BlurEvent extends Component.LegacyEvent { /** * Identifier for event that can be used in {@link EventRouter} @@ -242,7 +242,7 @@ public interface FieldEvents { * @see TextField#setTextChangeEventMode(com.vaadin.ui.TextField.TextChangeEventMode) * @since 6.5 */ - public static abstract class TextChangeEvent extends Component.Event { + public static abstract class TextChangeEvent extends Component.LegacyEvent { public TextChangeEvent(Component source) { super(source); @@ -314,7 +314,7 @@ public interface FieldEvents { this.component = component; } - protected abstract void fireEvent(Event event); + protected abstract void fireEvent(LegacyEvent event); @Override public void blur() { diff --git a/server/src/main/java/com/vaadin/event/MouseEvents.java b/server/src/main/java/com/vaadin/event/MouseEvents.java index b32ce06587..d037b8e9ef 100644 --- a/server/src/main/java/com/vaadin/event/MouseEvents.java +++ b/server/src/main/java/com/vaadin/event/MouseEvents.java @@ -44,7 +44,7 @@ public interface MouseEvents { * @see ClickListener * @since 6.2 */ - public static class ClickEvent extends Component.Event { + public static class ClickEvent extends Component.LegacyEvent { /** * @deprecated As of 7.0, use {@link Button#LEFT} instead. */ @@ -214,7 +214,7 @@ public interface MouseEvents { * @author Vaadin Ltd. * @since 6.2 */ - public static class DoubleClickEvent extends Component.Event { + public static class DoubleClickEvent extends Component.LegacyEvent { public DoubleClickEvent(Component source) { super(source); diff --git a/server/src/main/java/com/vaadin/event/SortEvent.java b/server/src/main/java/com/vaadin/event/SortEvent.java index f303e47781..a4c24fde3b 100644 --- a/server/src/main/java/com/vaadin/event/SortEvent.java +++ b/server/src/main/java/com/vaadin/event/SortEvent.java @@ -30,7 +30,7 @@ import com.vaadin.ui.Component; * @since 7.4 * @author Vaadin Ltd */ -public class SortEvent extends Component.Event { +public class SortEvent extends Component.LegacyEvent { private final List<SortOrder> sortOrder; private final boolean userOriginated; diff --git a/server/src/main/java/com/vaadin/event/UIEvents.java b/server/src/main/java/com/vaadin/event/UIEvents.java index e986386da8..636494cbf6 100644 --- a/server/src/main/java/com/vaadin/event/UIEvents.java +++ b/server/src/main/java/com/vaadin/event/UIEvents.java @@ -58,7 +58,7 @@ public interface UIEvents { * @since 7.2 * @author Vaadin Ltd */ - public static class PollEvent extends Component.Event { + public static class PollEvent extends Component.LegacyEvent { public PollEvent(UI ui) { super(ui); } diff --git a/server/src/main/java/com/vaadin/server/AbstractClientConnector.java b/server/src/main/java/com/vaadin/server/AbstractClientConnector.java index c043d8b091..18577be414 100644 --- a/server/src/main/java/com/vaadin/server/AbstractClientConnector.java +++ b/server/src/main/java/com/vaadin/server/AbstractClientConnector.java @@ -35,6 +35,7 @@ import java.util.concurrent.ConcurrentHashMap; import com.vaadin.event.EventRouter; import com.vaadin.event.MethodEventSource; +import com.vaadin.event.typed.Event; import com.vaadin.event.typed.Handler; import com.vaadin.event.typed.Registration; import com.vaadin.shared.communication.ClientRpc; @@ -42,7 +43,7 @@ import com.vaadin.shared.communication.ServerRpc; import com.vaadin.shared.communication.SharedState; import com.vaadin.shared.ui.ComponentStateUtil; import com.vaadin.ui.Component; -import com.vaadin.ui.Component.Event; +import com.vaadin.ui.Component.LegacyEvent; import com.vaadin.ui.HasComponents; import com.vaadin.ui.LegacyComponent; import com.vaadin.ui.UI; @@ -769,7 +770,8 @@ public abstract class AbstractClientConnector } /** - * Checks if the given {@link Event} type is listened for this component. + * Checks if the given {@link LegacyEvent} type is listened for this + * component. * * @param eventType * the event type to be checked @@ -1015,12 +1017,11 @@ public abstract class AbstractClientConnector } } - private static final Method EVENT_HANDLER_METHOD = ReflectTools.findMethod( - Handler.class, "accept", com.vaadin.event.typed.Event.class); + private static final Method EVENT_HANDLER_METHOD = ReflectTools + .findMethod(Handler.class, "accept", Event.class); @SuppressWarnings("rawtypes") - protected <T> Registration onEvent( - Class<? extends com.vaadin.event.typed.Event> eventType, + protected <T> Registration onEvent(Class<? extends Event> eventType, Handler<? super T> handler) { Objects.requireNonNull(handler, "Handler cannot be null"); addListener(eventType, handler, EVENT_HANDLER_METHOD); @@ -1029,8 +1030,7 @@ public abstract class AbstractClientConnector @SuppressWarnings("rawtypes") protected <T> Registration onEvent(String eventId, - Class<? extends com.vaadin.event.typed.Event> eventType, - Handler<? super T> handler) { + Class<? extends Event> eventType, Handler<? super T> handler) { addListener(eventId, eventType, handler, EVENT_HANDLER_METHOD); return () -> removeListener(eventType, handler); } diff --git a/server/src/main/java/com/vaadin/server/communication/data/typed/SelectionModel.java b/server/src/main/java/com/vaadin/server/communication/data/typed/SelectionModel.java index ae3779747f..48d6d3005e 100644 --- a/server/src/main/java/com/vaadin/server/communication/data/typed/SelectionModel.java +++ b/server/src/main/java/com/vaadin/server/communication/data/typed/SelectionModel.java @@ -18,6 +18,7 @@ package com.vaadin.server.communication.data.typed; import java.io.Serializable; import java.util.Collection; +import com.vaadin.event.typed.Event; import com.vaadin.server.ClientConnector; import com.vaadin.server.ListingExtension; import com.vaadin.ui.Component; @@ -33,7 +34,7 @@ import com.vaadin.ui.components.Listing; */ public interface SelectionModel<T> extends Serializable, ListingExtension<T> { - public class SelectionEvent<T> extends com.vaadin.event.typed.Event<T> { + public class SelectionEvent<T> extends Event<T> { public SelectionEvent(ClientConnector source, T value, boolean userOriginated) { super(source, value, userOriginated); diff --git a/server/src/main/java/com/vaadin/ui/AbstractComponent.java b/server/src/main/java/com/vaadin/ui/AbstractComponent.java index f8e2a16105..d9394a293b 100644 --- a/server/src/main/java/com/vaadin/ui/AbstractComponent.java +++ b/server/src/main/java/com/vaadin/ui/AbstractComponent.java @@ -785,7 +785,7 @@ public abstract class AbstractComponent extends AbstractClientConnector private static final Method COMPONENT_EVENT_METHOD = ReflectTools .findMethod(Component.Listener.class, "componentEvent", - Component.Event.class); + Component.LegacyEvent.class); /* Component event framework */ @@ -796,7 +796,7 @@ public abstract class AbstractComponent extends AbstractClientConnector */ @Override public void addListener(Component.Listener listener) { - addListener(Component.Event.class, listener, COMPONENT_EVENT_METHOD); + addListener(Component.LegacyEvent.class, listener, COMPONENT_EVENT_METHOD); } /* @@ -806,7 +806,7 @@ public abstract class AbstractComponent extends AbstractClientConnector */ @Override public void removeListener(Component.Listener listener) { - removeListener(Component.Event.class, listener, COMPONENT_EVENT_METHOD); + removeListener(Component.LegacyEvent.class, listener, COMPONENT_EVENT_METHOD); } /** @@ -814,7 +814,7 @@ public abstract class AbstractComponent extends AbstractClientConnector * interested in such events. */ protected void fireComponentEvent() { - fireEvent(new Component.Event(this)); + fireEvent(new Component.LegacyEvent(this)); } /** diff --git a/server/src/main/java/com/vaadin/ui/AbstractField.java b/server/src/main/java/com/vaadin/ui/AbstractField.java index 49eb5b050f..c2fbae88c0 100644 --- a/server/src/main/java/com/vaadin/ui/AbstractField.java +++ b/server/src/main/java/com/vaadin/ui/AbstractField.java @@ -1201,7 +1201,7 @@ public abstract class AbstractField<T> extends AbstractComponent implements * @author Vaadin Ltd. * @since 3.0 */ - public static class ReadOnlyStatusChangeEvent extends Component.Event + public static class ReadOnlyStatusChangeEvent extends Component.LegacyEvent implements Property.ReadOnlyStatusChangeEvent, Serializable { /** diff --git a/server/src/main/java/com/vaadin/ui/AbstractFocusable.java b/server/src/main/java/com/vaadin/ui/AbstractFocusable.java index ad3b96f29b..935d978fb5 100644 --- a/server/src/main/java/com/vaadin/ui/AbstractFocusable.java +++ b/server/src/main/java/com/vaadin/ui/AbstractFocusable.java @@ -38,7 +38,7 @@ public abstract class AbstractFocusable extends AbstractComponent implements protected AbstractFocusable() { registerRpc(new FocusAndBlurServerRpcImpl(this) { @Override - protected void fireEvent(Event event) { + protected void fireEvent(LegacyEvent event) { AbstractFocusable.this.fireEvent(event); } }); diff --git a/server/src/main/java/com/vaadin/ui/AbstractSplitPanel.java b/server/src/main/java/com/vaadin/ui/AbstractSplitPanel.java index 0561996277..d3d4ac4f5b 100644 --- a/server/src/main/java/com/vaadin/ui/AbstractSplitPanel.java +++ b/server/src/main/java/com/vaadin/ui/AbstractSplitPanel.java @@ -550,7 +550,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer { * * @since 7.5.0 */ - public static class SplitPositionChangeEvent extends Component.Event { + public static class SplitPositionChangeEvent extends Component.LegacyEvent { private final float position; private final Unit unit; diff --git a/server/src/main/java/com/vaadin/ui/Button.java b/server/src/main/java/com/vaadin/ui/Button.java index 677e8cac7d..82b6ec9d62 100644 --- a/server/src/main/java/com/vaadin/ui/Button.java +++ b/server/src/main/java/com/vaadin/ui/Button.java @@ -127,7 +127,7 @@ public class Button extends AbstractFocusable implements * @author Vaadin Ltd. * @since 3.0 */ - public static class ClickEvent extends Component.Event { + public static class ClickEvent extends Component.LegacyEvent { private final MouseEventDetails details; diff --git a/server/src/main/java/com/vaadin/ui/CheckBox.java b/server/src/main/java/com/vaadin/ui/CheckBox.java index 8b31edcbb4..8b94fc09f7 100644 --- a/server/src/main/java/com/vaadin/ui/CheckBox.java +++ b/server/src/main/java/com/vaadin/ui/CheckBox.java @@ -68,7 +68,7 @@ public class CheckBox extends AbstractField<Boolean> { FocusAndBlurServerRpcImpl focusBlurRpc = new FocusAndBlurServerRpcImpl(this) { @Override - protected void fireEvent(Event event) { + protected void fireEvent(LegacyEvent event) { CheckBox.this.fireEvent(event); } }; diff --git a/server/src/main/java/com/vaadin/ui/Component.java b/server/src/main/java/com/vaadin/ui/Component.java index 5db48806c3..e9433556fe 100644 --- a/server/src/main/java/com/vaadin/ui/Component.java +++ b/server/src/main/java/com/vaadin/ui/Component.java @@ -801,7 +801,7 @@ public interface Component extends ClientConnector, Sizeable, Serializable { * @see Component.Listener */ @SuppressWarnings("serial") - public static class Event extends ConnectorEvent { + public static class LegacyEvent extends ConnectorEvent { /** * Constructs a new event with the specified source component. @@ -809,7 +809,7 @@ public interface Component extends ClientConnector, Sizeable, Serializable { * @param source * the source component of the event */ - public Event(Component source) { + public LegacyEvent(Component source) { super(source); } @@ -915,7 +915,7 @@ public interface Component extends ClientConnector, Sizeable, Serializable { * @param event * the event that has occurred. */ - public void componentEvent(Component.Event event); + public void componentEvent(Component.LegacyEvent event); } /** @@ -966,7 +966,7 @@ public interface Component extends ClientConnector, Sizeable, Serializable { * * @param listener * the new Listener to be registered. - * @see Component.Event + * @see Component.LegacyEvent * @see #removeListener(Listener) */ public void addListener(Component.Listener listener); @@ -992,7 +992,7 @@ public interface Component extends ClientConnector, Sizeable, Serializable { * </p> */ @SuppressWarnings("serial") - public static class ErrorEvent extends Event { + public static class ErrorEvent extends LegacyEvent { private final ErrorMessage message; diff --git a/server/src/main/java/com/vaadin/ui/Field.java b/server/src/main/java/com/vaadin/ui/Field.java index 8a9acd570f..79f14ce779 100644 --- a/server/src/main/java/com/vaadin/ui/Field.java +++ b/server/src/main/java/com/vaadin/ui/Field.java @@ -90,7 +90,7 @@ public interface Field<T> extends Component, BufferedValidatable, Property<T>, * @since 3.0 */ @SuppressWarnings("serial") - public static class ValueChangeEvent extends Component.Event implements + public static class ValueChangeEvent extends Component.LegacyEvent implements Property.ValueChangeEvent { /** diff --git a/server/src/main/java/com/vaadin/ui/Grid.java b/server/src/main/java/com/vaadin/ui/Grid.java index 388d74aeee..ae28c455ce 100644 --- a/server/src/main/java/com/vaadin/ui/Grid.java +++ b/server/src/main/java/com/vaadin/ui/Grid.java @@ -201,7 +201,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, * * @since 7.5.0 */ - public static class ColumnVisibilityChangeEvent extends Component.Event { + public static class ColumnVisibilityChangeEvent extends Component.LegacyEvent { private final Column column; private final boolean userOriginated; @@ -687,7 +687,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, /** * An event which is fired when saving the editor fails */ - public static class CommitErrorEvent extends Component.Event { + public static class CommitErrorEvent extends Component.LegacyEvent { private CommitException cause; @@ -786,7 +786,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, * * @since 7.5.0 */ - public static class ColumnReorderEvent extends Component.Event { + public static class ColumnReorderEvent extends Component.LegacyEvent { private final boolean userOriginated; @@ -837,7 +837,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, * * @since 7.6 */ - public static class ColumnResizeEvent extends Component.Event { + public static class ColumnResizeEvent extends Component.LegacyEvent { private final Column column; private final boolean userOriginated; @@ -922,7 +922,7 @@ public class Grid extends AbstractFocusable implements SelectionNotifier, /** * Base class for editor related events */ - public static abstract class EditorEvent extends Component.Event { + public static abstract class EditorEvent extends Component.LegacyEvent { private Object itemID; diff --git a/server/src/main/java/com/vaadin/ui/HasComponents.java b/server/src/main/java/com/vaadin/ui/HasComponents.java index 6273e8053b..aeed2aac6c 100644 --- a/server/src/main/java/com/vaadin/ui/HasComponents.java +++ b/server/src/main/java/com/vaadin/ui/HasComponents.java @@ -116,7 +116,7 @@ public interface HasComponents extends Component, Iterable<Component> { * Component attach event sent when a component is attached to container. */ @SuppressWarnings("serial") - public static class ComponentAttachEvent extends Component.Event { + public static class ComponentAttachEvent extends Component.LegacyEvent { private final Component component; @@ -159,7 +159,7 @@ public interface HasComponents extends Component, Iterable<Component> { * Component detach event sent when a component is detached from container. */ @SuppressWarnings("serial") - public static class ComponentDetachEvent extends Component.Event { + public static class ComponentDetachEvent extends Component.LegacyEvent { private final Component component; diff --git a/server/src/main/java/com/vaadin/ui/Label.java b/server/src/main/java/com/vaadin/ui/Label.java index 1498246ec5..b539a5d35e 100644 --- a/server/src/main/java/com/vaadin/ui/Label.java +++ b/server/src/main/java/com/vaadin/ui/Label.java @@ -332,7 +332,7 @@ public class Label extends AbstractComponent implements Property<String>, * @author Vaadin Ltd. * @since 3.0 */ - public static class ValueChangeEvent extends Component.Event implements + public static class ValueChangeEvent extends Component.LegacyEvent implements Property.ValueChangeEvent { /** diff --git a/server/src/main/java/com/vaadin/ui/LoginForm.java b/server/src/main/java/com/vaadin/ui/LoginForm.java index 9df5f7343e..e8b25eca0f 100644 --- a/server/src/main/java/com/vaadin/ui/LoginForm.java +++ b/server/src/main/java/com/vaadin/ui/LoginForm.java @@ -59,7 +59,7 @@ public class LoginForm extends AbstractSingleComponentContainer { /** * This event is sent when login form is submitted. */ - public static class LoginEvent extends Event { + public static class LoginEvent extends LegacyEvent { private Map<String, String> params; diff --git a/server/src/main/java/com/vaadin/ui/NativeSelect.java b/server/src/main/java/com/vaadin/ui/NativeSelect.java index 137d57f677..361ba8515f 100644 --- a/server/src/main/java/com/vaadin/ui/NativeSelect.java +++ b/server/src/main/java/com/vaadin/ui/NativeSelect.java @@ -44,7 +44,7 @@ public class NativeSelect extends AbstractSelect implements FocusAndBlurServerRpcImpl focusBlurRpc = new FocusAndBlurServerRpcImpl(this) { @Override - protected void fireEvent(Event event) { + protected void fireEvent(LegacyEvent event) { NativeSelect.this.fireEvent(event); } }; diff --git a/server/src/main/java/com/vaadin/ui/PopupView.java b/server/src/main/java/com/vaadin/ui/PopupView.java index 73c93b29f3..06d10482ac 100644 --- a/server/src/main/java/com/vaadin/ui/PopupView.java +++ b/server/src/main/java/com/vaadin/ui/PopupView.java @@ -385,7 +385,7 @@ public class PopupView extends AbstractComponent implements HasComponents { * event with {@link #getPopupView()}. * */ - public static class PopupVisibilityEvent extends Event { + public static class PopupVisibilityEvent extends LegacyEvent { public PopupVisibilityEvent(PopupView source) { super(source); diff --git a/server/src/main/java/com/vaadin/ui/TabSheet.java b/server/src/main/java/com/vaadin/ui/TabSheet.java index 66784aaa02..4a61eff5a1 100644 --- a/server/src/main/java/com/vaadin/ui/TabSheet.java +++ b/server/src/main/java/com/vaadin/ui/TabSheet.java @@ -681,7 +681,7 @@ public class TabSheet extends AbstractComponentContainer implements Focusable, this) { @Override - protected void fireEvent(Event event) { + protected void fireEvent(LegacyEvent event) { TabSheet.this.fireEvent(event); } }; @@ -794,7 +794,7 @@ public class TabSheet extends AbstractComponentContainer implements Focusable, * @author Vaadin Ltd. * @since 3.0 */ - public static class SelectedTabChangeEvent extends Component.Event { + public static class SelectedTabChangeEvent extends Component.LegacyEvent { /** * New instance of selected tab change event diff --git a/server/src/main/java/com/vaadin/ui/Table.java b/server/src/main/java/com/vaadin/ui/Table.java index f518f4f161..6f462d69ce 100644 --- a/server/src/main/java/com/vaadin/ui/Table.java +++ b/server/src/main/java/com/vaadin/ui/Table.java @@ -5625,7 +5625,7 @@ public class Table extends AbstractSelect implements Action.Container, * columns property id which was fired, the previous width of the column and * the width of the column after the resize. */ - public static class ColumnResizeEvent extends Component.Event { + public static class ColumnResizeEvent extends Component.LegacyEvent { public static final Method COLUMN_RESIZE_METHOD; static { @@ -5752,7 +5752,7 @@ public class Table extends AbstractSelect implements Action.Container, /** * This event is fired when a columns are reordered by the end user user. */ - public static class ColumnReorderEvent extends Component.Event { + public static class ColumnReorderEvent extends Component.LegacyEvent { public static final Method METHOD; static { @@ -5796,7 +5796,7 @@ public class Table extends AbstractSelect implements Action.Container, * * @since 7.6 */ - public static class ColumnCollapseEvent extends Component.Event { + public static class ColumnCollapseEvent extends Component.LegacyEvent { public static final Method METHOD = ReflectTools.findMethod( ColumnCollapseListener.class, "columnCollapseStateChange", diff --git a/server/src/main/java/com/vaadin/ui/Tree.java b/server/src/main/java/com/vaadin/ui/Tree.java index 5e6ac55027..35d05fdef9 100644 --- a/server/src/main/java/com/vaadin/ui/Tree.java +++ b/server/src/main/java/com/vaadin/ui/Tree.java @@ -1026,7 +1026,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, * @author Vaadin Ltd. * @since 3.0 */ - public static class ExpandEvent extends Component.Event { + public static class ExpandEvent extends Component.LegacyEvent { private final Object expandedItemId; @@ -1129,7 +1129,7 @@ public class Tree extends AbstractSelect implements Container.Hierarchical, * @author Vaadin Ltd. * @since 3.0 */ - public static class CollapseEvent extends Component.Event { + public static class CollapseEvent extends Component.LegacyEvent { private final Object collapsedItemId; diff --git a/server/src/main/java/com/vaadin/ui/Upload.java b/server/src/main/java/com/vaadin/ui/Upload.java index a61bcf1bd9..fa893315c2 100644 --- a/server/src/main/java/com/vaadin/ui/Upload.java +++ b/server/src/main/java/com/vaadin/ui/Upload.java @@ -252,7 +252,7 @@ public class Upload extends AbstractComponent implements Component.Focusable, * @author Vaadin Ltd. * @since 3.0 */ - public static class FinishedEvent extends Component.Event { + public static class FinishedEvent extends Component.LegacyEvent { /** * Length of the received file. @@ -441,7 +441,7 @@ public class Upload extends AbstractComponent implements Component.Focusable, * @author Vaadin Ltd. * @since 5.0 */ - public static class StartedEvent extends Component.Event { + public static class StartedEvent extends Component.LegacyEvent { private final String filename; private final String type; @@ -507,7 +507,7 @@ public class Upload extends AbstractComponent implements Component.Focusable, * * @since 7.2 */ - public static class ChangeEvent extends Component.Event { + public static class ChangeEvent extends Component.LegacyEvent { private final String filename; diff --git a/server/src/main/java/com/vaadin/ui/Window.java b/server/src/main/java/com/vaadin/ui/Window.java index 70399ae566..24b3057be2 100644 --- a/server/src/main/java/com/vaadin/ui/Window.java +++ b/server/src/main/java/com/vaadin/ui/Window.java @@ -346,7 +346,7 @@ public class Window extends Panel implements FocusNotifier, BlurNotifier, } } - public static class CloseEvent extends Component.Event { + public static class CloseEvent extends Component.LegacyEvent { /** * @@ -456,7 +456,7 @@ public class Window extends Panel implements FocusNotifier, BlurNotifier, * @since 7.1 * */ - public static class WindowModeChangeEvent extends Component.Event { + public static class WindowModeChangeEvent extends Component.LegacyEvent { private final WindowMode windowMode; @@ -564,7 +564,7 @@ public class Window extends Panel implements FocusNotifier, BlurNotifier, * (e.g. the browser window is resized). The frequency may vary across * browsers. */ - public static class ResizeEvent extends Component.Event { + public static class ResizeEvent extends Component.LegacyEvent { /** * diff --git a/server/src/main/java/com/vaadin/ui/components/calendar/CalendarComponentEvent.java b/server/src/main/java/com/vaadin/ui/components/calendar/CalendarComponentEvent.java index dfb59e148b..403d030ed0 100644 --- a/server/src/main/java/com/vaadin/ui/components/calendar/CalendarComponentEvent.java +++ b/server/src/main/java/com/vaadin/ui/components/calendar/CalendarComponentEvent.java @@ -26,7 +26,7 @@ import com.vaadin.ui.Component; * */ @SuppressWarnings("serial") -public class CalendarComponentEvent extends Component.Event { +public class CalendarComponentEvent extends Component.LegacyEvent { /** * Set the source of the event diff --git a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorChangeEvent.java b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorChangeEvent.java index b55b55357f..6c32f6a108 100644 --- a/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorChangeEvent.java +++ b/server/src/main/java/com/vaadin/ui/components/colorpicker/ColorChangeEvent.java @@ -17,7 +17,7 @@ package com.vaadin.ui.components.colorpicker; import com.vaadin.shared.ui.colorpicker.Color; import com.vaadin.ui.Component; -import com.vaadin.ui.Component.Event; +import com.vaadin.ui.Component.LegacyEvent; /** * The color changed event which is passed to the listeners when a color change @@ -25,7 +25,7 @@ import com.vaadin.ui.Component.Event; * * @since 7.0.0 */ -public class ColorChangeEvent extends Event { +public class ColorChangeEvent extends LegacyEvent { private final Color color; public ColorChangeEvent(Component source, Color color) { diff --git a/server/src/main/java/com/vaadin/ui/components/field/DateField.java b/server/src/main/java/com/vaadin/ui/components/field/DateField.java index 46e62659db..48f8db4139 100644 --- a/server/src/main/java/com/vaadin/ui/components/field/DateField.java +++ b/server/src/main/java/com/vaadin/ui/components/field/DateField.java @@ -24,6 +24,7 @@ import org.jsoup.nodes.Element; import com.vaadin.event.FieldEvents.BlurEvent; import com.vaadin.event.FieldEvents.FocusEvent; +import com.vaadin.event.typed.Event; import com.vaadin.event.typed.Handler; import com.vaadin.event.typed.Registration; import com.vaadin.shared.ui.components.field.DateFieldServerRpc; @@ -43,8 +44,7 @@ public class DateField extends AbstractComponent private static final DateTimeFormatter FORMATTER = DateTimeFormatter .ofPattern("dd-MM-uuuu"); - public static class DateChange - extends com.vaadin.event.typed.Event<LocalDate> { + public static class DateChange extends Event<LocalDate> { protected DateChange(DateField source, LocalDate date, boolean userOriginated) { super(source, date, userOriginated); diff --git a/server/src/main/java/com/vaadin/ui/components/fields/AbstractTextField.java b/server/src/main/java/com/vaadin/ui/components/fields/AbstractTextField.java index af28b301c6..e7f977d7f4 100644 --- a/server/src/main/java/com/vaadin/ui/components/fields/AbstractTextField.java +++ b/server/src/main/java/com/vaadin/ui/components/fields/AbstractTextField.java @@ -26,6 +26,7 @@ import com.vaadin.event.FieldEvents.BlurListener; import com.vaadin.event.FieldEvents.FocusEvent; import com.vaadin.event.FieldEvents.FocusListener; import com.vaadin.event.FieldEvents.TextChangeListener; +import com.vaadin.event.typed.Event; import com.vaadin.event.typed.Handler; import com.vaadin.event.typed.Registration; import com.vaadin.shared.ui.components.fields.TextFieldServerRpc; @@ -44,7 +45,7 @@ public abstract class AbstractTextField extends AbstractComponent implements HasValue<String> { public static class TextChangeEvent - extends com.vaadin.event.typed.Event<String> { + extends Event<String> { public static final String ID = TextChangeListener.EVENT_ID; diff --git a/server/src/main/java/com/vaadin/ui/components/fields/CheckBox.java b/server/src/main/java/com/vaadin/ui/components/fields/CheckBox.java index ffcf279040..685b079e68 100644 --- a/server/src/main/java/com/vaadin/ui/components/fields/CheckBox.java +++ b/server/src/main/java/com/vaadin/ui/components/fields/CheckBox.java @@ -21,6 +21,7 @@ import org.jsoup.nodes.Attributes; import org.jsoup.nodes.Element; import com.vaadin.event.FieldEvents.FocusAndBlurServerRpcImpl; +import com.vaadin.event.typed.Event; import com.vaadin.event.typed.Handler; import com.vaadin.event.typed.Registration; import com.vaadin.shared.MouseEventDetails; @@ -33,8 +34,7 @@ import com.vaadin.ui.declarative.DesignContext; public class CheckBox extends AbstractComponent implements HasValue<Boolean> { - public class StateChangeEvent - extends com.vaadin.event.typed.Event<Boolean> { + public class StateChangeEvent extends Event<Boolean> { public StateChangeEvent(Boolean value, boolean userOriginated) { super(CheckBox.this, value, userOriginated); } @@ -68,7 +68,7 @@ public class CheckBox extends AbstractComponent implements HasValue<Boolean> { FocusAndBlurServerRpcImpl focusBlurRpc = new FocusAndBlurServerRpcImpl( this) { @Override - protected void fireEvent(Event event) { + protected void fireEvent(LegacyEvent event) { CheckBox.this.fireEvent(event); } }; diff --git a/server/src/test/java/com/vaadin/tests/event/EventRouterTest.java b/server/src/test/java/com/vaadin/tests/event/EventRouterTest.java index aeb460c49e..525fb2ad9a 100644 --- a/server/src/test/java/com/vaadin/tests/event/EventRouterTest.java +++ b/server/src/test/java/com/vaadin/tests/event/EventRouterTest.java @@ -36,7 +36,7 @@ public class EventRouterTest { private static final Method COMPONENT_EVENT_METHOD = ReflectTools .findMethod(Component.Listener.class, "componentEvent", - Component.Event.class); + Component.LegacyEvent.class); private EventRouter router; private Component component; @@ -49,28 +49,28 @@ public class EventRouterTest { component = EasyMock.createNiceMock(Component.class); errorHandler = EasyMock.createMock(ErrorHandler.class); listener = EasyMock.createMock(Component.Listener.class); - router.addListener(Component.Event.class, listener, + router.addListener(Component.LegacyEvent.class, listener, COMPONENT_EVENT_METHOD); } @Test public void fireEvent_noException_eventReceived() { - listener.componentEvent(EasyMock.<Component.Event> anyObject()); + listener.componentEvent(EasyMock.<Component.LegacyEvent> anyObject()); EasyMock.replay(component, listener, errorHandler); - router.fireEvent(new Component.Event(component), errorHandler); + router.fireEvent(new Component.LegacyEvent(component), errorHandler); EasyMock.verify(listener, errorHandler); } @Test public void fireEvent_exceptionFromListenerAndNoHandler_exceptionPropagated() { - listener.componentEvent(EasyMock.<Component.Event> anyObject()); + listener.componentEvent(EasyMock.<Component.LegacyEvent> anyObject()); EasyMock.expectLastCall().andThrow( new RuntimeException("listener failed")); EasyMock.replay(component, listener); try { - router.fireEvent(new Component.Event(component)); + router.fireEvent(new Component.LegacyEvent(component)); Assert.fail("Did not receive expected exception from listener"); } catch (RuntimeException e) { // e is a ListenerMethod@MethodException @@ -81,31 +81,31 @@ public class EventRouterTest { @Test public void fireEvent_exceptionFromListener_errorHandlerCalled() { - listener.componentEvent(EasyMock.<Component.Event> anyObject()); + listener.componentEvent(EasyMock.<Component.LegacyEvent> anyObject()); EasyMock.expectLastCall().andThrow( new RuntimeException("listener failed")); errorHandler.error(EasyMock.<ErrorEvent> anyObject()); EasyMock.replay(component, listener, errorHandler); - router.fireEvent(new Component.Event(component), errorHandler); + router.fireEvent(new Component.LegacyEvent(component), errorHandler); EasyMock.verify(listener, errorHandler); } @Test public void fireEvent_multipleListenersAndException_errorHandlerCalled() { Listener listener2 = EasyMock.createMock(Component.Listener.class); - router.addListener(Component.Event.class, listener2, + router.addListener(Component.LegacyEvent.class, listener2, COMPONENT_EVENT_METHOD); - listener.componentEvent(EasyMock.<Component.Event> anyObject()); + listener.componentEvent(EasyMock.<Component.LegacyEvent> anyObject()); EasyMock.expectLastCall().andThrow( new RuntimeException("listener failed")); errorHandler.error(EasyMock.<ErrorEvent> anyObject()); // second listener should be called despite an error in the first - listener2.componentEvent(EasyMock.<Component.Event> anyObject()); + listener2.componentEvent(EasyMock.<Component.LegacyEvent> anyObject()); EasyMock.replay(component, listener, listener2, errorHandler); - router.fireEvent(new Component.Event(component), errorHandler); + router.fireEvent(new Component.LegacyEvent(component), errorHandler); EasyMock.verify(listener, listener2, errorHandler); } } diff --git a/uitest/src/main/java/com/vaadin/tests/CustomLayoutDemo.java b/uitest/src/main/java/com/vaadin/tests/CustomLayoutDemo.java index 7b9f3d9926..36971f4493 100644 --- a/uitest/src/main/java/com/vaadin/tests/CustomLayoutDemo.java +++ b/uitest/src/main/java/com/vaadin/tests/CustomLayoutDemo.java @@ -19,7 +19,7 @@ package com.vaadin.tests; import com.vaadin.shared.ui.label.ContentMode; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; -import com.vaadin.ui.Component.Event; +import com.vaadin.ui.Component.LegacyEvent; import com.vaadin.ui.Component.Listener; import com.vaadin.ui.CustomLayout; import com.vaadin.ui.Field; @@ -151,7 +151,7 @@ public class CustomLayoutDemo extends com.vaadin.server.LegacyApplication * clicked. */ @Override - public void componentEvent(Event event) { + public void componentEvent(LegacyEvent event) { // Check if event occured at fsTree component if (event.getSource() == menu) { // Check if event is about changing value diff --git a/uitest/src/main/java/com/vaadin/tests/TestCaptionWrapper.java b/uitest/src/main/java/com/vaadin/tests/TestCaptionWrapper.java index edd70ece4e..a077c2db81 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestCaptionWrapper.java +++ b/uitest/src/main/java/com/vaadin/tests/TestCaptionWrapper.java @@ -212,7 +212,7 @@ public class TestCaptionWrapper extends CustomComponent implements Listener { } @Override - public void componentEvent(Event event) { + public void componentEvent(LegacyEvent event) { final String feedback = eventListenerString + " source=" + event.getSource() + ", toString()=" + event.toString(); System.out.println("eventListenerFeedback: " + feedback); diff --git a/uitest/src/main/java/com/vaadin/tests/TestForPreconfiguredComponents.java b/uitest/src/main/java/com/vaadin/tests/TestForPreconfiguredComponents.java index b8d1c17241..664385a7d8 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestForPreconfiguredComponents.java +++ b/uitest/src/main/java/com/vaadin/tests/TestForPreconfiguredComponents.java @@ -167,7 +167,7 @@ public class TestForPreconfiguredComponents extends CustomComponent { t.addListener(new Listener() { @Override - public void componentEvent(Event event) { + public void componentEvent(LegacyEvent event) { statusLayout .addComponent(new Label(event.getClass().getName())); // TODO should not use Field.toString() diff --git a/uitest/src/main/java/com/vaadin/tests/TestForTrees.java b/uitest/src/main/java/com/vaadin/tests/TestForTrees.java index 67f7faf44e..049ace1a5c 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestForTrees.java +++ b/uitest/src/main/java/com/vaadin/tests/TestForTrees.java @@ -162,7 +162,7 @@ public class TestForTrees extends CustomComponent implements Handler { t.addListener(new Listener() { @Override - public void componentEvent(Event event) { + public void componentEvent(LegacyEvent event) { statusLayout .addComponent(new Label(event.getClass().getName())); // TODO should not use Field.toString() diff --git a/uitest/src/main/java/com/vaadin/tests/TestForUpload.java b/uitest/src/main/java/com/vaadin/tests/TestForUpload.java index 0046457f30..8b67e1574c 100644 --- a/uitest/src/main/java/com/vaadin/tests/TestForUpload.java +++ b/uitest/src/main/java/com/vaadin/tests/TestForUpload.java @@ -110,7 +110,7 @@ public class TestForUpload extends CustomComponent implements private static final long serialVersionUID = -8319074730512324303L; @Override - public void componentEvent(Event event) { + public void componentEvent(LegacyEvent event) { // print out all events fired by upload for debug purposes System.out.println("Upload fired event | " + event); } diff --git a/uitest/src/main/java/com/vaadin/tests/TreeFilesystemContainer.java b/uitest/src/main/java/com/vaadin/tests/TreeFilesystemContainer.java index 55e57a7d92..bb66ae9f30 100644 --- a/uitest/src/main/java/com/vaadin/tests/TreeFilesystemContainer.java +++ b/uitest/src/main/java/com/vaadin/tests/TreeFilesystemContainer.java @@ -22,7 +22,7 @@ import com.vaadin.data.util.FilesystemContainer; import com.vaadin.data.util.FilesystemContainer.FileItem; import com.vaadin.server.VaadinSession; import com.vaadin.tests.util.SampleDirectory; -import com.vaadin.ui.Component.Event; +import com.vaadin.ui.Component.LegacyEvent; import com.vaadin.ui.Component.Listener; import com.vaadin.ui.Field; import com.vaadin.ui.Label; @@ -101,7 +101,7 @@ public class TreeFilesystemContainer extends * listener for component fsTree. */ @Override - public void componentEvent(Event event) { + public void componentEvent(LegacyEvent event) { // Check if event occured at fsTree component if (event.getSource() == filesystem) { // Check if event is about changing value diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.java index f1b96d24fd..c084a60c77 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.java +++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldDataSourceReadOnly.java @@ -3,7 +3,7 @@ package com.vaadin.tests.components.abstractfield; import com.vaadin.data.util.ObjectProperty; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; -import com.vaadin.ui.Component.Event; +import com.vaadin.ui.Component.LegacyEvent; import com.vaadin.ui.Component.Listener; import com.vaadin.ui.TextField; @@ -35,7 +35,7 @@ public class AbstractFieldDataSourceReadOnly extends TestBase { Button button = new Button("Make data source read-only"); button.addListener(new Listener() { @Override - public void componentEvent(Event event) { + public void componentEvent(LegacyEvent event) { stateHolder.buttonClicked(); } }); diff --git a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarTestEvent.java b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarTestEvent.java index b4e759b20b..aa05264713 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarTestEvent.java +++ b/uitest/src/main/java/com/vaadin/tests/components/calendar/CalendarTestEvent.java @@ -20,7 +20,7 @@ import com.vaadin.ui.components.calendar.event.BasicEvent; /** * Test CalendarEvent implementation. * - * @see com.vaadin.addon.calendar.test.ui.Calendar.Event + * @see com.vaadin.LegacyEvent.calendar.test.ui.Calendar.Event */ public class CalendarTestEvent extends BasicEvent { |