From bd306acb742a18bb7a234ae493a2b02257beaad2 Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Tue, 12 Mar 2024 10:33:10 +0100 Subject: [PATCH] Replace internal SWTEventListener directly with java.util.EventListener SWTEventListener was introduced to provide support for both J2SE and J2ME platforms. But SWT does not support the J2ME for over a decade now and other development artifacts have also been removed for a while already. Leftover of https://bugs.eclipse.org/bugs/show_bug.cgi?id=483638 --- .../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, 135 insertions(+), 173 deletions(-) delete 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 5e2e52a00fa..a15f88a7357 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 org.eclipse.swt.internal.SWTEventListener; +import java.util.*; /** * Classes which implement this interface provide methods @@ -30,7 +30,7 @@ * * @since 3.6 */ -public interface AccessibleActionListener extends SWTEventListener { +public interface AccessibleActionListener extends EventListener { /** * 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 936f0223a13..d3a7899c102 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 org.eclipse.swt.internal.SWTEventListener; +import java.util.*; /** * Classes which implement this interface provide methods @@ -31,7 +31,7 @@ * * @since 3.6 */ -public interface AccessibleAttributeListener extends SWTEventListener { +public interface AccessibleAttributeListener extends EventListener { /** * 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 e938a35adcb..79f69fb321d 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 org.eclipse.swt.internal.*; +import java.util.*; /** * Classes that implement this interface provide methods @@ -43,7 +43,7 @@ * * @since 2.0 */ -public interface AccessibleControlListener extends SWTEventListener { +public interface AccessibleControlListener extends EventListener { /** * 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 c7a930bc063..723cee24292 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 org.eclipse.swt.internal.SWTEventListener; +import java.util.*; /** * Classes which implement this interface provide methods @@ -31,7 +31,7 @@ * * @since 3.7 */ -public interface AccessibleEditableTextListener extends SWTEventListener { +public interface AccessibleEditableTextListener extends EventListener { /** * 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 de02c6b497b..bb17eb1493b 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 org.eclipse.swt.internal.SWTEventListener; +import java.util.*; /** * Classes which implement this interface provide methods @@ -30,7 +30,7 @@ * * @since 3.6 */ -public interface AccessibleHyperlinkListener extends SWTEventListener { +public interface AccessibleHyperlinkListener extends EventListener { /** * 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 a18dad8cc2a..0cfca5e4d1f 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,10 +14,9 @@ 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 @@ -41,7 +40,7 @@ * * @since 2.0 */ -public interface AccessibleListener extends SWTEventListener { +public interface AccessibleListener extends EventListener { /** * 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 5533da3937f..62042bc1e96 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 org.eclipse.swt.internal.SWTEventListener; +import java.util.*; /** * Classes which implement this interface provide methods @@ -30,7 +30,7 @@ * * @since 3.6 */ -public interface AccessibleTableCellListener extends SWTEventListener { +public interface AccessibleTableCellListener extends EventListener { /** * 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 ec901d305a2..bb5c96bc9b4 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 org.eclipse.swt.internal.*; +import java.util.*; /** * Classes which implement this interface provide methods @@ -35,7 +35,7 @@ * * @since 3.6 */ -public interface AccessibleTableListener extends SWTEventListener { +public interface AccessibleTableListener extends EventListener { /** * 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 e0291256a7e..3eef243cb4c 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 org.eclipse.swt.internal.*; +import java.util.*; /** * Classes that implement this interface provide methods @@ -43,7 +43,7 @@ * * @since 3.0 */ -public interface AccessibleTextListener extends SWTEventListener { +public interface AccessibleTextListener extends EventListener { /** * 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 e012164c34c..95943fc6557 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 org.eclipse.swt.internal.SWTEventListener; +import java.util.*; /** * Classes which implement this interface provide methods @@ -30,7 +30,7 @@ * * @since 3.6 */ -public interface AccessibleValueListener extends SWTEventListener { +public interface AccessibleValueListener extends EventListener { /** * 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 1e855def681..8d62e4e24d2 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 org.eclipse.swt.internal.*; +import java.util.*; /** * This listener interface may be implemented in order to receive @@ -26,7 +26,7 @@ * @since 3.5 */ @FunctionalInterface -public interface AuthenticationListener extends SWTEventListener { +public interface AuthenticationListener extends EventListener { /** * 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 a35b08c0c4e..9ce52d6456a 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 org.eclipse.swt.internal.*; +import java.util.*; /** * This listener interface may be implemented in order to receive @@ -29,7 +29,7 @@ * @since 3.0 */ @FunctionalInterface -public interface CloseWindowListener extends SWTEventListener { +public interface CloseWindowListener extends EventListener { /** * 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 5a37109e0b9..33d5aaee3bf 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,10 +13,9 @@ *******************************************************************************/ 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} @@ -28,7 +27,7 @@ * * @since 3.0 */ -public interface LocationListener extends SWTEventListener { +public interface LocationListener extends EventListener { /** * 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 8dc165fa0ac..7431911d762 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 org.eclipse.swt.internal.*; +import java.util.*; /** * This listener interface may be implemented in order to receive @@ -28,7 +28,7 @@ * @since 3.0 */ @FunctionalInterface -public interface OpenWindowListener extends SWTEventListener { +public interface OpenWindowListener extends EventListener { /** * 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 c24333f051f..9dc9f9ac3c6 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,10 +13,9 @@ *******************************************************************************/ 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} @@ -29,7 +28,7 @@ * * @since 3.0 */ -public interface ProgressListener extends SWTEventListener { +public interface ProgressListener extends EventListener { /** * 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 93786c48ac6..a05bb0b8c73 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 org.eclipse.swt.internal.*; +import java.util.*; /** * This listener interface may be implemented in order to receive @@ -26,7 +26,7 @@ * @since 3.0 */ @FunctionalInterface -public interface StatusTextListener extends SWTEventListener { +public interface StatusTextListener extends EventListener { /** * 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 3fa84cf2b1b..72e5b92ffda 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 org.eclipse.swt.internal.*; +import java.util.*; /** * This listener interface may be implemented in order to receive @@ -26,7 +26,7 @@ * @since 3.0 */ @FunctionalInterface -public interface TitleListener extends SWTEventListener { +public interface TitleListener extends EventListener { /** * 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 cbb88c78b33..3d61aa763ef 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,10 +13,9 @@ *******************************************************************************/ 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 @@ -29,7 +28,7 @@ * * @since 3.0 */ -public interface VisibilityWindowListener extends SWTEventListener { +public interface VisibilityWindowListener extends EventListener { /** * 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 ed569214ac9..3219f28bff3 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 org.eclipse.swt.internal.*; +import java.util.*; /** * This listener interface may be implemented in order to receive @@ -21,7 +21,7 @@ * @see BidiSegmentEvent */ @FunctionalInterface -public interface BidiSegmentListener extends SWTEventListener { +public interface BidiSegmentListener extends EventListener { /** * 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 25e00abeec3..e71f88fdadb 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,10 +13,9 @@ *******************************************************************************/ 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 @@ -35,7 +34,7 @@ * * @since 3.0 */ -public interface CTabFolder2Listener extends SWTEventListener { +public interface CTabFolder2Listener extends EventListener { /** * Sent when the user clicks on the close button of an item in the CTabFolder. @@ -117,7 +116,7 @@ public interface CTabFolder2Listener extends SWTEventListener { /** * 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 ce2e1a2fd8d..22a84794bb0 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 org.eclipse.swt.internal.*; +import java.util.*; /** * Classes which implement this interface provide a method @@ -29,7 +29,7 @@ * @see CTabFolderEvent */ @FunctionalInterface -public interface CTabFolderListener extends SWTEventListener { +public interface CTabFolderListener extends EventListener { /** * 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 a26605f514d..4633a7dc127 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 org.eclipse.swt.internal.*; +import java.util.*; /** * This listener interface may be implemented in order to receive @@ -24,7 +24,7 @@ * @since 3.5 */ @FunctionalInterface -public interface CaretListener extends SWTEventListener { +public interface CaretListener extends EventListener { /** * 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 3652482bc6d..995665243b6 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 org.eclipse.swt.internal.*; +import java.util.*; /** * Classes which implement this interface provide a method @@ -24,7 +24,7 @@ * @see Sample code and further information */ @FunctionalInterface -public interface ExtendedModifyListener extends SWTEventListener { +public interface ExtendedModifyListener extends EventListener { /** * 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 41f8bb241b0..f661636dd3f 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 org.eclipse.swt.internal.*; +import java.util.*; /** * Classes which implement this interface provide a method @@ -24,7 +24,7 @@ * @see Sample code and further information */ @FunctionalInterface -public interface LineBackgroundListener extends SWTEventListener { +public interface LineBackgroundListener extends EventListener { /** * 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 8e2797986ee..9053718a62a 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 org.eclipse.swt.internal.*; +import java.util.*; /** * Classes which implement this interface provide a method @@ -24,7 +24,7 @@ * @see Sample code and further information */ @FunctionalInterface -public interface LineStyleListener extends SWTEventListener { +public interface LineStyleListener extends EventListener { /** * 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 6fcb0f73cd5..a4ec7db5003 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 org.eclipse.swt.internal.SWTEventListener; +import java.util.*; /** * 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 SWTEventListener { +public interface MovementListener extends EventListener { /** * 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 f4384ad7026..31d82ad6ebd 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 org.eclipse.swt.internal.*; +import java.util.*; /** * This listener is invoked when an object needs to be drawn. * * @since 3.2 */ @FunctionalInterface -public interface PaintObjectListener extends SWTEventListener { +public interface PaintObjectListener extends EventListener { /** * 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 293890e0a07..0ca56132060 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,12 +13,13 @@ *******************************************************************************/ 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(SWTEventListener listener) { +StyledTextListener(EventListener 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 0585f6ee587..7352267b424 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 org.eclipse.swt.internal.SWTEventListener; +import java.util.*; /** * 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 SWTEventListener { +public interface TextChangeListener extends EventListener { /** * 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 c2852315a2c..87394bc43c5 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,8 +13,9 @@ *******************************************************************************/ 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 @@ -25,7 +26,7 @@ * @see Sample code and further information */ @FunctionalInterface -public interface VerifyKeyListener extends SWTEventListener { +public interface VerifyKeyListener extends EventListener { /** * The following event fields are used: