Attachment #125381 for bug #64830

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

Lines 1868-1875 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/Workbench.java (-2 / +1 lines)
1868	IWorkbenchConfigurer.RESTORE_CODE_RESET, msg, null);	1868	IWorkbenchConfigurer.RESTORE_CODE_RESET, msg, null);
1869	}	1869	}
1870		1870
1871	final IStatus result[] = { new Status(IStatus.OK,	1871	final IStatus result[] = { Status.OK_STATUS };
1872	WorkbenchPlugin.PI_WORKBENCH, IStatus.OK, "", null) }; //$NON-NLS-1$
1873	SafeRunner.run(new SafeRunnable(WorkbenchMessages.ErrorReadingState) {	1872	SafeRunner.run(new SafeRunnable(WorkbenchMessages.ErrorReadingState) {
1874	public void run() throws Exception {	1873	public void run() throws Exception {
1875	FileInputStream input = new FileInputStream(stateFile);	1874	FileInputStream input = new FileInputStream(stateFile);

Lines 269-275 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/ViewFactory.java (-1 / +1 lines)
269	//for dynamic UI - add the next line to replace subsequent code that is commented out	269	//for dynamic UI - add the next line to replace subsequent code that is commented out
270	restoreViewState(mem[i]);	270	restoreViewState(mem[i]);
271	}	271	}
272	return new Status(IStatus.OK, PlatformUI.PLUGIN_ID, 0, "", null); //$NON-NLS-1$	272	return Status.OK_STATUS;
273	}	273	}
274		274
275	/**	275	/**




import org.eclipse.ui.IWorkbenchPartReference;
import org.eclipse.ui.IWorkbenchPreferenceConstants;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.XMLMemento;
import org.eclipse.ui.internal.StartupThreading.StartupRunnable;
import org.eclipse.ui.internal.dnd.AbstractDropTarget;

        }
                
        
        return Status.OK_STATUS;
    }

    /* (non-Javadoc)

        }
        

        return Status.OK_STATUS;
    }

    protected WorkbenchPage getPage() {

Lines 153-160 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/EditorHistoryItem.java (-3 / +2 lines)
153	public IStatus restoreState() {	153	public IStatus restoreState() {
154	Assert.isTrue(!isRestored());	154	Assert.isTrue(!isRestored());
155		155
156	Status result = new Status(IStatus.OK, PlatformUI.PLUGIN_ID, 0,	156	IStatus result = Status.OK_STATUS;
157	"", null); //$NON-NLS-1$
158	IMemento memento = this.memento;	157	IMemento memento = this.memento;
159	this.memento = null;	158	this.memento = null;
160		159
Lines 235-241 Link Here
235	.getToolTipText());	234	.getToolTipText());
236	}	235	}
237	}	236	}
238	return new Status(IStatus.OK, PlatformUI.PLUGIN_ID, 0, "", null); //$NON-NLS-1$	237	return Status.OK_STATUS;
239	}	238	}
240		239
241	}	240	}




import org.eclipse.ui.IEditorDescriptor;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IMemento;
import org.eclipse.ui.PlatformUI;

/**
 * This class is used to record "open editor" actions as they

                add(item, fifoList.size());
            }
        }
        return Status.OK_STATUS;
    }

    /**

                item.saveState(itemMemento);
            }
        }
        return Status.OK_STATUS;
    }
}

Lines 632-637 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/EditorSashContainer.java (-1 / +1 lines)
632	}});	632	}});
633		633
634	}	634	}
635	return new Status(IStatus.OK, PlatformUI.PLUGIN_ID, 0, "", null); //$NON-NLS-1$	635	return Status.OK_STATUS;
636	}	636	}
637	}	637	}

Lines 1203-1209 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/Perspective.java (-1 / +1 lines)
1203	*/	1203	*/
1204	public IStatus restoreState() {	1204	public IStatus restoreState() {
1205	if (this.memento == null) {	1205	if (this.memento == null) {
1206	return new Status(IStatus.OK, PlatformUI.PLUGIN_ID, 0, "", null); //$NON-NLS-1$	1206	return Status.OK_STATUS;
1207	}	1207	}
1208		1208
1209	MultiStatus result = new MultiStatus(	1209	MultiStatus result = new MultiStatus(




import org.eclipse.ui.IPerspectiveFactory;
import org.eclipse.ui.IPluginContribution;
import org.eclipse.ui.ISharedImages;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.internal.IWorkbenchConstants;
import org.eclipse.ui.internal.WorkbenchImages;
import org.eclipse.ui.internal.WorkbenchPlugin;

				image = descriptor.getImageDescriptor();
			}
		}
		return Status.OK_STATUS;
	}

	/**

		if (singleton) {
			childMem.putInteger(IWorkbenchConstants.TAG_SINGLETON, 1);
		}
		return Status.OK_STATUS;
	}

	/**

Return to bug 64830

Lines 42-48 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/PartStack.java (-3 / +2 lines)
42	import org.eclipse.ui.IWorkbenchPartReference;	42	import org.eclipse.ui.IWorkbenchPartReference;
43	import org.eclipse.ui.IWorkbenchPreferenceConstants;	43	import org.eclipse.ui.IWorkbenchPreferenceConstants;
44	import org.eclipse.ui.PartInitException;	44	import org.eclipse.ui.PartInitException;
45	import org.eclipse.ui.PlatformUI;
46	import org.eclipse.ui.XMLMemento;	45	import org.eclipse.ui.XMLMemento;
47	import org.eclipse.ui.internal.StartupThreading.StartupRunnable;	46	import org.eclipse.ui.internal.StartupThreading.StartupRunnable;
48	import org.eclipse.ui.internal.dnd.AbstractDropTarget;	47	import org.eclipse.ui.internal.dnd.AbstractDropTarget;
Lines 1024-1030 Link Here
1024	}	1023	}
1025		1024
1026		1025
1027	return new Status(IStatus.OK, PlatformUI.PLUGIN_ID, 0, "", null); //$NON-NLS-1$	1026	return Status.OK_STATUS;
1028	}	1027	}
1029		1028
1030	/* (non-Javadoc)	1029	/* (non-Javadoc)
Lines 1158-1164 Link Here
1158	}	1157	}
1159		1158
1160		1159
1161	return new Status(IStatus.OK, PlatformUI.PLUGIN_ID, 0, "", null); //$NON-NLS-1$	1160	return Status.OK_STATUS;
1162	}	1161	}
1163		1162
1164	protected WorkbenchPage getPage() {	1163	protected WorkbenchPage getPage() {

Lines 19-25 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/EditorHistory.java (-3 / +2 lines)
19	import org.eclipse.ui.IEditorDescriptor;	19	import org.eclipse.ui.IEditorDescriptor;
20	import org.eclipse.ui.IEditorInput;	20	import org.eclipse.ui.IEditorInput;
21	import org.eclipse.ui.IMemento;	21	import org.eclipse.ui.IMemento;
22	import org.eclipse.ui.PlatformUI;
23		22
24	/**	23	/**
25	* This class is used to record "open editor" actions as they	24	* This class is used to record "open editor" actions as they
Lines 134-140 Link Here
134	add(item, fifoList.size());	133	add(item, fifoList.size());
135	}	134	}
136	}	135	}
137	return new Status(IStatus.OK, PlatformUI.PLUGIN_ID, 0, "", null); //$NON-NLS-1$	136	return Status.OK_STATUS;
138	}	137	}
139		138
140	/**	139	/**
Lines 152-157 Link Here
152	item.saveState(itemMemento);	151	item.saveState(itemMemento);
153	}	152	}
154	}	153	}
155	return new Status(IStatus.OK, PlatformUI.PLUGIN_ID, 0, "", null); //$NON-NLS-1$	154	return Status.OK_STATUS;
156	}	155	}
157	}	156	}

Lines 21-27 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/registry/PerspectiveDescriptor.java (-3 / +2 lines)
21	import org.eclipse.ui.IPerspectiveFactory;	21	import org.eclipse.ui.IPerspectiveFactory;
22	import org.eclipse.ui.IPluginContribution;	22	import org.eclipse.ui.IPluginContribution;
23	import org.eclipse.ui.ISharedImages;	23	import org.eclipse.ui.ISharedImages;
24	import org.eclipse.ui.PlatformUI;
25	import org.eclipse.ui.internal.IWorkbenchConstants;	24	import org.eclipse.ui.internal.IWorkbenchConstants;
26	import org.eclipse.ui.internal.WorkbenchImages;	25	import org.eclipse.ui.internal.WorkbenchImages;
27	import org.eclipse.ui.internal.WorkbenchPlugin;	26	import org.eclipse.ui.internal.WorkbenchPlugin;
Lines 337-343 Link Here
337	image = descriptor.getImageDescriptor();	336	image = descriptor.getImageDescriptor();
338	}	337	}
339	}	338	}
340	return new Status(IStatus.OK, PlatformUI.PLUGIN_ID, 0, "", null); //$NON-NLS-1$	339	return Status.OK_STATUS;
341	}	340	}
342		341
343	/**	342	/**
Lines 370-376 Link Here
370	if (singleton) {	369	if (singleton) {
371	childMem.putInteger(IWorkbenchConstants.TAG_SINGLETON, 1);	370	childMem.putInteger(IWorkbenchConstants.TAG_SINGLETON, 1);
372	}	371	}
373	return new Status(IStatus.OK, PlatformUI.PLUGIN_ID, 0, "", null); //$NON-NLS-1$	372	return Status.OK_STATUS;
374	}	373	}
375		374
376	/**	375	/**