new interfaces for j2me compatability

50 files changed, 223 insertions, 79 deletions

diff --git a/bundles/org.eclipse.swt/.classpath_motif b/bundles/org.eclipse.swt/.classpath_motif
index d89e2d31c2..826bb421ee 100755
--- a/bundles/org.eclipse.swt/.classpath_motif
+++ b/bundles/org.eclipse.swt/.classpath_motif
@@ -4,6 +4,7 @@
     <classpathentry kind="src" path="Eclipse SWT/motif"/>
     <classpathentry kind="src" path="Eclipse SWT/emulated"/>
     <classpathentry kind="src" path="Eclipse SWT/common"/>
+    <classpathentry kind="src" path="Eclipse SWT/common_j2se"/>
     <classpathentry kind="src" path="Eclipse SWT Printing/motif"/>
     <classpathentry kind="src" path="Eclipse SWT Printing/common"/>
     <classpathentry kind="src" path="Eclipse SWT Program/motif"/>
diff --git a/bundles/org.eclipse.swt/.classpath_motif_j2me b/bundles/org.eclipse.swt/.classpath_motif_j2me
index 09af6cf3ce..a5ff02332f 100644
--- a/bundles/org.eclipse.swt/.classpath_motif_j2me
+++ b/bundles/org.eclipse.swt/.classpath_motif_j2me
@@ -4,6 +4,7 @@
     <classpathentry kind="src" path="Eclipse SWT/motif"/>

     <classpathentry kind="src" path="Eclipse SWT/emulated"/>

     <classpathentry kind="src" path="Eclipse SWT/common"/>

+    <classpathentry kind="src" path="Eclipse SWT/common_j2me"/>

     <classpathentry kind="src" path="Eclipse SWT Printing/motif"/>

     <classpathentry kind="src" path="Eclipse SWT Printing/common"/>

     <classpathentry kind="src" path="Eclipse SWT Program/motif"/>

diff --git a/bundles/org.eclipse.swt/.classpath_photon b/bundles/org.eclipse.swt/.classpath_photon
index 89aa3ff82e..e8ef1bb5ec 100755
--- a/bundles/org.eclipse.swt/.classpath_photon
+++ b/bundles/org.eclipse.swt/.classpath_photon
@@ -4,6 +4,7 @@
     <classpathentry kind="src" path="Eclipse SWT/photon"/>
     <classpathentry kind="src" path="Eclipse SWT/emulated"/>
     <classpathentry kind="src" path="Eclipse SWT/common"/>
+    <classpathentry kind="src" path="Eclipse SWT/common_j2se"/>
     <classpathentry kind="src" path="Eclipse SWT Printing/photon"/>
     <classpathentry kind="src" path="Eclipse SWT Printing/common"/>
     <classpathentry kind="src" path="Eclipse SWT Program/photon"/>
diff --git a/bundles/org.eclipse.swt/.classpath_photon_j2me b/bundles/org.eclipse.swt/.classpath_photon_j2me
index 89aa3ff82e..d9ddb445ff 100644
--- a/bundles/org.eclipse.swt/.classpath_photon_j2me
+++ b/bundles/org.eclipse.swt/.classpath_photon_j2me
@@ -4,6 +4,7 @@
     <classpathentry kind="src" path="Eclipse SWT/photon"/>
     <classpathentry kind="src" path="Eclipse SWT/emulated"/>
     <classpathentry kind="src" path="Eclipse SWT/common"/>
+    <classpathentry kind="src" path="Eclipse SWT/common_j2me"/>
     <classpathentry kind="src" path="Eclipse SWT Printing/photon"/>
     <classpathentry kind="src" path="Eclipse SWT Printing/common"/>
     <classpathentry kind="src" path="Eclipse SWT Program/photon"/>
diff --git a/bundles/org.eclipse.swt/.classpath_win32_j2me b/bundles/org.eclipse.swt/.classpath_win32_j2me
index a743829e7a..acae8c33e8 100644
--- a/bundles/org.eclipse.swt/.classpath_win32_j2me
+++ b/bundles/org.eclipse.swt/.classpath_win32_j2me
@@ -3,6 +3,7 @@
     <classpathentry kind="var" path="JRE_LIB"/>
     <classpathentry kind="src" path="Eclipse SWT/win32"/>
     <classpathentry kind="src" path="Eclipse SWT/common"/>
