Skip to content

Commit cfa74b4

Browse files
committed
Deprecate TypedListener for removal to make it strongly internal later
1 parent fa71076 commit cfa74b4

File tree

8 files changed

+16
-1
lines changed

8 files changed

+16
-1
lines changed

bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/DefaultContent.java

+1
Original file line numberDiff line numberDiff line change
@@ -749,6 +749,7 @@ public String getTextRange(int start, int length) {
749749
* </ul>
750750
*/
751751
@Override
752+
@SuppressWarnings("removal")
752753
public void removeTextChangeListener(TextChangeListener listener){
753754
if (listener == null) error(SWT.ERROR_NULL_ARGUMENT);
754755
for (int i = 0; i < textListeners.size(); i++) {

bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledTextListener.java

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import org.eclipse.swt.internal.*;
1818
import org.eclipse.swt.widgets.*;
1919

20+
@SuppressWarnings("removal")
2021
class StyledTextListener extends TypedListener {
2122
StyledTextListener(SWTEventListener listener) {
2223
super(listener);

bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DNDListener.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import org.eclipse.swt.internal.*;
1717
import org.eclipse.swt.widgets.*;
1818

19-
19+
@SuppressWarnings("removal")
2020
class DNDListener extends TypedListener {
2121
Widget dndWidget;
2222
/**

bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Widget.java

+2
Original file line numberDiff line numberDiff line change
@@ -500,6 +500,7 @@ protected void addTypedListener (EventListener listener, int... eventTypes) {
500500
if (listener == null) {
501501
SWT.error(SWT.ERROR_NULL_ARGUMENT);
502502
}
503+
@SuppressWarnings("removal")
503504
TypedListener typedListener = new TypedListener(listener);
504505
for (int eventType : eventTypes) {
505506
_addListener(eventType, typedListener);
@@ -1028,6 +1029,7 @@ public Listener[] getListeners (int eventType) {
10281029
*
10291030
* @since 3.126
10301031
*/
1032+
@SuppressWarnings("removal")
10311033
public <L extends EventListener> Stream<L> getTypedListeners (int eventType, Class<L> listenerType) {
10321034
return Arrays.stream(getListeners(eventType)) //
10331035
.filter(TypedListener.class::isInstance).map(l -> ((TypedListener) l).eventListener)

bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/EventTable.java

+1
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ public void unhook (int eventType, Listener listener) {
147147
}
148148
}
149149

150+
@SuppressWarnings("removal")
150151
public void unhook (int eventType, EventListener listener) {
151152
if (types == null) return;
152153
for (int i=0; i<types.length; i++) {

bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/TypedListener.java

+6
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,13 @@
3636
* @noreference This class is not intended to be referenced by clients.
3737
* @noextend This class is not intended to be subclassed by clients.
3838
* @noinstantiate This class is not intended to be instantiated by clients.
39+
* @deprecated This class will become 'strongly' internal. For custom widgets
40+
* {@link Widget#addTypedListener(EventListener, int...)},
41+
* {@link Widget#getTypedListeners(int, Class)} or
42+
* {@link Widget#removeTypedListener(int, EventListener)} can
43+
* probably be used instead.
3944
*/
45+
@Deprecated(forRemoval = true, since = "3.129.0 (removal in 2027-03 or later)")
4046
public class TypedListener implements Listener {
4147

4248
/**

bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java

+2
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,7 @@ protected void addTypedListener (EventListener listener, int... eventTypes) {
361361
if (listener == null) {
362362
SWT.error(SWT.ERROR_NULL_ARGUMENT);
363363
}
364+
@SuppressWarnings("removal")
364365
TypedListener typedListener = new TypedListener(listener);
365366
for (int eventType : eventTypes) {
366367
_addListener(eventType, typedListener);
@@ -730,6 +731,7 @@ public Listener[] getListeners (int eventType) {
730731
*
731732
* @since 3.126
732733
*/
734+
@SuppressWarnings("removal")
733735
public <L extends EventListener> Stream<L> getTypedListeners (int eventType, Class<L> listenerType) {
734736
return Arrays.stream(getListeners(eventType)) //
735737
.filter(TypedListener.class::isInstance).map(l -> ((TypedListener) l).eventListener)

bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java

+2
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,7 @@ protected void addTypedListener (EventListener listener, int... eventTypes) {
256256
if (listener == null) {
257257
SWT.error(SWT.ERROR_NULL_ARGUMENT);
258258
}
259+
@SuppressWarnings("removal")
259260
TypedListener typedListener = new TypedListener(listener);
260261
for (int eventType : eventTypes) {
261262
_addListener(eventType, typedListener);
@@ -668,6 +669,7 @@ public Listener[] getListeners (int eventType) {
668669
*
669670
* @since 3.126
670671
*/
672+
@SuppressWarnings("removal")
671673
public <L extends EventListener> Stream<L> getTypedListeners (int eventType, Class<L> listenerType) {
672674
return Arrays.stream(getListeners(eventType)) //
673675
.filter(TypedListener.class::isInstance).map(l -> ((TypedListener) l).eventListener)

0 commit comments

Comments
 (0)