Attachment #19133 for bug #85373




import org.eclipse.core.runtime.IStatus;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.window.WindowManager;
import org.eclipse.ui.IMemento;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchWindow;


     * could not be restored, but that startup should continue
     * with a reset state.
     * 
     * @see #restoreState()
     */
    public static final int RESTORE_CODE_RESET = 1;


     * 	<code>false</code> to forget current workbench state on close.
     */
    public void setSaveAndRestore(boolean enabled);

	/**
	 * Saves the current state of the workbench using the
	 * specified memento.
	 * 
	 * @param memento the storage area for object's state
	 * @return a status object indicating whether the save was successful
	 */
	public IStatus saveSate(IMemento memento);
	
	/**
	 * Restores the Workbench state using the specified memento.
	 * 
	 * @param memento the storage area for object's state
	 * @return a status object indicating whether the restore was successful
	 */
	public IStatus restoreState(IMemento memento);

    /**
     * Returns the workbench window manager.




 *******************************************************************************/
package org.eclipse.ui.application;

import org.eclipse.core.runtime.IStatus;
import org.eclipse.swt.dnd.DropTargetListener;
import org.eclipse.swt.dnd.Transfer;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Menu;
import org.eclipse.ui.IMemento;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.presentations.AbstractPresentationFactory;


     * @return the page composite, suitable for laying out in the parent 
     */
    public Control createPageComposite(Composite parent);
	
	/**
	 * Saves the state of the <code>WorkbenchWindow</code> using
	 * the specified memento.
	 * 
	 * @param memento the storage area for object's state
	 * @return a status object indicating whether the save was successful
	 */
	public IStatus saveState(IMemento memento);
	
	/**
	 * Restores the state of the <code>WorkbenchWindow</code> using
	 * the specified memento.
	 * 
	 * @param memento the storage area for object's state
	 * @return a status object indicating whether the restore was successful
	 */
	public IStatus restoreState(IMemento memento);
}




import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IMemento;
import org.eclipse.ui.IWorkbenchPreferenceConstants;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;

	 */
	public Control createEmptyWindowContents(IWorkbenchWindowConfigurer configurer, Composite parent) {
		return null;
	}
	
	/**
	 * Saves the state of the workbench using the specified memento.
	 * <p>
	 * The default implementation of this uses <code>IWorkbenchConfigurer.saveState</code>.
	 * Subclasses may override.
	 * 
	 * @param memento the storage area for object's state
	 * @return a status object indicating whether the save was successful
	 */
	public IStatus saveState(IMemento memento) {
		// default behavior
		return getWorkbenchConfigurer().saveSate(memento);
	}
	
	/**
	 * Restores the state of the workbench using the specified memento.
	 * <p>
	 * The default implementation of this uses <code>IWorkbenchConfigurer.restoreState</code>.
	 * Subclasses may override.
	 *  
	 * @param memento the storage area for object's state
	 * @return a status object indicating whether the restore was successful
	 */
	public IStatus restoreState(IMemento memento) {
		// default behavior
		return getWorkbenchConfigurer().restoreState(memento);
	}
}





 *******************************************************************************/
package org.eclipse.ui.application;

import org.eclipse.core.runtime.IStatus;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IMemento;
import org.eclipse.ui.IWorkbenchPreferenceConstants;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.WorkbenchException;
import org.eclipse.ui.internal.WorkbenchWindowConfigurer;

    public void dispose() {
        // do nothing.
    }
	
	/**
	 * Saves the state of the workbench window using the specified memento.
	 * <p>
	 * The default implementation of this uses <code>IWorkbenchWindowConfigurer.saveState</code>.
	 * Subclasses may override.
	 * 
	 * @param window the window that is being saved
	 * @param memento the storage area for object's state
	 * @return a status object indicating whether the save was successful
	 */
	public IStatus saveState (IWorkbenchWindow window, IMemento memento) {
		// default behavior
		return windowConfigurer.saveState(memento);
	}
	
	/**
	 * Restores the state of the workbench window using the specified memento.
	 * <p>
	 * The default implementation of this uses <code>IWorkbenchWindowConfigurer.restoreState</code>.
	 * Subclasses may override.
	 * 
	 * @param window the window that is being restored
	 * @param memento the storage area for object's state
	 * @return a status object indicating whether the restore was successful
	 */
	public IStatus restoreState (IWorkbenchWindow window, IMemento memento) {
		// default behavior
		return windowConfigurer.restoreState(memento);
	}
}




				}

				// Restore the saved state
				IStatus restoreResult = getAdvisor().restoreState(memento);
				reader.close();
				if (restoreResult.getSeverity() == IStatus.ERROR) {
					ErrorDialog.openError(null,

	private XMLMemento recordWorkbenchState() {
		XMLMemento memento = XMLMemento
				.createWriteRoot(IWorkbenchConstants.TAG_WORKBENCH);
		IStatus status = getAdvisor().saveState(memento);
		if (status.getSeverity() != IStatus.OK) {
			// don't use newWindow as parent because it has not yet been opened
			// (bug 76724)

	/*
	 * Restores the state of the previously saved workbench
	 */
	IStatus restoreState(IMemento memento) {

		MultiStatus result = new MultiStatus(PlatformUI.PLUGIN_ID, IStatus.OK,
				WorkbenchMessages.Workbench_problemsRestoring, null);

			// for any exception that might hose us before we get a chance to
			// open it. If one occurs, remove the new window from the manager.
			try {
				result.merge(newWindow.restoreState(childMem));
				try {
					newWindow.fireWindowRestored();
				} catch (WorkbenchException e) {

	/*
	 * Saves the current state of the workbench so it can be restored later on
	 */
	IStatus saveState(IMemento memento) {
		MultiStatus result = new MultiStatus(PlatformUI.PLUGIN_ID, IStatus.OK,
				WorkbenchMessages.Workbench_problemsSaving, null);


			WorkbenchWindow window = (WorkbenchWindow) windows[nX];
			IMemento childMem = memento
					.createChild(IWorkbenchConstants.TAG_WINDOW);
			result.merge(window.recordState(childMem));
		}
		result.add(getEditorHistory().saveState(
				memento.createChild(IWorkbenchConstants.TAG_MRU_LIST))); //$NON-NLS-1$




import org.eclipse.core.runtime.IStatus;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.window.WindowManager;
import org.eclipse.ui.IMemento;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;

    public void openFirstTimeWindow() {
        ((Workbench) getWorkbench()).openFirstTimeWindow();
    }

	/* (non-Javadoc)
	 * @see org.eclipse.ui.application.IWorkbenchConfigurer#saveSate(org.eclipse.ui.IMemento)
	 */
	public IStatus saveSate(IMemento memento) {
		return ((Workbench) getWorkbench()).saveState(memento);
	}

	/* (non-Javadoc)
	 * @see org.eclipse.ui.application.IWorkbenchConfigurer#restoreState(org.eclipse.ui.IMemento)
	 */
	public IStatus restoreState(IMemento memento) {
		return ((Workbench) getWorkbench()).restoreState(memento);
	}
}

Lines 1373-1378 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java (+21 lines)
1373	}	1373	}
1374		1374
1375	/**	1375	/**
		1376	* Restores the state of the workbench window using the specified memento.
		1377	*
		1378	* @param memento the storage area for object's state
		1379	* @return a status object indicating whether the restore was successful
		1380	*/
		1381	IStatus restoreState(IMemento memento) {
		1382	return getWindowAdvisor().restoreState(this, memento);
		1383	}
		1384
		1385	/**
1376	* @see IPersistable.	1386	* @see IPersistable.
1377	*/	1387	*/
1378	public IStatus restoreState(IMemento memento,	1388	public IStatus restoreState(IMemento memento,
Lines 2505-2510 Link Here
2505	return getWorkbenchImpl().getAdvisor();	2515	return getWorkbenchImpl().getAdvisor();
2506	}	2516	}
2507		2517
		2518	/**
		2519	* Records the state of the workbench window using the
		2520	* specified memento.
		2521	*
		2522	* @param memento the storage area for object's state
		2523	* @return a status object indicating whether the record was successful
		2524	*/
		2525	IStatus recordState(IMemento memento) {
		2526	return getWindowAdvisor().saveState(this, memento);
		2527	}
		2528
2508	/**	2529	/**
2509	* Returns the window advisor, creating a new one for this	2530	* Returns the window advisor, creating a new one for this
2510	* window if needed.	2531	* window if needed.




import java.util.HashMap;
import java.util.Map;

import org.eclipse.core.runtime.IStatus;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.action.IContributionItem;
import org.eclipse.jface.action.ICoolBarManager;

import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Menu;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IMemento;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.application.IActionBarConfigurer;

    public Control createPageComposite(Composite parent) {
        return window.createPageComposite(parent);
    }

	/* (non-Javadoc)
	 * @see org.eclipse.ui.application.IWorkbenchWindowConfigurer#saveState(org.eclipse.ui.IMemento)
	 */
	public IStatus saveState(IMemento memento) {
		return window.saveState(memento);
	}

	/* (non-Javadoc)
	 * @see org.eclipse.ui.application.IWorkbenchWindowConfigurer#restoreState(org.eclipse.ui.IMemento)
	 */
	public IStatus restoreState(IMemento memento) {
		return window.restoreState(memento, null);
	}
}

Return to bug 85373

Lines 1252-1258 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/Workbench.java (-6 / +6 lines)
1252	}	1252	}
1253		1253
1254	// Restore the saved state	1254	// Restore the saved state
1255	IStatus restoreResult = restoreState(memento);	1255	IStatus restoreResult = getAdvisor().restoreState(memento);
1256	reader.close();	1256	reader.close();
1257	if (restoreResult.getSeverity() == IStatus.ERROR) {	1257	if (restoreResult.getSeverity() == IStatus.ERROR) {
1258	ErrorDialog.openError(null,	1258	ErrorDialog.openError(null,
Lines 1322-1328 Link Here
1322	private XMLMemento recordWorkbenchState() {	1322	private XMLMemento recordWorkbenchState() {
1323	XMLMemento memento = XMLMemento	1323	XMLMemento memento = XMLMemento
1324	.createWriteRoot(IWorkbenchConstants.TAG_WORKBENCH);	1324	.createWriteRoot(IWorkbenchConstants.TAG_WORKBENCH);
1325	IStatus status = saveState(memento);	1325	IStatus status = getAdvisor().saveState(memento);
1326	if (status.getSeverity() != IStatus.OK) {	1326	if (status.getSeverity() != IStatus.OK) {
1327	// don't use newWindow as parent because it has not yet been opened	1327	// don't use newWindow as parent because it has not yet been opened
1328	// (bug 76724)	1328	// (bug 76724)
Lines 1344-1350 Link Here
1344	/*	1344	/*
1345	* Restores the state of the previously saved workbench	1345	* Restores the state of the previously saved workbench
1346	*/	1346	*/
1347	private IStatus restoreState(IMemento memento) {	1347	IStatus restoreState(IMemento memento) {
1348		1348
1349	MultiStatus result = new MultiStatus(PlatformUI.PLUGIN_ID, IStatus.OK,	1349	MultiStatus result = new MultiStatus(PlatformUI.PLUGIN_ID, IStatus.OK,
1350	WorkbenchMessages.Workbench_problemsRestoring, null);	1350	WorkbenchMessages.Workbench_problemsRestoring, null);
Lines 1387-1393 Link Here
1387	// for any exception that might hose us before we get a chance to	1387	// for any exception that might hose us before we get a chance to
1388	// open it. If one occurs, remove the new window from the manager.	1388	// open it. If one occurs, remove the new window from the manager.
1389	try {	1389	try {
1390	result.merge(newWindow.restoreState(childMem, null));	1390	result.merge(newWindow.restoreState(childMem));
1391	try {	1391	try {
1392	newWindow.fireWindowRestored();	1392	newWindow.fireWindowRestored();
1393	} catch (WorkbenchException e) {	1393	} catch (WorkbenchException e) {
Lines 1561-1567 Link Here
1561	/*	1561	/*
1562	* Saves the current state of the workbench so it can be restored later on	1562	* Saves the current state of the workbench so it can be restored later on
1563	*/	1563	*/
1564	private IStatus saveState(IMemento memento) {	1564	IStatus saveState(IMemento memento) {
1565	MultiStatus result = new MultiStatus(PlatformUI.PLUGIN_ID, IStatus.OK,	1565	MultiStatus result = new MultiStatus(PlatformUI.PLUGIN_ID, IStatus.OK,
1566	WorkbenchMessages.Workbench_problemsSaving, null);	1566	WorkbenchMessages.Workbench_problemsSaving, null);
1567		1567
Lines 1574-1580 Link Here
1574	WorkbenchWindow window = (WorkbenchWindow) windows[nX];	1574	WorkbenchWindow window = (WorkbenchWindow) windows[nX];
1575	IMemento childMem = memento	1575	IMemento childMem = memento
1576	.createChild(IWorkbenchConstants.TAG_WINDOW);	1576	.createChild(IWorkbenchConstants.TAG_WINDOW);
1577	result.merge(window.saveState(childMem));	1577	result.merge(window.recordState(childMem));
1578	}	1578	}
1579	result.add(getEditorHistory().saveState(	1579	result.add(getEditorHistory().saveState(
1580	memento.createChild(IWorkbenchConstants.TAG_MRU_LIST))); //$NON-NLS-1$	1580	memento.createChild(IWorkbenchConstants.TAG_MRU_LIST))); //$NON-NLS-1$

Lines 13-18 Link Here

(-)Eclipse UI/org/eclipse/ui/application/IWorkbenchConfigurer.java (-1 / +19 lines)
13	import org.eclipse.core.runtime.IStatus;	13	import org.eclipse.core.runtime.IStatus;
14	import org.eclipse.jface.resource.ImageDescriptor;	14	import org.eclipse.jface.resource.ImageDescriptor;
15	import org.eclipse.jface.window.WindowManager;	15	import org.eclipse.jface.window.WindowManager;
		16	import org.eclipse.ui.IMemento;
16	import org.eclipse.ui.IWorkbench;	17	import org.eclipse.ui.IWorkbench;
17	import org.eclipse.ui.IWorkbenchWindow;	18	import org.eclipse.ui.IWorkbenchWindow;
18		19
Lines 36-42 Link Here
36	* could not be restored, but that startup should continue	37	* could not be restored, but that startup should continue
37	* with a reset state.	38	* with a reset state.
38	*	39	*
39	* @see #restoreState	40	* @see #restoreState()
40	*/	41	*/
41	public static final int RESTORE_CODE_RESET = 1;	42	public static final int RESTORE_CODE_RESET = 1;
42		43
Lines 75-80 Link Here
75	* <code>false</code> to forget current workbench state on close.	76	* <code>false</code> to forget current workbench state on close.
76	*/	77	*/
77	public void setSaveAndRestore(boolean enabled);	78	public void setSaveAndRestore(boolean enabled);
		79
		80	/**
		81	* Saves the current state of the workbench using the
		82	* specified memento.
		83	*
		84	* @param memento the storage area for object's state
		85	* @return a status object indicating whether the save was successful
		86	*/
		87	public IStatus saveSate(IMemento memento);
		88
		89	/**
		90	* Restores the Workbench state using the specified memento.
		91	*
		92	* @param memento the storage area for object's state
		93	* @return a status object indicating whether the restore was successful
		94	*/
		95	public IStatus restoreState(IMemento memento);
78		96
79	/**	97	/**
80	* Returns the workbench window manager.	98	* Returns the workbench window manager.

Lines 10-21 Link Here

(-)Eclipse UI/org/eclipse/ui/application/IWorkbenchWindowConfigurer.java (+20 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.ui.application;	11	package org.eclipse.ui.application;
12		12
		13	import org.eclipse.core.runtime.IStatus;
13	import org.eclipse.swt.dnd.DropTargetListener;	14	import org.eclipse.swt.dnd.DropTargetListener;
14	import org.eclipse.swt.dnd.Transfer;	15	import org.eclipse.swt.dnd.Transfer;
15	import org.eclipse.swt.graphics.Point;	16	import org.eclipse.swt.graphics.Point;
16	import org.eclipse.swt.widgets.Composite;	17	import org.eclipse.swt.widgets.Composite;
17	import org.eclipse.swt.widgets.Control;	18	import org.eclipse.swt.widgets.Control;
18	import org.eclipse.swt.widgets.Menu;	19	import org.eclipse.swt.widgets.Menu;
		20	import org.eclipse.ui.IMemento;
19	import org.eclipse.ui.IWorkbenchWindow;	21	import org.eclipse.ui.IWorkbenchWindow;
20	import org.eclipse.ui.presentations.AbstractPresentationFactory;	22	import org.eclipse.ui.presentations.AbstractPresentationFactory;
21		23
Lines 393-396 Link Here
393	* @return the page composite, suitable for laying out in the parent	395	* @return the page composite, suitable for laying out in the parent
394	*/	396	*/
395	public Control createPageComposite(Composite parent);	397	public Control createPageComposite(Composite parent);
		398
		399	/**
		400	* Saves the state of the <code>WorkbenchWindow</code> using
		401	* the specified memento.
		402	*
		403	* @param memento the storage area for object's state
		404	* @return a status object indicating whether the save was successful
		405	*/
		406	public IStatus saveState(IMemento memento);
		407
		408	/**
		409	* Restores the state of the <code>WorkbenchWindow</code> using
		410	* the specified memento.
		411	*
		412	* @param memento the storage area for object's state
		413	* @return a status object indicating whether the restore was successful
		414	*/
		415	public IStatus restoreState(IMemento memento);
396	}	416	}

Lines 14-19 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/WorkbenchWindowConfigurer.java (+16 lines)
14	import java.util.HashMap;	14	import java.util.HashMap;
15	import java.util.Map;	15	import java.util.Map;
16		16
		17	import org.eclipse.core.runtime.IStatus;
17	import org.eclipse.jface.action.IAction;	18	import org.eclipse.jface.action.IAction;
18	import org.eclipse.jface.action.IContributionItem;	19	import org.eclipse.jface.action.IContributionItem;
19	import org.eclipse.jface.action.ICoolBarManager;	20	import org.eclipse.jface.action.ICoolBarManager;
Lines 29-34 Link Here
29	import org.eclipse.swt.widgets.Control;	30	import org.eclipse.swt.widgets.Control;
30	import org.eclipse.swt.widgets.Menu;	31	import org.eclipse.swt.widgets.Menu;
31	import org.eclipse.swt.widgets.Shell;	32	import org.eclipse.swt.widgets.Shell;
		33	import org.eclipse.ui.IMemento;
32	import org.eclipse.ui.IWorkbenchPage;	34	import org.eclipse.ui.IWorkbenchPage;
33	import org.eclipse.ui.IWorkbenchWindow;	35	import org.eclipse.ui.IWorkbenchWindow;
34	import org.eclipse.ui.application.IActionBarConfigurer;	36	import org.eclipse.ui.application.IActionBarConfigurer;
Lines 600-603 Link Here
600	public Control createPageComposite(Composite parent) {	602	public Control createPageComposite(Composite parent) {
601	return window.createPageComposite(parent);	603	return window.createPageComposite(parent);
602	}	604	}
		605
		606	/* (non-Javadoc)
		607	* @see org.eclipse.ui.application.IWorkbenchWindowConfigurer#saveState(org.eclipse.ui.IMemento)
		608	*/
		609	public IStatus saveState(IMemento memento) {
		610	return window.saveState(memento);
		611	}
		612
		613	/* (non-Javadoc)
		614	* @see org.eclipse.ui.application.IWorkbenchWindowConfigurer#restoreState(org.eclipse.ui.IMemento)
		615	*/
		616	public IStatus restoreState(IMemento memento) {
		617	return window.restoreState(memento, null);
		618	}
603	}	619	}