+    <classpathentry kind="src" path="Eclipse SWT/common_j2me"/>
     <classpathentry kind="src" path="Eclipse SWT Printing/win32"/>
     <classpathentry kind="src" path="Eclipse SWT Printing/common"/>
     <classpathentry kind="src" path="Eclipse SWT Program/win32"/>
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolderListener.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolderListener.java
index c46e30c8d5..cfc10a8796 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolderListener.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/CTabFolderListener.java
@@ -5,8 +5,6 @@ package org.eclipse.swt.custom;
  * All Rights Reserved

  */

 

-import java.util.EventListener;

-

 public interface CTabFolderListener {

 	public void itemClosed(CTabFolderEvent event);

 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ExtendedModifyListener.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ExtendedModifyListener.java
index 59952fcdda..7805565e36 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ExtendedModifyListener.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/ExtendedModifyListener.java
@@ -4,9 +4,9 @@ package org.eclipse.swt.custom;
  * All Rights Reserved

  */

 

-import java.util.EventListener;

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

 

-public interface ExtendedModifyListener extends EventListener {

+public interface ExtendedModifyListener extends EventListenerCompatibility {

 /**

  * This method is called after a text change occurs.

  * <p>

diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/LineBackgroundListener.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/LineBackgroundListener.java
index 2854bef905..0edcf53c94 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/LineBackgroundListener.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/LineBackgroundListener.java
@@ -4,9 +4,9 @@ package org.eclipse.swt.custom;
  * All Rights Reserved

  */

 

-import java.util.EventListener;

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

 

-public interface LineBackgroundListener extends EventListener {

+public interface LineBackgroundListener extends EventListenerCompatibility {

 	

 /**

  * This method is called when a line is about to be drawn in order to get its

diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/LineStyleListener.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/LineStyleListener.java
index fb53717abf..f6568cfddb 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/LineStyleListener.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/LineStyleListener.java
@@ -4,9 +4,9 @@ package org.eclipse.swt.custom;
  * All Rights Reserved

  */

 

-import java.util.EventListener;

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

 

-public interface LineStyleListener extends EventListener {

+public interface LineStyleListener extends EventListenerCompatibility {

 /**

  * This method is called when a line is about to be drawn in order to get the

  * line's style information.

diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyleRange.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyleRange.java
index 10ca96699c..9fd1bda9f7 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyleRange.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyleRange.java
@@ -6,8 +6,9 @@ package org.eclipse.swt.custom;
 

 import org.eclipse.swt.*;

 import org.eclipse.swt.graphics.*;

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

 

-public class StyleRange implements Cloneable {

+public class StyleRange implements CloneableCompatibility {

 	public int start;		// style start offset. 0 based from the document start

 	public int length;		// style length.	

 	public Color foreground; 

diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledTextListener.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledTextListener.java
index a15f45f4c1..4ccdbe7a82 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledTextListener.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledTextListener.java
@@ -6,12 +6,12 @@ package org.eclipse.swt.custom;
 

 import org.eclipse.swt.events.*;

 import org.eclipse.swt.widgets.*;

-import java.util.EventListener;

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

 

 class StyledTextListener extends TypedListener {

 /**

  */

-StyledTextListener(EventListener listener) {

+StyledTextListener(EventListenerCompatibility listener) {

 	super(listener);

 }

 /**

diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TextChangeListener.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TextChangeListener.java
index c49d2209eb..a4c5631fe8 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TextChangeListener.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/TextChangeListener.java
@@ -4,7 +4,7 @@ package org.eclipse.swt.custom;
  * All Rights Reserved

  */

 

-import java.util.EventListener;

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

 

 /**

  * The StyledText widget implements this listener to receive

@@ -14,7 +14,7 @@ import java.util.EventListener;
  * the ModifyEvent or ExtendedModifyEvent that is sent by the StyledText 

  * widget to receive text change notifications.

  */

-public interface TextChangeListener extends EventListener {

+public interface TextChangeListener extends EventListenerCompatibility {

 

 /**

  * @param event.start replace start offset (input)	

diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/VerifyKeyListener.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/VerifyKeyListener.java
index 946bbcb20b..43a86d5819 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/VerifyKeyListener.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/VerifyKeyListener.java
@@ -5,9 +5,9 @@ package org.eclipse.swt.custom;
  */

 

 import org.eclipse.swt.events.*;

-import java.util.EventListener;

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

 

-public interface VerifyKeyListener extends EventListener {

+public interface VerifyKeyListener extends EventListenerCompatibility {

 /**

  * @param event.character the character that was typed (input)	

  * @param event.keyCode the key code that was typed (input)

diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DNDListener.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DNDListener.java
index b3d529c478..4f81b7530b 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DNDListener.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DNDListener.java
@@ -5,13 +5,15 @@ package org.eclipse.swt.dnd;
  * All Rights Reserved

  */

 import org.eclipse.swt.widgets.Event;

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

+

 

 class DNDListener extends org.eclipse.swt.widgets.TypedListener {

 /**

  * DNDListener constructor comment.

- * @param listener java.util.EventListener

+ * @param listener org.eclipse.swt.internal.EventListenerCompatibility

  */

-DNDListener(java.util.EventListener listener) {

+DNDListener(EventListenerCompatibility listener) {

 	super(listener);

 }

 public void handleEvent (Event e) {

diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DragSourceListener.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DragSourceListener.java
index ea57526fde..5b13fac466 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DragSourceListener.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DragSourceListener.java
@@ -4,7 +4,7 @@ package org.eclipse.swt.dnd;
  * (c) Copyright IBM Corp. 2000, 2001.

  * All Rights Reserved

  */

-import java.util.EventListener;

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

 

 /**

  * The <code>DragSourceListener</code> class provides event notification to the application for DragSource events.

@@ -17,7 +17,7 @@ import java.util.EventListener;
  * <b>move</b> operation, the application must remove the data that was transferred.</p>

  *

  */

-public interface DragSourceListener extends EventListener {

+public interface DragSourceListener extends EventListenerCompatibility {

 

 /**

  * The user has begun the actions required to drag the widget. This event gives the application 

diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DropTargetListener.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DropTargetListener.java
index 1423674be1..f4c2764912 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DropTargetListener.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DropTargetListener.java
@@ -5,7 +5,7 @@ package org.eclipse.swt.dnd;
  * All Rights Reserved

  */

 import org.eclipse.swt.graphics.*;

-import java.util.EventListener;

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

 

 /**

  * The <code>DropTargetListener</code> class provides event notification to the application for DropTarget events.

@@ -21,7 +21,7 @@ import java.util.EventListener;
  * operation that is performed but the data type is fixed.</p>

  *

  */

-public interface DropTargetListener extends EventListener {

+public interface DropTargetListener extends EventListenerCompatibility {

 /**

  * The cursor has entered the drop target boundaries.

  *

diff --git a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEventTable.java b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEventTable.java
index dca941fd32..aee23f6ce1 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEventTable.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT OLE Win32/win32/org/eclipse/swt/ole/win32/OleEventTable.java
@@ -5,8 +5,6 @@ package org.eclipse.swt.ole.win32;
  * All Rights Reserved

  */

 

-import java.util.EventListener;

-

 /**

 * The OleEventTable class implements a simple

 * look up mechanism that maps an event type

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;

 }

 

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common_j2me/org/eclipse/swt/internal/CloneableCompatibility.java b/bundles/org.eclipse.swt/Eclipse SWT/common_j2me/org/eclipse/swt/internal/CloneableCompatibility.java
new file mode 100644
index 0000000000..7ab0d205bc
--- /dev/null
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common_j2me/org/eclipse/swt/internal/CloneableCompatibility.java
@@ -0,0 +1,25 @@
+package org.eclipse.swt.internal; 

+

+/*

+ * (c) Copyright IBM Corp. 2000, 2001.

+ * All Rights Reserved

+ */

+

+/**

+ * This interface is the cross-platform version of the

+ * java.lang.Cloneable interface.

+ * <p>

+ * It is part of our effort to provide support for both J2SE

+ * and J2ME platforms. Under this scheme, classes need to 

+ * implement CloneableCompatibility instead of java.lang.Cloneable.

+ * </p>

+ * <p>

+ * Note: java.lang.Cloneable is not part of CLDC.

+ * </p>

+ * <p>

+ * IMPORTANT: CDC mandates Cloneable. Behavior on CLDC will have

+ * to be discussed further.

+ * </p>

+ */

+public interface CloneableCompatibility {

+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common_j2me/org/eclipse/swt/internal/EventListenerCompatibility.java b/bundles/org.eclipse.swt/Eclipse SWT/common_j2me/org/eclipse/swt/internal/EventListenerCompatibility.java
new file mode 100644
index 0000000000..960b2cd631
--- /dev/null
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common_j2me/org/eclipse/swt/internal/EventListenerCompatibility.java
@@ -0,0 +1,22 @@
+package org.eclipse.swt.internal;

+

+/*

+ * (c) Copyright IBM Corp. 2000, 2001.

+ * All Rights Reserved

+ */

+

+/**

+ * This interface is the cross-platform version of the

+ * java.util.EventListener interface.

+ * <p>

+ * It is part of our effort to provide support for both J2SE

+ * and J2ME platforms. Under this scheme, classes need to 

+ * implement EventListenerCompatibility instead of

+ * java.util.EventListener.

+ * </p>

+ * <p>

+ * Note: java.util.EventListener is not part of CDC and CLDC.

+ * </p>

+ */

+public interface EventListenerCompatibility {

+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common_j2me/org/eclipse/swt/internal/SerializableCompatibility.java b/bundles/org.eclipse.swt/Eclipse SWT/common_j2me/org/eclipse/swt/internal/SerializableCompatibility.java
new file mode 100644
index 0000000000..db2aa3eedb
--- /dev/null
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common_j2me/org/eclipse/swt/internal/SerializableCompatibility.java
@@ -0,0 +1,26 @@
+package org.eclipse.swt.internal;

+

+/*

+ * (c) Copyright IBM Corp. 2000, 2001.

+ * All Rights Reserved

+ */

+

+/**

+ * This interface is the cross-platform version of the

+ * java.io.Serializable interface.

+ * <p>

+ * It is part of our effort to provide support for both J2SE

+ * and J2ME platforms. Under this scheme, classes need to 

+ * implement SerializableCompatibility instead of

+ * java.io.Serializable.

+ * </p>

+ * <p>

+ * Note: java.io.Serializable is not part of CLDC.

+ * </p>

+ * <p>

+ * IMPORTANT: CDC mandates Serializable. Behavior on CLDC will have

+ * to be discussed further.

+ * </p>

+ */

+public interface SerializableCompatibility {

+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common_j2se/org/eclipse/swt/internal/CloneableCompatibility.java b/bundles/org.eclipse.swt/Eclipse SWT/common_j2se/org/eclipse/swt/internal/CloneableCompatibility.java
new file mode 100644
index 0000000000..e1fe1f1620
--- /dev/null
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common_j2se/org/eclipse/swt/internal/CloneableCompatibility.java
@@ -0,0 +1,21 @@
+package org.eclipse.swt.internal; 

+

+/*

+ * (c) Copyright IBM Corp. 2000, 2001.

+ * All Rights Reserved

+ */

+

+/**

+ * This interface is the cross-platform version of the

+ * java.lang.Cloneable interface.

+ * <p>

+ * It is part of our effort to provide support for both J2SE

+ * and J2ME platforms. Under this scheme, classes need to 

+ * implement CloneableCompatibility instead of java.lang.Cloneable.

+ * </p>

+ * <p>

+ * Note: java.lang.Cloneable is not part of CLDC.

+ * </p>

+ */

+public interface CloneableCompatibility extends Cloneable {

+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common_j2se/org/eclipse/swt/internal/EventListenerCompatibility.java b/bundles/org.eclipse.swt/Eclipse SWT/common_j2se/org/eclipse/swt/internal/EventListenerCompatibility.java
new file mode 100644
index 0000000000..a20ce46e34
--- /dev/null
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common_j2se/org/eclipse/swt/internal/EventListenerCompatibility.java
@@ -0,0 +1,24 @@
+package org.eclipse.swt.internal;

+

+/*

+ * (c) Copyright IBM Corp. 2000, 2001.

+ * All Rights Reserved

+ */

+

+import java.util.EventListener;

+

+/**

+ * This interface is the cross-platform version of the

+ * java.util.EventListener interface.

+ * <p>

+ * It is part of our effort to provide support for both J2SE

+ * and J2ME platforms. Under this scheme, classes need to 

+ * implement EventListenerCompatibility instead of

+ * java.util.EventListener.

+ * </p>

+ * <p>

+ * Note: java.util.EventListener is not part of CDC and CLDC.

+ * </p>

+ */

+public interface EventListenerCompatibility extends EventListener {

+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/common_j2se/org/eclipse/swt/internal/SerializableCompatibility.java b/bundles/org.eclipse.swt/Eclipse SWT/common_j2se/org/eclipse/swt/internal/SerializableCompatibility.java
new file mode 100644
index 0000000000..978f5d323e
--- /dev/null
+++ b/bundles/org.eclipse.swt/Eclipse SWT/common_j2se/org/eclipse/swt/internal/SerializableCompatibility.java
@@ -0,0 +1,24 @@
+package org.eclipse.swt.internal;

+

+/*

+ * (c) Copyright IBM Corp. 2000, 2001.

+ * All Rights Reserved

+ */

+

+import java.io.Serializable;

+

+/**

+ * This interface is the cross-platform version of the

+ * java.io.Serializable interface.

+ * <p>

+ * It is part of our effort to provide support for both J2SE

+ * and J2ME platforms. Under this scheme, classes need to 

+ * implement SerializableCompatibility instead of

+ * java.io.Serializable.

+ * </p>

+ * <p>

+ * Note: java.io.Serializable is not part of CLDC.

+ * </p>

+ */

+public interface SerializableCompatibility extends Serializable {

+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Widget.java b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Widget.java
index 6a4772825f..7d08be9021 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Widget.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/motif/org/eclipse/swt/widgets/Widget.java
@@ -10,7 +10,6 @@ import org.eclipse.swt.internal.motif.*;
 import org.eclipse.swt.*;

 import org.eclipse.swt.graphics.*;

 import org.eclipse.swt.events.*;

-import java.util.EventListener;

 

 /**

  * This class is the abstract superclass of all user interface objects.  

@@ -682,7 +681,7 @@ public void removeListener (int eventType, Listener handler) {
 /**

 * Warning: API under construction.

 */

-protected void removeListener (int eventType, EventListener handler) {

+protected void removeListener (int eventType, EventListenerCompatibility handler) {

 	checkWidget();

 	if (handler == null) error (SWT.ERROR_NULL_ARGUMENT);

 	if (eventTable == null) return;

diff --git a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Widget.java b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Widget.java
index 7ea8277cac..f15146ca35 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Widget.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/photon/org/eclipse/swt/widgets/Widget.java
@@ -11,8 +11,6 @@ import org.eclipse.swt.*;
 import org.eclipse.swt.graphics.*;

 import org.eclipse.swt.events.*;

 

-import java.util.EventListener;

-

 public abstract class Widget {

 	public int handle;

 	int style, state;

@@ -395,7 +393,7 @@ public void removeListener (int eventType, Listener handler) {
 	eventTable.unhook (eventType, handler);

 }

 

-protected void removeListener (int eventType, EventListener handler) {

+protected void removeListener (int eventType, EventListenerCompatibility handler) {

 	checkWidget();

 	if (handler == null) error (SWT.ERROR_NULL_ARGUMENT);

 	if (eventTable == null) return;

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 8fbaf377e3..6a46636098 100755
--- 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
@@ -10,7 +10,6 @@ import org.eclipse.swt.internal.win32.*;
 import org.eclipse.swt.*;

 import org.eclipse.swt.graphics.*;

 import org.eclipse.swt.events.*;

-import java.util.EventListener;

 

 /**

  * This class is the abstract superclass of all user interface objects.  

@@ -795,7 +794,7 @@ public void removeListener (int eventType, Listener listener) {
  * @see Listener

  * @see #addListener

  */

-protected void removeListener (int eventType, EventListener listener) {

+protected void removeListener (int eventType, EventListenerCompatibility listener) {

 	checkWidget();

 	if (listener == null) error (SWT.ERROR_NULL_ARGUMENT);

 	if (eventTable == null) return;