Attachment #139778 for bug #281114

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

View | Details | Raw Unified | Return to bug 281114
Collapse All | Expand All




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;

	      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
	      }
	    }
	  }




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.wizards.ExportWizardRegistry;
import org.eclipse.ui.internal.wizards.ImportWizardRegistry;
import org.eclipse.ui.internal.wizards.NewWizardRegistry;

    // Theme registry
//    private ThemeRegistry themeRegistry;

// RAP [bm] workingSetManager field unneeded, replaced by session-singleton    
    // Manager for working sets (IWorkingSet)
//    private WorkingSetManager workingSetManager;

// RAP [rh] workingSetRegistry field unneeded, replaced by session-singleton    
    // Working set registry, stores working set dialogs


// RAP [rh] themeRegistry field unneeded, replaced by session-singleton    
//        themeRegistry = 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;



    	// TODO normally super.stop(*) would be the last statement in this
    	// method
// RAP [bm] cleanup will be done in Workbench#ShutdownHandler    	
//        super.stop(context);
//        if (workingSetManager != null) {
//        	workingSetManager.dispose();
//        	workingSetManager= null;
//        }       
//        SWTResourceUtil.shutdown();
// RAPEND
    } 
    
    /**

Return to bug 281114

Lines 163-168 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/Workbench.java (+12 lines)
163	import org.eclipse.ui.internal.tweaklets.Tweaklets;	163	import org.eclipse.ui.internal.tweaklets.Tweaklets;
164	import org.eclipse.ui.internal.tweaklets.WorkbenchImplementation;	164	import org.eclipse.ui.internal.tweaklets.WorkbenchImplementation;
165	import org.eclipse.ui.internal.util.PrefUtil;	165	import org.eclipse.ui.internal.util.PrefUtil;
		166	import org.eclipse.ui.internal.util.SWTResourceUtil;
166	import org.eclipse.ui.internal.util.SessionSingletonEventManager;	167	import org.eclipse.ui.internal.util.SessionSingletonEventManager;
167	import org.eclipse.ui.internal.util.Util;	168	import org.eclipse.ui.internal.util.Util;
168	import org.eclipse.ui.intro.IIntroManager;	169	import org.eclipse.ui.intro.IIntroManager;
Lines 217-222 Link Here
217	if( Workbench.getInstance().started ) {	218	if( Workbench.getInstance().started ) {
218	Workbench.getInstance().sessionInvalidated = true;	219	Workbench.getInstance().sessionInvalidated = true;
219	Workbench.getInstance().close();	220	Workbench.getInstance().close();
		221
		222	// RAP [bm]: copy from WorkbenchPlugin#stop
		223	// in the worst case we create a manager to dispose it afterwards
		224	IWorkingSetManager workingSetManager = WorkbenchPlugin.getDefault()
		225	.getWorkingSetManager();
		226	if (workingSetManager != null) {
		227	workingSetManager.dispose();
		228	workingSetManager= null;
		229	}
		230	SWTResourceUtil.shutdown();
		231	// RAPEND
220	}	232	}
221	}	233	}
222	}	234	}

Lines 64-70 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/WorkbenchPlugin.java (-12 / +18 lines)
64	import org.eclipse.ui.internal.themes.ThemeRegistry;	64	import org.eclipse.ui.internal.themes.ThemeRegistry;
65	import org.eclipse.ui.internal.themes.ThemeRegistryReader;	65	import org.eclipse.ui.internal.themes.ThemeRegistryReader;
66	import org.eclipse.ui.internal.util.BundleUtility;	66	import org.eclipse.ui.internal.util.BundleUtility;
67	import org.eclipse.ui.internal.util.SWTResourceUtil;	67	//import org.eclipse.ui.internal.util.SWTResourceUtil;
68	import org.eclipse.ui.internal.wizards.ExportWizardRegistry;	68	import org.eclipse.ui.internal.wizards.ExportWizardRegistry;
69	import org.eclipse.ui.internal.wizards.ImportWizardRegistry;	69	import org.eclipse.ui.internal.wizards.ImportWizardRegistry;
70	import org.eclipse.ui.internal.wizards.NewWizardRegistry;	70	import org.eclipse.ui.internal.wizards.NewWizardRegistry;
Lines 254-261 Link Here
254	// Theme registry	254	// Theme registry
255	// private ThemeRegistry themeRegistry;	255	// private ThemeRegistry themeRegistry;
256		256
		257	// RAP [bm] workingSetManager field unneeded, replaced by session-singleton
257	// Manager for working sets (IWorkingSet)	258	// Manager for working sets (IWorkingSet)
258	private WorkingSetManager workingSetManager;	259	// private WorkingSetManager workingSetManager;
259		260
260	// RAP [rh] workingSetRegistry field unneeded, replaced by session-singleton	261	// RAP [rh] workingSetRegistry field unneeded, replaced by session-singleton
261	// Working set registry, stores working set dialogs	262	// Working set registry, stores working set dialogs
Lines 343-352 Link Here
343		344
344	// RAP [rh] themeRegistry field unneeded, replaced by session-singleton	345	// RAP [rh] themeRegistry field unneeded, replaced by session-singleton
345	// themeRegistry = null;	346	// themeRegistry = null;
346	if (workingSetManager != null) {	347
347	workingSetManager.dispose();	348	// RAP [rh] workingSetManager field unneeded, replaced by session-singleton
348	workingSetManager = null;	349	// if (workingSetManager != null) {
349	}	350	// workingSetManager.dispose();
		351	// workingSetManager = null;
		352	// }
		353
350	// RAP [rh] workingSetRegistry field unneeded, replaced by session-singleton	354	// RAP [rh] workingSetRegistry field unneeded, replaced by session-singleton
351	// workingSetRegistry = null;	355	// workingSetRegistry = null;
352		356
Lines 1335-1346 Link Here
1335		1339
1336	// TODO normally super.stop(*) would be the last statement in this	1340	// TODO normally super.stop(*) would be the last statement in this
1337	// method	1341	// method
1338	super.stop(context);	1342	// RAP [bm] cleanup will be done in Workbench#ShutdownHandler
1339	if (workingSetManager != null) {	1343	// super.stop(context);
1340	workingSetManager.dispose();	1344	// if (workingSetManager != null) {
1341	workingSetManager= null;	1345	// workingSetManager.dispose();
1342	}	1346	// workingSetManager= null;
1343	SWTResourceUtil.shutdown();	1347	// }
		1348	// SWTResourceUtil.shutdown();
		1349	// RAPEND
1344	}	1350	}
1345		1351
1346	/**	1352	/**