Attachment 148421 Details for Bug 243874 – Proposed patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Proposed patch

Bug-243874a.patch (text/plain), 6.12 KB, created by Jordan Yakovchev

on 2009-09-30 09:26:51 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jordan Yakovchev

Created: 2009-09-30 09:26:51 EDT

Size: 6.12 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rap.rwt
>Index: src/org/eclipse/rwt/internal/events/EventAdapter.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt/src/org/eclipse/rwt/internal/events/EventAdapter.java,v
>retrieving revision 1.2
>diff -u -r1.2 EventAdapter.java
>--- src/org/eclipse/rwt/internal/events/EventAdapter.java	12 Jun 2008 13:12:20 -0000	1.2
>+++ src/org/eclipse/rwt/internal/events/EventAdapter.java	30 Sep 2009 13:10:58 -0000
>@@ -13,6 +13,7 @@
> import java.util.*;
> 
> import org.eclipse.rwt.internal.util.ParamCheck;
>+import org.eclipse.swt.SWT;
> 
> public class EventAdapter implements IEventAdapter {
> 
>@@ -108,8 +109,12 @@
>   public void addListener( final Class listenerType, 
>                            final Object listener ) 
>   {
>-    ParamCheck.notNull( listenerType, "listenerType" );
>-    ParamCheck.notNull( listener, "listener" );
>+    if( listenerType == null ) {
>+      SWT.error( SWT.ERROR_NULL_ARGUMENT );
>+    }
>+    if( listener == null ) {
>+      SWT.error( SWT.ERROR_NULL_ARGUMENT );
>+    }
>     checkTypeCompatibility( listenerType, listener );
>     getListenerSet( listenerType ).add( listener );
>   }
>@@ -117,8 +122,12 @@
>   public void removeListener( final Class listenerType, 
>                               final Object listener )
>   {
>-    ParamCheck.notNull( listenerType, "listenerType" );
>-    ParamCheck.notNull( listener, "listener" );
>+    if( listenerType == null ) {
>+      SWT.error( SWT.ERROR_NULL_ARGUMENT );
>+    }
>+    if( listener == null ) {
>+      SWT.error( SWT.ERROR_NULL_ARGUMENT );
>+    }
>     checkTypeCompatibility( listenerType, listener );
>     if( hasListener( listenerType ) ) {
>       getListenerSet( listenerType ).remove( listener );
>#P org.eclipse.rap.rwt.test
>Index: src/org/eclipse/rwt/internal/events/EventAdapter_Test.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.test/src/org/eclipse/rwt/internal/events/EventAdapter_Test.java,v
>retrieving revision 1.3
>diff -u -r1.3 EventAdapter_Test.java
>--- src/org/eclipse/rwt/internal/events/EventAdapter_Test.java	12 Jun 2008 13:23:17 -0000	1.3
>+++ src/org/eclipse/rwt/internal/events/EventAdapter_Test.java	30 Sep 2009 13:10:59 -0000
>@@ -67,6 +67,16 @@
>       fail();
>     } catch( final IllegalArgumentException iae ) {
>     }
>+    try {
>+      eventAdapter.addListener( SelectionListener.class, null );
>+      fail();
>+    } catch( final IllegalArgumentException iae ) {
>+    }
>+    try {
>+      eventAdapter.addListener( null, new Object() );
>+      fail();
>+    } catch( final IllegalArgumentException iae ) {
>+    }
>     listener = eventAdapter.getListener( SelectionListener.class );
>     assertEquals( 0, listener.length );
>   }
>Index: src/org/eclipse/swt/custom/CCombo_Test.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.test/src/org/eclipse/swt/custom/CCombo_Test.java,v
>retrieving revision 1.9
>diff -u -r1.9 CCombo_Test.java
>--- src/org/eclipse/swt/custom/CCombo_Test.java	27 Aug 2009 14:58:18 -0000	1.9
>+++ src/org/eclipse/swt/custom/CCombo_Test.java	30 Sep 2009 13:10:59 -0000
>@@ -381,7 +381,7 @@
>     try {
>       combo.addModifyListener( null );
>       fail( "removeModifyListener must not allow null listener" );
>-    } catch( NullPointerException e ) {
>+    } catch( IllegalArgumentException e ) {
>       // expected
>     }
>     // test whether all content modifying API methods send a Modify event
>@@ -431,7 +431,7 @@
>     try {
>       combo.removeModifyListener( null );
>       fail( "removeModifyListener must not allow null listener" );
>-    } catch( NullPointerException e ) {
>+    } catch( IllegalArgumentException e ) {
>       // expected
>     }
>   }
>@@ -450,7 +450,7 @@
>     try {
>       combo.addModifyListener( null );
>       fail( "removeModifyListener must not allow null listener" );
>-    } catch( NullPointerException e ) {
>+    } catch( IllegalArgumentException e ) {
>       // expected
>     }
>     // test whether all content modifying API methods send a Modify event
>@@ -497,7 +497,7 @@
>     try {
>       combo.removeModifyListener( null );
>       fail( "removeModifyListener must not allow null listener" );
>-    } catch( NullPointerException e ) {
>+    } catch( IllegalArgumentException e ) {
>       // expected
>     }
>   }
>Index: src/org/eclipse/swt/widgets/Combo_Test.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.test/src/org/eclipse/swt/widgets/Combo_Test.java,v
>retrieving revision 1.21
>diff -u -r1.21 Combo_Test.java
>--- src/org/eclipse/swt/widgets/Combo_Test.java	27 Aug 2009 14:58:18 -0000	1.21
>+++ src/org/eclipse/swt/widgets/Combo_Test.java	30 Sep 2009 13:11:00 -0000
>@@ -359,7 +359,7 @@
>     try {
>       combo.addModifyListener( null );
>       fail( "removeModifyListener must not allow null listener" );
>-    } catch( NullPointerException e ) {
>+    } catch( IllegalArgumentException e ) {
>       // expected
>     }
>     // test whether all content modifying API methods send a Modify event
>@@ -409,7 +409,7 @@
>     try {
>       combo.removeModifyListener( null );
>       fail( "removeModifyListener must not allow null listener" );
>-    } catch( NullPointerException e ) {
>+    } catch( IllegalArgumentException e ) {
>       // expected
>     }
>   }
>@@ -428,7 +428,7 @@
>     try {
>       combo.addModifyListener( null );
>       fail( "removeModifyListener must not allow null listener" );
>-    } catch( NullPointerException e ) {
>+    } catch( IllegalArgumentException e ) {
>       // expected
>     }
>     // test whether all content modifying API methods send a Modify event
>@@ -475,7 +475,7 @@
>     try {
>       combo.removeModifyListener( null );
>       fail( "removeModifyListener must not allow null listener" );
>-    } catch( NullPointerException e ) {
>+    } catch( IllegalArgumentException e ) {
>       // expected
>     }
>   }

Flags:

ruediger.herrmann: iplog+

Actions: View | Diff

Attachments on bug 243874: 148391 | 148421