Attachment 226050 Details for Bug 398957 – Proposed fix

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

[patch] Proposed fix

bug-398957.patch (text/plain), 3.52 KB, created by Ivan Furnadjiev

on 2013-01-24 10:23:32 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan Furnadjiev

Created: 2013-01-24 10:23:32 EST

Size: 3.52 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.rap.rwt/widgetkits/org/eclipse/swt/internal/widgets/tabfolderkit/TabFolderLCA.java b/bundles/org.eclipse.rap.rwt/widgetkits/org/eclipse/swt/internal/widgets/tabfolderkit/TabFolderLCA.java
>index cbb2e2f..696b260 100644
>--- a/bundles/org.eclipse.rap.rwt/widgetkits/org/eclipse/swt/internal/widgets/tabfolderkit/TabFolderLCA.java
>+++ b/bundles/org.eclipse.rap.rwt/widgetkits/org/eclipse/swt/internal/widgets/tabfolderkit/TabFolderLCA.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2002, 2012 Innoopract Informationssysteme GmbH and others.
>+ * Copyright (c) 2002, 2013 Innoopract Informationssysteme GmbH and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -96,6 +96,7 @@
>         ProcessActionRunner.add( new Runnable() {
>           public void run() {
>             folder.setSelection( item );
>+            preserveProperty( folder, PROP_SELECTION, getSelection( folder ) );
>             ControlLCAUtil.processSelection( folder, item, false );
>             ControlLCAUtil.processDefaultSelection( folder, item );
>           }
>diff --git a/tests/org.eclipse.rap.rwt.test/src/org/eclipse/swt/internal/widgets/tabfolderkit/TabFolderLCA_Test.java b/tests/org.eclipse.rap.rwt.test/src/org/eclipse/swt/internal/widgets/tabfolderkit/TabFolderLCA_Test.java
>index 3fc3141..23c3c28 100644
>--- a/tests/org.eclipse.rap.rwt.test/src/org/eclipse/swt/internal/widgets/tabfolderkit/TabFolderLCA_Test.java
>+++ b/tests/org.eclipse.rap.rwt.test/src/org/eclipse/swt/internal/widgets/tabfolderkit/TabFolderLCA_Test.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2007, 2012 Innoopract Informationssysteme GmbH and others.
>+ * Copyright (c) 2007, 2013 Innoopract Informationssysteme GmbH and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -34,6 +34,7 @@
> import org.eclipse.rap.rwt.testfixture.Message;
> import org.eclipse.rap.rwt.testfixture.Message.CreateOperation;
> import org.eclipse.swt.SWT;
>+import org.eclipse.swt.events.SelectionAdapter;
> import org.eclipse.swt.events.SelectionEvent;
> import org.eclipse.swt.events.SelectionListener;
> import org.eclipse.swt.graphics.Color;
>@@ -301,6 +302,27 @@
>     assertSame( item, folder.getSelection()[ 0 ] );
>   }
> 
>+  @Test
>+  public void testResetSelectionInSelectionEvent() {
>+    Fixture.markInitialized( display );
>+    Fixture.markInitialized( folder );
>+    final TabItem item1 = new TabItem( folder, SWT.NONE );
>+    TabItem item2 = new TabItem( folder, SWT.NONE );
>+    folder.setSelection( item1 );
>+    folder.addSelectionListener( new SelectionAdapter() {
>+      @Override
>+      public void widgetSelected( SelectionEvent event ) {
>+        folder.setSelection( item1 );
>+      }
>+    } );
>+
>+    fakeWidgetSelected( folder, item2 );
>+    Fixture.executeLifeCycleFromServerThread();
>+
>+    Message message = Fixture.getProtocolMessage();
>+    assertEquals( WidgetUtil.getId( item1 ), message.findSetProperty( folder, "selection" ) );
>+  }
>+
>   private void fakeWidgetSelected( TabFolder folder, TabItem item ) {
>     Map<String, Object> parameters = new HashMap<String, Object>();
>     parameters.put( ClientMessageConst.EVENT_PARAM_ITEM, getId( item ) );

Flags:

ivan: review?

Actions: View | Diff

Attachments on bug 398957: 226050