Skip to content

Commit 0de600a

Browse files
HannesWellakurtakov
authored andcommitted
Replace usage of actually internal SWT TypedListener
Use the new API introduced in SWT via eclipse-platform/eclipse.platform.swt#1112
1 parent 1122c63 commit 0de600a

File tree

6 files changed

+9
-23
lines changed

6 files changed

+9
-23
lines changed

bundles/org.eclipse.jface.text/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Export-Package:
3535
Require-Bundle:
3636
org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
3737
org.eclipse.text;bundle-version="[3.8.0,4.0.0)";visibility:=reexport,
38-
org.eclipse.swt;bundle-version="[3.117.0,4.0.0)",
38+
org.eclipse.swt;bundle-version="[3.126.0,4.0.0)",
3939
org.eclipse.jface;bundle-version="[3.19.0,4.0.0)"
4040
Import-Package: com.ibm.icu.text
4141
Bundle-RequiredExecutionEnvironment: JavaSE-17

bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineNumberRulerColumn.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
import org.eclipse.swt.widgets.Composite;
4141
import org.eclipse.swt.widgets.Control;
4242
import org.eclipse.swt.widgets.Display;
43-
import org.eclipse.swt.widgets.TypedListener;
4443

4544
import org.eclipse.jface.text.BadLocationException;
4645
import org.eclipse.jface.text.IDocument;
@@ -599,10 +598,7 @@ public void addMouseListener(MouseListener listener) {
599598
if (listener == fMouseHandler)
600599
super.addMouseListener(listener);
601600
else {
602-
TypedListener typedListener= null;
603-
if (listener != null)
604-
typedListener= new TypedListener(listener);
605-
addListener(SWT.MouseDoubleClick, typedListener);
601+
addTypedListener(listener, SWT.MouseDoubleClick);
606602
}
607603
}
608604
};

bundles/org.eclipse.jface/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Export-Package: org.eclipse.jface,
3434
org.eclipse.jface.window,
3535
org.eclipse.jface.wizard,
3636
org.eclipse.jface.wizard.images
37-
Require-Bundle: org.eclipse.swt;bundle-version="[3.111.0,4.0.0)";visibility:=reexport,
37+
Require-Bundle: org.eclipse.swt;bundle-version="[3.126.0,4.0.0)";visibility:=reexport,
3838
org.eclipse.core.commands;bundle-version="[3.4.0,4.0.0)";visibility:=reexport,
3939
org.eclipse.equinox.common;bundle-version="[3.18.0,4.0.0)",
4040
org.eclipse.equinox.bidi;bundle-version="[0.10.0,2.0.0)";resolution:=optional

bundles/org.eclipse.ui.forms/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %name
44
Bundle-SymbolicName: org.eclipse.ui.forms;singleton:=true
5-
Bundle-Version: 3.13.200.qualifier
5+
Bundle-Version: 3.13.300.qualifier
66
Bundle-Vendor: %provider-name
77
Bundle-Localization: plugin
88
Export-Package: org.eclipse.ui.forms,

bundles/org.eclipse.ui.forms/src/org/eclipse/ui/forms/widgets/FormText.java

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
import org.eclipse.swt.widgets.Listener;
5959
import org.eclipse.swt.widgets.Menu;
6060
import org.eclipse.swt.widgets.MenuItem;
61-
import org.eclipse.swt.widgets.TypedListener;
6261
import org.eclipse.ui.forms.HyperlinkSettings;
6362
import org.eclipse.ui.forms.events.HyperlinkEvent;
6463
import org.eclipse.ui.forms.events.IHyperlinkListener;
@@ -994,12 +993,7 @@ public void removeHyperlinkListener(IHyperlinkListener listener) {
994993
* @since 3.1
995994
*/
996995
public void addSelectionListener(SelectionListener listener) {
997-
checkWidget();
998-
if (listener == null) {
999-
SWT.error(SWT.ERROR_NULL_ARGUMENT);
1000-
}
1001-
TypedListener typedListener = new TypedListener(listener);
1002-
addListener(SWT.Selection, typedListener);
996+
addTypedListener(listener, SWT.Selection);
1003997
}
1004998

1005999
/**
@@ -1021,11 +1015,7 @@ public void addSelectionListener(SelectionListener listener) {
10211015
* @since 3.1
10221016
*/
10231017
public void removeSelectionListener(SelectionListener listener) {
1024-
checkWidget();
1025-
if (listener == null) {
1026-
SWT.error(SWT.ERROR_NULL_ARGUMENT);
1027-
}
1028-
removeListener(SWT.Selection, listener);
1018+
removeTypedListener(SWT.Selection, listener);
10291019
}
10301020

10311021
/**

bundles/org.eclipse.ui/META-INF/MANIFEST.MF

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %Plugin.name
44
Bundle-SymbolicName: org.eclipse.ui; singleton:=true
5-
Bundle-Version: 3.205.100.qualifier
5+
Bundle-Version: 3.206.0.qualifier
66
Bundle-Activator: org.eclipse.ui.internal.UIPlugin
77
Bundle-ActivationPolicy: lazy
88
Bundle-Vendor: %Plugin.providerName
99
Bundle-Localization: plugin
1010
Export-Package: org.eclipse.ui.internal;x-internal:=true
1111
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
12-
org.eclipse.swt;bundle-version="[3.124.0,4.0.0)";visibility:=reexport,
13-
org.eclipse.jface;bundle-version="[3.31.0,4.0.0)";visibility:=reexport,
12+
org.eclipse.swt;bundle-version="[3.126.0,4.0.0)";visibility:=reexport,
13+
org.eclipse.jface;bundle-version="[3.34.0,4.0.0)";visibility:=reexport,
1414
org.eclipse.ui.workbench;bundle-version="[3.130.0,4.0.0)";visibility:=reexport,
1515
org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)"
1616
Bundle-RequiredExecutionEnvironment: JavaSE-17

0 commit comments

Comments
 (0)