Replace usage of actually internal SWT TypedListener

Use the new API introduced in SWT via eclipse-platform/eclipse.platform.swt#1112
HannesWell · Mar 19, 2024 · d44cb85 · d44cb85
1 parent 8292ced
commit d44cb85
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 21 deletions.
diff --git a/bundles/org.eclipse.jface.text/META-INF/MANIFEST.MF b/bundles/org.eclipse.jface.text/META-INF/MANIFEST.MF
@@ -35,7 +35,7 @@ Export-Package:
 Require-Bundle: 
  org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
  org.eclipse.text;bundle-version="[3.8.0,4.0.0)";visibility:=reexport,
- org.eclipse.swt;bundle-version="[3.117.0,4.0.0)",
+ org.eclipse.swt;bundle-version="[3.126.0,4.0.0)",
  org.eclipse.jface;bundle-version="[3.19.0,4.0.0)"
 Import-Package: com.ibm.icu.text
 Bundle-RequiredExecutionEnvironment: JavaSE-17

diff --git a/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineNumberRulerColumn.java b/bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/LineNumberRulerColumn.java
@@ -40,7 +40,6 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.TypedListener;
 
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
@@ -599,10 +598,7 @@ public void addMouseListener(MouseListener listener) {
 				if (listener == fMouseHandler)
 					super.addMouseListener(listener);
 				else {
-					TypedListener typedListener= null;
-					if (listener != null)
-						typedListener= new TypedListener(listener);
-					addListener(SWT.MouseDoubleClick, typedListener);
+					addTypedListener(listener, SWT.MouseDoubleClick);
 				}
 			}
 		};

diff --git a/bundles/org.eclipse.jface/META-INF/MANIFEST.MF b/bundles/org.eclipse.jface/META-INF/MANIFEST.MF
@@ -34,7 +34,7 @@ Export-Package: org.eclipse.jface,
  org.eclipse.jface.window,
  org.eclipse.jface.wizard,
  org.eclipse.jface.wizard.images
-Require-Bundle: org.eclipse.swt;bundle-version="[3.111.0,4.0.0)";visibility:=reexport,
+Require-Bundle: org.eclipse.swt;bundle-version="[3.126.0,4.0.0)";visibility:=reexport,
  org.eclipse.core.commands;bundle-version="[3.4.0,4.0.0)";visibility:=reexport,
  org.eclipse.equinox.common;bundle-version="[3.18.0,4.0.0)",
  org.eclipse.equinox.bidi;bundle-version="[0.10.0,2.0.0)";resolution:=optional

diff --git a/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/forms/widgets/FormText.java b/bundles/org.eclipse.ui.forms/src/org/eclipse/ui/forms/widgets/FormText.java
@@ -58,7 +58,6 @@
 import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Menu;
 import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.swt.widgets.TypedListener;
 import org.eclipse.ui.forms.HyperlinkSettings;
 import org.eclipse.ui.forms.events.HyperlinkEvent;
 import org.eclipse.ui.forms.events.IHyperlinkListener;
@@ -994,12 +993,7 @@ public void removeHyperlinkListener(IHyperlinkListener listener) {
 	 * @since 3.1
 	 */
 	public void addSelectionListener(SelectionListener listener) {
-		checkWidget();
-		if (listener == null) {
-			SWT.error(SWT.ERROR_NULL_ARGUMENT);
-		}
-		TypedListener typedListener = new TypedListener(listener);
-		addListener(SWT.Selection, typedListener);
+		addTypedListener(listener, SWT.Selection);
 	}
 
 	/**
@@ -1021,11 +1015,7 @@ public void addSelectionListener(SelectionListener listener) {
 	 * @since 3.1
 	 */
 	public void removeSelectionListener(SelectionListener listener) {
-		checkWidget();
-		if (listener == null) {
-			SWT.error(SWT.ERROR_NULL_ARGUMENT);
-		}
-		removeListener(SWT.Selection, listener);
+		removeTypedListener(SWT.Selection, listener);
 	}
 
 	/**

diff --git a/bundles/org.eclipse.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.ui/META-INF/MANIFEST.MF
@@ -9,8 +9,8 @@ Bundle-Vendor: %Plugin.providerName
 Bundle-Localization: plugin
 Export-Package: org.eclipse.ui.internal;x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
- org.eclipse.swt;bundle-version="[3.124.0,4.0.0)";visibility:=reexport,
- org.eclipse.jface;bundle-version="[3.31.0,4.0.0)";visibility:=reexport,
+ org.eclipse.swt;bundle-version="[3.126.0,4.0.0)";visibility:=reexport,
+ org.eclipse.jface;bundle-version="[3.34.0,4.0.0)";visibility:=reexport,
  org.eclipse.ui.workbench;bundle-version="[3.130.0,4.0.0)";visibility:=reexport,
  org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-17