Attachment 190427 Details for Bug 306952 – WorkbenchPage patch v1

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

[patch] WorkbenchPage patch v1

bug306952-patch-v1.txt (text/plain), 2.75 KB, created by Remy Suen

on 2011-03-04 14:00:12 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Remy Suen

Created: 2011-03-04 14:00:12 EST

Size: 2.75 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.workbench
>Index: Eclipse UI/org/eclipse/ui/internal/WorkbenchPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/e4/org.eclipse.e4.compatibility/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchPage.java,v
>retrieving revision 1.167
>diff -u -r1.167 WorkbenchPage.java
>--- Eclipse UI/org/eclipse/ui/internal/WorkbenchPage.java	4 Mar 2011 15:53:01 -0000	1.167
>+++ Eclipse UI/org/eclipse/ui/internal/WorkbenchPage.java	4 Mar 2011 18:59:10 -0000
>@@ -1704,6 +1704,61 @@
> 			return (IEditorPart) activePart;
> 		}
> 
>+		if (!activationList.isEmpty()) {
>+			IEditorPart editor = findActiveEditor();
>+			if (editor != null) {
>+				return editor;
>+			}
>+		}
>+
>+		MUIElement area = findSharedArea();
>+		if (area instanceof MPlaceholder) {
>+			area = ((MPlaceholder) area).getRef();
>+		}
>+		if (area != null && area.isVisible() && area.isToBeRendered()) {
>+			// we have a shared area, try iterating over its editors first
>+			List<MPart> editors = modelService.findElements(area,
>+					CompatibilityEditor.MODEL_ELEMENT_ID, MPart.class, null);
>+			for (MPart model : editors) {
>+				Object object = model.getObject();
>+				if (object instanceof CompatibilityEditor) {
>+					CompatibilityEditor editor = (CompatibilityEditor) object;
>+					// see bug 308492
>+					if (!editor.isBeingDisposed() && isInArea(area, model)) {
>+						return ((CompatibilityEditor) object).getEditor();
>+					}
>+				}
>+			}
>+		}
>+
>+		MPerspective perspective = getPerspectiveStack().getSelectedElement();
>+		List<MPart> parts = modelService.findElements(perspective,
>+				CompatibilityEditor.MODEL_ELEMENT_ID, MPart.class, null);
>+		for (MPart part : parts) {
>+			Object object = part.getObject();
>+			if (object instanceof CompatibilityEditor) {
>+				CompatibilityEditor editor = (CompatibilityEditor) object;
>+				// see bug 308492
>+				if (!editor.isBeingDisposed()) {
>+					if (isValid(perspective, part) || isValid(window, part)) {
>+						return ((CompatibilityEditor) object).getEditor();
>+					}
>+				}
>+			}
>+		}
>+		return null;
>+	}
>+
>+	/**
>+	 * Searches and returns an editor from the activation list that is being
>+	 * displayed in the current presentation. If an editor is in the
>+	 * presentation but is behind another part it will not be returned.
>+	 * 
>+	 * @return an editor that is being shown in the current presentation and was
>+	 *         previously activated, editors that are behind another part in a
>+	 *         stack will not be returned
>+	 */
>+	private IEditorPart findActiveEditor() {
> 		List<MPart> candidates = new ArrayList<MPart>(activationList);
> 		MUIElement area = findSharedArea();
> 		if (area instanceof MPlaceholder) {

Actions: View | Diff

Attachments on bug 306952: 190427