Bug 435284 - [Open Resource] Open Resource dialog's 'Show In' feature noI20140520-2000

longer lists active view

Need to consider the shell of the active part.

1 files changed, 9 insertions, 1 deletions

diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ShowInMenu.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ShowInMenu.java
index 4f771cd245f..28462ac6624 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ShowInMenu.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/ShowInMenu.java
@@ -37,6 +37,7 @@ import org.eclipse.jface.viewers.ISelectionProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Menu;
 import org.eclipse.swt.widgets.MenuItem;
+import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.ISourceProvider;
 import org.eclipse.ui.ISources;
@@ -325,7 +326,14 @@ public class ShowInMenu extends ContributionItem implements
 
 		IWorkbenchPage page = window.getActivePage();
 		if (page != null) {
-			return page.getActivePart();
+			IWorkbenchPart activePart = page.getActivePart();
+			/*
+			 * NOTE: Do not use window.getShell() to test since this won't work
+			 * for detached views (see bug 412285)
+			 */
+			Shell activePartShell = activePart.getSite().getShell();
+			if (activePartShell == activePartShell.getDisplay().getActiveShell())
+				return activePart;
 		}
 		return null;
 	}