From 699c8c6fa80e2b66b7fa8b0681634737e340d6fb Mon Sep 17 00:00:00 2001 From: Andrey Loskutov Date: Wed, 13 Mar 2024 09:29:06 +0100 Subject: [PATCH] Revert "Replace internal SWTEventListener directly with java.util.EventListener" This reverts commit bd306acb742a18bb7a234ae493a2b02257beaad2. Replacing SWTEventListener directly with java.util.EventListener breaks binary compatibility with bundles compiled against any older SWT version. See discussion on https://github.com/eclipse-platform/eclipse.platform.swt/pull/1101 --- .../AccessibleActionListener.java | 4 +-- .../AccessibleAttributeListener.java | 4 +-- .../AccessibleControlListener.java | 4 +-- .../AccessibleEditableTextListener.java | 4 +-- .../AccessibleHyperlinkListener.java | 4 +-- .../swt/accessibility/AccessibleListener.java | 5 +-- .../AccessibleTableCellListener.java | 4 +-- .../AccessibleTableListener.java | 4 +-- .../accessibility/AccessibleTextListener.java | 4 +-- .../AccessibleValueListener.java | 4 +-- .../swt/browser/AuthenticationListener.java | 4 +-- .../swt/browser/CloseWindowListener.java | 4 +-- .../eclipse/swt/browser/LocationListener.java | 5 +-- .../swt/browser/OpenWindowListener.java | 4 +-- .../eclipse/swt/browser/ProgressListener.java | 5 +-- .../swt/browser/StatusTextListener.java | 4 +-- .../eclipse/swt/browser/TitleListener.java | 4 +-- .../swt/browser/VisibilityWindowListener.java | 5 +-- .../swt/custom/BidiSegmentListener.java | 4 +-- .../swt/custom/CTabFolder2Listener.java | 7 ++-- .../swt/custom/CTabFolderListener.java | 4 +-- .../org/eclipse/swt/custom/CaretListener.java | 4 +-- .../swt/custom/ExtendedModifyListener.java | 4 +-- .../swt/custom/LineBackgroundListener.java | 4 +-- .../eclipse/swt/custom/LineStyleListener.java | 4 +-- .../eclipse/swt/custom/MovementListener.java | 4 +-- .../swt/custom/PaintObjectListener.java | 4 +-- .../swt/custom/StyledTextListener.java | 5 ++- .../swt/custom/TextChangeListener.java | 4 +-- .../eclipse/swt/custom/VerifyKeyListener.java | 5 ++- .../org/eclipse/swt/dnd/DNDListener.java | 5 ++- .../eclipse/swt/dnd/DragSourceListener.java | 4 +-- .../eclipse/swt/dnd/DropTargetListener.java | 4 +-- .../cocoa/org/eclipse/swt/widgets/Widget.java | 4 +-- .../org/eclipse/swt/events/ArmListener.java | 4 +-- .../eclipse/swt/events/ControlListener.java | 5 +-- .../eclipse/swt/events/DisposeListener.java | 4 +-- .../swt/events/DragDetectListener.java | 4 +-- .../eclipse/swt/events/ExpandListener.java | 5 +-- .../org/eclipse/swt/events/FocusListener.java | 5 +-- .../eclipse/swt/events/GestureListener.java | 4 +-- .../org/eclipse/swt/events/HelpListener.java | 4 +-- .../org/eclipse/swt/events/KeyListener.java | 5 +-- .../swt/events/MenuDetectListener.java | 4 +-- .../org/eclipse/swt/events/MenuListener.java | 5 +-- .../eclipse/swt/events/ModifyListener.java | 4 +-- .../org/eclipse/swt/events/MouseListener.java | 5 +-- .../eclipse/swt/events/MouseMoveListener.java | 4 +-- .../swt/events/MouseTrackListener.java | 5 +-- .../swt/events/MouseWheelListener.java | 4 +-- .../org/eclipse/swt/events/PaintListener.java | 4 +-- .../eclipse/swt/events/SegmentListener.java | 4 +-- .../eclipse/swt/events/SelectionListener.java | 5 +-- .../org/eclipse/swt/events/ShellListener.java | 5 +-- .../org/eclipse/swt/events/TouchListener.java | 4 +-- .../eclipse/swt/events/TraverseListener.java | 4 +-- .../org/eclipse/swt/events/TreeListener.java | 5 +-- .../eclipse/swt/events/VerifyListener.java | 4 +-- .../swt/graphics/ImageLoaderListener.java | 4 +-- .../swt/internal/SWTEventListener.java | 33 +++++++++++++++++++ .../org/eclipse/swt/widgets/EventTable.java | 4 +-- .../eclipse/swt/widgets/TypedListener.java | 9 +++-- .../gtk/org/eclipse/swt/widgets/Widget.java | 2 +- .../win32/org/eclipse/swt/widgets/Widget.java | 4 +-- 64 files changed, 173 insertions(+), 135 deletions(-) create mode 100644 bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/internal/SWTEventListener.java diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleActionListener.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleActionListener.java index a15f88a7357..5e2e52a00fa 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleActionListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleActionListener.java @@ -13,7 +13,7 @@ *******************************************************************************/ package org.eclipse.swt.accessibility; -import java.util.*; +import org.eclipse.swt.internal.SWTEventListener; /** * Classes which implement this interface provide methods @@ -30,7 +30,7 @@ * * @since 3.6 */ -public interface AccessibleActionListener extends EventListener { +public interface AccessibleActionListener extends SWTEventListener { /** * Returns the number of accessible actions available in this object. *

diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleAttributeListener.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleAttributeListener.java index d3a7899c102..936f0223a13 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleAttributeListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleAttributeListener.java @@ -13,7 +13,7 @@ *******************************************************************************/ package org.eclipse.swt.accessibility; -import java.util.*; +import org.eclipse.swt.internal.SWTEventListener; /** * Classes which implement this interface provide methods @@ -31,7 +31,7 @@ * * @since 3.6 */ -public interface AccessibleAttributeListener extends EventListener { +public interface AccessibleAttributeListener extends SWTEventListener { /** * Returns attributes specific to this Accessible object. * diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleControlListener.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleControlListener.java index 79f69fb321d..e938a35adcb 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleControlListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleControlListener.java @@ -14,7 +14,7 @@ package org.eclipse.swt.accessibility; -import java.util.*; +import org.eclipse.swt.internal.*; /** * Classes that implement this interface provide methods @@ -43,7 +43,7 @@ * * @since 2.0 */ -public interface AccessibleControlListener extends EventListener { +public interface AccessibleControlListener extends SWTEventListener { /** * Sent when an accessibility client requests the identifier diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleEditableTextListener.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleEditableTextListener.java index 723cee24292..c7a930bc063 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleEditableTextListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleEditableTextListener.java @@ -13,7 +13,7 @@ *******************************************************************************/ package org.eclipse.swt.accessibility; -import java.util.*; +import org.eclipse.swt.internal.SWTEventListener; /** * Classes which implement this interface provide methods @@ -31,7 +31,7 @@ * * @since 3.7 */ -public interface AccessibleEditableTextListener extends EventListener { +public interface AccessibleEditableTextListener extends SWTEventListener { /** * Copies the substring beginning at the specified start offset * and extending to the character at offset end - 1 to the clipboard. diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleHyperlinkListener.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleHyperlinkListener.java index bb17eb1493b..de02c6b497b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleHyperlinkListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleHyperlinkListener.java @@ -13,7 +13,7 @@ *******************************************************************************/ package org.eclipse.swt.accessibility; -import java.util.*; +import org.eclipse.swt.internal.SWTEventListener; /** * Classes which implement this interface provide methods @@ -30,7 +30,7 @@ * * @since 3.6 */ -public interface AccessibleHyperlinkListener extends EventListener { +public interface AccessibleHyperlinkListener extends SWTEventListener { /** * Returns the anchor for the link at the specified index. * diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleListener.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleListener.java index 0cfca5e4d1f..a18dad8cc2a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleListener.java @@ -14,9 +14,10 @@ package org.eclipse.swt.accessibility; -import java.util.*; import java.util.function.*; +import org.eclipse.swt.internal.*; + /** * Classes that implement this interface provide methods * that deal with the events that are generated when an @@ -40,7 +41,7 @@ * * @since 2.0 */ -public interface AccessibleListener extends EventListener { +public interface AccessibleListener extends SWTEventListener { /** * Sent when an accessibility client requests the name diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleTableCellListener.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleTableCellListener.java index 62042bc1e96..5533da3937f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleTableCellListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleTableCellListener.java @@ -13,7 +13,7 @@ *******************************************************************************/ package org.eclipse.swt.accessibility; -import java.util.*; +import org.eclipse.swt.internal.SWTEventListener; /** * Classes which implement this interface provide methods @@ -30,7 +30,7 @@ * * @since 3.6 */ -public interface AccessibleTableCellListener extends EventListener { +public interface AccessibleTableCellListener extends SWTEventListener { /** * Returns the number of columns occupied by this cell accessible. *

diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleTableListener.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleTableListener.java index bb5c96bc9b4..ec901d305a2 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleTableListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleTableListener.java @@ -13,7 +13,7 @@ *******************************************************************************/ package org.eclipse.swt.accessibility; -import java.util.*; +import org.eclipse.swt.internal.*; /** * Classes which implement this interface provide methods @@ -35,7 +35,7 @@ * * @since 3.6 */ -public interface AccessibleTableListener extends EventListener { +public interface AccessibleTableListener extends SWTEventListener { /** * Deselects one column, leaving other selected columns selected (if any). * diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleTextListener.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleTextListener.java index 3eef243cb4c..e0291256a7e 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleTextListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleTextListener.java @@ -14,7 +14,7 @@ package org.eclipse.swt.accessibility; -import java.util.*; +import org.eclipse.swt.internal.*; /** * Classes that implement this interface provide methods @@ -43,7 +43,7 @@ * * @since 3.0 */ -public interface AccessibleTextListener extends EventListener { +public interface AccessibleTextListener extends SWTEventListener { /** * Sent when an accessibility client requests the current character offset diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleValueListener.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleValueListener.java index 95943fc6557..e012164c34c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleValueListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/common/org/eclipse/swt/accessibility/AccessibleValueListener.java @@ -13,7 +13,7 @@ *******************************************************************************/ package org.eclipse.swt.accessibility; -import java.util.*; +import org.eclipse.swt.internal.SWTEventListener; /** * Classes which implement this interface provide methods @@ -30,7 +30,7 @@ * * @since 3.6 */ -public interface AccessibleValueListener extends EventListener { +public interface AccessibleValueListener extends SWTEventListener { /** * Returns the value of this object as a number. * diff --git a/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/AuthenticationListener.java b/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/AuthenticationListener.java index 8d62e4e24d2..1e855def681 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/AuthenticationListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/AuthenticationListener.java @@ -13,7 +13,7 @@ *******************************************************************************/ package org.eclipse.swt.browser; -import java.util.*; +import org.eclipse.swt.internal.*; /** * This listener interface may be implemented in order to receive @@ -26,7 +26,7 @@ * @since 3.5 */ @FunctionalInterface -public interface AuthenticationListener extends EventListener { +public interface AuthenticationListener extends SWTEventListener { /** * This method is called when a page is navigated to that requires diff --git a/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/CloseWindowListener.java b/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/CloseWindowListener.java index 9ce52d6456a..a35b08c0c4e 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/CloseWindowListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/CloseWindowListener.java @@ -13,7 +13,7 @@ *******************************************************************************/ package org.eclipse.swt.browser; -import java.util.*; +import org.eclipse.swt.internal.*; /** * This listener interface may be implemented in order to receive @@ -29,7 +29,7 @@ * @since 3.0 */ @FunctionalInterface -public interface CloseWindowListener extends EventListener { +public interface CloseWindowListener extends SWTEventListener { /** * This method is called when the window hosting a {@link Browser} should be closed. diff --git a/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/LocationListener.java b/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/LocationListener.java index 33d5aaee3bf..5a37109e0b9 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/LocationListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/LocationListener.java @@ -13,9 +13,10 @@ *******************************************************************************/ package org.eclipse.swt.browser; -import java.util.*; import java.util.function.*; +import org.eclipse.swt.internal.*; + /** * This listener interface may be implemented in order to receive * a {@link LocationEvent} notification when a {@link Browser} @@ -27,7 +28,7 @@ * * @since 3.0 */ -public interface LocationListener extends EventListener { +public interface LocationListener extends SWTEventListener { /** * This method is called when the current location is about to be changed. diff --git a/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/OpenWindowListener.java b/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/OpenWindowListener.java index 7431911d762..8dc165fa0ac 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/OpenWindowListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/OpenWindowListener.java @@ -13,7 +13,7 @@ *******************************************************************************/ package org.eclipse.swt.browser; -import java.util.*; +import org.eclipse.swt.internal.*; /** * This listener interface may be implemented in order to receive @@ -28,7 +28,7 @@ * @since 3.0 */ @FunctionalInterface -public interface OpenWindowListener extends EventListener { +public interface OpenWindowListener extends SWTEventListener { /** * This method is called when a new window needs to be created. diff --git a/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/ProgressListener.java b/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/ProgressListener.java index 9dc9f9ac3c6..c24333f051f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/ProgressListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/ProgressListener.java @@ -13,9 +13,10 @@ *******************************************************************************/ package org.eclipse.swt.browser; -import java.util.*; import java.util.function.*; +import org.eclipse.swt.internal.*; + /** * This listener interface may be implemented in order to receive * a {@link ProgressEvent} notification when a {@link Browser} @@ -28,7 +29,7 @@ * * @since 3.0 */ -public interface ProgressListener extends EventListener { +public interface ProgressListener extends SWTEventListener { /** * This method is called when a progress is made during the loading of the diff --git a/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/StatusTextListener.java b/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/StatusTextListener.java index a05bb0b8c73..93786c48ac6 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/StatusTextListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/StatusTextListener.java @@ -13,7 +13,7 @@ *******************************************************************************/ package org.eclipse.swt.browser; -import java.util.*; +import org.eclipse.swt.internal.*; /** * This listener interface may be implemented in order to receive @@ -26,7 +26,7 @@ * @since 3.0 */ @FunctionalInterface -public interface StatusTextListener extends EventListener { +public interface StatusTextListener extends SWTEventListener { /** * This method is called when the status text is changed. The diff --git a/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/TitleListener.java b/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/TitleListener.java index 72e5b92ffda..3fa84cf2b1b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/TitleListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/TitleListener.java @@ -13,7 +13,7 @@ *******************************************************************************/ package org.eclipse.swt.browser; -import java.util.*; +import org.eclipse.swt.internal.*; /** * This listener interface may be implemented in order to receive @@ -26,7 +26,7 @@ * @since 3.0 */ @FunctionalInterface -public interface TitleListener extends EventListener { +public interface TitleListener extends SWTEventListener { /** * This method is called when the title of the current document diff --git a/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/VisibilityWindowListener.java b/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/VisibilityWindowListener.java index 3d61aa763ef..cbb88c78b33 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/VisibilityWindowListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Browser/common/org/eclipse/swt/browser/VisibilityWindowListener.java @@ -13,9 +13,10 @@ *******************************************************************************/ package org.eclipse.swt.browser; -import java.util.*; import java.util.function.*; +import org.eclipse.swt.internal.*; + /** * This listener interface may be implemented in order to receive * a {@link WindowEvent} notification when a window hosting a @@ -28,7 +29,7 @@ * * @since 3.0 */ -public interface VisibilityWindowListener extends EventListener { +public interface VisibilityWindowListener extends SWTEventListener { /** * This method is called when the window hosting a Browser diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/BidiSegmentListener.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/BidiSegmentListener.java index 3219f28bff3..ed569214ac9 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/BidiSegmentListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/BidiSegmentListener.java @@ -13,7 +13,7 @@ *******************************************************************************/ package org.eclipse.swt.custom; -import java.util.*; +import org.eclipse.swt.internal.*; /** * This listener interface may be implemented in order to receive @@ -21,7 +21,7 @@ * @see BidiSegmentEvent */ @FunctionalInterface -public interface BidiSegmentListener extends EventListener { +public interface BidiSegmentListener extends SWTEventListener { /** * This method is called when a line needs to be reordered for diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder2Listener.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder2Listener.java index e71f88fdadb..25e00abeec3 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder2Listener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder2Listener.java @@ -13,9 +13,10 @@ *******************************************************************************/ package org.eclipse.swt.custom; -import java.util.*; import java.util.function.*; +import org.eclipse.swt.internal.*; + /** * Classes which implement this interface provide methods * that deal with the events that are generated by the CTabFolder @@ -34,7 +35,7 @@ * * @since 3.0 */ -public interface CTabFolder2Listener extends EventListener { +public interface CTabFolder2Listener extends SWTEventListener { /** * Sent when the user clicks on the close button of an item in the CTabFolder. @@ -116,7 +117,7 @@ public interface CTabFolder2Listener extends EventListener { /** * Sent when the tab items count changes - * + * * @param event from observed tab folder * @since 3.124 */ diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolderListener.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolderListener.java index 22a84794bb0..ce2e1a2fd8d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolderListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolderListener.java @@ -13,7 +13,7 @@ *******************************************************************************/ package org.eclipse.swt.custom; -import java.util.*; +import org.eclipse.swt.internal.*; /** * Classes which implement this interface provide a method @@ -29,7 +29,7 @@ * @see CTabFolderEvent */ @FunctionalInterface -public interface CTabFolderListener extends EventListener { +public interface CTabFolderListener extends SWTEventListener { /** * Sent when the user clicks on the close button of an item in the CTabFolder. The item being closed is specified diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CaretListener.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CaretListener.java index 4633a7dc127..a26605f514d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CaretListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CaretListener.java @@ -13,7 +13,7 @@ *******************************************************************************/ package org.eclipse.swt.custom; -import java.util.*; +import org.eclipse.swt.internal.*; /** * This listener interface may be implemented in order to receive @@ -24,7 +24,7 @@ * @since 3.5 */ @FunctionalInterface -public interface CaretListener extends EventListener { +public interface CaretListener extends SWTEventListener { /** * This method is called after the caret offset is changed. diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ExtendedModifyListener.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ExtendedModifyListener.java index 995665243b6..3652482bc6d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ExtendedModifyListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ExtendedModifyListener.java @@ -13,7 +13,7 @@ *******************************************************************************/ package org.eclipse.swt.custom; -import java.util.*; +import org.eclipse.swt.internal.*; /** * Classes which implement this interface provide a method @@ -24,7 +24,7 @@ * @see Sample code and further information */ @FunctionalInterface -public interface ExtendedModifyListener extends EventListener { +public interface ExtendedModifyListener extends SWTEventListener { /** * This method is called after a text change occurs. diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/LineBackgroundListener.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/LineBackgroundListener.java index f661636dd3f..41f8bb241b0 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/LineBackgroundListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/LineBackgroundListener.java @@ -13,7 +13,7 @@ *******************************************************************************/ package org.eclipse.swt.custom; -import java.util.*; +import org.eclipse.swt.internal.*; /** * Classes which implement this interface provide a method @@ -24,7 +24,7 @@ * @see Sample code and further information */ @FunctionalInterface -public interface LineBackgroundListener extends EventListener { +public interface LineBackgroundListener extends SWTEventListener { /** * This method is called when a line is about to be drawn in order to get its diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/LineStyleListener.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/LineStyleListener.java index 9053718a62a..8e2797986ee 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/LineStyleListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/LineStyleListener.java @@ -13,7 +13,7 @@ *******************************************************************************/ package org.eclipse.swt.custom; -import java.util.*; +import org.eclipse.swt.internal.*; /** * Classes which implement this interface provide a method @@ -24,7 +24,7 @@ * @see Sample code and further information */ @FunctionalInterface -public interface LineStyleListener extends EventListener { +public interface LineStyleListener extends SWTEventListener { /** * This method is called when a line is about to be drawn in order to get the diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/MovementListener.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/MovementListener.java index a4ec7db5003..6fcb0f73cd5 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/MovementListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/MovementListener.java @@ -13,7 +13,7 @@ *******************************************************************************/ package org.eclipse.swt.custom; -import java.util.*; +import org.eclipse.swt.internal.SWTEventListener; /** * This listener is invoked when a new offset is required based on the current @@ -27,7 +27,7 @@ * * @since 3.3 */ -public interface MovementListener extends EventListener { +public interface MovementListener extends SWTEventListener { /** * This method is called when a new offset is required based on the current * offset and a movement type. diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/PaintObjectListener.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/PaintObjectListener.java index 31d82ad6ebd..f4384ad7026 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/PaintObjectListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/PaintObjectListener.java @@ -14,14 +14,14 @@ package org.eclipse.swt.custom; -import java.util.*; +import org.eclipse.swt.internal.*; /** * This listener is invoked when an object needs to be drawn. * * @since 3.2 */ @FunctionalInterface -public interface PaintObjectListener extends EventListener { +public interface PaintObjectListener extends SWTEventListener { /** * This method is called when an object needs to be drawn. * diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledTextListener.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledTextListener.java index 0ca56132060..293890e0a07 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledTextListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledTextListener.java @@ -13,13 +13,12 @@ *******************************************************************************/ package org.eclipse.swt.custom; -import java.util.*; - import org.eclipse.swt.events.*; +import org.eclipse.swt.internal.*; import org.eclipse.swt.widgets.*; class StyledTextListener extends TypedListener { -StyledTextListener(EventListener listener) { +StyledTextListener(SWTEventListener listener) { super(listener); } /** diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TextChangeListener.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TextChangeListener.java index 7352267b424..0585f6ee587 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TextChangeListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TextChangeListener.java @@ -14,7 +14,7 @@ package org.eclipse.swt.custom; -import java.util.*; +import org.eclipse.swt.internal.SWTEventListener; /** * The StyledText widget implements this listener to receive @@ -29,7 +29,7 @@ * below. If the entire text is replaced the textSet method * should be called instead. */ -public interface TextChangeListener extends EventListener { +public interface TextChangeListener extends SWTEventListener { /** * This method is called when the content is about to be changed. diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/VerifyKeyListener.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/VerifyKeyListener.java index 87394bc43c5..c2852315a2c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/VerifyKeyListener.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/VerifyKeyListener.java @@ -13,9 +13,8 @@ *******************************************************************************/ package org.eclipse.swt.custom; -import java.util.*; - import org.eclipse.swt.events.*; +import org.eclipse.swt.internal.*; /** * Classes which implement this interface provide a method @@ -26,7 +25,7 @@ * @see Sample code and further information */ @FunctionalInterface -public interface VerifyKeyListener extends EventListener { +public interface VerifyKeyListener extends SWTEventListener { /** * The following event fields are used: