Attachment 196290 Details for Bug 346576 – Proposed patch

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

[patch] Proposed patch

Bug-346576.patch (text/plain), 2.61 KB, created by Ivan Furnadjiev

on 2011-05-22 04:28:47 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan Furnadjiev

Created: 2011-05-22 04:28:47 EDT

Size: 2.61 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rap.rwt
>Index: src/org/eclipse/swt/widgets/Table.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/Table.java,v
>retrieving revision 1.100
>diff -u -r1.100 Table.java
>--- src/org/eclipse/swt/widgets/Table.java	28 Apr 2011 07:42:05 -0000	1.100
>+++ src/org/eclipse/swt/widgets/Table.java	22 May 2011 08:26:56 -0000
>@@ -567,7 +567,7 @@
>   public void setItemCount( int count ) {
>     checkWidget();
>     int newItemCount = Math.max( 0, count );
>-    if( newItemCount != itemCount ) {
>+    if( newItemCount != itemCount && !isInDispose() ) {
>       while( newItemCount < itemCount ) {
>         TableItem item = items[ newItemCount ];
>         if( item != null && !item.isDisposed() ) {
>#P org.eclipse.rap.rwt.test
>Index: src/org/eclipse/swt/widgets/Table_Test.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.test/src/org/eclipse/swt/widgets/Table_Test.java,v
>retrieving revision 1.72
>diff -u -r1.72 Table_Test.java
>--- src/org/eclipse/swt/widgets/Table_Test.java	16 May 2011 15:08:45 -0000	1.72
>+++ src/org/eclipse/swt/widgets/Table_Test.java	22 May 2011 08:26:58 -0000
>@@ -1402,6 +1402,36 @@
>     table.dispose();
>   }
> 
>+  public void testSetItemCountInDisposeListener() {
>+    Fixture.fakePhase( PhaseId.PROCESS_ACTION );
>+    final Table table = new Table( shell, SWT.VIRTUAL );
>+    table.setItemCount( 10 );
>+    table.addDisposeListener( new DisposeListener() {
>+      public void widgetDisposed( DisposeEvent e ) {
>+        table.setItemCount( 0 );
>+      }
>+    } );
>+    table.dispose();
>+  }
>+
>+  public void testDisposeItemsWithSetItemCountInDisposeListener() {
>+    Fixture.fakePhase( PhaseId.PROCESS_ACTION );
>+    final Table table = new Table( shell, SWT.VIRTUAL );
>+    TableItem item1 = new TableItem( table, SWT.NONE );
>+    TableItem item2 = new TableItem( table, SWT.NONE );
>+    TableItem item3 = new TableItem( table, SWT.NONE );
>+    table.setItemCount( 10 );
>+    table.addDisposeListener( new DisposeListener() {
>+      public void widgetDisposed( DisposeEvent e ) {
>+        table.setItemCount( 0 );
>+      }
>+    } );
>+    table.dispose();
>+    assertTrue( item1.isDisposed() );
>+    assertTrue( item2.isDisposed() );
>+    assertTrue( item3.isDisposed() );
>+  }
>+
>   public void testRedrawAfterDisposeVirtual() {
>     Fixture.fakePhase( PhaseId.PROCESS_ACTION );
>     Table table = new Table( shell, SWT.VIRTUAL );

Flags:

rsternberg: review+

Actions: View | Diff

Attachments on bug 346576: 196179 | 196290