Attachment 196215 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.patch (text/plain), 3.02 KB, created by Ivan Furnadjiev

on 2011-05-20 09:25:07 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan Furnadjiev

Created: 2011-05-20 09:25:07 EDT

Size: 3.02 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
>diff -u -r1.5 TreeItem.js
>--- js/org/eclipse/rwt/widgets/TreeItem.js	6 May 2011 18:13:42 -0000	1.5
>+++ js/org/eclipse/rwt/widgets/TreeItem.js	20 May 2011 13:17:39 -0000
>@@ -198,11 +198,13 @@
>      */
>     _add : function( item, index ) {
>       if( index === this._children.length || index === undefined ) {    
>+        // TODO [tb] : this code is currently only used by tests, remove and refactor tests
>         this._children.push( item );
>         this._update( "add", item );
>       } else {
>         if( this._children[ index ] ) {
>           this._children.splice( index, 0, item );
>+          this._children.pop();
>           this._update( "add", item );
>         } else {
>           this._children[ index ] = 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
>diff -u -r1.2 TreeItemTest.js
>--- js/org/eclipse/rwt/test/tests/TreeItemTest.js	6 May 2011 18:13:31 -0000	1.2
>+++ js/org/eclipse/rwt/test/tests/TreeItemTest.js	20 May 2011 13:17:40 -0000
>@@ -332,6 +332,7 @@
>     testAddItemAt : function() {
>       var wm = org.eclipse.swt.WidgetManager.getInstance();
>       var root = new org.eclipse.rwt.widgets.TreeItem();
>+      root.setItemCount( 3 );
>       org.eclipse.rwt.widgets.TreeItem.createItem( root, 0, "w1" );
>       org.eclipse.rwt.widgets.TreeItem.createItem( root, 1, "w2" );
>       org.eclipse.rwt.widgets.TreeItem.createItem( root, 1, "w3" );
>@@ -378,6 +379,23 @@
>       assertEquals( [ "add", item, "remove", item ], log );
>     },
> 
>+    testSetItemCountStaysOnInsert : function() {
>+      var item = new org.eclipse.rwt.widgets.TreeItem();
>+      var log = [];
>+      item.setItemCount( 4 );
>+      assertEquals( 4, item._children.length );
>+      assertEquals( [ undefined, undefined, undefined, undefined ], item._children );
>+      var child1 = new org.eclipse.rwt.widgets.TreeItem( item, 0 );
>+      var child2 = new org.eclipse.rwt.widgets.TreeItem( item, 1 );
>+      assertEquals( 4, item._children.length );
>+      assertEquals( [ child1, child2, undefined, undefined ], item._children );
>+      var child3 = new org.eclipse.rwt.widgets.TreeItem( item, 1 );
>+      // setItemCount is not rendered by server since it stays the same
>+      assertEquals( 4, item._children.length );
>+      assertEquals( [ child1, child3, child2, undefined ], item._children );
>+      item.dispose();
>+    },
>+
>     testReplaceUndefinedItem : function() {
>       var log = [];
>       var root = new org.eclipse.rwt.widgets.TreeItem();

Flags:

tbuschto: review+

Actions: View | Diff

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