Attachment 139696 Details for Bug 280994 – patch

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

[patch] patch

clipboard.txt (text/plain), 5.29 KB, created by Benjamin Muskalla

on 2009-06-20 19:15:32 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Benjamin Muskalla

Created: 2009-06-20 19:15:32 EDT

Size: 5.29 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rap.rwt
>Index: src/org/eclipse/swt/custom/CCombo.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt/src/org/eclipse/swt/custom/CCombo.java,v
>retrieving revision 1.2
>diff -u -r1.2 CCombo.java
>--- src/org/eclipse/swt/custom/CCombo.java	28 Apr 2009 20:11:00 -0000	1.2
>+++ src/org/eclipse/swt/custom/CCombo.java	20 Jun 2009 23:16:36 -0000
>@@ -749,7 +749,7 @@
>       model.deselectAll();
>       String[] items = model.getItems();
>       for( int i = 0; i < items.length; i++ ) {
>-        if( verifiedText == items[i] ) {
>+        if( verifiedText.equals( items[i] ) ) {
>           model.setSelection( i );
>           break;
>         }
>Index: src/org/eclipse/swt/widgets/Combo.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/Combo.java,v
>retrieving revision 1.35
>diff -u -r1.35 Combo.java
>--- src/org/eclipse/swt/widgets/Combo.java	28 Apr 2009 20:11:00 -0000	1.35
>+++ src/org/eclipse/swt/widgets/Combo.java	20 Jun 2009 23:16:36 -0000
>@@ -607,7 +607,7 @@
>       model.deselectAll();
>       String[] items = model.getItems();
>       for( int i = 0; i < items.length; i++ ) {
>-        if( verifiedText == items[i] ) {
>+        if( verifiedText.equals( items[i] ) ) {
>           model.setSelection( i );
>           break;
>         }
>#P org.eclipse.rap.rwt.test
>Index: src/org/eclipse/RWTHostTestSuite.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.test/src/org/eclipse/RWTHostTestSuite.java,v
>retrieving revision 1.33
>diff -u -r1.33 RWTHostTestSuite.java
>--- src/org/eclipse/RWTHostTestSuite.java	4 Jun 2009 11:49:02 -0000	1.33
>+++ src/org/eclipse/RWTHostTestSuite.java	20 Jun 2009 23:16:39 -0000
>@@ -131,6 +131,7 @@
>     suite.addTestSuite( TableColumn_Test.class );
>     suite.addTestSuite( TableItem_Test.class );
>     suite.addTestSuite( CCombo_Test.class );
>+    suite.addTestSuite( Combo_Test.class );
>     suite.addTestSuite( List_Test.class );
>     suite.addTestSuite( ToolBar_Test.class );
>     suite.addTestSuite( CTabFolder_Test.class );
>Index: src/org/eclipse/swt/custom/CCombo_Test.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.test/src/org/eclipse/swt/custom/CCombo_Test.java,v
>retrieving revision 1.3
>diff -u -r1.3 CCombo_Test.java
>--- src/org/eclipse/swt/custom/CCombo_Test.java	4 Jun 2009 11:49:02 -0000	1.3
>+++ src/org/eclipse/swt/custom/CCombo_Test.java	20 Jun 2009 23:16:39 -0000
>@@ -16,8 +16,7 @@
> import org.eclipse.rwt.lifecycle.PhaseId;
> import org.eclipse.swt.RWTFixture;
> import org.eclipse.swt.SWT;
>-import org.eclipse.swt.events.ModifyEvent;
>-import org.eclipse.swt.events.ModifyListener;
>+import org.eclipse.swt.events.*;
> import org.eclipse.swt.graphics.Point;
> import org.eclipse.swt.widgets.*;
> 
>@@ -537,6 +536,23 @@
>     expected = new Point( 100, 100 );
>     assertEquals( expected, combo.computeSize( 100, 100 ) );
>   }
>+  
>+  public void testSetTextAndSelection() throws Exception {
>+    RWTFixture.fakePhase( PhaseId.PROCESS_ACTION );
>+    Display display = new Display();
>+    Shell shell = new Shell( display, SWT.NONE );
>+    final CCombo combo = new CCombo( shell, SWT.NONE );
>+    combo.add( "test" );
>+    combo.add( "test1" );
>+    combo.add( "test2" );
>+    combo.addVerifyListener( new VerifyListener() {
>+      public void verifyText( VerifyEvent event ) {
>+        event.text = event.text + "2";
>+      }
>+    } );
>+    combo.setText( "test" );
>+    assertEquals( 2, combo.getSelectionIndex() );
>+  }
> 
>   protected void setUp() throws Exception {
>     RWTFixture.setUp();
>Index: src/org/eclipse/swt/widgets/Combo_Test.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.test/src/org/eclipse/swt/widgets/Combo_Test.java,v
>retrieving revision 1.14
>diff -u -r1.14 Combo_Test.java
>--- src/org/eclipse/swt/widgets/Combo_Test.java	4 Jun 2009 11:49:01 -0000	1.14
>+++ src/org/eclipse/swt/widgets/Combo_Test.java	20 Jun 2009 23:16:39 -0000
>@@ -17,8 +17,7 @@
> import org.eclipse.rwt.lifecycle.PhaseId;
> import org.eclipse.swt.RWTFixture;
> import org.eclipse.swt.SWT;
>-import org.eclipse.swt.events.ModifyEvent;
>-import org.eclipse.swt.events.ModifyListener;
>+import org.eclipse.swt.events.*;
> import org.eclipse.swt.graphics.Point;
> 
> /*
>@@ -468,6 +467,23 @@
>     expected = new Point( 104, 104 );
>     assertEquals( expected, combo.computeSize( 100, 100 ) );
>   }
>+  
>+  public void testSetTextAndSelection() throws Exception {
>+    RWTFixture.fakePhase( PhaseId.PROCESS_ACTION );
>+    Display display = new Display();
>+    Shell shell = new Shell( display, SWT.NONE );
>+    final Combo combo = new Combo( shell, SWT.NONE );
>+    combo.add( "test" );
>+    combo.add( "test1" );
>+    combo.add( "test2" );
>+    combo.addVerifyListener( new VerifyListener() {
>+      public void verifyText( VerifyEvent event ) {
>+        event.text = event.text + "2";
>+      }
>+    } );
>+    combo.setText( "test" );
>+    assertEquals( 2, combo.getSelectionIndex() );
>+  }
> 
>   protected void setUp() throws Exception {
>     RWTFixture.setUp();

Actions: View | Diff

Attachments on bug 280994: 139696