Attachment 138351 Details for Bug 278741 – Another patch plus fix

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

[patch] Another patch plus fix

clipboard.txt (text/plain), 2.45 KB, created by Rüdiger Herrmann

on 2009-06-04 18:07:53 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Rüdiger Herrmann

Created: 2009-06-04 18:07:53 EDT

Size: 2.45 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rap.rwt
>Index: src/org/eclipse/swt/widgets/Shell.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/Shell.java,v
>retrieving revision 1.43
>diff -u -r1.43 Shell.java
>--- src/org/eclipse/swt/widgets/Shell.java	4 Jun 2009 11:48:51 -0000	1.43
>+++ src/org/eclipse/swt/widgets/Shell.java	4 Jun 2009 22:09:00 -0000
>@@ -652,10 +652,6 @@
>         event.processEvent();
>         if( event.doit ) {
>           Shell.this.dispose();
>-          Shell[] dialogShells = getShells();
>-          for( int i = 0; i < dialogShells.length; i++ ) {
>-            dialogShells[ i ].dispose();
>-          }
>         }
>       }
>     } );
>@@ -941,7 +937,15 @@
>   ///////////
>   // Disposal
> 
>-  final void releaseParent() {
>+  void releaseChildren() {
>+    super.releaseChildren();
>+    Shell[] dialogShells = getShells();
>+    for( int i = 0; i < dialogShells.length; i++ ) {
>+      dialogShells[ i ].dispose();
>+    }
>+  }
>+  
>+  void releaseParent() {
>     // Do not call super.releaseParent()
>     // This method would try to remove a child-shell from its ControlHolder
>     // but shells are currently not added to the ControlHolder of its parent
>#P org.eclipse.rap.rwt.test
>Index: src/org/eclipse/swt/widgets/Shell_Test.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.rwt.test/org.eclipse.rap.rwt.test/src/org/eclipse/swt/widgets/Shell_Test.java,v
>retrieving revision 1.15
>diff -u -r1.15 Shell_Test.java
>--- src/org/eclipse/swt/widgets/Shell_Test.java	4 Jun 2009 14:53:23 -0000	1.15
>+++ src/org/eclipse/swt/widgets/Shell_Test.java	4 Jun 2009 22:09:02 -0000
>@@ -195,6 +195,15 @@
>     shell.setVisible( false );
>     assertEquals( "", log.toString() );
>   }
>+  
>+  public void testCloseChildShells() {
>+    Display display = new Display();
>+    Shell shell = new Shell( display, SWT.NONE );
>+    shell.open();
>+    Shell childShell = new Shell( shell );
>+    shell.close();
>+    assertTrue( childShell.isDisposed() );
>+  }
> 
>   public void testDisposeChildShell() {
>     Display display = new Display();
>@@ -203,6 +212,9 @@
>     Shell childShell = new Shell( shell );
>     childShell.dispose();
>     assertTrue( childShell.isDisposed() );
>+    childShell = new Shell( shell );
>+    shell.dispose();
>+    assertTrue( childShell.isDisposed() );
>   }
> 
>   public void testCreateDescendantShell() {

Actions: View | Diff

Attachments on bug 278741: 137969 | 138351