Attachment 197067 Details for Bug 346458 – Proposed patch

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

[patch] Proposed patch

Bug-346458-v1.4.patch (text/plain), 5.55 KB, created by Ivan Furnadjiev

on 2011-06-01 05:13:25 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan Furnadjiev

Created: 2011-06-01 05:13:25 EDT

Size: 5.55 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rap.rwt.q07
>Index: js/org/eclipse/rwt/widgets/TreeItem.js
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt.q07/js/org/eclipse/rwt/widgets/TreeItem.js,v
>retrieving revision 1.5.2.1
>diff -u -r1.5.2.1 TreeItem.js
>--- js/org/eclipse/rwt/widgets/TreeItem.js	22 May 2011 07:34:59 -0000	1.5.2.1
>+++ js/org/eclipse/rwt/widgets/TreeItem.js	1 Jun 2011 09:05:11 -0000
>@@ -217,6 +217,7 @@
>       var children = this._children;
>       var index = children.indexOf( item );
>       this._children.splice( index, 1 );
>+      this._children.push( undefined );
>       this._update( "remove", item );
>     },
> 
>#P org.eclipse.rap.rwt.q07.jstest
>Index: js/org/eclipse/rwt/test/tests/TreeItemTest.js
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/tests/TreeItemTest.js,v
>retrieving revision 1.2.2.1
>diff -u -r1.2.2.1 TreeItemTest.js
>--- js/org/eclipse/rwt/test/tests/TreeItemTest.js	22 May 2011 07:34:55 -0000	1.2.2.1
>+++ js/org/eclipse/rwt/test/tests/TreeItemTest.js	1 Jun 2011 09:05:13 -0000
>@@ -228,7 +228,7 @@
>       var child3 = new org.eclipse.rwt.widgets.TreeItem( root );
>       assertEquals( [ child1, child2, child3 ], root._children );
>       child2.dispose();
>-      assertEquals( [ child1, child3 ], root._children );
>+      assertEquals( [ child1, child3, undefined ], root._children );
>     },
> 
>     testRemoveItemEvent : function() {
>Index: js/org/eclipse/rwt/test/tests/TreeTest.js
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/tests/TreeTest.js,v
>retrieving revision 1.28
>diff -u -r1.28 TreeTest.js
>--- js/org/eclipse/rwt/test/tests/TreeTest.js	6 May 2011 18:13:31 -0000	1.28
>+++ js/org/eclipse/rwt/test/tests/TreeTest.js	1 Jun 2011 09:05:13 -0000
>@@ -346,13 +346,15 @@
>     testRenderRemoveItem : function() {
>       var testUtil = org.eclipse.rwt.test.fixture.TestUtil;
>       var tree = this._createDefaultTree();
>+      tree.setItemCount( 10 );
>       var item;
>       for( var i = 0; i < 10; i++ ) {
>-        item = new org.eclipse.rwt.widgets.TreeItem( tree.getRootItem() );
>+        item = new org.eclipse.rwt.widgets.TreeItem( tree.getRootItem(), i );
>         item.setTexts( [ "Test" + i ] );
>       }
>       testUtil.flush();
>       item.dispose();
>+      tree.setItemCount( 9 ); // order is relevant: dispose before setItemCount
>       testUtil.flush();
>       var sample = tree._clientArea._getTargetNode().childNodes[ 9 ];
>       assertEquals( 1, sample.childNodes.length );
>@@ -360,18 +362,58 @@
>       tree.destroy();
>     },
> 
>+    testRenderRemoveAddItem : function() {
>+      var testUtil = org.eclipse.rwt.test.fixture.TestUtil;
>+      var tree = this._createDefaultTree();
>+      tree.setItemCount( 10 );
>+      var item;
>+      for( var i = 0; i < 10; i++ ) {
>+        item = new org.eclipse.rwt.widgets.TreeItem( tree.getRootItem(), i );
>+        item.setTexts( [ "Test" + i ] );
>+      }
>+      testUtil.flush();
>+      item.dispose();
>+	    item = new org.eclipse.rwt.widgets.TreeItem( tree.getRootItem(), 9 );
>+	    item.setTexts( [ "newItem" ] );
>+      testUtil.flush();
>+      var sample = tree._clientArea._getTargetNode().childNodes[ 9 ];
>+      assertEquals( 1, sample.childNodes.length );
>+      assertEquals( "newItem", sample.childNodes[ 0 ].innerHTML );
>+      tree.destroy();
>+    },
>+
>+    testRenderRemoveItemVirtual : function() {
>+      var testUtil = org.eclipse.rwt.test.fixture.TestUtil;
>+      var tree = this._createDefaultTree();
>+      tree.setItemCount( 10 );
>+      var item;
>+      for( var i = 0; i < 10; i++ ) {
>+        item = new org.eclipse.rwt.widgets.TreeItem( tree.getRootItem(), i );
>+        item.setTexts( [ "Test" + i ] );
>+      }
>+      testUtil.flush();
>+      item.dispose();
>+      testUtil.flush();
>+      var sample = tree._clientArea._getTargetNode().childNodes[ 9 ];
>+      assertEquals( 1, sample.childNodes.length );
>+      assertEquals( "...", sample.childNodes[ 0 ].innerHTML );
>+      tree.destroy();
>+    },
>+
>     testRenderRemoveFirstItem : function() {
>       var testUtil = org.eclipse.rwt.test.fixture.TestUtil;
>       var tree = this._createDefaultTree();
>+      tree.setItemCount( 10 );
>       var item;
>       for( var i = 0; i < 10; i++ ) {
>-        item = new org.eclipse.rwt.widgets.TreeItem( tree.getRootItem() );
>+        item = new org.eclipse.rwt.widgets.TreeItem( tree.getRootItem(), i );
>         item.setTexts( [ "Test" + i ] );
>       }
>       item = tree._rootItem._children[ 0 ];
>       assertEquals( "Test0", item.getText( 0 ) );
>       testUtil.flush();
>       item.dispose();
>+      tree.setItemCount( 9 );
>       testUtil.flush();
>       item = tree._rootItem._children[ 0 ];
>       assertEquals( "Test1", item.getText( 0 ) );
>@@ -443,10 +485,12 @@
>       testUtil.flush();
>       var node = tree._rows[ 0 ]._getTargetNode();
>       assertTrue( node.innerHTML.indexOf( "empty.gif" ) != -1 ); 
>+      item.setItemCount( 1 );
>       var item2 = new org.eclipse.rwt.widgets.TreeItem( item );
>       testUtil.flush();
>       assertTrue( node.innerHTML.indexOf( "children.gif" ) != -1 );
>       item2.dispose(); 
>+      item.setItemCount( 0 );
>       testUtil.flush();
>       assertTrue( node.innerHTML.indexOf( "empty.gif" ) != -1 );
>       tree.destroy();

Flags:

rsternberg: review+
tbuschto: review+

Actions: View | Diff

Attachments on bug 346458: 196117 | 196215 | 197067 | 197436 | 197455 | 197601