new interfaces for j2me compatability

24 files changed, 51 insertions, 49 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ArmListener.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ArmListener.java
index 46d7fe5233..165fdb3de5 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ArmListener.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ArmListener.java
@@ -5,7 +5,7 @@ package org.eclipse.swt.events;
  * All Rights Reserved

  */

 

-import java.util.EventListener;

+import org.eclipse.swt.internal.EventListenerCompatibility;

 

 /**

  * Classes which implement this interface provide a method

@@ -21,7 +21,7 @@ import java.util.EventListener;
  *

  * @see ArmEvent

  */

-public interface ArmListener extends EventListener {

+public interface ArmListener extends EventListenerCompatibility {

 

 /**

  * Sent when a widget is armed, or 'about to be selected'.

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ControlListener.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ControlListener.java
index 8f8ebcf95c..0bdaa6456a 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ControlListener.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ControlListener.java
@@ -5,7 +5,7 @@ package org.eclipse.swt.events;
  * All Rights Reserved

  */

 

-import java.util.EventListener;

+import org.eclipse.swt.internal.EventListenerCompatibility;

 

 /**

  * Classes which implement this interface provide methods

@@ -23,7 +23,7 @@ import java.util.EventListener;
  * @see ControlAdapter

  * @see ControlEvent

  */

-public interface ControlListener extends EventListener {

+public interface ControlListener extends EventListenerCompatibility {

 

 /**

  * Sent when the location (x, y) of a control changes relative

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/DisposeListener.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/DisposeListener.java
index 45fa5c032a..6a0f22f8dd 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/DisposeListener.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/DisposeListener.java
@@ -5,7 +5,7 @@ package org.eclipse.swt.events;
  * All Rights Reserved

  */

 

-import java.util.EventListener;

+import org.eclipse.swt.internal.EventListenerCompatibility;

 

 /**

  * Classes which implement this interface provide a method

@@ -22,7 +22,7 @@ import java.util.EventListener;
  *

  * @see DisposeEvent

  */

-public interface DisposeListener extends EventListener {

+public interface DisposeListener extends EventListenerCompatibility {

 

 /**

  * Sent when the widget is disposed.

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/FocusListener.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/FocusListener.java
index 41736134a2..04b9f58d27 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/FocusListener.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/FocusListener.java
@@ -5,7 +5,7 @@ package org.eclipse.swt.events;
  * All Rights Reserved

  */

 

-import java.util.EventListener;

+import org.eclipse.swt.internal.EventListenerCompatibility;

 

 /**

  * Classes which implement this interface provide methods

@@ -23,7 +23,7 @@ import java.util.EventListener;
  * @see FocusAdapter

  * @see FocusEvent

  */

-public interface FocusListener extends EventListener {

+public interface FocusListener extends EventListenerCompatibility {

 

 /**

  * Sent when a control gets focus.

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/HelpListener.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/HelpListener.java
index 44edd2afd6..e843ed454f 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/HelpListener.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/HelpListener.java
@@ -5,7 +5,7 @@ package org.eclipse.swt.events;
  * All Rights Reserved

  */

 

-import java.util.EventListener;

+import org.eclipse.swt.internal.EventListenerCompatibility;

 

 /**

  * Classes which implement this interface provide a method

@@ -22,7 +22,7 @@ import java.util.EventListener;
  *

  * @see HelpEvent

  */

-public interface HelpListener extends EventListener {

+public interface HelpListener extends EventListenerCompatibility {

 

 /**

  * Sent when help is requested for a control, typically

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/KeyListener.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/KeyListener.java
index 988125ae3f..2b0f39824a 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/KeyListener.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/KeyListener.java
@@ -5,7 +5,7 @@ package org.eclipse.swt.events;
  * All Rights Reserved

  */

 

-import java.util.EventListener;

+import org.eclipse.swt.internal.EventListenerCompatibility;

 

 /**

  * Classes which implement this interface provide methods

@@ -23,7 +23,7 @@ import java.util.EventListener;
  * @see KeyAdapter

  * @see KeyEvent

  */

-public interface KeyListener extends EventListener {

+public interface KeyListener extends EventListenerCompatibility {

 

 /**

  * Sent when a key is pressed on the system keyboard.

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MenuListener.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MenuListener.java
index 9f9a837af3..26337ec6b1 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MenuListener.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MenuListener.java
@@ -5,7 +5,7 @@ package org.eclipse.swt.events;
  * All Rights Reserved

  */

 

-import java.util.EventListener;

+import org.eclipse.swt.internal.EventListenerCompatibility;

 

 /**

  * Classes which implement this interface provide methods

@@ -22,7 +22,7 @@ import java.util.EventListener;
  * @see MenuAdapter

  * @see MenuEvent

  */

-public interface MenuListener extends EventListener {

+public interface MenuListener extends EventListenerCompatibility {

 

 /**

  * Sent when a menu is hidden.

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ModifyListener.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ModifyListener.java
index e4da14c48a..fcacf86d71 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ModifyListener.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ModifyListener.java
@@ -5,7 +5,7 @@ package org.eclipse.swt.events;
  * All Rights Reserved

  */

 

-import java.util.EventListener;

+import org.eclipse.swt.internal.EventListenerCompatibility;

 

 /**

  * Classes which implement this interface provide a method

@@ -21,7 +21,7 @@ import java.util.EventListener;
  *

  * @see ModifyEvent

  */

-public interface ModifyListener extends EventListener {

+public interface ModifyListener extends EventListenerCompatibility {

 

 /**

  * Sent when the text is modified.

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MouseListener.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MouseListener.java
index 185de9ac6d..234d7bdb72 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MouseListener.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MouseListener.java
@@ -5,7 +5,7 @@ package org.eclipse.swt.events;
  * All Rights Reserved

  */

 

-import java.util.EventListener;

+import org.eclipse.swt.internal.EventListenerCompatibility;

 

 /**

  * Classes which implement this interface provide methods

@@ -23,7 +23,7 @@ import java.util.EventListener;
  * @see MouseAdapter

  * @see MouseEvent

  */

-public interface MouseListener extends EventListener {

+public interface MouseListener extends EventListenerCompatibility {

 

 /**

  * Sent when a mouse button is pressed twice within the 

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MouseMoveListener.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MouseMoveListener.java
index 6302053d56..63ac4118c8 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MouseMoveListener.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MouseMoveListener.java
@@ -5,7 +5,7 @@ package org.eclipse.swt.events;
  * All Rights Reserved

  */

 

-import java.util.EventListener;

+import org.eclipse.swt.internal.EventListenerCompatibility;

 

 /**

  * Classes which implement this interface provide a method

@@ -21,7 +21,7 @@ import java.util.EventListener;
  *

  * @see MouseEvent

  */

-public interface MouseMoveListener extends EventListener {

+public interface MouseMoveListener extends EventListenerCompatibility {

 

 /**

  * Sent when the mouse moves.

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MouseTrackListener.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MouseTrackListener.java
index 8eac067faf..fdfb891862 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MouseTrackListener.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/MouseTrackListener.java
@@ -5,7 +5,7 @@ package org.eclipse.swt.events;
  * All Rights Reserved

  */

 

-import java.util.EventListener;

+import org.eclipse.swt.internal.EventListenerCompatibility;

 

 /**

  * Classes which implement this interface provide methods

@@ -24,7 +24,7 @@ import java.util.EventListener;
  * @see MouseTrackAdapter

  * @see MouseEvent

  */

-public interface MouseTrackListener extends EventListener {

+public interface MouseTrackListener extends EventListenerCompatibility {

 

 /**

  * Sent when the mouse pointer passes into the area of

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/PaintListener.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/PaintListener.java
index c1ab6bd003..98c773f992 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/PaintListener.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/PaintListener.java
@@ -5,7 +5,7 @@ package org.eclipse.swt.events;
  * All Rights Reserved

  */

 

-import java.util.EventListener;

+import org.eclipse.swt.internal.EventListenerCompatibility;

 

 /**

  * Classes which implement this interface provide methods

@@ -22,7 +22,7 @@ import java.util.EventListener;
  *

  * @see PaintEvent

  */

-public interface PaintListener extends EventListener {

+public interface PaintListener extends EventListenerCompatibility {

 

 /**

  * Sent when a paint event occurs for the control.

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/SelectionListener.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/SelectionListener.java
index 7b16986827..32bb7f4c1d 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/SelectionListener.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/SelectionListener.java
@@ -5,7 +5,7 @@ package org.eclipse.swt.events;
  * All Rights Reserved

  */

 

-import java.util.EventListener;

+import org.eclipse.swt.internal.EventListenerCompatibility;

 

 /**

  * Classes which implement this interface provide methods

@@ -23,7 +23,7 @@ import java.util.EventListener;
  * @see SelectionAdapter

  * @see SelectionEvent

  */

-public interface SelectionListener extends EventListener {

+public interface SelectionListener extends EventListenerCompatibility {

 

 /**

  * Sent when selection occurs in the control.

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ShellListener.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ShellListener.java
index c5c1e86440..cb1c1ce946 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ShellListener.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/ShellListener.java
@@ -5,7 +5,7 @@ package org.eclipse.swt.events;
  * All Rights Reserved

  */

 

-import java.util.EventListener;

+import org.eclipse.swt.internal.EventListenerCompatibility;

 

 /**

  * Classes which implement this interface provide methods

@@ -22,7 +22,7 @@ import java.util.EventListener;
  * @see ShellAdapter

  * @see ShellEvent

  */

-public interface ShellListener extends EventListener {

+public interface ShellListener extends EventListenerCompatibility {

 

 /**

  * Sent when a shell becomes the active window.

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/TraverseListener.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/TraverseListener.java
index 38ee3285b3..e75968601d 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/TraverseListener.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/TraverseListener.java
@@ -5,7 +5,7 @@ package org.eclipse.swt.events;
  * All Rights Reserved

  */

 

-import java.util.EventListener;

+import org.eclipse.swt.internal.EventListenerCompatibility;

 

 /**

  * Classes which implement this interface provide a method

@@ -22,7 +22,7 @@ import java.util.EventListener;
  *

  * @see TraverseEvent

  */

-public interface TraverseListener extends EventListener {

+public interface TraverseListener extends EventListenerCompatibility {

 

 /**

  * Sent when a traverse event occurs in a control.

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/TreeListener.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/TreeListener.java
index 44c625ff29..39c9d06cb6 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/TreeListener.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/TreeListener.java
@@ -5,7 +5,7 @@ package org.eclipse.swt.events;
  * All Rights Reserved

  */

 

-import java.util.EventListener;

+import org.eclipse.swt.internal.EventListenerCompatibility;

 

 /**

  * Classes which implement this interface provide methods

@@ -23,7 +23,7 @@ import java.util.EventListener;
  * @see TreeAdapter

  * @see TreeEvent

  */

-public interface TreeListener extends EventListener {

+public interface TreeListener extends EventListenerCompatibility {

 

 /**

  * Sent when a tree branch is collapsed.

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/VerifyListener.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/VerifyListener.java
index 59906669ba..9d0704d20f 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/VerifyListener.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/events/VerifyListener.java
@@ -5,7 +5,7 @@ package org.eclipse.swt.events;
  * All Rights Reserved

  */

 

-import java.util.EventListener;

+import org.eclipse.swt.internal.EventListenerCompatibility;

 

 /**

  * Classes which implement this interface provide a method

@@ -22,7 +22,7 @@ import java.util.EventListener;
  *

  * @see VerifyEvent

  */

-public interface VerifyListener extends EventListener {

+public interface VerifyListener extends EventListenerCompatibility {

 

 /**

  * Sent when the text is about to be modified.

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageData.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageData.java
index fe8ca697f1..ca7e26be42 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageData.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageData.java
@@ -8,6 +8,7 @@ package org.eclipse.swt.graphics;
 import java.io.*;

 import org.eclipse.swt.*;

 import org.eclipse.swt.internal.image.*;

+import org.eclipse.swt.internal.CloneableCompatibility;

 

 /**

  * Instances of this class are device-independent descriptions

@@ -25,7 +26,7 @@ import org.eclipse.swt.internal.image.*;
  * @see ImageLoader

  */

 

-public final class ImageData implements Cloneable {

+public final class ImageData implements CloneableCompatibility {

 	

 	/**

 	 * the width of the image, in pixels

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageLoaderListener.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageLoaderListener.java
index 808c6d8677..4b2749c0b1 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageLoaderListener.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/ImageLoaderListener.java
@@ -5,7 +5,7 @@ package org.eclipse.swt.graphics;
  * All Rights Reserved

  */

 

-import java.util.EventListener;

+import org.eclipse.swt.internal.EventListenerCompatibility;

 

 /**

  * Classes which implement this interface provide methods

@@ -23,7 +23,7 @@ import java.util.EventListener;
  * @see ImageLoaderEvent

  */

 

-public interface ImageLoaderListener extends EventListener {

+public interface ImageLoaderListener extends EventListenerCompatibility {

 

 /**

  * Sent when image data is either partially or completely loaded.

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/Point.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/Point.java
index f4acc565ba..8836a3f176 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/Point.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/Point.java
@@ -5,7 +5,7 @@ package org.eclipse.swt.graphics;
  * All Rights Reserved

  */

 

-import java.io.Serializable;

+import org.eclipse.swt.internal.SerializableCompatibility;

 

 /**

  * Instances of this class represent places on the (x, y)

@@ -25,7 +25,7 @@ import java.io.Serializable;
  * @see Rectangle

  */

 

-public final class Point implements Serializable {

+public final class Point implements SerializableCompatibility {

 	

 	/**

 	 * the x coordinate of the point

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/RGB.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/RGB.java
index 50ee5806c2..686d519af9 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/RGB.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/RGB.java
@@ -5,7 +5,7 @@ package org.eclipse.swt.graphics;
  * All Rights Reserved

  */

 

-import java.io.Serializable;

+import org.eclipse.swt.internal.SerializableCompatibility;

 import org.eclipse.swt.*;

 

 /**

@@ -25,7 +25,7 @@ import org.eclipse.swt.*;
  * @see Color

  */

 

-public final class RGB implements Serializable {

+public final class RGB implements SerializableCompatibility {

 	

 	/**

 	 * the red component of the RGB

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/Rectangle.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/Rectangle.java
index 9f9d8bbbdb..5a53032233 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/Rectangle.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/graphics/Rectangle.java
@@ -5,7 +5,7 @@ package org.eclipse.swt.graphics;
  * All Rights Reserved

  */

 

-import java.io.Serializable;

+import org.eclipse.swt.internal.SerializableCompatibility;

 import org.eclipse.swt.*;

 

 /**

@@ -28,7 +28,7 @@ import org.eclipse.swt.*;
  * @see Point

  */

 

-public final class Rectangle implements Serializable {

+public final class Rectangle implements SerializableCompatibility {

 	

 	/**

 	 * the x coordinate of the rectangle

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/EventTable.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/EventTable.java
index 483e5a8d53..0c50d3f3e0 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/EventTable.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/EventTable.java
@@ -5,7 +5,8 @@ package org.eclipse.swt.widgets;
  * All Rights Reserved

  */

 

-import java.util.EventListener;

+import org.eclipse.swt.internal.EventListenerCompatibility;

+

 

 /**

  * Instances of this class implement a simple

@@ -66,7 +67,7 @@ public void unhook (int eventType, Listener handler) {
 	}

 }

 

-public void unhook (int eventType, EventListener handler) {

+public void unhook (int eventType, EventListenerCompatibility handler) {

 	if (handlers == null) return;

 	for (int i=0; i<types.length; i++) {

 		if (types [i] == eventType) {

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/TypedListener.java b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/TypedListener.java
index 14607192f7..654ac9ab04 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/TypedListener.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common/org/eclipse/swt/widgets/TypedListener.java
@@ -5,7 +5,7 @@ package org.eclipse.swt.widgets;
  * All Rights Reserved

  */

 

-import java.util.EventListener;

+import org.eclipse.swt.internal.EventListenerCompatibility;

 import org.eclipse.swt.*;

 import org.eclipse.swt.events.*;

 

@@ -29,7 +29,7 @@ public class TypedListener implements Listener {
 	/**

 	 * The receiver's event listener

 	 */

-	protected EventListener eventListener;

+	protected EventListenerCompatibility eventListener;

 

 /**

  * Constructs a new instance of this class for the given event listener.

@@ -42,7 +42,7 @@ public class TypedListener implements Listener {
  *

  * @param listener the event listener to store in the receiver

  */

-public TypedListener (EventListener listener) {

+public TypedListener (EventListenerCompatibility listener) {

 	eventListener = listener;

 }

 

@@ -57,7 +57,7 @@ public TypedListener (EventListener listener) {
  *

  * @return the receiver's event listener

  */

-public EventListener getEventListener () {

+public EventListenerCompatibility getEventListener () {

 	return eventListener;

 }