diff --git a/releng/org.eclipse.nebula.nebula-parent/pom.xml b/releng/org.eclipse.nebula.nebula-parent/pom.xml index ad3f5bd8c..34d79311a 100644 --- a/releng/org.eclipse.nebula.nebula-parent/pom.xml +++ b/releng/org.eclipse.nebula.nebula-parent/pom.xml @@ -272,6 +272,11 @@ Contributors: p2 ${target-platform} + + eclipse-iBuild + p2 + https://download.eclipse.org/eclipse/updates/4.32-I-builds + diff --git a/widgets/calendarcombo/org.eclipse.nebula.widgets.calendarcombo/META-INF/MANIFEST.MF b/widgets/calendarcombo/org.eclipse.nebula.widgets.calendarcombo/META-INF/MANIFEST.MF index 2950e6320..159d394b1 100644 --- a/widgets/calendarcombo/org.eclipse.nebula.widgets.calendarcombo/META-INF/MANIFEST.MF +++ b/widgets/calendarcombo/org.eclipse.nebula.widgets.calendarcombo/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Nebula Calendar Combo Widget - Incubating Bundle-SymbolicName: org.eclipse.nebula.widgets.calendarcombo Bundle-Version: 1.0.0.qualifier -Require-Bundle: org.eclipse.swt +Require-Bundle: org.eclipse.swt;bundle-version="[3.126.0,4.0.0)" Export-Package: org.eclipse.nebula.widgets.calendarcombo Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Vendor: Eclipse Nebula diff --git a/widgets/calendarcombo/org.eclipse.nebula.widgets.calendarcombo/src/org/eclipse/nebula/widgets/calendarcombo/CustomCombo.java b/widgets/calendarcombo/org.eclipse.nebula.widgets.calendarcombo/src/org/eclipse/nebula/widgets/calendarcombo/CustomCombo.java index 030af57c2..90a170a52 100644 --- a/widgets/calendarcombo/org.eclipse.nebula.widgets.calendarcombo/src/org/eclipse/nebula/widgets/calendarcombo/CustomCombo.java +++ b/widgets/calendarcombo/org.eclipse.nebula.widgets.calendarcombo/src/org/eclipse/nebula/widgets/calendarcombo/CustomCombo.java @@ -30,7 +30,6 @@ import org.eclipse.swt.widgets.Menu; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; -import org.eclipse.swt.widgets.TypedListener; import org.eclipse.swt.widgets.Widget; /** @@ -259,11 +258,7 @@ public void add(String string, int index) { * @see #removeModifyListener */ public void addModifyListener(ModifyListener listener) { - checkWidget(); - if (listener == null) - SWT.error(SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener(listener); - addListener(SWT.Modify, typedListener); + addTypedListener(listener, SWT.Modify); } /** @@ -294,12 +289,7 @@ public void addModifyListener(ModifyListener listener) { * @see SelectionEvent */ public void addSelectionListener(SelectionListener listener) { - checkWidget(); - if (listener == null) - SWT.error(SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener(listener); - addListener(SWT.Selection, typedListener); - addListener(SWT.DefaultSelection, typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } /** @@ -325,11 +315,7 @@ public void addSelectionListener(SelectionListener listener) { * @since 3.3 */ public void addVerifyListener(VerifyListener listener) { - checkWidget(); - if (listener == null) - SWT.error(SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener(listener); - addListener(SWT.Verify, typedListener); + addTypedListener(listener, SWT.Verify); } void arrowEvent(Event event) { @@ -1417,10 +1403,7 @@ public void removeAll() { * @see #addModifyListener */ public void removeModifyListener(ModifyListener listener) { - checkWidget(); - if (listener == null) - SWT.error(SWT.ERROR_NULL_ARGUMENT); - removeListener(SWT.Modify, listener); + removeTypedListener(SWT.Modify, listener); } /** @@ -1442,11 +1425,8 @@ public void removeModifyListener(ModifyListener listener) { * @see #addSelectionListener */ public void removeSelectionListener(SelectionListener listener) { - checkWidget(); - if (listener == null) - SWT.error(SWT.ERROR_NULL_ARGUMENT); - removeListener(SWT.Selection, listener); - removeListener(SWT.DefaultSelection, listener); + removeTypedListener(SWT.Selection, listener); + removeTypedListener(SWT.DefaultSelection, listener); } /** @@ -1470,10 +1450,7 @@ public void removeSelectionListener(SelectionListener listener) { * @since 3.3 */ public void removeVerifyListener(VerifyListener listener) { - checkWidget(); - if (listener == null) - SWT.error(SWT.ERROR_NULL_ARGUMENT); - removeListener(SWT.Verify, listener); + removeTypedListener(SWT.Verify, listener); } /** diff --git a/widgets/carousel/org.eclipse.nebula.widgets.carousel/META-INF/MANIFEST.MF b/widgets/carousel/org.eclipse.nebula.widgets.carousel/META-INF/MANIFEST.MF index c999e53fe..099a96bf1 100644 --- a/widgets/carousel/org.eclipse.nebula.widgets.carousel/META-INF/MANIFEST.MF +++ b/widgets/carousel/org.eclipse.nebula.widgets.carousel/META-INF/MANIFEST.MF @@ -7,5 +7,5 @@ Bundle-Vendor: Eclipse Nebula Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.nebula.widgets.carousel Require-Bundle: org.eclipse.nebula.widgets.opal.commons;visibility:=reexport, - org.eclipse.swt + org.eclipse.swt;bundle-version="[3.126.0,4.0.0)" Automatic-Module-Name: org.eclipse.nebula.widgets.carousel diff --git a/widgets/carousel/org.eclipse.nebula.widgets.carousel/src/org/eclipse/nebula/widgets/carousel/Carousel.java b/widgets/carousel/org.eclipse.nebula.widgets.carousel/src/org/eclipse/nebula/widgets/carousel/Carousel.java index b735fe698..1a5339f20 100644 --- a/widgets/carousel/org.eclipse.nebula.widgets.carousel/src/org/eclipse/nebula/widgets/carousel/Carousel.java +++ b/widgets/carousel/org.eclipse.nebula.widgets.carousel/src/org/eclipse/nebula/widgets/carousel/Carousel.java @@ -165,8 +165,7 @@ public void addImage(final Image image) { * @see SelectionEvent */ public void addSelectionListener(final SelectionListener listener) { - checkWidget(); - SelectionListenerUtil.addSelectionListener(this, listener); + addTypedListener(listener, SWT.Selection); } /** @@ -219,8 +218,7 @@ public void removeImage(final Image image) { * @see #addSelectionListener */ public void removeSelectionListener(final SelectionListener listener) { - checkWidget(); - SelectionListenerUtil.removeSelectionListener(this, listener); + removeTypedListener(SWT.Selection, listener); } // ---- Getters & Setters diff --git a/widgets/cdatetime/org.eclipse.nebula.widgets.cdatetime/META-INF/MANIFEST.MF b/widgets/cdatetime/org.eclipse.nebula.widgets.cdatetime/META-INF/MANIFEST.MF index 30b270b3d..da83f0540 100644 --- a/widgets/cdatetime/org.eclipse.nebula.widgets.cdatetime/META-INF/MANIFEST.MF +++ b/widgets/cdatetime/org.eclipse.nebula.widgets.cdatetime/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.core.runtime, - org.eclipse.swt, + org.eclipse.swt;bundle-version="[3.126.0,4.0.0)", org.eclipse.nebula.cwt;bundle-version="0.9.0";visibility:=reexport Export-Package: org.eclipse.nebula.widgets.cdatetime Automatic-Module-Name: org.eclipse.nebula.widgets.cdatetime diff --git a/widgets/cdatetime/org.eclipse.nebula.widgets.cdatetime/src/org/eclipse/nebula/widgets/cdatetime/CDateTime.java b/widgets/cdatetime/org.eclipse.nebula.widgets.cdatetime/src/org/eclipse/nebula/widgets/cdatetime/CDateTime.java index e7a33993e..47ca526a8 100644 --- a/widgets/cdatetime/org.eclipse.nebula.widgets.cdatetime/src/org/eclipse/nebula/widgets/cdatetime/CDateTime.java +++ b/widgets/cdatetime/org.eclipse.nebula.widgets.cdatetime/src/org/eclipse/nebula/widgets/cdatetime/CDateTime.java @@ -65,7 +65,6 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Spinner; import org.eclipse.swt.widgets.Text; -import org.eclipse.swt.widgets.TypedListener; /** * The CDateTime provides both textual and graphical means selecting a @@ -425,9 +424,7 @@ public CDateTime(Composite parent, int style) { */ public void addSelectionListener(SelectionListener listener) { if (listener != null) { - TypedListener typedListener = new TypedListener(listener); - addListener(SWT.Selection, typedListener); - addListener(SWT.DefaultSelection, typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } } @@ -1527,9 +1524,7 @@ protected void postClose(Shell popup) { */ public void removeSelectionListener(SelectionListener listener) { if (listener != null) { - TypedListener l = new TypedListener(listener); - removeListener(SWT.Selection, l); - removeListener(SWT.DefaultSelection, l); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } } diff --git a/widgets/chips/org.eclipse.nebula.widgets.chips/META-INF/MANIFEST.MF b/widgets/chips/org.eclipse.nebula.widgets.chips/META-INF/MANIFEST.MF index f9e79d513..500d18cb8 100644 --- a/widgets/chips/org.eclipse.nebula.widgets.chips/META-INF/MANIFEST.MF +++ b/widgets/chips/org.eclipse.nebula.widgets.chips/META-INF/MANIFEST.MF @@ -7,5 +7,5 @@ Bundle-Vendor: Eclipse Nebula Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.nebula.widgets.chips Require-Bundle: org.eclipse.nebula.widgets.opal.commons;visibility:=reexport, - org.eclipse.swt + org.eclipse.swt;bundle-version="[3.126.0,4.0.0)" Automatic-Module-Name: org.eclipse.nebula.widgets.chips diff --git a/widgets/chips/org.eclipse.nebula.widgets.chips/src/org/eclipse/nebula/widgets/chips/Chips.java b/widgets/chips/org.eclipse.nebula.widgets.chips/src/org/eclipse/nebula/widgets/chips/Chips.java index fe032f6c1..1ada24f2e 100644 --- a/widgets/chips/org.eclipse.nebula.widgets.chips/src/org/eclipse/nebula/widgets/chips/Chips.java +++ b/widgets/chips/org.eclipse.nebula.widgets.chips/src/org/eclipse/nebula/widgets/chips/Chips.java @@ -411,8 +411,7 @@ public void addListener(final int eventType, final Listener listener) { * @see SelectionEvent */ public void addSelectionListener(final SelectionListener listener) { - checkWidget(); - SelectionListenerUtil.addSelectionListener(this, listener); + addTypedListener(listener, SWT.Selection); } /** @@ -466,8 +465,7 @@ public void removeCloseListener(final CloseListener listener) { * @see #addSelectionListener */ public void removeSelectionListener(final SelectionListener listener) { - checkWidget(); - SelectionListenerUtil.removeSelectionListener(this, listener); + removeTypedListener(SWT.Selection, listener); } // ---- Getters & Setters diff --git a/widgets/chips/org.eclipse.nebula.widgets.chips/src/org/eclipse/nebula/widgets/chips/CloseListener.java b/widgets/chips/org.eclipse.nebula.widgets.chips/src/org/eclipse/nebula/widgets/chips/CloseListener.java index 5379e2d7e..6824b5b2b 100644 --- a/widgets/chips/org.eclipse.nebula.widgets.chips/src/org/eclipse/nebula/widgets/chips/CloseListener.java +++ b/widgets/chips/org.eclipse.nebula.widgets.chips/src/org/eclipse/nebula/widgets/chips/CloseListener.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.nebula.widgets.chips; -import org.eclipse.swt.internal.SWTEventListener; +import java.util.EventListener; /** * Classes which implement this interface provide methods @@ -28,9 +28,8 @@ * * @see CloseEvent */ -@SuppressWarnings("restriction") @FunctionalInterface -public interface CloseListener extends SWTEventListener { +public interface CloseListener extends EventListener { /** * Sent when a Chips widget is closed. * diff --git a/widgets/ctree/org.eclipse.nebula.widgets.ctree/META-INF/MANIFEST.MF b/widgets/ctree/org.eclipse.nebula.widgets.ctree/META-INF/MANIFEST.MF index dc98c93e5..a3de9c7b8 100644 --- a/widgets/ctree/org.eclipse.nebula.widgets.ctree/META-INF/MANIFEST.MF +++ b/widgets/ctree/org.eclipse.nebula.widgets.ctree/META-INF/MANIFEST.MF @@ -5,6 +5,6 @@ Bundle-SymbolicName: org.eclipse.nebula.widgets.ctree Bundle-Version: 0.8.0 Bundle-Vendor: Eclipse Nebula Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Bundle: org.eclipse.swt +Require-Bundle: org.eclipse.swt;bundle-version="[3.126.0,4.0.0)" Export-Package: org.eclipse.nebula.widgets.ctree Automatic-Module-Name: org.eclipse.nebula.widgets.ctree diff --git a/widgets/ctree/org.eclipse.nebula.widgets.ctree/src/org/eclipse/nebula/widgets/ctree/CTree.java b/widgets/ctree/org.eclipse.nebula.widgets.ctree/src/org/eclipse/nebula/widgets/ctree/CTree.java index ef9493001..ecc5d61c7 100644 --- a/widgets/ctree/org.eclipse.nebula.widgets.ctree/src/org/eclipse/nebula/widgets/ctree/CTree.java +++ b/widgets/ctree/org.eclipse.nebula.widgets.ctree/src/org/eclipse/nebula/widgets/ctree/CTree.java @@ -43,7 +43,6 @@ import org.eclipse.swt.widgets.Menu; import org.eclipse.swt.widgets.ScrollBar; import org.eclipse.swt.widgets.Table; -import org.eclipse.swt.widgets.TypedListener; import org.eclipse.swt.widgets.Widget; @@ -389,18 +388,14 @@ public void addPaintedItemListener(Listener listener) { public void addSelectionListener(SelectionListener listener) { checkWidget(); if (listener != null) { - TypedListener typedListener = new TypedListener(listener); - addListener(SWT.Selection, typedListener); - addListener(SWT.DefaultSelection, typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } } public void addTreeListener(TreeListener listener) { checkWidget (); if(listener != null) { - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Collapse, typedListener); - addListener (SWT.Expand, typedListener); + addTypedListener(listener, SWT.Collapse, SWT.Expand); } } @@ -1367,16 +1362,16 @@ public void removePaintedItemListener(Listener listener) { public void removeSelectionListener(SelectionListener listener) { checkWidget(); if (listener != null) { - removeListener(SWT.Selection, listener); - removeListener(SWT.DefaultSelection, listener); + removeTypedListener(SWT.Selection, listener); + removeTypedListener(SWT.DefaultSelection, listener); } } public void removeTreeListener(TreeListener listener) { checkWidget (); if(listener != null) { - removeListener(SWT.Collapse, listener); - removeListener(SWT.Expand, listener); + removeTypedListener(SWT.Collapse, listener); + removeTypedListener(SWT.Expand, listener); } } diff --git a/widgets/ctreecombo/org.eclipse.nebula.widgets.ctreecombo/META-INF/MANIFEST.MF b/widgets/ctreecombo/org.eclipse.nebula.widgets.ctreecombo/META-INF/MANIFEST.MF index 1b6529fe6..e2643b976 100644 --- a/widgets/ctreecombo/org.eclipse.nebula.widgets.ctreecombo/META-INF/MANIFEST.MF +++ b/widgets/ctreecombo/org.eclipse.nebula.widgets.ctreecombo/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.nebula.widgets.ctreecombo Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Nebula Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Bundle: org.eclipse.swt, +Require-Bundle: org.eclipse.swt;bundle-version="[3.126.0,4.0.0)", org.eclipse.jface, org.eclipse.core.runtime;bundle-version="3.13.0", org.eclipse.core.databinding.observable diff --git a/widgets/ctreecombo/org.eclipse.nebula.widgets.ctreecombo/src/org/eclipse/nebula/widgets/ctreecombo/CTreeCombo.java b/widgets/ctreecombo/org.eclipse.nebula.widgets.ctreecombo/src/org/eclipse/nebula/widgets/ctreecombo/CTreeCombo.java index a5949d4d0..70dfee9aa 100644 --- a/widgets/ctreecombo/org.eclipse.nebula.widgets.ctreecombo/src/org/eclipse/nebula/widgets/ctreecombo/CTreeCombo.java +++ b/widgets/ctreecombo/org.eclipse.nebula.widgets.ctreecombo/src/org/eclipse/nebula/widgets/ctreecombo/CTreeCombo.java @@ -49,7 +49,6 @@ import org.eclipse.swt.widgets.Tree; import org.eclipse.swt.widgets.TreeColumn; import org.eclipse.swt.widgets.TreeItem; -import org.eclipse.swt.widgets.TypedListener; import org.eclipse.swt.widgets.Widget; public class CTreeCombo extends Composite { @@ -240,14 +239,7 @@ char _findMnemonic(String string) { * @see SelectionEvent */ public void addSelectionListener(final SelectionListener listener) { - checkWidget(); - if (listener == null) { - SWT.error(SWT.ERROR_NULL_ARGUMENT); - } - - final TypedListener typedListener = new TypedListener(listener); - addListener(SWT.Selection, typedListener); - addListener(SWT.DefaultSelection, typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } /** @@ -1125,12 +1117,8 @@ public void removeAll() { * @see #addSelectionListener */ public void removeSelectionListener(final SelectionListener listener) { - checkWidget(); - if (listener == null) { - SWT.error(SWT.ERROR_NULL_ARGUMENT); - } - removeListener(SWT.Selection, listener); - removeListener(SWT.DefaultSelection, listener); + removeTypedListener(SWT.Selection, listener); + removeTypedListener(SWT.DefaultSelection, listener); } /** diff --git a/widgets/datechooser/org.eclipse.nebula.widgets.datechooser/META-INF/MANIFEST.MF b/widgets/datechooser/org.eclipse.nebula.widgets.datechooser/META-INF/MANIFEST.MF index c48b16745..cec3d96da 100644 --- a/widgets/datechooser/org.eclipse.nebula.widgets.datechooser/META-INF/MANIFEST.MF +++ b/widgets/datechooser/org.eclipse.nebula.widgets.datechooser/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Export-Package: org.eclipse.nebula.widgets.datechooser Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-Vendor: Eclipse Nebula Import-Package: org.eclipse.jface.layout, - org.eclipse.swt, + org.eclipse.swt;bundle-version="[3.126.0,4.0.0)", org.eclipse.swt.events, org.eclipse.swt.graphics, org.eclipse.swt.internal, diff --git a/widgets/datechooser/org.eclipse.nebula.widgets.datechooser/src/org/eclipse/nebula/widgets/datechooser/AbstractCombo.java b/widgets/datechooser/org.eclipse.nebula.widgets.datechooser/src/org/eclipse/nebula/widgets/datechooser/AbstractCombo.java index d682e050e..cecf48cb6 100644 --- a/widgets/datechooser/org.eclipse.nebula.widgets.datechooser/src/org/eclipse/nebula/widgets/datechooser/AbstractCombo.java +++ b/widgets/datechooser/org.eclipse.nebula.widgets.datechooser/src/org/eclipse/nebula/widgets/datechooser/AbstractCombo.java @@ -36,7 +36,6 @@ import org.eclipse.swt.widgets.Menu; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; -import org.eclipse.swt.widgets.TypedListener; /** * Abstract class for combo widgets composed of a Text, a @@ -201,11 +200,7 @@ static int checkStyle(int style) { * @see #removeModifyListener */ public void addModifyListener(ModifyListener listener) { - checkWidget(); - if (listener == null) - SWT.error(SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener(listener); - addListener(SWT.Modify, typedListener); + addTypedListener(listener, SWT.Modify); } /** @@ -233,12 +228,7 @@ public void addModifyListener(ModifyListener listener) { * @see SelectionEvent */ public void addSelectionListener(SelectionListener listener) { - checkWidget(); - if (listener == null) - SWT.error(SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener(listener); - addListener(SWT.Selection, typedListener); - addListener(SWT.DefaultSelection, typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } /** @@ -261,11 +251,7 @@ public void addSelectionListener(SelectionListener listener) { * @see #removeVerifyListener */ public void addVerifyListener(VerifyListener listener) { - checkWidget(); - if (listener == null) - SWT.error(SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener(listener); - addListener(SWT.Verify, typedListener); + addTypedListener(listener, SWT.Verify); } /** @@ -832,10 +818,7 @@ public void redraw(int x, int y, int width, int height, boolean all) { * @see #addModifyListener */ public void removeModifyListener(ModifyListener listener) { - checkWidget(); - if (listener == null) - SWT.error(SWT.ERROR_NULL_ARGUMENT); - removeListener(SWT.Modify, listener); + removeTypedListener(SWT.Modify, listener); } /** @@ -856,11 +839,8 @@ public void removeModifyListener(ModifyListener listener) { * @see #addSelectionListener */ public void removeSelectionListener(SelectionListener listener) { - checkWidget(); - if (listener == null) - SWT.error(SWT.ERROR_NULL_ARGUMENT); - removeListener(SWT.Selection, listener); - removeListener(SWT.DefaultSelection, listener); + removeTypedListener(SWT.Selection, listener); + removeTypedListener(SWT.DefaultSelection, listener); } /** @@ -881,10 +861,7 @@ public void removeSelectionListener(SelectionListener listener) { * @see #addVerifyListener */ public void removeVerifyListener(VerifyListener listener) { - checkWidget(); - if (listener == null) - SWT.error(SWT.ERROR_NULL_ARGUMENT); - removeListener(SWT.Verify, listener); + removeTypedListener(SWT.Verify, listener); } /** diff --git a/widgets/datechooser/org.eclipse.nebula.widgets.datechooser/src/org/eclipse/nebula/widgets/datechooser/DateChooser.java b/widgets/datechooser/org.eclipse.nebula.widgets.datechooser/src/org/eclipse/nebula/widgets/datechooser/DateChooser.java index 72407ff05..6aa8f7cae 100644 --- a/widgets/datechooser/org.eclipse.nebula.widgets.datechooser/src/org/eclipse/nebula/widgets/datechooser/DateChooser.java +++ b/widgets/datechooser/org.eclipse.nebula.widgets.datechooser/src/org/eclipse/nebula/widgets/datechooser/DateChooser.java @@ -47,7 +47,6 @@ import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Menu; import org.eclipse.swt.widgets.MenuItem; -import org.eclipse.swt.widgets.TypedListener; /** * Calendar widget. Presents the monthly view of a calendar for date picking. @@ -356,12 +355,7 @@ public DateChooser(Composite parent, int style) { * @see #removeSelectionListener */ public void addSelectionListener(SelectionListener lsnr) { - checkWidget(); - if (lsnr == null) { - SWT.error(SWT.ERROR_NULL_ARGUMENT); - } - final TypedListener typedListener = new TypedListener(lsnr); - addListener(SWT.Selection, typedListener); + addTypedListener(lsnr, SWT.Selection); } /** @@ -1106,11 +1100,7 @@ private void removeSelectedDate(Date d, boolean refresh) { * @see #addSelectionListener */ public void removeSelectionListener(SelectionListener lsnr) { - checkWidget(); - if (lsnr == null) { - SWT.error(SWT.ERROR_NULL_ARGUMENT); - } - removeListener(SWT.Selection, lsnr); + removeTypedListener(SWT.Selection, lsnr); } /** diff --git a/widgets/gallery/org.eclipse.nebula.widgets.gallery/META-INF/MANIFEST.MF b/widgets/gallery/org.eclipse.nebula.widgets.gallery/META-INF/MANIFEST.MF index fa3f4100f..462c01f80 100644 --- a/widgets/gallery/org.eclipse.nebula.widgets.gallery/META-INF/MANIFEST.MF +++ b/widgets/gallery/org.eclipse.nebula.widgets.gallery/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Nebula Gallery Widget Bundle-SymbolicName: org.eclipse.nebula.widgets.gallery Bundle-Version: 1.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Bundle: org.eclipse.swt, +Require-Bundle: org.eclipse.swt;bundle-version="[3.126.0,4.0.0)", org.eclipse.jface;resolution:=optional Export-Package: org.eclipse.nebula.animation, org.eclipse.nebula.animation.effects, diff --git a/widgets/gallery/org.eclipse.nebula.widgets.gallery/src/org/eclipse/nebula/widgets/gallery/Gallery.java b/widgets/gallery/org.eclipse.nebula.widgets.gallery/src/org/eclipse/nebula/widgets/gallery/Gallery.java index b7409320e..f55f9bd17 100644 --- a/widgets/gallery/org.eclipse.nebula.widgets.gallery/src/org/eclipse/nebula/widgets/gallery/Gallery.java +++ b/widgets/gallery/org.eclipse.nebula.widgets.gallery/src/org/eclipse/nebula/widgets/gallery/Gallery.java @@ -33,7 +33,6 @@ import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Item; import org.eclipse.swt.widgets.ScrollBar; -import org.eclipse.swt.widgets.TypedListener; /** *

