Attachment #148391 for bug #243874

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

Lines 13-18 Link Here

(-)src/org/eclipse/rwt/internal/events/EventAdapter.java (-4 / +13 lines)
13	import java.util.*;	13	import java.util.*;
14		14
15	import org.eclipse.rwt.internal.util.ParamCheck;	15	import org.eclipse.rwt.internal.util.ParamCheck;
		16	import org.eclipse.swt.SWT;
16		17
17	public class EventAdapter implements IEventAdapter {	18	public class EventAdapter implements IEventAdapter {
18		19
Lines 108-115 Link Here
108	public void addListener( final Class listenerType,	109	public void addListener( final Class listenerType,
109	final Object listener )	110	final Object listener )
110	{	111	{
111	ParamCheck.notNull( listenerType, "listenerType" );	112	if( listenerType == null ) {
112	ParamCheck.notNull( listener, "listener" );	113	SWT.error( SWT.ERROR_NULL_ARGUMENT );
		114	}
		115	if( listener == null ) {
		116	SWT.error( SWT.ERROR_NULL_ARGUMENT );
		117	}
113	checkTypeCompatibility( listenerType, listener );	118	checkTypeCompatibility( listenerType, listener );
114	getListenerSet( listenerType ).add( listener );	119	getListenerSet( listenerType ).add( listener );
115	}	120	}
Lines 117-124 Link Here
117	public void removeListener( final Class listenerType,	122	public void removeListener( final Class listenerType,
118	final Object listener )	123	final Object listener )
119	{	124	{
120	ParamCheck.notNull( listenerType, "listenerType" );	125	if( listenerType == null ) {
121	ParamCheck.notNull( listener, "listener" );	126	SWT.error( SWT.ERROR_NULL_ARGUMENT );
		127	}
		128	if( listener == null ) {
		129	SWT.error( SWT.ERROR_NULL_ARGUMENT );
		130	}
122	checkTypeCompatibility( listenerType, listener );	131	checkTypeCompatibility( listenerType, listener );
123	if( hasListener( listenerType ) ) {	132	if( hasListener( listenerType ) ) {
124	getListenerSet( listenerType ).remove( listener );	133	getListenerSet( listenerType ).remove( listener );




      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 );
  }

Return to bug 243874

Lines 67-72 Link Here

(-)src/org/eclipse/rwt/internal/events/EventAdapter_Test.java (+10 lines)
67	fail();	67	fail();
68	} catch( final IllegalArgumentException iae ) {	68	} catch( final IllegalArgumentException iae ) {
69	}	69	}
		70	try {
		71	eventAdapter.addListener( SelectionListener.class, null );
		72	fail();
		73	} catch( final IllegalArgumentException iae ) {
		74	}
		75	try {
		76	eventAdapter.addListener( null, new Object() );
		77	fail();
		78	} catch( final IllegalArgumentException iae ) {
		79	}
70	listener = eventAdapter.getListener( SelectionListener.class );	80	listener = eventAdapter.getListener( SelectionListener.class );
71	assertEquals( 0, listener.length );	81	assertEquals( 0, listener.length );
72	}	82	}