Attachment 191690 Details for Bug 337475 – Same patch (snippet) against CVS HEAD

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

[patch] Same patch (snippet) against CVS HEAD

Bug-337475-snippet.patch (text/plain), 3.48 KB, created by Ivan Furnadjiev

on 2011-03-22 11:32:40 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan Furnadjiev

Created: 2011-03-22 11:32:40 EDT

Size: 3.48 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rap.demo
>Index: src/org/eclipse/rap/demo/controls/ControlsDemo.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.ui/org.eclipse.rap.demo/src/org/eclipse/rap/demo/controls/ControlsDemo.java,v
>retrieving revision 1.59
>diff -u -r1.59 ControlsDemo.java
>--- src/org/eclipse/rap/demo/controls/ControlsDemo.java	24 Jan 2011 10:37:30 -0000	1.59
>+++ src/org/eclipse/rap/demo/controls/ControlsDemo.java	22 Mar 2011 15:32:11 -0000
>@@ -56,6 +56,7 @@
>     topFolder.marginHeight = 5;
> 
>     final ExampleTab[] tabs = new ExampleTab[] {
>+      new ShellTab( topFolder ),
>       new ButtonTab( topFolder ),
> //      new RequestTab( topFolder ),
>       new CBannerTab( topFolder ),
>@@ -73,7 +74,6 @@
>       new LinkTab( topFolder ),
>       new SashTab( topFolder ),
>       new SashFormTab( topFolder ),
>-      new ShellTab( topFolder ),
>       new TabFolderTab( topFolder ),
>       new CTabFolderTab( topFolder ),
>       new TableTab( topFolder ),
>Index: src/org/eclipse/rap/demo/controls/ShellTab.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.ui/org.eclipse.rap.demo/src/org/eclipse/rap/demo/controls/ShellTab.java,v
>retrieving revision 1.34
>diff -u -r1.34 ShellTab.java
>--- src/org/eclipse/rap/demo/controls/ShellTab.java	9 Feb 2010 11:20:36 -0000	1.34
>+++ src/org/eclipse/rap/demo/controls/ShellTab.java	22 Mar 2011 15:32:11 -0000
>@@ -31,6 +31,8 @@
>   private final java.util.List shells;
>   private int shellCounter;
>   private final ShellAdapter confirmCloseListener;
>+  private final ShellAdapter shellActivatedListener;
>+  private final ShellAdapter shellDeactivatedListener;
>   private Image shellImage;
>   private Button createInvisibleButton;
>   private Button createAsDialogButton;
>@@ -52,6 +54,16 @@
>         event.doit = canClose;
>       }
>     };
>+    shellActivatedListener = new ShellAdapter() {
>+      public void shellActivated( ShellEvent e ) {
>+        ((Shell)e.getSource()).getData();
>+      }
>+    };
>+    shellDeactivatedListener = new ShellAdapter() {
>+      public void shellDeactivated( ShellEvent e ) {
>+        ((Shell)e.getSource()).close();
>+      }
>+    };
>     setDefaultStyle( SWT.SHELL_TRIM );
>   }
> 
>@@ -188,11 +200,12 @@
> 
>   private void createShell() {
>     Shell shell;
>-    if( createAsDialogButton.getSelection() ) {
>-      shell = new Shell( getShell(), getStyle() );
>-    } else {
>-      shell = new Shell( getShell().getDisplay(), getStyle() );
>-    }
>+//    if( createAsDialogButton.getSelection() ) {
>+//      shell = new Shell( getShell(), getStyle() );
>+//    } else {
>+//      shell = new Shell( getShell().getDisplay(), getStyle() );
>+//    }
>+    shell = new Shell( getShell(), getStyle() );
> //    if( customBgColorButton.getSelection() ) {
> //      shell.setBackground( BG_COLOR_BROWN );
> //    }
>@@ -206,6 +219,8 @@
>     shell.setText( "Test Shell " + shellCounter );
>     shell.setAlpha( alpha );
>     shell.setImage( shellImage );
>+    shell.addShellListener( shellActivatedListener );
>+    shell.addShellListener( shellDeactivatedListener );
>     if( confirmCloseButton.getSelection() ) {
>       shell.addShellListener( confirmCloseListener );
>     }
>@@ -348,7 +363,7 @@
>   private Point getNextShellLocation() {
>     Point result = getShell().getLocation();
>     int count = getShells().length % 12;
>-    result.x += 50 + count * 10;
>+    result.x += 200 + count * 10;
>     result.y += 50 + count * 10;
>     return result ;
>   }

Actions: View | Diff

Attachments on bug 337475: 189213 | 191690 | 191752