Attachment 232027 Details for Bug 410024 – Patch that fixes the issue

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

[patch] Patch that fixes the issue

bug-410024.patch (text/plain), 2.20 KB, created by Ivan Furnadjiev

on 2013-06-06 04:22:53 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan Furnadjiev

Created: 2013-06-06 04:22:53 EDT

Size: 2.20 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/TabFolder.java b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/TabFolder.java
>index 2225ced..b67fe14 100644
>--- a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/TabFolder.java
>+++ b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/TabFolder.java
>@@ -520,7 +520,7 @@
>       setSelection( -1, false );
>     }
>     itemHolder.remove( item );
>-    if( itemHolder.size() > 0 && index <= oldSelectionIndex ) {
>+    if( itemHolder.size() > 0 && index <= oldSelectionIndex && !isInDispose() ) {
>       boolean notifySelectionChanged = index == oldSelectionIndex;
>       setSelection( Math.max( 0, oldSelectionIndex - 1 ), notifySelectionChanged );
>     }
>diff --git a/tests/org.eclipse.rap.rwt.test/src/org/eclipse/swt/widgets/TabFolder_Test.java b/tests/org.eclipse.rap.rwt.test/src/org/eclipse/swt/widgets/TabFolder_Test.java
>index 125a6d7..ff7d0a4 100644
>--- a/tests/org.eclipse.rap.rwt.test/src/org/eclipse/swt/widgets/TabFolder_Test.java
>+++ b/tests/org.eclipse.rap.rwt.test/src/org/eclipse/swt/widgets/TabFolder_Test.java
>@@ -17,7 +17,10 @@
> import static org.junit.Assert.assertSame;
> import static org.junit.Assert.assertTrue;
> import static org.junit.Assert.fail;
>+import static org.mockito.Matchers.any;
> import static org.mockito.Mockito.mock;
>+import static org.mockito.Mockito.times;
>+import static org.mockito.Mockito.verify;
> 
> import java.util.ArrayList;
> 
>@@ -219,7 +222,9 @@
>   @Test
>   public void testDispose() {
>     TabItem item = new TabItem( folder, SWT.NONE );
>+
>     folder.dispose();
>+
>     assertTrue( item.isDisposed() );
>     assertEquals( 0, ItemHolder.getItemHolder( folder ).getItems().length );
>   }
>@@ -457,6 +462,17 @@
>     assertEquals( 2, folder.getItemCount() );
>   }
> 
>+  @Test
>+  public void testDispose_doesNotFireSelectionEvent() {
>+    createItems( folder, 3 );
>+    Listener listener = mock( Listener.class );
>+    folder.addListener( SWT.Selection, listener );
>+
>+    folder.dispose();
>+
>+    verify( listener, times( 0 ) ).handleEvent( any( Event.class ) );
>+  }
>+
>   private void createItems( TabFolder folder, int number ) {
>     for( int i = 0; i < number; i++ ) {
>       TabItem item = new TabItem( folder, SWT.NONE );

Actions: View | Diff

Attachments on bug 410024: 232027