Attachment 139778 Details for Bug 281114 – 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), 4.17 KB, created by Benjamin Muskalla

on 2009-06-22 13:18:45 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Benjamin Muskalla

Created: 2009-06-22 13:18:45 EDT

Size: 4.17 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rap.ui.workbench
>Index: Eclipse UI/org/eclipse/ui/internal/Workbench.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.ui/org.eclipse.rap.ui.workbench/Eclipse UI/org/eclipse/ui/internal/Workbench.java,v
>retrieving revision 1.18
>diff -u -r1.18 Workbench.java
>--- Eclipse UI/org/eclipse/ui/internal/Workbench.java	5 Apr 2009 16:11:38 -0000	1.18
>+++ Eclipse UI/org/eclipse/ui/internal/Workbench.java	22 Jun 2009 17:20:11 -0000
>@@ -163,6 +163,7 @@
> import org.eclipse.ui.internal.tweaklets.Tweaklets;
> import org.eclipse.ui.internal.tweaklets.WorkbenchImplementation;
> import org.eclipse.ui.internal.util.PrefUtil;
>+import org.eclipse.ui.internal.util.SWTResourceUtil;
> import org.eclipse.ui.internal.util.SessionSingletonEventManager;
> import org.eclipse.ui.internal.util.Util;
> import org.eclipse.ui.intro.IIntroManager;
>@@ -217,6 +218,17 @@
> 	      if( Workbench.getInstance().started ) {
> 	        Workbench.getInstance().sessionInvalidated = true;
> 	        Workbench.getInstance().close();
>+	        
>+	        // RAP [bm]: copy from WorkbenchPlugin#stop
>+	        // in the worst case we create a manager to dispose it afterwards
>+	        IWorkingSetManager workingSetManager = WorkbenchPlugin.getDefault()
>+	        	.getWorkingSetManager();
>+			if (workingSetManager  != null) {
>+	        	workingSetManager.dispose();
>+	        	workingSetManager= null;
>+	        }
>+	        SWTResourceUtil.shutdown();
>+	        // RAPEND
> 	      }
> 	    }
> 	  }
>Index: Eclipse UI/org/eclipse/ui/internal/WorkbenchPlugin.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.ui/org.eclipse.rap.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPlugin.java,v
>retrieving revision 1.18
>diff -u -r1.18 WorkbenchPlugin.java
>--- Eclipse UI/org/eclipse/ui/internal/WorkbenchPlugin.java	15 May 2009 09:04:18 -0000	1.18
>+++ Eclipse UI/org/eclipse/ui/internal/WorkbenchPlugin.java	22 Jun 2009 17:20:11 -0000
>@@ -64,7 +64,7 @@
> import org.eclipse.ui.internal.themes.ThemeRegistry;
> import org.eclipse.ui.internal.themes.ThemeRegistryReader;
> import org.eclipse.ui.internal.util.BundleUtility;
>-import org.eclipse.ui.internal.util.SWTResourceUtil;
>+//import org.eclipse.ui.internal.util.SWTResourceUtil;
> import org.eclipse.ui.internal.wizards.ExportWizardRegistry;
> import org.eclipse.ui.internal.wizards.ImportWizardRegistry;
> import org.eclipse.ui.internal.wizards.NewWizardRegistry;
>@@ -254,8 +254,9 @@
>     // Theme registry
> //    private ThemeRegistry themeRegistry;
> 
>+// RAP [bm] workingSetManager field unneeded, replaced by session-singleton    
>     // Manager for working sets (IWorkingSet)
>-    private WorkingSetManager workingSetManager;
>+//    private WorkingSetManager workingSetManager;
> 
> // RAP [rh] workingSetRegistry field unneeded, replaced by session-singleton    
>     // Working set registry, stores working set dialogs
>@@ -343,10 +344,13 @@
> 
> // RAP [rh] themeRegistry field unneeded, replaced by session-singleton    
> //        themeRegistry = null;
>-        if (workingSetManager != null) {
>-        	workingSetManager.dispose();
>-        	workingSetManager = null;
>-        }
>+        
>+// RAP [rh] workingSetManager field unneeded, replaced by session-singleton    
>+//        if (workingSetManager != null) {
>+//        	workingSetManager.dispose();
>+//        	workingSetManager = null;
>+//        }
>+        
> // RAP [rh] workingSetRegistry field unneeded, replaced by session-singleton    
> //        workingSetRegistry = null;
> 
>@@ -1335,12 +1339,14 @@
> 
>     	// TODO normally super.stop(*) would be the last statement in this
>     	// method
>-        super.stop(context);
>-        if (workingSetManager != null) {
>-        	workingSetManager.dispose();
>-        	workingSetManager= null;
>-        }       
>-        SWTResourceUtil.shutdown();
>+// RAP [bm] cleanup will be done in Workbench#ShutdownHandler    	
>+//        super.stop(context);
>+//        if (workingSetManager != null) {
>+//        	workingSetManager.dispose();
>+//        	workingSetManager= null;
>+//        }       
>+//        SWTResourceUtil.shutdown();
>+// RAPEND
>     } 
>     
>     /**

Actions: View | Diff

Attachments on bug 281114: 139778