From ba7cb0b03115234c91ca4eac58408e484bd7780c Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Wed, 13 Mar 2024 21:22:38 +0100 Subject: [PATCH] Leverage new Widget.addTypedListeners() and Widget.getTypedListeners() --- .../common/org/eclipse/swt/custom/CCombo.java | 25 ++---- .../org/eclipse/swt/custom/CTabFolder.java | 12 +-- .../org/eclipse/swt/custom/StyledText.java | 36 ++++----- .../org/eclipse/swt/custom/TableCursor.java | 11 +-- .../org/eclipse/swt/custom/TreeCursor.java | 10 +-- .../cocoa/org/eclipse/swt/dnd/DragSource.java | 26 ++----- .../cocoa/org/eclipse/swt/dnd/DropTarget.java | 30 +++---- .../gtk/org/eclipse/swt/dnd/DragSource.java | 26 ++----- .../gtk/org/eclipse/swt/dnd/DropTarget.java | 32 +++----- .../win32/org/eclipse/swt/dnd/DragSource.java | 26 ++----- .../win32/org/eclipse/swt/dnd/DropTarget.java | 32 +++----- .../cocoa/org/eclipse/swt/widgets/Button.java | 6 +- .../cocoa/org/eclipse/swt/widgets/Combo.java | 20 +---- .../org/eclipse/swt/widgets/Control.java | 77 ++++-------------- .../org/eclipse/swt/widgets/DateTime.java | 6 +- .../cocoa/org/eclipse/swt/widgets/Link.java | 6 +- .../cocoa/org/eclipse/swt/widgets/List.java | 6 +- .../cocoa/org/eclipse/swt/widgets/Menu.java | 11 +-- .../org/eclipse/swt/widgets/MenuItem.java | 20 ++--- .../cocoa/org/eclipse/swt/widgets/Sash.java | 6 +- .../cocoa/org/eclipse/swt/widgets/Scale.java | 6 +- .../org/eclipse/swt/widgets/ScrollBar.java | 6 +- .../cocoa/org/eclipse/swt/widgets/Shell.java | 9 +-- .../cocoa/org/eclipse/swt/widgets/Slider.java | 9 +-- .../org/eclipse/swt/widgets/Spinner.java | 16 +--- .../org/eclipse/swt/widgets/TabFolder.java | 6 +- .../cocoa/org/eclipse/swt/widgets/Table.java | 6 +- .../org/eclipse/swt/widgets/TableColumn.java | 12 +-- .../cocoa/org/eclipse/swt/widgets/Text.java | 20 +---- .../org/eclipse/swt/widgets/ToolItem.java | 6 +- .../org/eclipse/swt/widgets/Tracker.java | 12 +-- .../org/eclipse/swt/widgets/TrayItem.java | 11 +-- .../cocoa/org/eclipse/swt/widgets/Tree.java | 12 +-- .../org/eclipse/swt/widgets/TreeColumn.java | 12 +-- .../cocoa/org/eclipse/swt/widgets/Widget.java | 5 +- .../org/eclipse/swt/widgets/CoolItem.java | 6 +- .../org/eclipse/swt/widgets/ExpandBar.java | 6 +- .../org/eclipse/swt/widgets/ToolTip.java | 6 +- .../gtk/org/eclipse/swt/widgets/Button.java | 6 +- .../gtk/org/eclipse/swt/widgets/Combo.java | 20 +---- .../gtk/org/eclipse/swt/widgets/Control.java | 78 ++++--------------- .../gtk/org/eclipse/swt/widgets/DateTime.java | 6 +- .../org/eclipse/swt/widgets/ExpandBar.java | 6 +- .../gtk/org/eclipse/swt/widgets/Link.java | 6 +- .../gtk/org/eclipse/swt/widgets/List.java | 6 +- .../gtk/org/eclipse/swt/widgets/Menu.java | 11 +-- .../gtk/org/eclipse/swt/widgets/MenuItem.java | 16 +--- .../gtk/org/eclipse/swt/widgets/Sash.java | 7 +- .../gtk/org/eclipse/swt/widgets/Scale.java | 6 +- .../org/eclipse/swt/widgets/ScrollBar.java | 6 +- .../gtk/org/eclipse/swt/widgets/Shell.java | 9 +-- .../gtk/org/eclipse/swt/widgets/Slider.java | 6 +- .../gtk/org/eclipse/swt/widgets/Spinner.java | 16 +--- .../org/eclipse/swt/widgets/TabFolder.java | 6 +- .../gtk/org/eclipse/swt/widgets/Table.java | 6 +- .../org/eclipse/swt/widgets/TableColumn.java | 12 +-- .../gtk/org/eclipse/swt/widgets/Text.java | 20 +---- .../gtk/org/eclipse/swt/widgets/ToolItem.java | 6 +- .../gtk/org/eclipse/swt/widgets/ToolTip.java | 6 +- .../gtk/org/eclipse/swt/widgets/Tracker.java | 12 +-- .../gtk/org/eclipse/swt/widgets/TrayItem.java | 11 +-- .../gtk/org/eclipse/swt/widgets/Tree.java | 12 +-- .../org/eclipse/swt/widgets/TreeColumn.java | 12 +-- .../gtk/org/eclipse/swt/widgets/Widget.java | 5 +- .../win32/org/eclipse/swt/widgets/Button.java | 6 +- .../win32/org/eclipse/swt/widgets/Combo.java | 20 +---- .../org/eclipse/swt/widgets/Control.java | 77 ++++-------------- .../org/eclipse/swt/widgets/CoolItem.java | 6 +- .../org/eclipse/swt/widgets/DateTime.java | 6 +- .../org/eclipse/swt/widgets/ExpandBar.java | 6 +- .../win32/org/eclipse/swt/widgets/Link.java | 6 +- .../win32/org/eclipse/swt/widgets/List.java | 6 +- .../win32/org/eclipse/swt/widgets/Menu.java | 11 +-- .../org/eclipse/swt/widgets/MenuItem.java | 16 +--- .../win32/org/eclipse/swt/widgets/Sash.java | 6 +- .../win32/org/eclipse/swt/widgets/Scale.java | 6 +- .../org/eclipse/swt/widgets/ScrollBar.java | 6 +- .../win32/org/eclipse/swt/widgets/Shell.java | 9 +-- .../win32/org/eclipse/swt/widgets/Slider.java | 6 +- .../org/eclipse/swt/widgets/Spinner.java | 16 +--- .../org/eclipse/swt/widgets/TabFolder.java | 6 +- .../win32/org/eclipse/swt/widgets/Table.java | 6 +- .../org/eclipse/swt/widgets/TableColumn.java | 12 +-- .../win32/org/eclipse/swt/widgets/Text.java | 20 +---- .../org/eclipse/swt/widgets/ToolItem.java | 6 +- .../org/eclipse/swt/widgets/ToolTip.java | 6 +- .../org/eclipse/swt/widgets/Tracker.java | 12 +-- .../org/eclipse/swt/widgets/TrayItem.java | 11 +-- .../win32/org/eclipse/swt/widgets/Tree.java | 12 +-- .../org/eclipse/swt/widgets/TreeColumn.java | 12 +-- .../win32/org/eclipse/swt/widgets/Widget.java | 5 +- .../swt/examples/accessibility/CTable.java | 11 +-- .../examples/accessibility/CTableColumn.java | 24 ++---- 93 files changed, 268 insertions(+), 987 deletions(-) diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CCombo.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CCombo.java index 77f060a67ee..e24bd918dfe 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CCombo.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CCombo.java @@ -301,10 +301,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); } /** * Adds the listener to the collection of listeners who will @@ -331,11 +328,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); } /** * Adds the listener to the collection of listeners who will @@ -359,11 +352,9 @@ 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) { switch (event.type) { case SWT.FocusIn: { @@ -1451,7 +1442,7 @@ public void removeAll () { public void removeModifyListener (ModifyListener listener) { checkWidget(); if (listener == null) SWT.error (SWT.ERROR_NULL_ARGUMENT); - removeListener(SWT.Modify, listener); + removeTypedListener(SWT.Modify, listener); } /** * Removes the listener from the collection of listeners who will @@ -1473,8 +1464,8 @@ public void removeModifyListener (ModifyListener listener) { 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); } /** * Removes the listener from the collection of listeners who will @@ -1498,7 +1489,7 @@ public void removeSelectionListener (SelectionListener listener) { public void removeVerifyListener (VerifyListener listener) { checkWidget(); if (listener == null) SWT.error (SWT.ERROR_NULL_ARGUMENT); - removeListener(SWT.Verify, listener); + removeTypedListener(SWT.Verify, listener); } /** * Selects the item at the given zero-relative index in the receiver's diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder.java index d1acaab705a..cfae6bb330f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolder.java @@ -503,13 +503,7 @@ public void addCTabFolderListener(CTabFolderListener 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); } Rectangle[] computeControlBounds (Point size, boolean[][] position) { @@ -2353,8 +2347,8 @@ public void removeSelectionListener(SelectionListener listener) { 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); } @Override diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java index b069312a487..b8b2ebaf50e 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java @@ -886,9 +886,7 @@ public void addLineStyleListener(LineStyleListener listener) { * */ public void addModifyListener(ModifyListener modifyListener) { - checkWidget(); - if (modifyListener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); - addListener(SWT.Modify, new TypedListener(modifyListener)); + addTypedListener(modifyListener, SWT.Modify); } /** * Adds a paint object listener. A paint object event is sent by the widget when an object @@ -940,9 +938,7 @@ public void addPaintObjectListener(PaintObjectListener listener) { * @see SelectionEvent */ public void addSelectionListener(SelectionListener listener) { - checkWidget(); - if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); - addListener(SWT.Selection, new TypedListener(listener)); + addTypedListener(listener, SWT.Selection); //TODO: default selection? } /** * Adds a verify key listener. A VerifyKey event is sent by the widget when a key @@ -979,9 +975,7 @@ public void addVerifyKeyListener(VerifyKeyListener listener) { * */ public void addVerifyListener(VerifyListener verifyListener) { - checkWidget(); - if (verifyListener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); - addListener(SWT.Verify, new TypedListener(verifyListener)); + addTypedListener(verifyListener, SWT.Verify); } /** * Adds a word movement listener. A movement event is sent when the boundary @@ -7486,7 +7480,7 @@ public void redrawRange(int start, int length, boolean clearBackground) { public void removeBidiSegmentListener(BidiSegmentListener listener) { checkWidget(); if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); - removeListener(ST.LineGetSegments, listener); + removeTypedListener(ST.LineGetSegments, listener); resetCache(0, content.getLineCount()); setCaretLocations(); super.redraw(); @@ -7509,7 +7503,7 @@ public void removeBidiSegmentListener(BidiSegmentListener listener) { public void removeCaretListener(CaretListener listener) { checkWidget(); if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); - removeListener(ST.CaretMoved, listener); + removeTypedListener(ST.CaretMoved, listener); } /** * Removes the specified extended modify listener. @@ -7527,7 +7521,7 @@ public void removeCaretListener(CaretListener listener) { public void removeExtendedModifyListener(ExtendedModifyListener extendedModifyListener) { checkWidget(); if (extendedModifyListener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); - removeListener(ST.ExtendedModify, extendedModifyListener); + removeTypedListener(ST.ExtendedModify, extendedModifyListener); } /** * Removes the specified line background listener. @@ -7545,7 +7539,7 @@ public void removeExtendedModifyListener(ExtendedModifyListener extendedModifyLi public void removeLineBackgroundListener(LineBackgroundListener listener) { checkWidget(); if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); - removeListener(ST.LineGetBackground, listener); + removeTypedListener(ST.LineGetBackground, listener); } /** * Removes the specified line style listener. @@ -7563,7 +7557,7 @@ public void removeLineBackgroundListener(LineBackgroundListener listener) { public void removeLineStyleListener(LineStyleListener listener) { checkWidget(); if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); - removeListener(ST.LineGetStyle, listener); + removeTypedListener(ST.LineGetStyle, listener); setCaretLocations(); } /** @@ -7582,7 +7576,7 @@ public void removeLineStyleListener(LineStyleListener listener) { public void removeModifyListener(ModifyListener modifyListener) { checkWidget(); if (modifyListener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); - removeListener(SWT.Modify, modifyListener); + removeTypedListener(SWT.Modify, modifyListener); } /** * Removes the specified listener. @@ -7601,7 +7595,7 @@ public void removeModifyListener(ModifyListener modifyListener) { public void removePaintObjectListener(PaintObjectListener listener) { checkWidget(); if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); - removeListener(ST.PaintObject, listener); + removeTypedListener(ST.PaintObject, listener); } /** * Removes the listener from the collection of listeners who will @@ -7623,7 +7617,7 @@ public void removePaintObjectListener(PaintObjectListener listener) { public void removeSelectionListener(SelectionListener listener) { checkWidget(); if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); - removeListener(SWT.Selection, listener); + removeTypedListener(SWT.Selection, listener); } /** * Removes the specified verify listener. @@ -7641,7 +7635,7 @@ public void removeSelectionListener(SelectionListener listener) { public void removeVerifyListener(VerifyListener verifyListener) { checkWidget(); if (verifyListener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); - removeListener(SWT.Verify, verifyListener); + removeTypedListener(SWT.Verify, verifyListener); } /** * Removes the specified key verify listener. @@ -7658,7 +7652,7 @@ public void removeVerifyListener(VerifyListener verifyListener) { */ public void removeVerifyKeyListener(VerifyKeyListener listener) { if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); - removeListener(ST.VerifyKey, listener); + removeTypedListener(ST.VerifyKey, listener); } /** * Removes the specified word movement listener. @@ -7683,8 +7677,8 @@ public void removeVerifyKeyListener(VerifyKeyListener listener) { public void removeWordMovementListener(MovementListener listener) { checkWidget(); if (listener == null) SWT.error(SWT.ERROR_NULL_ARGUMENT); - removeListener(ST.WordNext, listener); - removeListener(ST.WordPrevious, listener); + removeTypedListener(ST.WordNext, listener); + removeTypedListener(ST.WordPrevious, listener); } /** * Replaces the styles in the given range with new styles. This method diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TableCursor.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TableCursor.java index 18f0225463b..c6aaf539482 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TableCursor.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TableCursor.java @@ -197,12 +197,7 @@ public void getName(AccessibleEvent e) { * @see #removeSelectionListener(SelectionListener) */ 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); } void onDispose(Event event) { @@ -502,8 +497,8 @@ public void removeSelectionListener(SelectionListener listener) { 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); } void _resize() { diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TreeCursor.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TreeCursor.java index 48a597482be..74e026facd3 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TreeCursor.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TreeCursor.java @@ -268,11 +268,7 @@ public void getName(AccessibleEvent e) { * @see #removeSelectionListener(SelectionListener) */ 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); } int countSubTreePages(TreeItem root) { @@ -704,8 +700,8 @@ void paint(Event event) { 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); } void _resize() { diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/DragSource.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/DragSource.java index aa95b8f2cdc..1c99b5bc6df 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/DragSource.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/DragSource.java @@ -15,6 +15,8 @@ package org.eclipse.swt.dnd; +import java.util.*; + import org.eclipse.swt.*; import org.eclipse.swt.graphics.*; import org.eclipse.swt.internal.*; @@ -616,21 +618,9 @@ public Control getControl () { * @since 3.4 */ public DragSourceListener[] getDragListeners() { - Listener[] listeners = getListeners(DND.DragStart); - int length = listeners.length; - DragSourceListener[] dragListeners = new DragSourceListener[length]; - int count = 0; - for (int i = 0; i < length; i++) { - Listener listener = listeners[i]; - if (listener instanceof DNDListener) { - dragListeners[count] = (DragSourceListener) ((DNDListener) listener).getEventListener(); - count++; - } - } - if (count == length) return dragListeners; - DragSourceListener[] result = new DragSourceListener[count]; - System.arraycopy(dragListeners, 0, result, 0, count); - return result; + return Arrays.stream(getTypedListeners(DND.DragStart)) // + .filter(DragSourceListener.class::isInstance).map(DragSourceListener.class::cast) + .toArray(DragSourceListener[]::new); } /** @@ -790,9 +780,9 @@ void pasteboard_provideDataForType(long id, long sel, long arg0, long arg1) { */ public void removeDragListener(DragSourceListener listener) { if (listener == null) DND.error (SWT.ERROR_NULL_ARGUMENT); - removeListener (DND.DragStart, listener); - removeListener (DND.DragSetData, listener); - removeListener (DND.DragEnd, listener); + removeTypedListener(DND.DragStart, listener); + removeTypedListener(DND.DragSetData, listener); + removeTypedListener(DND.DragEnd, listener); } /** diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/DropTarget.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/DropTarget.java index 70f8d8bc05e..cac3b5ec685 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/DropTarget.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/cocoa/org/eclipse/swt/dnd/DropTarget.java @@ -506,21 +506,9 @@ public Control getControl () { * @since 3.4 */ public DropTargetListener[] getDropListeners() { - Listener[] listeners = getListeners(DND.DragEnter); - int length = listeners.length; - DropTargetListener[] dropListeners = new DropTargetListener[length]; - int count = 0; - for (int i = 0; i < length; i++) { - Listener listener = listeners[i]; - if (listener instanceof DNDListener) { - dropListeners[count] = (DropTargetListener) ((DNDListener) listener).getEventListener(); - count++; - } - } - if (count == length) return dropListeners; - DropTargetListener[] result = new DropTargetListener[count]; - System.arraycopy(dropListeners, 0, result, 0, count); - return result; + return Arrays.stream(getTypedListeners(DND.DragEnter)) // + .filter(DropTargetListener.class::isInstance).map(DropTargetListener.class::cast) + .toArray(DropTargetListener[]::new); } /** @@ -798,12 +786,12 @@ long outlineView_validateDrop_proposedItem_proposedChildIndex(long id, long sel, */ public void removeDropListener(DropTargetListener listener) { if (listener == null) DND.error (SWT.ERROR_NULL_ARGUMENT); - removeListener (DND.DragEnter, listener); - removeListener (DND.DragLeave, listener); - removeListener (DND.DragOver, listener); - removeListener (DND.DragOperationChanged, listener); - removeListener (DND.Drop, listener); - removeListener (DND.DropAccept, listener); + removeTypedListener(DND.DragEnter, listener); + removeTypedListener(DND.DragLeave, listener); + removeTypedListener(DND.DragOver, listener); + removeTypedListener(DND.DragOperationChanged, listener); + removeTypedListener(DND.Drop, listener); + removeTypedListener(DND.DropAccept, listener); } /** diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DragSource.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DragSource.java index 0f7a63f1a6a..eab4e6cb3db 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DragSource.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DragSource.java @@ -16,6 +16,7 @@ import java.lang.reflect.*; +import java.util.*; import org.eclipse.swt.*; import org.eclipse.swt.graphics.*; @@ -25,6 +26,7 @@ import org.eclipse.swt.internal.gtk3.*; import org.eclipse.swt.internal.gtk4.*; import org.eclipse.swt.widgets.*; +import org.eclipse.swt.widgets.List; /** * @@ -577,21 +579,9 @@ public Control getControl () { * @since 3.4 */ public DragSourceListener[] getDragListeners() { - Listener[] listeners = getListeners(DND.DragStart); - int length = listeners.length; - DragSourceListener[] dragListeners = new DragSourceListener[length]; - int count = 0; - for (int i = 0; i < length; i++) { - Listener listener = listeners[i]; - if (listener instanceof DNDListener) { - dragListeners[count] = (DragSourceListener) ((DNDListener) listener).getEventListener(); - count++; - } - } - if (count == length) return dragListeners; - DragSourceListener[] result = new DragSourceListener[count]; - System.arraycopy(dragListeners, 0, result, 0, count); - return result; + return Arrays.stream(getTypedListeners(DND.DragStart)) // + .filter(DragSourceListener.class::isInstance).map(DragSourceListener.class::cast) + .toArray(DragSourceListener[]::new); } /** @@ -677,9 +667,9 @@ int osOpToOp(int osOperation){ */ public void removeDragListener(DragSourceListener listener) { if (listener == null) DND.error (SWT.ERROR_NULL_ARGUMENT); - removeListener (DND.DragStart, listener); - removeListener (DND.DragSetData, listener); - removeListener (DND.DragEnd, listener); + removeTypedListener(DND.DragStart, listener); + removeTypedListener(DND.DragSetData, listener); + removeTypedListener(DND.DragEnd, listener); } /** diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DropTarget.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DropTarget.java index 4d9f0612004..0e90fb5bc81 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DropTarget.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/gtk/org/eclipse/swt/dnd/DropTarget.java @@ -14,6 +14,8 @@ package org.eclipse.swt.dnd; +import java.util.*; + import org.eclipse.swt.*; import org.eclipse.swt.graphics.*; import org.eclipse.swt.internal.*; @@ -546,21 +548,9 @@ public Control getControl () { * @since 3.4 */ public DropTargetListener[] getDropListeners() { - Listener[] listeners = getListeners(DND.DragEnter); - int length = listeners.length; - DropTargetListener[] dropListeners = new DropTargetListener[length]; - int count = 0; - for (int i = 0; i < length; i++) { - Listener listener = listeners[i]; - if (listener instanceof DNDListener) { - dropListeners[count] = (DropTargetListener) ((DNDListener) listener).getEventListener(); - count++; - } - } - if (count == length) return dropListeners; - DropTargetListener[] result = new DropTargetListener[count]; - System.arraycopy(dropListeners, 0, result, 0, count); - return result; + return Arrays.stream(getTypedListeners(DND.DragEnter)) // + .filter(DropTargetListener.class::isInstance).map(DropTargetListener.class::cast) + .toArray(DropTargetListener[]::new); } /** @@ -663,12 +653,12 @@ int osOpToOp(int osOperation){ */ public void removeDropListener(DropTargetListener listener) { if (listener == null) DND.error (SWT.ERROR_NULL_ARGUMENT); - removeListener (DND.DragEnter, listener); - removeListener (DND.DragLeave, listener); - removeListener (DND.DragOver, listener); - removeListener (DND.DragOperationChanged, listener); - removeListener (DND.Drop, listener); - removeListener (DND.DropAccept, listener); + removeTypedListener(DND.DragEnter, listener); + removeTypedListener(DND.DragLeave, listener); + removeTypedListener(DND.DragOver, listener); + removeTypedListener(DND.DragOperationChanged, listener); + removeTypedListener(DND.Drop, listener); + removeTypedListener(DND.DropAccept, listener); } /** diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DragSource.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DragSource.java index fb276dd7f97..2b0d0ebd974 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DragSource.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DragSource.java @@ -16,6 +16,8 @@ package org.eclipse.swt.dnd; +import java.util.*; + import org.eclipse.swt.*; import org.eclipse.swt.graphics.*; import org.eclipse.swt.internal.*; @@ -639,21 +641,9 @@ public Control getControl() { * @since 3.4 */ public DragSourceListener[] getDragListeners() { - Listener[] listeners = getListeners(DND.DragStart); - int length = listeners.length; - DragSourceListener[] dragListeners = new DragSourceListener[length]; - int count = 0; - for (int i = 0; i < length; i++) { - Listener listener = listeners[i]; - if (listener instanceof DNDListener) { - dragListeners[count] = (DragSourceListener) ((DNDListener) listener).getEventListener(); - count++; - } - } - if (count == length) return dragListeners; - DragSourceListener[] result = new DragSourceListener[count]; - System.arraycopy(dragListeners, 0, result, 0, count); - return result; + return Arrays.stream(getTypedListeners(DND.DragStart)) // + .filter(DragSourceListener.class::isInstance).map(DragSourceListener.class::cast) + .toArray(DragSourceListener[]::new); } /** @@ -809,9 +799,9 @@ private static int QueryInterface(COMObject comObject, long riid, long ppvObject */ public void removeDragListener(DragSourceListener listener) { if (listener == null) DND.error(SWT.ERROR_NULL_ARGUMENT); - removeListener(DND.DragStart, listener); - removeListener(DND.DragSetData, listener); - removeListener(DND.DragEnd, listener); + removeTypedListener(DND.DragStart, listener); + removeTypedListener(DND.DragSetData, listener); + removeTypedListener(DND.DragEnd, listener); } /** diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DropTarget.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DropTarget.java index 38fae8ec95b..a2b0b956aac 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DropTarget.java +++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/win32/org/eclipse/swt/dnd/DropTarget.java @@ -13,6 +13,8 @@ *******************************************************************************/ package org.eclipse.swt.dnd; +import java.util.*; + import org.eclipse.swt.*; import org.eclipse.swt.internal.*; import org.eclipse.swt.internal.ole.win32.*; @@ -515,21 +517,9 @@ public Control getControl () { * @since 3.4 */ public DropTargetListener[] getDropListeners() { - Listener[] listeners = getListeners(DND.DragEnter); - int length = listeners.length; - DropTargetListener[] dropListeners = new DropTargetListener[length]; - int count = 0; - for (int i = 0; i < length; i++) { - Listener listener = listeners[i]; - if (listener instanceof DNDListener) { - dropListeners[count] = (DropTargetListener) ((DNDListener) listener).getEventListener(); - count++; - } - } - if (count == length) return dropListeners; - DropTargetListener[] result = new DropTargetListener[count]; - System.arraycopy(dropListeners, 0, result, 0, count); - return result; + return Arrays.stream(getTypedListeners(DND.DragEnter)) // + .filter(DropTargetListener.class::isInstance).map(DropTargetListener.class::cast) + .toArray(DropTargetListener[]::new); } /** @@ -685,12 +675,12 @@ void refresh() { */ public void removeDropListener(DropTargetListener listener) { if (listener == null) DND.error (SWT.ERROR_NULL_ARGUMENT); - removeListener (DND.DragEnter, listener); - removeListener (DND.DragLeave, listener); - removeListener (DND.DragOver, listener); - removeListener (DND.DragOperationChanged, listener); - removeListener (DND.Drop, listener); - removeListener (DND.DropAccept, listener); + removeTypedListener(DND.DragEnter, listener); + removeTypedListener(DND.DragLeave, listener); + removeTypedListener(DND.DragOver, listener); + removeTypedListener(DND.DragOperationChanged, listener); + removeTypedListener(DND.Drop, listener); + removeTypedListener(DND.DropAccept, listener); } /** diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Button.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Button.java index 1d6cbca5bd6..571b793a070 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Button.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Button.java @@ -139,11 +139,7 @@ public Button (Composite parent, int style) { * @see SelectionEvent */ public void addSelectionListener(SelectionListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener(listener); - addListener(SWT.Selection,typedListener); - addListener(SWT.DefaultSelection,typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } @Override diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Combo.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Combo.java index 02801327de8..5cd1adc7731 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Combo.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Combo.java @@ -225,10 +225,7 @@ public void add (String string, int index) { * @see #removeModifyListener */ public void addModifyListener (ModifyListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Modify, typedListener); + addTypedListener(listener, SWT.Modify); } /** @@ -266,9 +263,7 @@ public void addModifyListener (ModifyListener listener) { * @since 3.103 */ public void addSegmentListener (SegmentListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - addListener (SWT.Segments, new TypedListener (listener)); + addTypedListener(listener, SWT.Segments); } /** @@ -296,11 +291,7 @@ public void addSegmentListener (SegmentListener listener) { * @see SelectionEvent */ public void addSelectionListener(SelectionListener listener) { - checkWidget(); - if (listener == null) 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,10 +316,7 @@ public void addSelectionListener(SelectionListener listener) { * @since 3.1 */ public void addVerifyListener (VerifyListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Verify, typedListener); + addTypedListener(listener, SWT.Verify); } @Override diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java index 3b85144ac42..13e26aa318e 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Control.java @@ -353,11 +353,7 @@ void accessibilitySetValue_forAttribute(long id, long sel, long arg0, long arg1) * @see #removeControlListener */ public void addControlListener(ControlListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Resize,typedListener); - addListener (SWT.Move,typedListener); + addTypedListener(listener, SWT.Resize, SWT.Move); } /** @@ -382,10 +378,7 @@ public void addControlListener(ControlListener listener) { * @since 3.3 */ public void addDragDetectListener (DragDetectListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.DragDetect,typedListener); + addTypedListener(listener, SWT.DragDetect); } /** @@ -408,11 +401,7 @@ public void addDragDetectListener (DragDetectListener listener) { * @see #removeFocusListener */ public void addFocusListener(FocusListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener(SWT.FocusIn,typedListener); - addListener(SWT.FocusOut,typedListener); + addTypedListener(listener, SWT.FocusIn, SWT.FocusOut); } /** @@ -448,10 +437,7 @@ public void addFocusListener(FocusListener listener) { * @since 3.7 */ public void addGestureListener (GestureListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Gesture, typedListener); + addTypedListener(listener, SWT.Gesture); } /** @@ -474,10 +460,7 @@ public void addGestureListener (GestureListener listener) { * @see #removeHelpListener */ public void addHelpListener (HelpListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Help, typedListener); + addTypedListener(listener, SWT.Help); } /** @@ -511,11 +494,7 @@ public void addHelpListener (HelpListener listener) { * @see #removeKeyListener */ public void addKeyListener(KeyListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener(SWT.KeyUp,typedListener); - addListener(SWT.KeyDown,typedListener); + addTypedListener(listener, SWT.KeyUp, SWT.KeyDown); } /** @@ -540,10 +519,7 @@ public void addKeyListener(KeyListener listener) { * @since 3.3 */ public void addMenuDetectListener (MenuDetectListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.MenuDetect, typedListener); + addTypedListener(listener, SWT.MenuDetect); } /** @@ -566,12 +542,7 @@ public void addMenuDetectListener (MenuDetectListener listener) { * @see #removeMouseListener */ public void addMouseListener(MouseListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener(SWT.MouseDown,typedListener); - addListener(SWT.MouseUp,typedListener); - addListener(SWT.MouseDoubleClick,typedListener); + addTypedListener(listener, SWT.MouseDown, SWT.MouseUp, SWT.MouseDoubleClick); } /** @@ -594,12 +565,7 @@ public void addMouseListener(MouseListener listener) { * @see #removeMouseTrackListener */ public void addMouseTrackListener (MouseTrackListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.MouseEnter,typedListener); - addListener (SWT.MouseExit,typedListener); - addListener (SWT.MouseHover,typedListener); + addTypedListener(listener, SWT.MouseEnter, SWT.MouseExit, SWT.MouseHover); } /** @@ -622,10 +588,7 @@ public void addMouseTrackListener (MouseTrackListener listener) { * @see #removeMouseMoveListener */ public void addMouseMoveListener(MouseMoveListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener(SWT.MouseMove,typedListener); + addTypedListener(listener, SWT.MouseMove); } /** @@ -650,10 +613,7 @@ public void addMouseMoveListener(MouseMoveListener listener) { * @since 3.3 */ public void addMouseWheelListener (MouseWheelListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.MouseWheel, typedListener); + addTypedListener(listener, SWT.MouseWheel); } void addRelation (Control control) { @@ -679,10 +639,7 @@ void addRelation (Control control) { * @see #removePaintListener */ public void addPaintListener(PaintListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener(SWT.Paint,typedListener); + addTypedListener(listener, SWT.Paint); } static final double SYNTHETIC_BOLD = -2.5; @@ -729,10 +686,7 @@ void addTraits(NSMutableDictionary dict, Font font) { * @since 3.7 */ public void addTouchListener (TouchListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Touch,typedListener); + addTypedListener(listener, SWT.Touch); } /** @@ -755,10 +709,7 @@ public void addTouchListener (TouchListener listener) { * @see #removeTraverseListener */ public void addTraverseListener (TraverseListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Traverse,typedListener); + addTypedListener(listener, SWT.Traverse); } @Override diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/DateTime.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/DateTime.java index 0b9f1e9a40b..7ac1c917e72 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/DateTime.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/DateTime.java @@ -143,11 +143,7 @@ protected void checkSubclass () { * @see SelectionEvent */ public void addSelectionListener (SelectionListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Selection, typedListener); - addListener (SWT.DefaultSelection, typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } @Override diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Link.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Link.java index ae364618b79..3e4a170635a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Link.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Link.java @@ -110,11 +110,7 @@ public Link (Composite parent, int style) { * @see SelectionEvent */ public void addSelectionListener (SelectionListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Selection, typedListener); - addListener (SWT.DefaultSelection, typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } @Override diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/List.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/List.java index 7d56e8a552a..053be646ca7 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/List.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/List.java @@ -205,11 +205,7 @@ public void add (String string, int index) { * @see SelectionEvent */ public void addSelectionListener(SelectionListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener(listener); - addListener(SWT.Selection,typedListener); - addListener(SWT.DefaultSelection,typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } static int checkStyle (int style) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Menu.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Menu.java index 597dc10f15e..f71afede802 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Menu.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Menu.java @@ -298,10 +298,7 @@ void _setVisible (boolean visible) { * @see #removeHelpListener */ public void addHelpListener (HelpListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Help, typedListener); + addTypedListener(listener, SWT.Help); } /** @@ -324,11 +321,7 @@ public void addHelpListener (HelpListener listener) { * @see #removeMenuListener */ public void addMenuListener (MenuListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Hide,typedListener); - addListener (SWT.Show,typedListener); + addTypedListener(listener, SWT.Hide, SWT.Show); } @Override diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/MenuItem.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/MenuItem.java index e61f78d1658..f28172a8f9b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/MenuItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/MenuItem.java @@ -14,10 +14,10 @@ package org.eclipse.swt.widgets; -import org.eclipse.swt.internal.cocoa.*; import org.eclipse.swt.*; -import org.eclipse.swt.graphics.*; import org.eclipse.swt.events.*; +import org.eclipse.swt.graphics.*; +import org.eclipse.swt.internal.cocoa.*; /** * Instances of this class represent a selectable user interface object @@ -155,10 +155,7 @@ public MenuItem (Menu parent, int style, int index) { * @see #removeArmListener */ public void addArmListener (ArmListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Arm, typedListener); + addTypedListener(listener, SWT.Arm); } /** @@ -181,10 +178,7 @@ public void addArmListener (ArmListener listener) { * @see #removeHelpListener */ public void addHelpListener (HelpListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Help, typedListener); + addTypedListener(listener, SWT.Help); } /** @@ -218,11 +212,7 @@ public void addHelpListener (HelpListener listener) { * @see SelectionEvent */ public void addSelectionListener (SelectionListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener(listener); - addListener (SWT.Selection,typedListener); - addListener (SWT.DefaultSelection,typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } @Override diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Sash.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Sash.java index 29ad16ad69e..029c2978521 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Sash.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Sash.java @@ -234,11 +234,7 @@ boolean accessibilityIsIgnored(long id, long sel) { * @see SelectionEvent */ public void addSelectionListener(SelectionListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener(listener); - addListener(SWT.Selection,typedListener); - addListener(SWT.DefaultSelection,typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } static int checkStyle (int style) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Scale.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Scale.java index 7e5d6cef365..789b251c446 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Scale.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Scale.java @@ -102,11 +102,7 @@ public Scale (Composite parent, int style) { * @see #removeSelectionListener */ public void addSelectionListener(SelectionListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener(listener); - addListener(SWT.Selection,typedListener); - addListener(SWT.DefaultSelection,typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } static int checkStyle (int style) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ScrollBar.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ScrollBar.java index e5659be461b..8f4da019d25 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ScrollBar.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ScrollBar.java @@ -132,11 +132,7 @@ public class ScrollBar extends Widget { * @see SelectionEvent */ public void addSelectionListener(SelectionListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener(listener); - addListener(SWT.Selection,typedListener); - addListener(SWT.DefaultSelection,typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } static int checkStyle (int style) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Shell.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Shell.java index 5c7876a6f79..5c7cc8e9936 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Shell.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Shell.java @@ -478,14 +478,7 @@ boolean accessibilityIsIgnored(long id, long sel) { * @see #removeShellListener */ public void addShellListener(ShellListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener(SWT.Activate,typedListener); - addListener(SWT.Close,typedListener); - addListener(SWT.Deactivate,typedListener); - addListener(SWT.Iconify,typedListener); - addListener(SWT.Deiconify,typedListener); + addTypedListener(listener, SWT.Activate, SWT.Close, SWT.Deactivate, SWT.Iconify, SWT.Deiconify); } void attachObserversToWindow(NSWindow newWindow) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Slider.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Slider.java index fda67becd0b..f1e6f4798cc 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Slider.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Slider.java @@ -14,11 +14,10 @@ package org.eclipse.swt.widgets; -import org.eclipse.swt.internal.cocoa.*; - import org.eclipse.swt.*; import org.eclipse.swt.events.*; import org.eclipse.swt.graphics.*; +import org.eclipse.swt.internal.cocoa.*; /** * Instances of this class are selectable user interface @@ -146,11 +145,7 @@ public Slider (Composite parent, int style) { * @see SelectionEvent */ public void addSelectionListener(SelectionListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener(listener); - addListener(SWT.Selection,typedListener); - addListener(SWT.DefaultSelection,typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } static int checkStyle (int style) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Spinner.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Spinner.java index ad1dc2262c1..3ebdcbef8b8 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Spinner.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Spinner.java @@ -134,10 +134,7 @@ boolean accessibilityIsIgnored(long id, long sel) { * @see #removeModifyListener */ public void addModifyListener (ModifyListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Modify, typedListener); + addTypedListener(listener, SWT.Modify); } /** @@ -165,11 +162,7 @@ public void addModifyListener (ModifyListener listener) { * @see SelectionEvent */ public void addSelectionListener(SelectionListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener(listener); - addListener (SWT.Selection,typedListener); - addListener (SWT.DefaultSelection,typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } /** @@ -192,10 +185,7 @@ public void addSelectionListener(SelectionListener listener) { * @see #removeVerifyListener */ void addVerifyListener (VerifyListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Verify, typedListener); + addTypedListener(listener, SWT.Verify); } static int checkStyle (int style) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TabFolder.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TabFolder.java index c80631d01ed..66f6c975027 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TabFolder.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TabFolder.java @@ -114,11 +114,7 @@ public TabFolder (Composite parent, int style) { * @see SelectionEvent */ public void addSelectionListener(SelectionListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Selection,typedListener); - addListener (SWT.DefaultSelection,typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } static int checkStyle (int style) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Table.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Table.java index f62d8bc4d42..30460ef0e35 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Table.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Table.java @@ -200,11 +200,7 @@ void _addListener (int eventType, Listener listener) { * @see SelectionEvent */ public void addSelectionListener (SelectionListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Selection, typedListener); - addListener (SWT.DefaultSelection, typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } TableItem _getItem (int index) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TableColumn.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TableColumn.java index 59e3a77847d..1660ebb1573 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TableColumn.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TableColumn.java @@ -146,11 +146,7 @@ public TableColumn (Table parent, int style, int index) { * @see #removeControlListener */ public void addControlListener(ControlListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Resize,typedListener); - addListener (SWT.Move,typedListener); + addTypedListener(listener, SWT.Resize, SWT.Move); } /** @@ -178,11 +174,7 @@ public void addControlListener(ControlListener listener) { * @see SelectionEvent */ public void addSelectionListener (SelectionListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Selection,typedListener); - addListener (SWT.DefaultSelection,typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } static int checkStyle (int style) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Text.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Text.java index 9090131cc23..c8f1c744033 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Text.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Text.java @@ -191,10 +191,7 @@ public Text (Composite parent, int style) { * @see #removeModifyListener */ public void addModifyListener (ModifyListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Modify, typedListener); + addTypedListener(listener, SWT.Modify); } /** @@ -232,9 +229,7 @@ public void addModifyListener (ModifyListener listener) { * @since 3.8 */ public void addSegmentListener (SegmentListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - addListener (SWT.Segments, new TypedListener (listener)); + addTypedListener(listener, SWT.Segments); } /** @@ -266,11 +261,7 @@ public void addSegmentListener (SegmentListener listener) { * @see SelectionEvent */ public void addSelectionListener(SelectionListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Selection,typedListener); - addListener (SWT.DefaultSelection,typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } /** @@ -293,10 +284,7 @@ public void addSelectionListener(SelectionListener listener) { * @see #removeVerifyListener */ public void addVerifyListener (VerifyListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Verify, typedListener); + addTypedListener(listener, SWT.Verify); } /** diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ToolItem.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ToolItem.java index a07913019f5..68b4b6cf7e9 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ToolItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/ToolItem.java @@ -283,11 +283,7 @@ boolean accessibilityIsIgnored(long id, long sel) { * @see SelectionEvent */ public void addSelectionListener(SelectionListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener(listener); - addListener(SWT.Selection,typedListener); - addListener(SWT.DefaultSelection,typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } static int checkStyle (int style) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tracker.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tracker.java index ac41a530cec..bd7e6801325 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tracker.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tracker.java @@ -162,11 +162,7 @@ public Tracker (Display display, int style) { * @see #removeControlListener */ public void addControlListener (ControlListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Resize, typedListener); - addListener (SWT.Move, typedListener); + addTypedListener(listener, SWT.Resize, SWT.Move); } /** @@ -189,11 +185,7 @@ public void addControlListener (ControlListener listener) { * @see #removeKeyListener */ public void addKeyListener(KeyListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener(SWT.KeyUp,typedListener); - addListener(SWT.KeyDown,typedListener); + addTypedListener(listener, SWT.KeyUp, SWT.KeyDown); } Point adjustMoveCursor () { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TrayItem.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TrayItem.java index 558908bb5e6..a864689679c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TrayItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TrayItem.java @@ -106,10 +106,7 @@ public TrayItem (Tray parent, int style) { * @since 3.3 */ public void addMenuDetectListener (MenuDetectListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.MenuDetect, typedListener); + addTypedListener(listener, SWT.MenuDetect); } /** @@ -137,11 +134,7 @@ public void addMenuDetectListener (MenuDetectListener listener) { * @see SelectionEvent */ public void addSelectionListener(SelectionListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Selection,typedListener); - addListener (SWT.DefaultSelection,typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } @Override diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tree.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tree.java index 45fd96cba4c..cd4ceb89341 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tree.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Tree.java @@ -233,11 +233,7 @@ long accessibilityAttributeValue(long id, long sel, long arg0) { * @see SelectionEvent */ public void addSelectionListener(SelectionListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Selection, typedListener); - addListener (SWT.DefaultSelection, typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } /** @@ -260,11 +256,7 @@ public void addSelectionListener(SelectionListener listener) { * @see #removeTreeListener */ public void addTreeListener(TreeListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Expand, typedListener); - addListener (SWT.Collapse, typedListener); + addTypedListener(listener, SWT.Expand, SWT.Collapse); } int calculateWidth (TreeItem[] items, int index, GC gc, boolean recurse) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TreeColumn.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TreeColumn.java index c8789d53704..32925a776d5 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TreeColumn.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TreeColumn.java @@ -148,11 +148,7 @@ public TreeColumn (Tree parent, int style, int index) { * @see #removeControlListener */ public void addControlListener(ControlListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Resize,typedListener); - addListener (SWT.Move,typedListener); + addTypedListener(listener, SWT.Resize, SWT.Move); } /** @@ -180,11 +176,7 @@ public void addControlListener(ControlListener listener) { * @see SelectionEvent */ public void addSelectionListener (SelectionListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Selection,typedListener); - addListener (SWT.DefaultSelection,typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } static int checkStyle (int style) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Widget.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Widget.java index a69bdb80748..5ac6cf41433 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Widget.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Widget.java @@ -530,10 +530,7 @@ void _addListener (int eventType, Listener listener) { * @see #removeDisposeListener */ public void addDisposeListener (DisposeListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Dispose, typedListener); + addTypedListener(listener, SWT.Dispose); } boolean canBecomeKeyView(long id, long sel) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/emulated/coolbar/org/eclipse/swt/widgets/CoolItem.java b/bundles/org.eclipse.swt/Eclipse SWT/emulated/coolbar/org/eclipse/swt/widgets/CoolItem.java index 2c0c0619d7f..5a4f5112de6 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/emulated/coolbar/org/eclipse/swt/widgets/CoolItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/emulated/coolbar/org/eclipse/swt/widgets/CoolItem.java @@ -160,11 +160,7 @@ public CoolItem (CoolBar parent, int style, int index) { * @since 2.0 */ public void addSelectionListener(SelectionListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Selection,typedListener); - addListener (SWT.DefaultSelection,typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } @Override protected void checkSubclass () { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/emulated/expand/org/eclipse/swt/widgets/ExpandBar.java b/bundles/org.eclipse.swt/Eclipse SWT/emulated/expand/org/eclipse/swt/widgets/ExpandBar.java index cee64d90e1e..659f6011b08 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/emulated/expand/org/eclipse/swt/widgets/ExpandBar.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/emulated/expand/org/eclipse/swt/widgets/ExpandBar.java @@ -137,11 +137,7 @@ public ExpandBar (Composite parent, int style) { * @see #removeExpandListener */ public void addExpandListener (ExpandListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Expand, typedListener); - addListener (SWT.Collapse, typedListener); + addTypedListener(listener, SWT.Expand, SWT.Collapse); } static int checkStyle (int style) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/emulated/tooltip/org/eclipse/swt/widgets/ToolTip.java b/bundles/org.eclipse.swt/Eclipse SWT/emulated/tooltip/org/eclipse/swt/widgets/ToolTip.java index 193390ef52d..b424bf8e35c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/emulated/tooltip/org/eclipse/swt/widgets/ToolTip.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/emulated/tooltip/org/eclipse/swt/widgets/ToolTip.java @@ -145,11 +145,7 @@ static int checkStyle (int style) { * @see SelectionEvent */ public void addSelectionListener (SelectionListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Selection,typedListener); - addListener (SWT.DefaultSelection,typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } void configure () { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Button.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Button.java index 422607f649f..983ea961e0a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Button.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Button.java @@ -183,11 +183,7 @@ GdkRGBA getContextBackgroundGdkRGBA () { * @see SelectionEvent */ public void addSelectionListener (SelectionListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Selection,typedListener); - addListener (SWT.DefaultSelection,typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } @Override diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java index 0f698d1bf5b..1da4e63a030 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Combo.java @@ -269,10 +269,7 @@ private void gtk_combo_box_toggle_wrap (boolean wrap) { * @see #removeModifyListener */ public void addModifyListener (ModifyListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Modify, typedListener); + addTypedListener(listener, SWT.Modify); } /** @@ -310,9 +307,7 @@ public void addModifyListener (ModifyListener listener) { * @since 3.103 */ public void addSegmentListener (SegmentListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - addListener (SWT.Segments, new TypedListener (listener)); + addTypedListener(listener, SWT.Segments); } /** @@ -340,11 +335,7 @@ public void addSegmentListener (SegmentListener listener) { * @see SelectionEvent */ public void addSelectionListener(SelectionListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Selection,typedListener); - addListener (SWT.DefaultSelection,typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } /** @@ -369,10 +360,7 @@ public void addSelectionListener(SelectionListener listener) { * @since 3.1 */ public void addVerifyListener (VerifyListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Verify, typedListener); + addTypedListener(listener, SWT.Verify); } static int checkStyle (int style) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java index 224dab38809..cd035eeef94 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Control.java @@ -1811,11 +1811,7 @@ Point getControlOrigin() { * @see #removeControlListener */ public void addControlListener(ControlListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Resize,typedListener); - addListener (SWT.Move,typedListener); + addTypedListener(listener, SWT.Resize, SWT.Move); } /** @@ -1840,10 +1836,7 @@ public void addControlListener(ControlListener listener) { * @since 3.3 */ public void addDragDetectListener (DragDetectListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.DragDetect,typedListener); + addTypedListener(listener, SWT.DragDetect); } /** @@ -1866,11 +1859,7 @@ public void addDragDetectListener (DragDetectListener listener) { * @see #removeFocusListener */ public void addFocusListener(FocusListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener(SWT.FocusIn,typedListener); - addListener(SWT.FocusOut,typedListener); + addTypedListener(listener, SWT.FocusIn, SWT.FocusOut); } /** @@ -1906,10 +1895,7 @@ public void addFocusListener(FocusListener listener) { * @since 3.7 */ public void addGestureListener (GestureListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Gesture, typedListener); + addTypedListener(listener, SWT.Gesture); } /** @@ -1932,10 +1918,7 @@ public void addGestureListener (GestureListener listener) { * @see #removeHelpListener */ public void addHelpListener (HelpListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Help, typedListener); + addTypedListener(listener, SWT.Help); } /** @@ -1969,11 +1952,7 @@ public void addHelpListener (HelpListener listener) { * @see #removeKeyListener */ public void addKeyListener(KeyListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener(SWT.KeyUp,typedListener); - addListener(SWT.KeyDown,typedListener); + addTypedListener(listener, SWT.KeyUp, SWT.KeyDown); } /** @@ -1998,10 +1977,7 @@ public void addKeyListener(KeyListener listener) { * @since 3.3 */ public void addMenuDetectListener (MenuDetectListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.MenuDetect, typedListener); + addTypedListener(listener, SWT.MenuDetect); } /** @@ -2024,12 +2000,7 @@ public void addMenuDetectListener (MenuDetectListener listener) { * @see #removeMouseListener */ public void addMouseListener(MouseListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener(SWT.MouseDown,typedListener); - addListener(SWT.MouseUp,typedListener); - addListener(SWT.MouseDoubleClick,typedListener); + addTypedListener(listener, SWT.MouseDown, SWT.MouseUp, SWT.MouseDoubleClick); } /** @@ -2052,10 +2023,7 @@ public void addMouseListener(MouseListener listener) { * @see #removeMouseMoveListener */ public void addMouseMoveListener(MouseMoveListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener(SWT.MouseMove,typedListener); + addTypedListener(listener, SWT.MouseMove); } /** @@ -2078,12 +2046,7 @@ public void addMouseMoveListener(MouseMoveListener listener) { * @see #removeMouseTrackListener */ public void addMouseTrackListener (MouseTrackListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.MouseEnter,typedListener); - addListener (SWT.MouseExit,typedListener); - addListener (SWT.MouseHover,typedListener); + addTypedListener(listener, SWT.MouseEnter, SWT.MouseExit, SWT.MouseHover); } /** @@ -2108,10 +2071,7 @@ public void addMouseTrackListener (MouseTrackListener listener) { * @since 3.3 */ public void addMouseWheelListener (MouseWheelListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.MouseWheel, typedListener); + addTypedListener(listener, SWT.MouseWheel); } /** @@ -2134,11 +2094,7 @@ public void addMouseWheelListener (MouseWheelListener listener) { * @see #removePaintListener */ public void addPaintListener(PaintListener listener) { - checkWidget(); - if (listener == null) error(SWT.ERROR_NULL_ARGUMENT); - - TypedListener typedListener = new TypedListener(listener); - addListener(SWT.Paint, typedListener); + addTypedListener(listener, SWT.Paint); } /** @@ -2185,10 +2141,7 @@ void addRelation (Control control) { * @since 3.7 */ public void addTouchListener (TouchListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Touch,typedListener); + addTypedListener(listener, SWT.Touch); } /** @@ -2211,10 +2164,7 @@ public void addTouchListener (TouchListener listener) { * @see #removeTraverseListener */ public void addTraverseListener (TraverseListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Traverse,typedListener); + addTypedListener(listener, SWT.Traverse); } /** diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DateTime.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DateTime.java index 1e200aa53b8..d1f268b87f8 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DateTime.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DateTime.java @@ -252,11 +252,7 @@ static int checkStyle (int style) { * @see SelectionEvent */ public void addSelectionListener (SelectionListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Selection, typedListener); - addListener (SWT.DefaultSelection, typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } @Override diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandBar.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandBar.java index 15898650919..8fc0e1a92e5 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandBar.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ExpandBar.java @@ -107,11 +107,7 @@ public ExpandBar (Composite parent, int style) { * @see #removeExpandListener */ public void addExpandListener (ExpandListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Expand, typedListener); - addListener (SWT.Collapse, typedListener); + addTypedListener(listener, SWT.Expand, SWT.Collapse); } @Override diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Link.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Link.java index 026138e2fbe..099764719a6 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Link.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Link.java @@ -117,11 +117,7 @@ public Link (Composite parent, int style) { * @see SelectionEvent */ public void addSelectionListener (SelectionListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Selection, typedListener); - addListener (SWT.DefaultSelection, typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } @Override diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/List.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/List.java index d67807cdd78..bb1bcf8cb1f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/List.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/List.java @@ -188,11 +188,7 @@ public void add (String string, int index) { * @see SelectionEvent */ public void addSelectionListener(SelectionListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Selection,typedListener); - addListener (SWT.DefaultSelection,typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } static int checkStyle (int style) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Menu.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Menu.java index 0ca0eabbfa2..22bb51cdb4c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Menu.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Menu.java @@ -424,11 +424,7 @@ void addAccelerators (long accelGroup) { * @see #removeMenuListener */ public void addMenuListener (MenuListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Hide,typedListener); - addListener (SWT.Show,typedListener); + addTypedListener(listener, SWT.Hide, SWT.Show); } /** @@ -451,10 +447,7 @@ public void addMenuListener (MenuListener listener) { * @see #removeHelpListener */ public void addHelpListener (HelpListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Help, typedListener); + addTypedListener(listener, SWT.Help); } @Override diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MenuItem.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MenuItem.java index 17d7c6860a7..1ab9134fff4 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MenuItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/MenuItem.java @@ -185,10 +185,7 @@ void addAccelerators (long accelGroup) { * @see #removeArmListener */ public void addArmListener (ArmListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Arm, typedListener); + addTypedListener(listener, SWT.Arm); } /** @@ -211,10 +208,7 @@ public void addArmListener (ArmListener listener) { * @see #removeHelpListener */ public void addHelpListener (HelpListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Help, typedListener); + addTypedListener(listener, SWT.Help); } /** @@ -248,11 +242,7 @@ public void addHelpListener (HelpListener listener) { * @see SelectionEvent */ public void addSelectionListener (SelectionListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener(listener); - addListener (SWT.Selection,typedListener); - addListener (SWT.DefaultSelection,typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } static int checkStyle (int style) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Sash.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Sash.java index 33cc1c8365e..0b131624385 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Sash.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Sash.java @@ -113,12 +113,7 @@ public Sash(Composite parent, int style) { * @see SelectionEvent */ public void addSelectionListener(SelectionListener listener) { - checkWidget(); - if (listener == null) error(SWT.ERROR_NULL_ARGUMENT); - - TypedListener typedListener = new TypedListener(listener); - addListener(SWT.Selection, typedListener); - addListener(SWT.DefaultSelection, typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } static int checkStyle(int style) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scale.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scale.java index bc6af88beb7..c65bfd7367e 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scale.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Scale.java @@ -101,11 +101,7 @@ public Scale (Composite parent, int style) { * @see #removeSelectionListener */ public void addSelectionListener (SelectionListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Selection,typedListener); - addListener (SWT.DefaultSelection,typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } static int checkStyle (int style) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ScrollBar.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ScrollBar.java index 187e2bfa610..1b6747bf801 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ScrollBar.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ScrollBar.java @@ -140,11 +140,7 @@ public class ScrollBar extends Widget { * @see SelectionEvent */ public void addSelectionListener (SelectionListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Selection,typedListener); - addListener (SWT.DefaultSelection,typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } static int checkStyle (int style) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java index 3843e20124c..7c93c8fc2b9 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java @@ -462,14 +462,7 @@ static int checkStyle (Shell parent, int style) { * @see #removeShellListener */ public void addShellListener (ShellListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Close,typedListener); - addListener (SWT.Iconify,typedListener); - addListener (SWT.Deiconify,typedListener); - addListener (SWT.Activate, typedListener); - addListener (SWT.Deactivate, typedListener); + addTypedListener(listener, SWT.Close, SWT.Iconify, SWT.Deiconify, SWT.Activate, SWT.Deactivate); } void addToolTip (ToolTip toolTip) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Slider.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Slider.java index 1897b74493c..869f1656c76 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Slider.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Slider.java @@ -150,11 +150,7 @@ public Slider (Composite parent, int style) { * @see SelectionEvent */ public void addSelectionListener (SelectionListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Selection,typedListener); - addListener (SWT.DefaultSelection,typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } static int checkStyle (int style) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Spinner.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Spinner.java index dd4031d3720..0bea1a4c29f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Spinner.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Spinner.java @@ -129,10 +129,7 @@ public Spinner (Composite parent, int style) { * @see #removeModifyListener */ public void addModifyListener (ModifyListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Modify, typedListener); + addTypedListener(listener, SWT.Modify); } /** @@ -160,11 +157,7 @@ public void addModifyListener (ModifyListener listener) { * @see SelectionEvent */ public void addSelectionListener(SelectionListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener(listener); - addListener(SWT.Selection,typedListener); - addListener(SWT.DefaultSelection,typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } /** @@ -187,10 +180,7 @@ public void addSelectionListener(SelectionListener listener) { * @see #removeVerifyListener */ void addVerifyListener (VerifyListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Verify, typedListener); + addTypedListener(listener, SWT.Verify); } static int checkStyle (int style) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabFolder.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabFolder.java index 77cb971b160..e3f7631a40c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabFolder.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TabFolder.java @@ -158,11 +158,7 @@ protected void checkSubclass () { * @see SelectionEvent */ public void addSelectionListener(SelectionListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener(listener); - addListener(SWT.Selection,typedListener); - addListener(SWT.DefaultSelection,typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } @Override diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java index bc3fedc5f92..d2d99021f65 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Table.java @@ -330,11 +330,7 @@ protected void checkSubclass () { * @see SelectionEvent */ public void addSelectionListener (SelectionListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Selection, typedListener); - addListener (SWT.DefaultSelection, typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } int calculateWidth (long column, long iter) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TableColumn.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TableColumn.java index 8fbaec89777..d44c0037a3b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TableColumn.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TableColumn.java @@ -149,11 +149,7 @@ public TableColumn (Table parent, int style, int index) { * @see #removeControlListener */ public void addControlListener(ControlListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Resize,typedListener); - addListener (SWT.Move,typedListener); + addTypedListener(listener, SWT.Resize, SWT.Move); } /** @@ -181,11 +177,7 @@ public void addControlListener(ControlListener listener) { * @see SelectionEvent */ public void addSelectionListener (SelectionListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Selection,typedListener); - addListener (SWT.DefaultSelection,typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } static int checkStyle (int style) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java index c6f99130fed..a5470f9e08d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Text.java @@ -352,10 +352,7 @@ void createWidget (int index) { * @see #removeModifyListener */ public void addModifyListener (ModifyListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Modify, typedListener); + addTypedListener(listener, SWT.Modify); } /** @@ -393,9 +390,7 @@ public void addModifyListener (ModifyListener listener) { * @since 3.8 */ public void addSegmentListener (SegmentListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - addListener (SWT.Segments, new TypedListener (listener)); + addTypedListener(listener, SWT.Segments); clearSegments (true); applySegments (); } @@ -429,11 +424,7 @@ public void addSegmentListener (SegmentListener listener) { * @see SelectionEvent */ public void addSelectionListener(SelectionListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener(listener); - addListener(SWT.Selection,typedListener); - addListener(SWT.DefaultSelection,typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } /** @@ -456,10 +447,7 @@ public void addSelectionListener(SelectionListener listener) { * @see #removeVerifyListener */ public void addVerifyListener (VerifyListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Verify, typedListener); + addTypedListener(listener, SWT.Verify); } /** diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolItem.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolItem.java index cd970973ab9..60f566b5d20 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolItem.java @@ -189,11 +189,7 @@ public ToolItem (ToolBar parent, int style, int index) { * @see SelectionEvent */ public void addSelectionListener(SelectionListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Selection,typedListener); - addListener (SWT.DefaultSelection,typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } static int checkStyle (int style) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolTip.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolTip.java index 9f467287625..7e6ca1d03fc 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolTip.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolTip.java @@ -132,11 +132,7 @@ static int checkStyle (int style) { * @see SelectionEvent */ public void addSelectionListener (SelectionListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Selection,typedListener); - addListener (SWT.DefaultSelection,typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } void configure () { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tracker.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tracker.java index d2d967f0a62..42723c9f4c7 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tracker.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tracker.java @@ -169,11 +169,7 @@ public Tracker (Display display, int style) { * @see #removeControlListener */ public void addControlListener(ControlListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Resize, typedListener); - addListener (SWT.Move, typedListener); + addTypedListener(listener, SWT.Resize, SWT.Move); } /** @@ -196,11 +192,7 @@ public void addControlListener(ControlListener listener) { * @see #removeKeyListener */ public void addKeyListener(KeyListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener(SWT.KeyUp,typedListener); - addListener(SWT.KeyDown,typedListener); + addTypedListener(listener, SWT.KeyUp, SWT.KeyDown); } Point adjustMoveCursor () { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TrayItem.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TrayItem.java index a2fd985e199..bfa043cf123 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TrayItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TrayItem.java @@ -106,10 +106,7 @@ public TrayItem (Tray parent, int style) { * @since 3.3 */ public void addMenuDetectListener (MenuDetectListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.MenuDetect, typedListener); + addTypedListener(listener, SWT.MenuDetect); } /** @@ -137,11 +134,7 @@ public void addMenuDetectListener (MenuDetectListener listener) { * @see SelectionEvent */ public void addSelectionListener(SelectionListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Selection, typedListener); - addListener (SWT.DefaultSelection, typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } @Override diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java index 4dfa8df4ba1..808623da98d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Tree.java @@ -413,11 +413,7 @@ protected void checkSubclass () { * @see SelectionEvent */ public void addSelectionListener (SelectionListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Selection, typedListener); - addListener (SWT.DefaultSelection, typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } /** @@ -440,11 +436,7 @@ public void addSelectionListener (SelectionListener listener) { * @see #removeTreeListener */ public void addTreeListener(TreeListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Expand, typedListener); - addListener (SWT.Collapse, typedListener); + addTypedListener(listener, SWT.Expand, SWT.Collapse); } int calculateWidth (long column, long iter, boolean recurse) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeColumn.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeColumn.java index 6208ef498a2..8c9cab8bb73 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeColumn.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/TreeColumn.java @@ -151,11 +151,7 @@ public TreeColumn (Tree parent, int style, int index) { * @see #removeControlListener */ public void addControlListener(ControlListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Resize,typedListener); - addListener (SWT.Move,typedListener); + addTypedListener(listener, SWT.Resize, SWT.Move); } /** @@ -183,11 +179,7 @@ public void addControlListener(ControlListener listener) { * @see SelectionEvent */ public void addSelectionListener (SelectionListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Selection,typedListener); - addListener (SWT.DefaultSelection,typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } static int checkStyle (int style) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java index d488397e4cd..56cdbb12dcf 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java @@ -386,10 +386,7 @@ protected void addTypedListener (EventListener listener, int... eventTypes) { * @see #removeDisposeListener */ public void addDisposeListener (DisposeListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Dispose, typedListener); + addTypedListener(listener, SWT.Dispose); } long paintWindow () { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Button.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Button.java index ba4db6517d0..631846cdb06 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Button.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Button.java @@ -240,11 +240,7 @@ void _setText (String text) { * @see SelectionEvent */ public void addSelectionListener (SelectionListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Selection,typedListener); - addListener (SWT.DefaultSelection,typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } @Override diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Combo.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Combo.java index fc7f4879b94..e5d65b25346 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Combo.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Combo.java @@ -234,10 +234,7 @@ public void add (String string, int index) { * @see #removeModifyListener */ public void addModifyListener (ModifyListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Modify, typedListener); + addTypedListener(listener, SWT.Modify); } /** @@ -275,9 +272,7 @@ public void addModifyListener (ModifyListener listener) { * @since 3.103 */ public void addSegmentListener (SegmentListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - addListener (SWT.Segments, new TypedListener (listener)); + addTypedListener (listener, SWT.Segments); int selection = OS.CB_ERR; if (!noSelection) { selection = (int)OS.SendMessage (handle, OS.CB_GETCURSEL, 0, 0); @@ -315,11 +310,7 @@ public void addSegmentListener (SegmentListener listener) { * @see SelectionEvent */ public void addSelectionListener(SelectionListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Selection,typedListener); - addListener (SWT.DefaultSelection,typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } /** @@ -344,10 +335,7 @@ public void addSelectionListener(SelectionListener listener) { * @since 3.1 */ public void addVerifyListener (VerifyListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Verify, typedListener); + addTypedListener(listener, SWT.Verify); } void applyEditSegments () { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Control.java index aadf4d6c8eb..832b5cee72e 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Control.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Control.java @@ -136,11 +136,7 @@ public Control (Composite parent, int style) { * @see #removeControlListener */ public void addControlListener(ControlListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Resize,typedListener); - addListener (SWT.Move,typedListener); + addTypedListener(listener, SWT.Resize, SWT.Move); } /** @@ -165,10 +161,7 @@ public void addControlListener(ControlListener listener) { * @since 3.3 */ public void addDragDetectListener (DragDetectListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.DragDetect,typedListener); + addTypedListener(listener, SWT.DragDetect); } /** @@ -191,11 +184,7 @@ public void addDragDetectListener (DragDetectListener listener) { * @see #removeFocusListener */ public void addFocusListener (FocusListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.FocusIn,typedListener); - addListener (SWT.FocusOut,typedListener); + addTypedListener(listener, SWT.FocusIn, SWT.FocusOut); } /** @@ -231,10 +220,7 @@ public void addFocusListener (FocusListener listener) { * @since 3.7 */ public void addGestureListener (GestureListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Gesture, typedListener); + addTypedListener(listener, SWT.Gesture); } /** @@ -257,10 +243,7 @@ public void addGestureListener (GestureListener listener) { * @see #removeHelpListener */ public void addHelpListener (HelpListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Help, typedListener); + addTypedListener(listener, SWT.Help); } /** @@ -294,11 +277,7 @@ public void addHelpListener (HelpListener listener) { * @see #removeKeyListener */ public void addKeyListener (KeyListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.KeyUp,typedListener); - addListener (SWT.KeyDown,typedListener); + addTypedListener(listener, SWT.KeyUp, SWT.KeyDown); } /** @@ -323,10 +302,7 @@ public void addKeyListener (KeyListener listener) { * @since 3.3 */ public void addMenuDetectListener (MenuDetectListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.MenuDetect, typedListener); + addTypedListener(listener, SWT.MenuDetect); } /** @@ -349,12 +325,7 @@ public void addMenuDetectListener (MenuDetectListener listener) { * @see #removeMouseListener */ public void addMouseListener (MouseListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.MouseDown,typedListener); - addListener (SWT.MouseUp,typedListener); - addListener (SWT.MouseDoubleClick,typedListener); + addTypedListener(listener, SWT.MouseDown, SWT.MouseUp, SWT.MouseDoubleClick); } /** @@ -377,12 +348,7 @@ public void addMouseListener (MouseListener listener) { * @see #removeMouseTrackListener */ public void addMouseTrackListener (MouseTrackListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.MouseEnter,typedListener); - addListener (SWT.MouseExit,typedListener); - addListener (SWT.MouseHover,typedListener); + addTypedListener(listener, SWT.MouseEnter, SWT.MouseExit, SWT.MouseHover); } /** @@ -405,10 +371,7 @@ public void addMouseTrackListener (MouseTrackListener listener) { * @see #removeMouseMoveListener */ public void addMouseMoveListener (MouseMoveListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.MouseMove,typedListener); + addTypedListener(listener, SWT.MouseMove); } /** @@ -433,10 +396,7 @@ public void addMouseMoveListener (MouseMoveListener listener) { * @since 3.3 */ public void addMouseWheelListener (MouseWheelListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.MouseWheel, typedListener); + addTypedListener(listener, SWT.MouseWheel); } /** @@ -459,10 +419,7 @@ public void addMouseWheelListener (MouseWheelListener listener) { * @see #removePaintListener */ public void addPaintListener (PaintListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Paint,typedListener); + addTypedListener(listener, SWT.Paint); } /** @@ -497,10 +454,7 @@ public void addPaintListener (PaintListener listener) { * @since 3.7 */ public void addTouchListener (TouchListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Touch,typedListener); + addTypedListener(listener, SWT.Touch); } /** @@ -523,10 +477,7 @@ public void addTouchListener (TouchListener listener) { * @see #removeTraverseListener */ public void addTraverseListener (TraverseListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Traverse,typedListener); + addTypedListener(listener, SWT.Traverse); } int binarySearch (int [] indices, int start, int end, int index) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolItem.java index 52e6a2cc7a9..b0f2c4f7c4f 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/CoolItem.java @@ -148,11 +148,7 @@ public CoolItem (CoolBar parent, int style, int index) { * @since 2.0 */ public void addSelectionListener(SelectionListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Selection,typedListener); - addListener (SWT.DefaultSelection,typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } @Override diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/DateTime.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/DateTime.java index 1b45d44cf0f..3367e1c358a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/DateTime.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/DateTime.java @@ -188,11 +188,7 @@ public DateTime (Composite parent, int style) { * @see SelectionEvent */ public void addSelectionListener (SelectionListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Selection, typedListener); - addListener (SWT.DefaultSelection, typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } @Override diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandBar.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandBar.java index d32e364b81b..5ba69f0b51a 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandBar.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandBar.java @@ -108,11 +108,7 @@ public ExpandBar (Composite parent, int style) { * @see #removeExpandListener */ public void addExpandListener (ExpandListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Expand, typedListener); - addListener (SWT.Collapse, typedListener); + addTypedListener(listener, SWT.Expand, SWT.Collapse); } @Override diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Link.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Link.java index 6bf7cd3bf33..92b992cb558 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Link.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Link.java @@ -135,11 +135,7 @@ public Link (Composite parent, int style) { * @see SelectionEvent */ public void addSelectionListener (SelectionListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Selection, typedListener); - addListener (SWT.DefaultSelection, typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } @Override diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/List.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/List.java index 5de5feaeb3f..accf21b86f5 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/List.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/List.java @@ -180,11 +180,7 @@ public void add (String string, int index) { * @see SelectionEvent */ public void addSelectionListener(SelectionListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Selection,typedListener); - addListener (SWT.DefaultSelection,typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } @Override diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Menu.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Menu.java index 8bb55eb1c6a..a1b0ccbc973 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Menu.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Menu.java @@ -274,10 +274,7 @@ void _setVisible (boolean visible) { * @see #removeHelpListener */ public void addHelpListener (HelpListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Help, typedListener); + addTypedListener(listener, SWT.Help); } /** @@ -300,11 +297,7 @@ public void addHelpListener (HelpListener listener) { * @see #removeMenuListener */ public void addMenuListener (MenuListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Hide,typedListener); - addListener (SWT.Show,typedListener); + addTypedListener(listener, SWT.Hide, SWT.Show); } static Control checkNull (Control control) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MenuItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MenuItem.java index f06b704655a..f5359f13769 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MenuItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/MenuItem.java @@ -159,10 +159,7 @@ public MenuItem (Menu parent, int style, int index) { * @see #removeArmListener */ public void addArmListener (ArmListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Arm, typedListener); + addTypedListener(listener, SWT.Arm); } /** @@ -185,10 +182,7 @@ public void addArmListener (ArmListener listener) { * @see #removeHelpListener */ public void addHelpListener (HelpListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Help, typedListener); + addTypedListener(listener, SWT.Help); } /** @@ -222,11 +216,7 @@ public void addHelpListener (HelpListener listener) { * @see SelectionEvent */ public void addSelectionListener (SelectionListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener(listener); - addListener (SWT.Selection,typedListener); - addListener (SWT.DefaultSelection,typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } @Override diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Sash.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Sash.java index 59eb302b268..f0d199ab38d 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Sash.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Sash.java @@ -106,11 +106,7 @@ public Sash (Composite parent, int style) { * @see SelectionEvent */ public void addSelectionListener (SelectionListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Selection,typedListener); - addListener (SWT.DefaultSelection,typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } @Override diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Scale.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Scale.java index 65d41a87af3..0f343716f1c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Scale.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Scale.java @@ -130,11 +130,7 @@ public Scale (Composite parent, int style) { * @see #removeSelectionListener */ public void addSelectionListener(SelectionListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Selection,typedListener); - addListener (SWT.DefaultSelection,typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } @Override diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ScrollBar.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ScrollBar.java index 347214f2c97..e90cf998b74 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ScrollBar.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ScrollBar.java @@ -159,11 +159,7 @@ public class ScrollBar extends Widget { * @see SelectionEvent */ public void addSelectionListener (SelectionListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener(listener); - addListener (SWT.Selection,typedListener); - addListener (SWT.DefaultSelection,typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } static int checkStyle (int style) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Shell.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Shell.java index cb96a2cbd91..a006d157a43 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Shell.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Shell.java @@ -463,14 +463,7 @@ static int checkStyle (Shell parent, int style) { * @see #removeShellListener */ public void addShellListener (ShellListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Close,typedListener); - addListener (SWT.Iconify,typedListener); - addListener (SWT.Deiconify,typedListener); - addListener (SWT.Activate, typedListener); - addListener (SWT.Deactivate, typedListener); + addTypedListener(listener, SWT.Close, SWT.Iconify, SWT.Deiconify, SWT.Activate, SWT.Deactivate); } long balloonTipHandle () { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Slider.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Slider.java index 66d6f7a6d34..6d13421e839 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Slider.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Slider.java @@ -150,11 +150,7 @@ public Slider (Composite parent, int style) { * @see SelectionEvent */ public void addSelectionListener (SelectionListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener(listener); - addListener (SWT.Selection,typedListener); - addListener (SWT.DefaultSelection,typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } @Override diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Spinner.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Spinner.java index 1001d65e469..ed729ec89f9 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Spinner.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Spinner.java @@ -202,10 +202,7 @@ void createHandle () { * @see #removeModifyListener */ public void addModifyListener (ModifyListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Modify, typedListener); + addTypedListener(listener, SWT.Modify); } /** @@ -233,11 +230,7 @@ public void addModifyListener (ModifyListener listener) { * @see SelectionEvent */ public void addSelectionListener(SelectionListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Selection,typedListener); - addListener (SWT.DefaultSelection,typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } /** @@ -260,10 +253,7 @@ public void addSelectionListener(SelectionListener listener) { * @see #removeVerifyListener */ void addVerifyListener (VerifyListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Verify, typedListener); + addTypedListener(listener, SWT.Verify); } @Override Point computeSizeInPixels (int wHint, int hHint, boolean changed) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabFolder.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabFolder.java index ddd8df6bc85..a72b87151e6 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabFolder.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TabFolder.java @@ -151,11 +151,7 @@ public TabFolder (Composite parent, int style) { * @see SelectionEvent */ public void addSelectionListener(SelectionListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener(listener); - addListener(SWT.Selection,typedListener); - addListener(SWT.DefaultSelection,typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } @Override diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java index d9acb9239ee..31399a97f2b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java @@ -442,11 +442,7 @@ void _setItemCount (int count, int itemCount) { * @see SelectionEvent */ public void addSelectionListener (SelectionListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Selection,typedListener); - addListener (SWT.DefaultSelection,typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } @Override diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableColumn.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableColumn.java index 9ba9d5d4c50..ce6d1490492 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableColumn.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TableColumn.java @@ -147,11 +147,7 @@ public TableColumn (Table parent, int style, int index) { * @see #removeControlListener */ public void addControlListener(ControlListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Resize,typedListener); - addListener (SWT.Move,typedListener); + addTypedListener(listener, SWT.Resize, SWT.Move); } /** @@ -179,11 +175,7 @@ public void addControlListener(ControlListener listener) { * @see SelectionEvent */ public void addSelectionListener (SelectionListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Selection,typedListener); - addListener (SWT.DefaultSelection,typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } static int checkStyle (int style) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Text.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Text.java index b640c4d710d..f1f403786dd 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Text.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Text.java @@ -404,10 +404,7 @@ int applyThemeBackground () { * @see #removeModifyListener */ public void addModifyListener (ModifyListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Modify, typedListener); + addTypedListener(listener, SWT.Modify); } /** @@ -445,9 +442,7 @@ public void addModifyListener (ModifyListener listener) { * @since 3.8 */ public void addSegmentListener (SegmentListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - addListener (SWT.Segments, new TypedListener (listener)); + addTypedListener (listener, SWT.Segments); clearSegments (true); applySegments (); } @@ -481,11 +476,7 @@ public void addSegmentListener (SegmentListener listener) { * @see SelectionEvent */ public void addSelectionListener (SelectionListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Selection,typedListener); - addListener (SWT.DefaultSelection,typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } /** @@ -508,10 +499,7 @@ public void addSelectionListener (SelectionListener listener) { * @see #removeVerifyListener */ public void addVerifyListener (VerifyListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Verify, typedListener); + addTypedListener(listener, SWT.Verify); } /** diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolItem.java index 76fde07cf19..87a0cb80cb6 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolItem.java @@ -164,11 +164,7 @@ public ToolItem (ToolBar parent, int style, int index) { * @see SelectionEvent */ public void addSelectionListener(SelectionListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Selection,typedListener); - addListener (SWT.DefaultSelection,typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } static int checkStyle (int style) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolTip.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolTip.java index fcef3775924..59fb48ed26b 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolTip.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolTip.java @@ -120,11 +120,7 @@ static int checkStyle (int style) { * @see SelectionEvent */ public void addSelectionListener (SelectionListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener(listener); - addListener (SWT.Selection,typedListener); - addListener (SWT.DefaultSelection,typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } @Override diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tracker.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tracker.java index c6c88c56c17..770835b9f06 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tracker.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tracker.java @@ -165,11 +165,7 @@ public Tracker (Display display, int style) { * @see #removeControlListener */ public void addControlListener (ControlListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Resize, typedListener); - addListener (SWT.Move, typedListener); + addTypedListener(listener, SWT.Resize,SWT.Move); } /** @@ -192,11 +188,7 @@ public void addControlListener (ControlListener listener) { * @see #removeKeyListener */ public void addKeyListener (KeyListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.KeyUp,typedListener); - addListener (SWT.KeyDown,typedListener); + addTypedListener(listener, SWT.KeyUp, SWT.KeyDown); } Point adjustMoveCursor () { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TrayItem.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TrayItem.java index ea39f2614cf..1cb73944e5c 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TrayItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TrayItem.java @@ -108,11 +108,7 @@ public TrayItem (Tray parent, int style) { * @see SelectionEvent */ public void addSelectionListener(SelectionListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Selection,typedListener); - addListener (SWT.DefaultSelection,typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } /** @@ -137,10 +133,7 @@ public void addSelectionListener(SelectionListener listener) { * @since 3.3 */ public void addMenuDetectListener (MenuDetectListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.MenuDetect, typedListener); + addTypedListener(listener, SWT.MenuDetect); } @Override diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java index 98b366e98a1..29cc4eaefa5 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java @@ -346,11 +346,7 @@ void _setBackgroundPixel (int newPixel) { * @see SelectionEvent */ public void addSelectionListener(SelectionListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Selection, typedListener); - addListener (SWT.DefaultSelection, typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } /** @@ -373,11 +369,7 @@ public void addSelectionListener(SelectionListener listener) { * @see #removeTreeListener */ public void addTreeListener(TreeListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Expand, typedListener); - addListener (SWT.Collapse, typedListener); + addTypedListener(listener, SWT.Expand, SWT.Collapse); } @Override diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeColumn.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeColumn.java index f5db5f961be..285d1b8a661 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeColumn.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/TreeColumn.java @@ -149,11 +149,7 @@ public TreeColumn (Tree parent, int style, int index) { * @see #removeControlListener */ public void addControlListener(ControlListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Resize,typedListener); - addListener (SWT.Move,typedListener); + addTypedListener(listener, SWT.Resize, SWT.Move); } /** @@ -181,11 +177,7 @@ public void addControlListener(ControlListener listener) { * @see SelectionEvent */ public void addSelectionListener (SelectionListener listener) { - checkWidget (); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Selection,typedListener); - addListener (SWT.DefaultSelection,typedListener); + addTypedListener(listener, SWT.Selection, SWT.DefaultSelection); } static int checkStyle (int style) { diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java index 9a90a678df2..5489286b6f4 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java @@ -265,10 +265,7 @@ protected void addTypedListener (EventListener listener, int... eventTypes) { * @see #removeDisposeListener */ public void addDisposeListener (DisposeListener listener) { - checkWidget(); - if (listener == null) error (SWT.ERROR_NULL_ARGUMENT); - TypedListener typedListener = new TypedListener (listener); - addListener (SWT.Dispose, typedListener); + addTypedListener(listener, SWT.Dispose); } long callWindowProc (long hwnd, int msg, long wParam, long lParam) { diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/accessibility/CTable.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/accessibility/CTable.java index 6e102e879b1..a3c12619033 100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/accessibility/CTable.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/accessibility/CTable.java @@ -45,7 +45,6 @@ import org.eclipse.swt.widgets.ScrollBar; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Tracker; -import org.eclipse.swt.widgets.TypedListener; import org.eclipse.swt.widgets.Widget; /** @@ -276,11 +275,7 @@ public CTable (Composite parent, int style) { * @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); } boolean checkData (CTableItem item, boolean redraw) { if (item.cached) return true; @@ -3550,8 +3545,8 @@ void removeSelectedItem (int index) { 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); } /** * Selects the item at the given zero-relative index in the receiver. diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/accessibility/CTableColumn.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/accessibility/CTableColumn.java index 2542316a313..ffb3f33c14f 100644 --- a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/accessibility/CTableColumn.java +++ b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/accessibility/CTableColumn.java @@ -31,7 +31,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; import org.eclipse.swt.widgets.Widget; /** @@ -160,13 +159,10 @@ public CTableColumn (CTable parent, int style, int index) { * @see ControlListener * @see #removeControlListener */ -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); +public void addControlListener(ControlListener listener) { + addTypedListener(listener, SWT.Resize, SWT.Move); } + /** * Adds the listener to the collection of listeners who will * be notified when the control is selected by the user, by sending @@ -192,11 +188,7 @@ public void addControlListener (ControlListener 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); } static CTable checkNull (CTable table) { if (table == null) SWT.error (SWT.ERROR_NULL_ARGUMENT); @@ -554,8 +546,8 @@ void paint (GC gc) { public void removeControlListener (ControlListener listener) { checkWidget (); if (listener == null) SWT.error (SWT.ERROR_NULL_ARGUMENT); - removeListener (SWT.Move, listener); - removeListener (SWT.Resize, listener); + removeTypedListener(SWT.Move, listener); + removeTypedListener(SWT.Resize, listener); } /** * Removes the listener from the collection of listeners who will @@ -577,8 +569,8 @@ public void removeControlListener (ControlListener listener) { 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); } /** * Controls how text and images will be displayed in the receiver.