Attachment 199458 Details for Bug 321278 – diff -r Merged_e_4_0_m_3_x -r e_4_0_m_3_x

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

[patch] diff -r Merged_e_4_0_m_3_x -r e_4_0_m_3_x

e_4_0_m_3_x.diff (text/plain), 3.22 KB, created by Steffen Pingel

on 2011-07-11 20:09:13 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Steffen Pingel

Created: 2011-07-11 20:09:13 EDT

Size: 3.22 KB

patch

obsolete

>Index: src/org/eclipse/mylyn/internal/context/ui/ContextEditorManager.java
>===================================================================
>RCS file: /cvsroot/mylyn/org.eclipse.mylyn.contexts/org.eclipse.mylyn.context.ui/src/org/eclipse/mylyn/internal/context/ui/ContextEditorManager.java,v
>retrieving revision 1.23
>retrieving revision 1.21.6.2
>diff -u -r1.23 -r1.21.6.2
>--- src/org/eclipse/mylyn/internal/context/ui/ContextEditorManager.java	3 Mar 2011 00:27:17 -0000	1.23
>+++ src/org/eclipse/mylyn/internal/context/ui/ContextEditorManager.java	18 May 2011 01:16:27 -0000	1.21.6.2
>@@ -52,7 +52,6 @@
> import org.eclipse.ui.PartInitException;
> import org.eclipse.ui.PlatformUI;
> import org.eclipse.ui.XMLMemento;
>-import org.eclipse.ui.internal.EditorManager;
> import org.eclipse.ui.internal.IPreferenceConstants;
> import org.eclipse.ui.internal.IWorkbenchConstants;
> import org.eclipse.ui.internal.Workbench;
>@@ -256,7 +255,7 @@
> 				memento.putInteger(ATTRIBUTE_NUMER, number);
> 				memento.putBoolean(ATTRIBUTE_IS_LAUNCHING, window == launchingWindow);
> 				memento.putBoolean(ATTRIBUTE_IS_ACTIVE, window == activeWindow);
>-				((WorkbenchPage) window.getActivePage()).getEditorManager().saveState(memento);
>+				//((WorkbenchPage) window.getActivePage()).getEditorManager().saveState(memento);
> 			}
> 			// TODO: avoid storing with preferences due to bloat?
> 			StringWriter writer = new StringWriter();
>@@ -309,7 +308,7 @@
> 	 */
> 	@SuppressWarnings("unchecked")
> 	private void restoreEditors(WorkbenchPage page, IMemento memento, boolean isActiveWindow) {
>-		EditorManager editorManager = page.getEditorManager();
>+		//EditorManager editorManager = page.getEditorManager();
> 		final ArrayList visibleEditors = new ArrayList(5);
> 		final IEditorReference activeEditor[] = new IEditorReference[1];
> 		final MultiStatus result = new MultiStatus(PlatformUI.PLUGIN_ID, IStatus.OK, "", null); //$NON-NLS-1$
>@@ -320,21 +319,21 @@
> 			editorMementoSet.addAll(Arrays.asList(editorMementos));
> 			// HACK: same parts could have different editors
> 			Set<String> restoredPartNames = new HashSet<String>();
>-			List<IEditorReference> alreadyVisibleEditors = Arrays.asList(editorManager.getEditors());
>-			for (IEditorReference editorReference : alreadyVisibleEditors) {
>-				restoredPartNames.add(editorReference.getPartName());
>-			}
>+//			List<IEditorReference> alreadyVisibleEditors = Arrays.asList(editorManager.getEditors());
>+//			for (IEditorReference editorReference : alreadyVisibleEditors) {
>+//				restoredPartNames.add(editorReference.getPartName());
>+//			}
> 			for (IMemento editorMemento : editorMementoSet) {
> 				String partName = editorMemento.getString(IWorkbenchConstants.TAG_PART_NAME);
> 				if (!restoredPartNames.contains(partName)) {
>-					editorManager.restoreEditorState(editorMemento, visibleEditors, activeEditor, result);
>+					//editorManager.restoreEditorState(editorMemento, visibleEditors, activeEditor, result);
> 				} else {
> 					restoredPartNames.add(partName);
> 				}
> 			}
> 
> 			for (int i = 0; i < visibleEditors.size(); i++) {
>-				editorManager.setVisibleEditor((IEditorReference) visibleEditors.get(i), false);
>+				//editorManager.setVisibleEditor((IEditorReference) visibleEditors.get(i), false);
> 			}
> 
> 			if (activeEditor[0] != null && isActiveWindow) {

Actions: View | Diff

Attachments on bug 321278: 178366 | 199458 | 199459