Attachment 223800 Details for Bug 394643 – patch for 1.5

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

[patch] patch for 1.5

Always-render-dispose-for-Grid-items.patch (text/plain), 3.86 KB, created by Tim Buschtoens

on 2012-11-21 07:54:54 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Tim Buschtoens

Created: 2012-11-21 07:54:54 EST

Size: 3.86 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rap.rwt
>diff --git widgetkits/org/eclipse/swt/internal/widgets/tableitemkit/TableItemLCA.java widgetkits/org/eclipse/swt/internal/widgets/tableitemkit/TableItemLCA.java
>index e1c28d8..1cd1028 100644
>--- widgetkits/org/eclipse/swt/internal/widgets/tableitemkit/TableItemLCA.java
>+++ widgetkits/org/eclipse/swt/internal/widgets/tableitemkit/TableItemLCA.java
>@@ -102,11 +102,7 @@
> 
>   @Override
>   public void renderDispose( Widget widget ) throws IOException {
>-    TableItem item = ( TableItem )widget;
>-    if( !isParentDisposed( item ) ) {
>-      // The tree disposes the items itself on the client (faster)
>-      ClientObjectFactory.getClientObject( widget ).destroy();
>-    }
>+    ClientObjectFactory.getClientObject( widget ).destroy();
>   }
> 
>   //////////////////
>diff --git widgetkits/org/eclipse/swt/internal/widgets/treeitemkit/TreeItemLCA.java widgetkits/org/eclipse/swt/internal/widgets/treeitemkit/TreeItemLCA.java
>index 358bdf7..4b57bbf 100644
>--- widgetkits/org/eclipse/swt/internal/widgets/treeitemkit/TreeItemLCA.java
>+++ widgetkits/org/eclipse/swt/internal/widgets/treeitemkit/TreeItemLCA.java
>@@ -139,12 +139,7 @@
> 
>   @Override
>   public void renderDispose( Widget widget ) throws IOException {
>-    TreeItem item = ( TreeItem )widget;
>-    ITreeItemAdapter itemAdapter = item.getAdapter( ITreeItemAdapter.class );
>-    if( !itemAdapter.isParentDisposed() ) {
>-      // The tree disposes the items itself on the client (faster)
>-      ClientObjectFactory.getClientObject( widget ).destroy();
>-    }
>+    ClientObjectFactory.getClientObject( widget ).destroy();
>   }
> 
>   //////////////////
>#P org.eclipse.rap.rwt.jstest
>diff --git js/org/eclipse/rwt/test/tests/TreeTest.js js/org/eclipse/rwt/test/tests/TreeTest.js
>index 7341594..3edc74d 100644
>--- js/org/eclipse/rwt/test/tests/TreeTest.js
>+++ js/org/eclipse/rwt/test/tests/TreeTest.js
>@@ -1067,8 +1067,11 @@
>       assertNotNull( tree._rootItem );
>       assertNotNull( tree._focusItem );
>       assertNotNull( tree._leadItem );
>+
>+      item.dispose(); // The fix for Bug 394643 causes the server to always render a item dispose
>       tree.destroy();
>       TestUtil.flush();
>+
>       assertTrue( element.parentNode !== document.body );
>       assertTrue( tree.isDisposed() );
>       assertTrue( row.isDisposed() );
>#P org.eclipse.rap.rwt.test
>diff --git src/org/eclipse/swt/internal/widgets/tableitemkit/TableItemLCA_Test.java src/org/eclipse/swt/internal/widgets/tableitemkit/TableItemLCA_Test.java
>index 3247ac3..61763cc 100644
>--- src/org/eclipse/swt/internal/widgets/tableitemkit/TableItemLCA_Test.java
>+++ src/org/eclipse/swt/internal/widgets/tableitemkit/TableItemLCA_Test.java
>@@ -234,7 +234,7 @@
> 
>     // when the whole table is disposed of, the tableitem's dispose must not be rendered
>     Message message = Fixture.getProtocolMessage();
>-    assertNull( message.findDestroyOperation( tableItem ) );
>+    assertNotNull( message.findDestroyOperation( tableItem ) );
>     assertTrue( tableItem.isDisposed() );
>   }
> 
>diff --git src/org/eclipse/swt/internal/widgets/treeitemkit/TreeItemLCA_Test.java src/org/eclipse/swt/internal/widgets/treeitemkit/TreeItemLCA_Test.java
>index 10fac14..406951b 100644
>--- src/org/eclipse/swt/internal/widgets/treeitemkit/TreeItemLCA_Test.java
>+++ src/org/eclipse/swt/internal/widgets/treeitemkit/TreeItemLCA_Test.java
>@@ -306,7 +306,7 @@
>     lca.renderDispose( item );
> 
>     Message message = Fixture.getProtocolMessage();
>-    assertEquals( 0, message.getOperationCount() );
>+    assertEquals( 1, message.getOperationCount() );
>   }
> 
>   public void testRenderDisposeWithDisposedParentItem() throws IOException {
>@@ -317,7 +317,7 @@
>     lca.renderDispose( subitem );
> 
>     Message message = Fixture.getProtocolMessage();
>-    assertEquals( 0, message.getOperationCount() );
>+    assertEquals( 1, message.getOperationCount() );
>   }
> 
>   public void testRenderParent() throws IOException {

Flags:

tbuschto: review?

Actions: View | Diff

Attachments on bug 394643: 223800