@@ -309,13 +308,7 @@ public void setItemRenderer(AbstractGalleryItemRenderer itemRenderer) { * @see SelectionEvent */ public void addSelectionListener(SelectionListener listener) { - checkWidget(); - if (listener == null) - SWT.error(SWT.ERROR_NULL_ARGUMENT); - - TypedListener typedListener = new TypedListener(listener); - addListener(SWT.Selection, typedListener); - addListener(SWT.DefaultSelection, typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } /** @@ -341,9 +334,8 @@ public void addSelectionListener(SelectionListener listener) { * @see #addSelectionListener(SelectionListener) */ public void removeSelectionListener(SelectionListener listener) { - checkWidget(); - removeListener(SWT.Selection, listener); - removeListener(SWT.DefaultSelection, listener); + removeTypedListener(SWT.Selection, listener); + removeTypedListener(SWT.DefaultSelection, listener); } /** @@ -353,8 +345,7 @@ public void removeSelectionListener(SelectionListener listener) { * @param listener */ public void removeTreeListener(SelectionListener listener) { - checkWidget(); - removeListener(SWT.Expand, listener); + removeTypedListener(SWT.Expand, listener); } /** @@ -365,10 +356,7 @@ public void removeTreeListener(SelectionListener listener) { * @param listener */ public void addTreeListener(TreeListener listener) { - checkWidget(); - if (listener == null) - SWT.error(SWT.ERROR_NULL_ARGUMENT); - addListener(SWT.Expand, new TypedListener(listener)); + addTypedListener(listener, SWT.Expand); } /** diff --git a/widgets/grid/org.eclipse.nebula.widgets.grid/META-INF/MANIFEST.MF b/widgets/grid/org.eclipse.nebula.widgets.grid/META-INF/MANIFEST.MF index abbc835d1..d9a68439b 100644 --- a/widgets/grid/org.eclipse.nebula.widgets.grid/META-INF/MANIFEST.MF +++ b/widgets/grid/org.eclipse.nebula.widgets.grid/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Nebula Grid Bundle-SymbolicName: org.eclipse.nebula.widgets.grid Bundle-Version: 1.1.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Bundle: org.eclipse.swt, +Require-Bundle: org.eclipse.swt;bundle-version="[3.126.0,4.0.0)", org.eclipse.jface;resolution:=optional Export-Package: org.eclipse.nebula.jface.gridviewer, org.eclipse.nebula.jface.gridviewer.internal;x-internal:=true, diff --git a/widgets/grid/org.eclipse.nebula.widgets.grid/src/org/eclipse/nebula/widgets/grid/Grid.java b/widgets/grid/org.eclipse.nebula.widgets.grid/src/org/eclipse/nebula/widgets/grid/Grid.java index 6bf7067f5..609ee1659 100644 --- a/widgets/grid/org.eclipse.nebula.widgets.grid/src/org/eclipse/nebula/widgets/grid/Grid.java +++ b/widgets/grid/org.eclipse.nebula.widgets.grid/src/org/eclipse/nebula/widgets/grid/Grid.java @@ -82,7 +82,6 @@ import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.ScrollBar; -import org.eclipse.swt.widgets.TypedListener; /** * The Grid widget is a spreadsheet/table component that offers features not @@ -956,12 +955,7 @@ public void setCellHeaderSelectionBackground(final Color cellSelectionBackground * */ public void addSelectionListener(final SelectionListener listener) { - checkWidget(); - if (listener == null) { - SWT.error(SWT.ERROR_NULL_ARGUMENT); - } - addListener(SWT.Selection, new TypedListener(listener)); - addListener(SWT.DefaultSelection, new TypedListener(listener)); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } /** @@ -987,13 +981,7 @@ public void addSelectionListener(final SelectionListener listener) { * @see org.eclipse.swt.events.TreeEvent */ public void addTreeListener(final TreeListener listener) { - checkWidget(); - if (listener == null) { - SWT.error(SWT.ERROR_NULL_ARGUMENT); - } - - addListener(SWT.Expand, new TypedListener(listener)); - addListener(SWT.Collapse, new TypedListener(listener)); + addTypedListener(listener, SWT.Expand, SWT.Collapse); } /** @@ -3273,9 +3261,8 @@ public void disposeAllItems() { * */ public void removeSelectionListener(final SelectionListener listener) { - checkWidget(); - removeListener(SWT.Selection, listener); - removeListener(SWT.DefaultSelection, listener); + removeTypedListener(SWT.Selection, listener); + removeTypedListener(SWT.DefaultSelection, listener); } /** @@ -3295,9 +3282,8 @@ public void removeSelectionListener(final SelectionListener listener) { * */ public void removeTreeListener(final TreeListener listener) { - checkWidget(); - removeListener(SWT.Expand, listener); - removeListener(SWT.Collapse, listener); + removeTypedListener(SWT.Expand, listener); + removeTypedListener(SWT.Collapse, listener); } /** diff --git a/widgets/grid/org.eclipse.nebula.widgets.grid/src/org/eclipse/nebula/widgets/grid/GridColumn.java b/widgets/grid/org.eclipse.nebula.widgets.grid/src/org/eclipse/nebula/widgets/grid/GridColumn.java index 868128312..bd0149e5b 100644 --- a/widgets/grid/org.eclipse.nebula.widgets.grid/src/org/eclipse/nebula/widgets/grid/GridColumn.java +++ b/widgets/grid/org.eclipse.nebula.widgets.grid/src/org/eclipse/nebula/widgets/grid/GridColumn.java @@ -37,7 +37,6 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Item; -import org.eclipse.swt.widgets.TypedListener; /** *

@@ -501,11 +500,7 @@ public int getSort() { * */ public void addSelectionListener(SelectionListener listener) { - checkWidget(); - if (listener == null) { - SWT.error(SWT.ERROR_NULL_ARGUMENT); - } - this.addListener(SWT.Selection, new TypedListener(listener)); + addTypedListener(listener, SWT.Selection); } /** @@ -525,8 +520,7 @@ public void addSelectionListener(SelectionListener listener) { * */ public void removeSelectionListener(SelectionListener listener) { - checkWidget(); - this.removeListener(SWT.Selection, listener); + removeTypedListener(SWT.Selection, listener); } /** @@ -813,13 +807,7 @@ public void setFooterRenderer(GridFooterRenderer footerRenderer) { * */ public void addControlListener(ControlListener listener) { - checkWidget(); - if (listener == null) { - SWT.error(SWT.ERROR_NULL_ARGUMENT); - } - TypedListener typedListener = new TypedListener(listener); - addListener(SWT.Resize, typedListener); - addListener(SWT.Move, typedListener); + addTypedListener(listener, SWT.Resize, SWT.Move); } /** @@ -840,12 +828,8 @@ public void addControlListener(ControlListener listener) { * */ public void removeControlListener(ControlListener listener) { - checkWidget(); - if (listener == null) { - SWT.error(SWT.ERROR_NULL_ARGUMENT); - } - removeListener(SWT.Resize, listener); - removeListener(SWT.Move, listener); + removeTypedListener(SWT.Resize, listener); + removeTypedListener(SWT.Move, listener); } /** diff --git a/widgets/grid/org.eclipse.nebula.widgets.grid/src/org/eclipse/nebula/widgets/grid/GridColumnGroup.java b/widgets/grid/org.eclipse.nebula.widgets.grid/src/org/eclipse/nebula/widgets/grid/GridColumnGroup.java index 9f1dda143..82c69eaa5 100644 --- a/widgets/grid/org.eclipse.nebula.widgets.grid/src/org/eclipse/nebula/widgets/grid/GridColumnGroup.java +++ b/widgets/grid/org.eclipse.nebula.widgets.grid/src/org/eclipse/nebula/widgets/grid/GridColumnGroup.java @@ -25,7 +25,6 @@ import org.eclipse.swt.graphics.Point; import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.widgets.Item; -import org.eclipse.swt.widgets.TypedListener; /** *

@@ -122,11 +121,7 @@ private void init(int style) { * @see #removeTreeListener */ public void addTreeListener(TreeListener listener) { - checkWidget (); - if (listener == null) SWT.error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Expand, typedListener); - addListener (SWT.Collapse, typedListener); + addTypedListener(listener, SWT.Expand, SWT.Collapse); } /** @@ -147,10 +142,8 @@ public void addTreeListener(TreeListener listener) { * @see #addTreeListener */ public void removeTreeListener(TreeListener listener) { - checkWidget (); - if (listener == null) SWT.error (SWT.ERROR_NULL_ARGUMENT); - removeListener (SWT.Expand, listener); - removeListener (SWT.Collapse, listener); + removeTypedListener(SWT.Expand, listener); + removeTypedListener(SWT.Collapse, listener); } /** diff --git a/widgets/grid/org.eclipse.nebula.widgets.grid/src/org/eclipse/nebula/widgets/grid/GridItem.java b/widgets/grid/org.eclipse.nebula.widgets.grid/src/org/eclipse/nebula/widgets/grid/GridItem.java index d3df21717..d8b44f3e2 100644 --- a/widgets/grid/org.eclipse.nebula.widgets.grid/src/org/eclipse/nebula/widgets/grid/GridItem.java +++ b/widgets/grid/org.eclipse.nebula.widgets.grid/src/org/eclipse/nebula/widgets/grid/GridItem.java @@ -30,7 +30,6 @@ import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Item; -import org.eclipse.swt.widgets.TypedListener; /** *

@@ -348,11 +347,7 @@ public void dispose() { * */ public void addControlListener(ControlListener listener) { - checkWidget(); - if (listener == null) - SWT.error(SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener(listener); - addListener(SWT.Resize, typedListener); + addTypedListener(listener, SWT.Resize); } /** @@ -375,10 +370,7 @@ public void addControlListener(ControlListener listener) { * */ public void removeControlListener(ControlListener listener) { - checkWidget(); - if (listener == null) - SWT.error(SWT.ERROR_NULL_ARGUMENT); - removeListener(SWT.Resize, listener); + removeTypedListener(SWT.Resize, listener); } /** diff --git a/widgets/nebulaslider/org.eclipse.nebula.widgets.nebulaslider/META-INF/MANIFEST.MF b/widgets/nebulaslider/org.eclipse.nebula.widgets.nebulaslider/META-INF/MANIFEST.MF index 6f089ba05..addd9a5df 100644 --- a/widgets/nebulaslider/org.eclipse.nebula.widgets.nebulaslider/META-INF/MANIFEST.MF +++ b/widgets/nebulaslider/org.eclipse.nebula.widgets.nebulaslider/META-INF/MANIFEST.MF @@ -6,6 +6,6 @@ Bundle-Version: 1.1.0.qualifier Bundle-Vendor: Eclipse Nebula Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.nebula.widgets.opal.commons;bundle-version="1.0.0";visibility:=reexport, - org.eclipse.swt + org.eclipse.swt;bundle-version="[3.126.0,4.0.0)" Export-Package: org.eclipse.nebula.widgets.opal.nebulaslider Automatic-Module-Name: org.eclipse.nebula.widgets.nebulaslider diff --git a/widgets/nebulaslider/org.eclipse.nebula.widgets.nebulaslider/src/org/eclipse/nebula/widgets/opal/nebulaslider/NebulaSlider.java b/widgets/nebulaslider/org.eclipse.nebula.widgets.nebulaslider/src/org/eclipse/nebula/widgets/opal/nebulaslider/NebulaSlider.java index 0823a1fb0..52264c505 100644 --- a/widgets/nebulaslider/org.eclipse.nebula.widgets.nebulaslider/src/org/eclipse/nebula/widgets/opal/nebulaslider/NebulaSlider.java +++ b/widgets/nebulaslider/org.eclipse.nebula.widgets.nebulaslider/src/org/eclipse/nebula/widgets/opal/nebulaslider/NebulaSlider.java @@ -333,8 +333,7 @@ private void addMouseListeners() { * @see SelectionEvent */ public void addSelectionListener(final SelectionListener listener) { - checkWidget(); - SelectionListenerUtil.addSelectionListener(this, listener); + addTypedListener(listener, SWT.Selection); } /** @@ -367,8 +366,7 @@ public Point computeSize(final int wHint, final int hHint, final boolean changed * @see #addSelectionListener */ public void removeSelectionListener(final SelectionListener listener) { - checkWidget(); - SelectionListenerUtil.removeSelectionListener(this, listener); + removeTypedListener(SWT.Selection, listener); } // ----------------------- Getters & Setters diff --git a/widgets/opal/checkboxgroup/org.eclipse.nebula.widgets.opal.checkboxgroup/META-INF/MANIFEST.MF b/widgets/opal/checkboxgroup/org.eclipse.nebula.widgets.opal.checkboxgroup/META-INF/MANIFEST.MF index 2601bbd49..def58807c 100644 --- a/widgets/opal/checkboxgroup/org.eclipse.nebula.widgets.opal.checkboxgroup/META-INF/MANIFEST.MF +++ b/widgets/opal/checkboxgroup/org.eclipse.nebula.widgets.opal.checkboxgroup/META-INF/MANIFEST.MF @@ -6,6 +6,6 @@ Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Nebula Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.nebula.widgets.opal.commons;bundle-version="1.0.0";visibility:=reexport, - org.eclipse.swt + org.eclipse.swt;bundle-version="[3.126.0,4.0.0)" Export-Package: org.eclipse.nebula.widgets.opal.checkboxgroup Automatic-Module-Name: org.eclipse.nebula.widgets.opal.checkboxgroup diff --git a/widgets/opal/checkboxgroup/org.eclipse.nebula.widgets.opal.checkboxgroup/src/org/eclipse/nebula/widgets/opal/checkboxgroup/CheckBoxGroup.java b/widgets/opal/checkboxgroup/org.eclipse.nebula.widgets.opal.checkboxgroup/src/org/eclipse/nebula/widgets/opal/checkboxgroup/CheckBoxGroup.java index f1a18f543..e8f3d9459 100644 --- a/widgets/opal/checkboxgroup/org.eclipse.nebula.widgets.opal.checkboxgroup/src/org/eclipse/nebula/widgets/opal/checkboxgroup/CheckBoxGroup.java +++ b/widgets/opal/checkboxgroup/org.eclipse.nebula.widgets.opal.checkboxgroup/src/org/eclipse/nebula/widgets/opal/checkboxgroup/CheckBoxGroup.java @@ -157,8 +157,7 @@ public void activate() { * @see SelectionEvent */ public void addSelectionListener(final SelectionListener listener) { - checkWidget(); - SelectionListenerUtil.addSelectionListener(this, listener); + addTypedListener(listener, SWT.Selection); } /** @@ -207,8 +206,7 @@ public Layout getLayout() { * @see #addSelectionListener */ public void removeSelectionListener(final SelectionListener listener) { - checkWidget(); - SelectionListenerUtil.removeSelectionListener(this, listener); + removeTypedListener(SWT.Selection, listener); } diff --git a/widgets/opal/columnbrowser/org.eclipse.nebula.widgets.opal.columnbrowser/META-INF/MANIFEST.MF b/widgets/opal/columnbrowser/org.eclipse.nebula.widgets.opal.columnbrowser/META-INF/MANIFEST.MF index 8278d1f08..32dc36b7b 100644 --- a/widgets/opal/columnbrowser/org.eclipse.nebula.widgets.opal.columnbrowser/META-INF/MANIFEST.MF +++ b/widgets/opal/columnbrowser/org.eclipse.nebula.widgets.opal.columnbrowser/META-INF/MANIFEST.MF @@ -6,6 +6,6 @@ Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Nebula Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.nebula.widgets.opal.commons;bundle-version="1.0.0";visibility:=reexport, - org.eclipse.swt + org.eclipse.swt;bundle-version="[3.126.0,4.0.0)" Export-Package: org.eclipse.nebula.widgets.opal.columnbrowser Automatic-Module-Name: org.eclipse.nebula.widgets.opal.columnbrowser diff --git a/widgets/opal/columnbrowser/org.eclipse.nebula.widgets.opal.columnbrowser/src/org/eclipse/nebula/widgets/opal/columnbrowser/ColumnBrowserWidget.java b/widgets/opal/columnbrowser/org.eclipse.nebula.widgets.opal.columnbrowser/src/org/eclipse/nebula/widgets/opal/columnbrowser/ColumnBrowserWidget.java index d0c45c676..3ff8b287a 100644 --- a/widgets/opal/columnbrowser/org.eclipse.nebula.widgets.opal.columnbrowser/src/org/eclipse/nebula/widgets/opal/columnbrowser/ColumnBrowserWidget.java +++ b/widgets/opal/columnbrowser/org.eclipse.nebula.widgets.opal.columnbrowser/src/org/eclipse/nebula/widgets/opal/columnbrowser/ColumnBrowserWidget.java @@ -325,8 +325,7 @@ void updateContent() { * @see SelectionEvent */ public void addSelectionListener(final SelectionListener listener) { - checkWidget(); - SelectionListenerUtil.addSelectionListener(this, listener); + addTypedListener(listener, SWT.Selection); } /** @@ -405,8 +404,7 @@ public ColumnItem getSelection() { * @see #addSelectionListener */ public void removeSelectionListener(final SelectionListener listener) { - checkWidget(); - SelectionListenerUtil.removeSelectionListener(this, listener); + removeTypedListener(SWT.Selection, listener); } /** diff --git a/widgets/opal/commons/org.eclipse.nebula.widgets.opal.commons/META-INF/MANIFEST.MF b/widgets/opal/commons/org.eclipse.nebula.widgets.opal.commons/META-INF/MANIFEST.MF index fd459e63d..03439f382 100644 --- a/widgets/opal/commons/org.eclipse.nebula.widgets.opal.commons/META-INF/MANIFEST.MF +++ b/widgets/opal/commons/org.eclipse.nebula.widgets.opal.commons/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Nebula Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.equinox.common, - org.eclipse.swt + org.eclipse.swt;bundle-version="[3.126.0,4.0.0)" Export-Package: org.eclipse.nebula.widgets.opal.commons, org.eclipse.nebula.widgets.opal.commons.resources Automatic-Module-Name: org.eclipse.nebula.widgets.opal.commons diff --git a/widgets/opal/commons/org.eclipse.nebula.widgets.opal.commons/src/org/eclipse/nebula/widgets/opal/commons/SelectionListenerUtil.java b/widgets/opal/commons/org.eclipse.nebula.widgets.opal.commons/src/org/eclipse/nebula/widgets/opal/commons/SelectionListenerUtil.java index 661fb9549..dfab92269 100644 --- a/widgets/opal/commons/org.eclipse.nebula.widgets.opal.commons/src/org/eclipse/nebula/widgets/opal/commons/SelectionListenerUtil.java +++ b/widgets/opal/commons/org.eclipse.nebula.widgets.opal.commons/src/org/eclipse/nebula/widgets/opal/commons/SelectionListenerUtil.java @@ -18,7 +18,6 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Listener; -import org.eclipse.swt.widgets.TypedListener; public class SelectionListenerUtil { /** @@ -27,11 +26,12 @@ public class SelectionListenerUtil { * @param control control on which the selection listener is added * @param listener listener to add */ + @Deprecated(forRemoval = true) public static void addSelectionListener(final Control control, final SelectionListener listener) { if (listener == null) { SWT.error(SWT.ERROR_NULL_ARGUMENT); } - TypedListener typedListener = new TypedListener(listener); + var typedListener = new org.eclipse.swt.widgets.TypedListener(listener); control.addListener(SWT.Selection, typedListener); } @@ -41,20 +41,13 @@ public static void addSelectionListener(final Control control, final SelectionLi * @param control control on which the selection listener is removed * @param listener listener to remove */ + @Deprecated(forRemoval = true) public static void removeSelectionListener(final Control control, final SelectionListener listener) { if (listener == null) { SWT.error(SWT.ERROR_NULL_ARGUMENT); } - final Listener[] listeners = control.getListeners(SWT.Selection); - for (Listener l : listeners) { - if (l instanceof TypedListener) { - TypedListener typedListener = (TypedListener) l; - if (typedListener.getEventListener() == listener) { - ReflectionUtils.callMethod(control, "removeListener", SWT.Selection, ((TypedListener) l).getEventListener()); - return; - } - } - } + control.getTypedListeners(SWT.Selection, SelectionListener.class) + .forEach(l -> ReflectionUtils.callMethod(control, "removeListener", SWT.Selection, l)); } /** diff --git a/widgets/opal/duallist/org.eclipse.nebula.widgets.opal.duallist/META-INF/MANIFEST.MF b/widgets/opal/duallist/org.eclipse.nebula.widgets.opal.duallist/META-INF/MANIFEST.MF index 42ec98905..53813b193 100644 --- a/widgets/opal/duallist/org.eclipse.nebula.widgets.opal.duallist/META-INF/MANIFEST.MF +++ b/widgets/opal/duallist/org.eclipse.nebula.widgets.opal.duallist/META-INF/MANIFEST.MF @@ -6,6 +6,6 @@ Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Nebula Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.nebula.widgets.opal.commons;bundle-version="1.0.0";visibility:=reexport, - org.eclipse.swt + org.eclipse.swt;bundle-version="[3.126.0,4.0.0)" Export-Package: org.eclipse.nebula.widgets.opal.duallist Automatic-Module-Name: org.eclipse.nebula.widgets.opal.duallist diff --git a/widgets/opal/duallist/org.eclipse.nebula.widgets.opal.duallist/src/org/eclipse/nebula/widgets/opal/duallist/DualList.java b/widgets/opal/duallist/org.eclipse.nebula.widgets.opal.duallist/src/org/eclipse/nebula/widgets/opal/duallist/DualList.java index f7f735252..72fe280fe 100644 --- a/widgets/opal/duallist/org.eclipse.nebula.widgets.opal.duallist/src/org/eclipse/nebula/widgets/opal/duallist/DualList.java +++ b/widgets/opal/duallist/org.eclipse.nebula.widgets.opal.duallist/src/org/eclipse/nebula/widgets/opal/duallist/DualList.java @@ -306,11 +306,7 @@ public void add(final DLItem item, final int index) { * @see SelectionEvent */ public void addSelectionListener(final SelectionListener listener) { - checkWidget(); - if (listener == null) { - SWT.error(SWT.ERROR_NULL_ARGUMENT); - } - SelectionListenerUtil.addSelectionListener(this, listener); + addTypedListener(listener, SWT.Selection); } /** @@ -335,8 +331,7 @@ public void addSelectionListener(final SelectionListener listener) { * @see #addSelectionListener */ public void removeSelectionListener(final SelectionListener listener) { - checkWidget(); - SelectionListenerUtil.removeSelectionListener(this, listener); + removeTypedListener(SWT.Selection, listener); } /** diff --git a/widgets/opal/duallist/org.eclipse.nebula.widgets.opal.duallist/src/org/eclipse/nebula/widgets/opal/duallist/SelectionChangeListener.java b/widgets/opal/duallist/org.eclipse.nebula.widgets.opal.duallist/src/org/eclipse/nebula/widgets/opal/duallist/SelectionChangeListener.java index 3a92ce33a..14a588c6e 100644 --- a/widgets/opal/duallist/org.eclipse.nebula.widgets.opal.duallist/src/org/eclipse/nebula/widgets/opal/duallist/SelectionChangeListener.java +++ b/widgets/opal/duallist/org.eclipse.nebula.widgets.opal.duallist/src/org/eclipse/nebula/widgets/opal/duallist/SelectionChangeListener.java @@ -12,7 +12,7 @@ *******************************************************************************/ package org.eclipse.nebula.widgets.opal.duallist; -import org.eclipse.swt.internal.SWTEventListener; +import java.util.EventListener; /** * Classes which implement this interface provide methods that deal with the @@ -27,9 +27,8 @@ * * @see SelectionChangeEvent */ -@SuppressWarnings("restriction") @FunctionalInterface -public interface SelectionChangeListener extends SWTEventListener { +public interface SelectionChangeListener extends EventListener { /** * Sent when selection occurs in the control. diff --git a/widgets/opal/horizontalspinner/org.eclipse.nebula.widgets.opal.horizontalspinner/META-INF/MANIFEST.MF b/widgets/opal/horizontalspinner/org.eclipse.nebula.widgets.opal.horizontalspinner/META-INF/MANIFEST.MF index 3a2d9d221..5ca2fd5aa 100644 --- a/widgets/opal/horizontalspinner/org.eclipse.nebula.widgets.opal.horizontalspinner/META-INF/MANIFEST.MF +++ b/widgets/opal/horizontalspinner/org.eclipse.nebula.widgets.opal.horizontalspinner/META-INF/MANIFEST.MF @@ -6,6 +6,6 @@ Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Nebula Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.nebula.widgets.opal.commons;bundle-version="1.0.0";visibility:=reexport, - org.eclipse.swt + org.eclipse.swt;bundle-version="[3.126.0,4.0.0)" Export-Package: org.eclipse.nebula.widgets.opal.horizontalspinner Automatic-Module-Name: org.eclipse.nebula.widgets.opal.horizontalspinner diff --git a/widgets/opal/horizontalspinner/org.eclipse.nebula.widgets.opal.horizontalspinner/src/org/eclipse/nebula/widgets/opal/horizontalspinner/HorizontalSpinner.java b/widgets/opal/horizontalspinner/org.eclipse.nebula.widgets.opal.horizontalspinner/src/org/eclipse/nebula/widgets/opal/horizontalspinner/HorizontalSpinner.java index ec8aec15b..4ebd57c6a 100644 --- a/widgets/opal/horizontalspinner/org.eclipse.nebula.widgets.opal.horizontalspinner/src/org/eclipse/nebula/widgets/opal/horizontalspinner/HorizontalSpinner.java +++ b/widgets/opal/horizontalspinner/org.eclipse.nebula.widgets.opal.horizontalspinner/src/org/eclipse/nebula/widgets/opal/horizontalspinner/HorizontalSpinner.java @@ -363,8 +363,7 @@ public void addModifyListener(final ModifyListener listener) { * @see SelectionEvent */ public void addSelectionListener(final SelectionListener listener) { - checkWidget(); - SelectionListenerUtil.addSelectionListener(this, listener); + addTypedListener(listener, SWT.Selection); } /** @@ -627,8 +626,7 @@ public void removeModifyListener(final ModifyListener listener) { * @see #addSelectionListener */ public void removeSelectionListener(final SelectionListener listener) { - checkWidget(); - SelectionListenerUtil.removeSelectionListener(this, listener); + removeTypedListener(SWT.Selection, listener); } /** diff --git a/widgets/opal/launcher/org.eclipse.nebula.widgets.opal.launcher/META-INF/MANIFEST.MF b/widgets/opal/launcher/org.eclipse.nebula.widgets.opal.launcher/META-INF/MANIFEST.MF index 5173d7cea..f1238bf99 100644 --- a/widgets/opal/launcher/org.eclipse.nebula.widgets.opal.launcher/META-INF/MANIFEST.MF +++ b/widgets/opal/launcher/org.eclipse.nebula.widgets.opal.launcher/META-INF/MANIFEST.MF @@ -6,6 +6,6 @@ Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Nebula Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.nebula.widgets.opal.commons;bundle-version="1.0.0";visibility:=reexport, - org.eclipse.swt + org.eclipse.swt;bundle-version="[3.126.0,4.0.0)" Export-Package: org.eclipse.nebula.widgets.opal.launcher Automatic-Module-Name: org.eclipse.nebula.widgets.opal.launcher diff --git a/widgets/opal/launcher/org.eclipse.nebula.widgets.opal.launcher/src/org/eclipse/nebula/widgets/opal/launcher/Launcher.java b/widgets/opal/launcher/org.eclipse.nebula.widgets.opal.launcher/src/org/eclipse/nebula/widgets/opal/launcher/Launcher.java index 1f5039e3c..204ce120f 100644 --- a/widgets/opal/launcher/org.eclipse.nebula.widgets.opal.launcher/src/org/eclipse/nebula/widgets/opal/launcher/Launcher.java +++ b/widgets/opal/launcher/org.eclipse.nebula.widgets.opal.launcher/src/org/eclipse/nebula/widgets/opal/launcher/Launcher.java @@ -152,8 +152,7 @@ private void addListenerToLabel(final LauncherLabel label) { * @see SelectionEvent */ public void addSelectionListener(final SelectionListener listener) { - checkWidget(); - SelectionListenerUtil.addSelectionListener(this, listener); + addTypedListener(listener, SWT.Selection); } /** @@ -395,11 +394,7 @@ private void handleKeyPressedEvent(final Event event) { * @see #addSelectionListener */ public void removeSelectionListener(final SelectionListener listener) { - checkWidget(); - if (listener == null) { - SWT.error(SWT.ERROR_NULL_ARGUMENT); - } - SelectionListenerUtil.removeSelectionListener(this, listener); + removeTypedListener(SWT.Selection, listener); } /** diff --git a/widgets/opal/rangeslider/org.eclipse.nebula.widgets.opal.rangeslider/META-INF/MANIFEST.MF b/widgets/opal/rangeslider/org.eclipse.nebula.widgets.opal.rangeslider/META-INF/MANIFEST.MF index 956dd832f..f9784aa50 100644 --- a/widgets/opal/rangeslider/org.eclipse.nebula.widgets.opal.rangeslider/META-INF/MANIFEST.MF +++ b/widgets/opal/rangeslider/org.eclipse.nebula.widgets.opal.rangeslider/META-INF/MANIFEST.MF @@ -6,6 +6,6 @@ Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Nebula Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.nebula.widgets.opal.commons;bundle-version="1.0.0";visibility:=reexport, - org.eclipse.swt + org.eclipse.swt;bundle-version="[3.126.0,4.0.0)" Export-Package: org.eclipse.nebula.widgets.opal.rangeslider Automatic-Module-Name: org.eclipse.nebula.widgets.opal.rangeslider diff --git a/widgets/opal/rangeslider/org.eclipse.nebula.widgets.opal.rangeslider/src/org/eclipse/nebula/widgets/opal/rangeslider/RangeSlider.java b/widgets/opal/rangeslider/org.eclipse.nebula.widgets.opal.rangeslider/src/org/eclipse/nebula/widgets/opal/rangeslider/RangeSlider.java index 9d63c190e..28abd3a3a 100644 --- a/widgets/opal/rangeslider/org.eclipse.nebula.widgets.opal.rangeslider/src/org/eclipse/nebula/widgets/opal/rangeslider/RangeSlider.java +++ b/widgets/opal/rangeslider/org.eclipse.nebula.widgets.opal.rangeslider/src/org/eclipse/nebula/widgets/opal/rangeslider/RangeSlider.java @@ -1126,8 +1126,7 @@ private void translateValues(int amount) { * @see #removeSelectionListener */ public void addSelectionListener(final SelectionListener listener) { - checkWidget(); - SelectionListenerUtil.addSelectionListener(this, listener); + addTypedListener(listener, SWT.Selection); } /** @@ -1320,8 +1319,7 @@ public int getUpperValue() { * @see #addSelectionListener */ public void removeSelectionListener(final SelectionListener listener) { - checkWidget(); - SelectionListenerUtil.removeSelectionListener(this, listener); + removeTypedListener(SWT.Selection, listener); } /** diff --git a/widgets/opal/starrating/org.eclipse.nebula.widgets.opal.starrating/META-INF/MANIFEST.MF b/widgets/opal/starrating/org.eclipse.nebula.widgets.opal.starrating/META-INF/MANIFEST.MF index 68539dcf2..bdec4117d 100644 --- a/widgets/opal/starrating/org.eclipse.nebula.widgets.opal.starrating/META-INF/MANIFEST.MF +++ b/widgets/opal/starrating/org.eclipse.nebula.widgets.opal.starrating/META-INF/MANIFEST.MF @@ -6,6 +6,6 @@ Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Nebula Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.nebula.widgets.opal.commons;bundle-version="1.0.0";visibility:=reexport, - org.eclipse.swt + org.eclipse.swt;bundle-version="[3.126.0,4.0.0)" Export-Package: org.eclipse.nebula.widgets.opal.starrating Automatic-Module-Name: org.eclipse.nebula.widgets.opal.starrating diff --git a/widgets/opal/starrating/org.eclipse.nebula.widgets.opal.starrating/src/org/eclipse/nebula/widgets/opal/starrating/StarRating.java b/widgets/opal/starrating/org.eclipse.nebula.widgets.opal.starrating/src/org/eclipse/nebula/widgets/opal/starrating/StarRating.java index f6c8e0a81..3a2826920 100644 --- a/widgets/opal/starrating/org.eclipse.nebula.widgets.opal.starrating/src/org/eclipse/nebula/widgets/opal/starrating/StarRating.java +++ b/widgets/opal/starrating/org.eclipse.nebula.widgets.opal.starrating/src/org/eclipse/nebula/widgets/opal/starrating/StarRating.java @@ -222,8 +222,7 @@ private void onDispose(final Event event) { * @see SelectionEvent */ public void addSelectionListener(final SelectionListener listener) { - checkWidget(); - SelectionListenerUtil.addSelectionListener(this, listener); + addTypedListener(listener, SWT.Selection); } /** @@ -323,8 +322,7 @@ public SIZE getSizeOfStars() { * @see #addSelectionListener */ public void removeSelectionListener(final SelectionListener listener) { - checkWidget(); - SelectionListenerUtil.removeSelectionListener(this, listener); + removeTypedListener(SWT.Selection, listener); } /** diff --git a/widgets/opal/switchbutton/org.eclipse.nebula.widgets.opal.switchbutton/META-INF/MANIFEST.MF b/widgets/opal/switchbutton/org.eclipse.nebula.widgets.opal.switchbutton/META-INF/MANIFEST.MF index 8e7098337..8e880352a 100644 --- a/widgets/opal/switchbutton/org.eclipse.nebula.widgets.opal.switchbutton/META-INF/MANIFEST.MF +++ b/widgets/opal/switchbutton/org.eclipse.nebula.widgets.opal.switchbutton/META-INF/MANIFEST.MF @@ -6,6 +6,6 @@ Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Nebula Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.nebula.widgets.opal.commons;bundle-version="1.0.0";visibility:=reexport, - org.eclipse.swt + org.eclipse.swt;bundle-version="[3.126.0,4.0.0)" Export-Package: org.eclipse.nebula.widgets.opal.switchbutton Automatic-Module-Name: org.eclipse.nebula.widgets.opal.switchbutton diff --git a/widgets/opal/switchbutton/org.eclipse.nebula.widgets.opal.switchbutton/src/org/eclipse/nebula/widgets/opal/switchbutton/SwitchButton.java b/widgets/opal/switchbutton/org.eclipse.nebula.widgets.opal.switchbutton/src/org/eclipse/nebula/widgets/opal/switchbutton/SwitchButton.java index 4a4a576d6..ec2c6c64c 100644 --- a/widgets/opal/switchbutton/org.eclipse.nebula.widgets.opal.switchbutton/src/org/eclipse/nebula/widgets/opal/switchbutton/SwitchButton.java +++ b/widgets/opal/switchbutton/org.eclipse.nebula.widgets.opal.switchbutton/src/org/eclipse/nebula/widgets/opal/switchbutton/SwitchButton.java @@ -403,8 +403,7 @@ private void drawBorder() { * @see SelectionEvent */ public void addSelectionListener(final SelectionListener listener) { - checkWidget(); - SelectionListenerUtil.addSelectionListener(this, listener); + addTypedListener(listener, SWT.Selection); } /** @@ -429,8 +428,7 @@ public void addSelectionListener(final SelectionListener listener) { * @see #addSelectionListener */ public void removeSelectionListener(final SelectionListener listener) { - checkWidget(); - SelectionListenerUtil.removeSelectionListener(this, listener); + removeTypedListener(SWT.Selection, listener); } /** diff --git a/widgets/pgroup/org.eclipse.nebula.widgets.pgroup/META-INF/MANIFEST.MF b/widgets/pgroup/org.eclipse.nebula.widgets.pgroup/META-INF/MANIFEST.MF index 71344fb5a..11456f1cf 100644 --- a/widgets/pgroup/org.eclipse.nebula.widgets.pgroup/META-INF/MANIFEST.MF +++ b/widgets/pgroup/org.eclipse.nebula.widgets.pgroup/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Nebula PGroup Bundle-SymbolicName: org.eclipse.nebula.widgets.pgroup Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Nebula -Require-Bundle: org.eclipse.swt +Require-Bundle: org.eclipse.swt;bundle-version="[3.126.0,4.0.0)" Export-Package: org.eclipse.nebula.widgets.pgroup, org.eclipse.nebula.widgets.pgroup.internal;x-internal:=true Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/widgets/pgroup/org.eclipse.nebula.widgets.pgroup/src/org/eclipse/nebula/widgets/pgroup/PGroup.java b/widgets/pgroup/org.eclipse.nebula.widgets.pgroup/src/org/eclipse/nebula/widgets/pgroup/PGroup.java index 2ed4b253c..b330306d5 100644 --- a/widgets/pgroup/org.eclipse.nebula.widgets.pgroup/src/org/eclipse/nebula/widgets/pgroup/PGroup.java +++ b/widgets/pgroup/org.eclipse.nebula.widgets.pgroup/src/org/eclipse/nebula/widgets/pgroup/PGroup.java @@ -37,7 +37,6 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Listener; -import org.eclipse.swt.widgets.TypedListener; import org.eclipse.swt.widgets.Widget; /** @@ -692,13 +691,7 @@ private void onDispose() */ public void addExpandListener(ExpandListener listener) { - checkWidget(); - if (listener == null) - SWT.error(SWT.ERROR_NULL_ARGUMENT); - - TypedListener typedListener = new TypedListener(listener); - addListener(SWT.Expand, typedListener); - addListener(SWT.Collapse, typedListener); + addTypedListener(listener, SWT.Expand, SWT.Collapse); } /** @@ -720,12 +713,8 @@ public void addExpandListener(ExpandListener listener) */ public void removeExpandListener(ExpandListener listener) { - checkWidget(); - if (listener == null) - SWT.error(SWT.ERROR_NULL_ARGUMENT); - - removeListener(SWT.Expand, listener); - removeListener(SWT.Collapse, listener); + removeTypedListener(SWT.Expand, listener); + removeTypedListener(SWT.Collapse, listener); } /** diff --git a/widgets/pgroup/org.eclipse.nebula.widgets.pgroup/src/org/eclipse/nebula/widgets/pgroup/PGroupToolItem.java b/widgets/pgroup/org.eclipse.nebula.widgets.pgroup/src/org/eclipse/nebula/widgets/pgroup/PGroupToolItem.java index 3becfde58..46e2bff91 100644 --- a/widgets/pgroup/org.eclipse.nebula.widgets.pgroup/src/org/eclipse/nebula/widgets/pgroup/PGroupToolItem.java +++ b/widgets/pgroup/org.eclipse.nebula.widgets.pgroup/src/org/eclipse/nebula/widgets/pgroup/PGroupToolItem.java @@ -18,7 +18,6 @@ import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Item; -import org.eclipse.swt.widgets.TypedListener; /** * Instances of this class represent a selectable user interface object that @@ -76,14 +75,12 @@ public boolean getSelection() { } public void addSelectionListener(SelectionListener listener) { - TypedListener typedListener = new TypedListener(listener); - addListener(SWT.Selection, typedListener); - addListener(SWT.DefaultSelection, typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } public void removeSelectionListener(SelectionListener listener) { - removeListener(SWT.Selection, listener); - removeListener(SWT.DefaultSelection, listener); + removeTypedListener(SWT.Selection, listener); + removeTypedListener(SWT.DefaultSelection, listener); } void setDropDownArea(Rectangle dropdownArea) { diff --git a/widgets/pshelf/org.eclipse.nebula.widgets.pshelf/META-INF/MANIFEST.MF b/widgets/pshelf/org.eclipse.nebula.widgets.pshelf/META-INF/MANIFEST.MF index d4ac96277..3380dfdcf 100644 --- a/widgets/pshelf/org.eclipse.nebula.widgets.pshelf/META-INF/MANIFEST.MF +++ b/widgets/pshelf/org.eclipse.nebula.widgets.pshelf/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Nebula PShelf Bundle-SymbolicName: org.eclipse.nebula.widgets.pshelf Bundle-Version: 1.1.0.qualifier Bundle-Vendor: Eclipse Nebula -Require-Bundle: org.eclipse.swt, +Require-Bundle: org.eclipse.swt;bundle-version="[3.126.0,4.0.0)", org.eclipse.jface, org.eclipse.core.runtime, org.eclipse.nebula.widgets.opal.commons diff --git a/widgets/pshelf/org.eclipse.nebula.widgets.pshelf/src/org/eclipse/nebula/widgets/pshelf/PShelf.java b/widgets/pshelf/org.eclipse.nebula.widgets.pshelf/src/org/eclipse/nebula/widgets/pshelf/PShelf.java index 7e02b8dc1..2c7d2e31e 100644 --- a/widgets/pshelf/org.eclipse.nebula.widgets.pshelf/src/org/eclipse/nebula/widgets/pshelf/PShelf.java +++ b/widgets/pshelf/org.eclipse.nebula.widgets.pshelf/src/org/eclipse/nebula/widgets/pshelf/PShelf.java @@ -25,7 +25,6 @@ import org.eclipse.swt.widgets.Canvas; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Event; -import org.eclipse.swt.widgets.TypedListener; /** *

@@ -594,11 +593,7 @@ public PShelfItem[] getItems() * @see SelectionEvent */ public void addSelectionListener(SelectionListener listener) { - checkWidget (); - if (listener == null) SWT.error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener(listener); - addListener(SWT.Selection,typedListener); - addListener(SWT.DefaultSelection,typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } /** @@ -619,11 +614,8 @@ public void addSelectionListener(SelectionListener listener) { * @see #addSelectionListener */ public void removeSelectionListener (SelectionListener listener) { - checkWidget (); - if (listener == null) SWT.error (SWT.ERROR_NULL_ARGUMENT); - - removeListener(SWT.Selection, listener); - removeListener(SWT.DefaultSelection,listener); + removeTypedListener(SWT.Selection, listener); + removeTypedListener(SWT.DefaultSelection,listener); } /** diff --git a/widgets/radiogroup/org.eclipse.nebula.widgets.radiogroup/META-INF/MANIFEST.MF b/widgets/radiogroup/org.eclipse.nebula.widgets.radiogroup/META-INF/MANIFEST.MF index 0b785ffc4..ae210af93 100644 --- a/widgets/radiogroup/org.eclipse.nebula.widgets.radiogroup/META-INF/MANIFEST.MF +++ b/widgets/radiogroup/org.eclipse.nebula.widgets.radiogroup/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 0.1.0.qualifier Bundle-Vendor: Eclipse Nebula Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.equinox.common, - org.eclipse.swt, + org.eclipse.swt;bundle-version="[3.126.0,4.0.0)", org.eclipse.jface, org.eclipse.core.databinding;bundle-version="1.2.0", org.eclipse.core.databinding.property;bundle-version="1.2.0", diff --git a/widgets/radiogroup/org.eclipse.nebula.widgets.radiogroup/src/org/eclipse/nebula/widgets/radiogroup/RadioGroup.java b/widgets/radiogroup/org.eclipse.nebula.widgets.radiogroup/src/org/eclipse/nebula/widgets/radiogroup/RadioGroup.java index 718c0418c..7a0676a73 100644 --- a/widgets/radiogroup/org.eclipse.nebula.widgets.radiogroup/src/org/eclipse/nebula/widgets/radiogroup/RadioGroup.java +++ b/widgets/radiogroup/org.eclipse.nebula.widgets.radiogroup/src/org/eclipse/nebula/widgets/radiogroup/RadioGroup.java @@ -26,7 +26,6 @@ import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Item; import org.eclipse.swt.widgets.Layout; -import org.eclipse.swt.widgets.TypedListener; import org.eclipse.swt.widgets.Widget; /** @@ -199,13 +198,7 @@ void addItem(RadioItem item, int position) { * @see SelectionEvent */ public void addSelectionListener(SelectionListener listener) { - checkWidget(); - if (listener == null) { - SWT.error(SWT.ERROR_NULL_ARGUMENT); - } - final TypedListener typedListener = new TypedListener(listener); - addListener(SWT.Selection, typedListener); - addListener(SWT.DefaultSelection, typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } private int checkAddPosition(int position) { @@ -573,9 +566,8 @@ void removeItem(RadioItem item) { * @see #addSelectionListener */ public void removeSelectionListener(SelectionListener listener) { - checkWidget(); - removeListener(SWT.Selection, listener); - removeListener(SWT.DefaultSelection, listener); + removeTypedListener(SWT.Selection, listener); + removeTypedListener(SWT.DefaultSelection, listener); } /** diff --git a/widgets/roundedcheckbox/org.eclipse.nebula.widgets.roundedcheckbox/META-INF/MANIFEST.MF b/widgets/roundedcheckbox/org.eclipse.nebula.widgets.roundedcheckbox/META-INF/MANIFEST.MF index bdccdab1d..0565ac1b7 100644 --- a/widgets/roundedcheckbox/org.eclipse.nebula.widgets.roundedcheckbox/META-INF/MANIFEST.MF +++ b/widgets/roundedcheckbox/org.eclipse.nebula.widgets.roundedcheckbox/META-INF/MANIFEST.MF @@ -6,6 +6,6 @@ Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Nebula Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.nebula.widgets.opal.commons;bundle-version="1.0.0";visibility:=reexport, - org.eclipse.swt + org.eclipse.swt;bundle-version="[3.126.0,4.0.0)" Export-Package: org.eclipse.nebula.widgets.roundedcheckbox Automatic-Module-Name: org.eclipse.nebula.widgets.roundedcheckbox diff --git a/widgets/roundedcheckbox/org.eclipse.nebula.widgets.roundedcheckbox/src/org/eclipse/nebula/widgets/roundedcheckbox/RoundedCheckbox.java b/widgets/roundedcheckbox/org.eclipse.nebula.widgets.roundedcheckbox/src/org/eclipse/nebula/widgets/roundedcheckbox/RoundedCheckbox.java index 4600c1f43..e894e19ae 100644 --- a/widgets/roundedcheckbox/org.eclipse.nebula.widgets.roundedcheckbox/src/org/eclipse/nebula/widgets/roundedcheckbox/RoundedCheckbox.java +++ b/widgets/roundedcheckbox/org.eclipse.nebula.widgets.roundedcheckbox/src/org/eclipse/nebula/widgets/roundedcheckbox/RoundedCheckbox.java @@ -240,8 +240,7 @@ private Color getAndDisposeColor(int r, int g, int b) { * @see SelectionEvent */ public void addSelectionListener(final SelectionListener listener) { - checkWidget(); - SelectionListenerUtil.addSelectionListener(this, listener); + addTypedListener(listener, SWT.Selection); } /** @@ -391,8 +390,7 @@ public Color getUnselectedColor() { * @see #addSelectionListener */ public void removeSelectionListener(final SelectionListener listener) { - checkWidget(); - SelectionListenerUtil.removeSelectionListener(this, listener); + removeTypedListener(SWT.Selection, listener); } /** diff --git a/widgets/roundedswitch/org.eclipse.nebula.widgets.roundedswitch/META-INF/MANIFEST.MF b/widgets/roundedswitch/org.eclipse.nebula.widgets.roundedswitch/META-INF/MANIFEST.MF index a666be60d..e8aaad809 100644 --- a/widgets/roundedswitch/org.eclipse.nebula.widgets.roundedswitch/META-INF/MANIFEST.MF +++ b/widgets/roundedswitch/org.eclipse.nebula.widgets.roundedswitch/META-INF/MANIFEST.MF @@ -7,5 +7,5 @@ Bundle-Vendor: Eclipse Nebula Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.nebula.widgets.roundedswitch Require-Bundle: org.eclipse.nebula.widgets.opal.commons;visibility:=reexport, - org.eclipse.swt + org.eclipse.swt;bundle-version="[3.126.0,4.0.0)" Automatic-Module-Name: org.eclipse.nebula.widgets.roundedswitch diff --git a/widgets/roundedswitch/org.eclipse.nebula.widgets.roundedswitch/src/org/eclipse/nebula/widgets/roundedswitch/RoundedSwitch.java b/widgets/roundedswitch/org.eclipse.nebula.widgets.roundedswitch/src/org/eclipse/nebula/widgets/roundedswitch/RoundedSwitch.java index dc2d267c8..9b762b58f 100644 --- a/widgets/roundedswitch/org.eclipse.nebula.widgets.roundedswitch/src/org/eclipse/nebula/widgets/roundedswitch/RoundedSwitch.java +++ b/widgets/roundedswitch/org.eclipse.nebula.widgets.roundedswitch/src/org/eclipse/nebula/widgets/roundedswitch/RoundedSwitch.java @@ -253,8 +253,7 @@ private void onKeyPress(Event e) { * @see SelectionEvent */ public void addSelectionListener(final SelectionListener listener) { - checkWidget(); - SelectionListenerUtil.addSelectionListener(this, listener); + addTypedListener(listener, SWT.Selection); } /** @@ -321,8 +320,7 @@ public boolean getSelection() { * @see #addSelectionListener */ public void removeSelectionListener(final SelectionListener listener) { - checkWidget(); - SelectionListenerUtil.removeSelectionListener(this, listener); + removeTypedListener(SWT.Selection, listener); } /** diff --git a/widgets/tablecombo/org.eclipse.nebula.widgets.tablecombo/META-INF/MANIFEST.MF b/widgets/tablecombo/org.eclipse.nebula.widgets.tablecombo/META-INF/MANIFEST.MF index c3d704155..b56c75211 100644 --- a/widgets/tablecombo/org.eclipse.nebula.widgets.tablecombo/META-INF/MANIFEST.MF +++ b/widgets/tablecombo/org.eclipse.nebula.widgets.tablecombo/META-INF/MANIFEST.MF @@ -7,6 +7,6 @@ Export-Package: org.eclipse.nebula.jface.tablecomboviewer, org.eclipse.nebula.widgets.tablecombo Automatic-Module-Name: org.eclipse.nebula.widgets.tablecombo Bundle-RequiredExecutionEnvironment: JavaSE-11 -Require-Bundle: org.eclipse.swt, +Require-Bundle: org.eclipse.swt;bundle-version="[3.126.0,4.0.0)", org.eclipse.jface;resolution:=optional Bundle-Vendor: Eclipse Nebula diff --git a/widgets/tablecombo/org.eclipse.nebula.widgets.tablecombo/src/org/eclipse/nebula/widgets/tablecombo/TableCombo.java b/widgets/tablecombo/org.eclipse.nebula.widgets.tablecombo/src/org/eclipse/nebula/widgets/tablecombo/TableCombo.java index f6a6ad55b..14e8367fb 100644 --- a/widgets/tablecombo/org.eclipse.nebula.widgets.tablecombo/src/org/eclipse/nebula/widgets/tablecombo/TableCombo.java +++ b/widgets/tablecombo/org.eclipse.nebula.widgets.tablecombo/src/org/eclipse/nebula/widgets/tablecombo/TableCombo.java @@ -57,7 +57,6 @@ import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.TableItem; import org.eclipse.swt.widgets.Text; -import org.eclipse.swt.widgets.TypedListener; import org.eclipse.swt.widgets.Widget; /** @@ -342,12 +341,7 @@ private static int checkStyle(final int style) { * @see #removeModifyListener */ public void addModifyListener(final ModifyListener listener) { - checkWidget(); - if (listener == null) { - SWT.error(SWT.ERROR_NULL_ARGUMENT); - } - final TypedListener typedListener = new TypedListener(listener); - addListener(SWT.Modify, typedListener); + addTypedListener(listener, SWT.Modify); } /** @@ -381,14 +375,7 @@ public void addModifyListener(final ModifyListener listener) { * @see SelectionEvent */ public void addSelectionListener(final SelectionListener listener) { - checkWidget(); - if (listener == null) { - SWT.error(SWT.ERROR_NULL_ARGUMENT); - } - - final TypedListener typedListener = new TypedListener(listener); - addListener(SWT.Selection, typedListener); - addListener(SWT.DefaultSelection, typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } /** @@ -473,12 +460,7 @@ public void removeTextControlKeyListener(final KeyListener listener) { * @since 3.3 */ public void addVerifyListener(final VerifyListener listener) { - checkWidget(); - if (listener == null) { - SWT.error(SWT.ERROR_NULL_ARGUMENT); - } - final TypedListener typedListener = new TypedListener(listener); - addListener(SWT.Verify, typedListener); + addTypedListener(listener, SWT.Verify); } /** @@ -1818,11 +1800,7 @@ public void redraw(final int x, final int y, final int width, final int height, * @see #addModifyListener */ public void removeModifyListener(final ModifyListener listener) { - checkWidget(); - if (listener == null) { - SWT.error(SWT.ERROR_NULL_ARGUMENT); - } - removeListener(SWT.Modify, listener); + removeTypedListener(SWT.Modify, listener); } /** @@ -1848,12 +1826,8 @@ public void removeModifyListener(final ModifyListener listener) { * @see #addSelectionListener */ public void removeSelectionListener(final SelectionListener listener) { - checkWidget(); - if (listener == null) { - SWT.error(SWT.ERROR_NULL_ARGUMENT); - } - removeListener(SWT.Selection, listener); - removeListener(SWT.DefaultSelection, listener); + removeTypedListener(SWT.Selection, listener); + removeTypedListener(SWT.DefaultSelection, listener); } /** @@ -1881,11 +1855,7 @@ public void removeSelectionListener(final SelectionListener listener) { * @since 3.3 */ public void removeVerifyListener(final VerifyListener listener) { - checkWidget(); - if (listener == null) { - SWT.error(SWT.ERROR_NULL_ARGUMENT); - } - removeListener(SWT.Verify, listener); + removeTypedListener(SWT.Verify, listener); } /** diff --git a/widgets/tiles/org.eclipse.nebula.widgets.tiles/META-INF/MANIFEST.MF b/widgets/tiles/org.eclipse.nebula.widgets.tiles/META-INF/MANIFEST.MF index 9c607dbda..fabea86d4 100644 --- a/widgets/tiles/org.eclipse.nebula.widgets.tiles/META-INF/MANIFEST.MF +++ b/widgets/tiles/org.eclipse.nebula.widgets.tiles/META-INF/MANIFEST.MF @@ -6,5 +6,5 @@ Bundle-Version: 1.0.0.qualifier Bundle-Vendor: Eclipse Nebula Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.nebula.widgets.tiles -Require-Bundle: org.eclipse.swt +Require-Bundle: org.eclipse.swt;bundle-version="[3.126.0,4.0.0)" Automatic-Module-Name: org.eclipse.nebula.widgets.tiles diff --git a/widgets/tiles/org.eclipse.nebula.widgets.tiles/src/org/eclipse/nebula/widgets/tiles/Tiles.java b/widgets/tiles/org.eclipse.nebula.widgets.tiles/src/org/eclipse/nebula/widgets/tiles/Tiles.java index 7c06315d0..8cfadb096 100644 --- a/widgets/tiles/org.eclipse.nebula.widgets.tiles/src/org/eclipse/nebula/widgets/tiles/Tiles.java +++ b/widgets/tiles/org.eclipse.nebula.widgets.tiles/src/org/eclipse/nebula/widgets/tiles/Tiles.java @@ -35,7 +35,6 @@ import org.eclipse.swt.widgets.Canvas; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Event; -import org.eclipse.swt.widgets.TypedListener; /** * @@ -109,8 +108,7 @@ public Tiles(final Composite parent, final int style) { * @param listener */ public void addSelectionListener(final SelectionListener listener) { - super.checkWidget(); - addListener(SWT.Selection, new TypedListener(listener)); + addTypedListener(listener, SWT.Selection); } /** @@ -253,8 +251,7 @@ public T getSelectedItem() { * @param listener */ public void removeSelectionListener(final SelectionListener listener) { - super.checkWidget(); - removeListener(SWT.Selection, listener); + removeTypedListener(SWT.Selection, listener); } /**