From 8567242e2faa0be2f3377ee32f6f9a6c4db287c5 Mon Sep 17 00:00:00 2001 From: Anton Leherbauer Date: Tue, 23 Jan 2007 10:49:17 +0000 Subject: [PATCH] Project Explorer: Fix enablement of context menu item Open In New Window --- .../ui/navigator/CNavigatorOpenActionProvider.java | 4 +--- .../ui/navigator/CNavigatorOpenEditorActionGroup.java | 10 ++++++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorOpenActionProvider.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorOpenActionProvider.java index 9e5f0e3a3e3..04cd49c8447 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorOpenActionProvider.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorOpenActionProvider.java @@ -76,9 +76,7 @@ public class CNavigatorOpenActionProvider extends CommonActionProvider { */ public void fillContextMenu(IMenuManager menu) { if (fOpenGroup != null) { - if (fOpenGroup.getOpenAction().isEnabled()) { - fOpenGroup.fillContextMenu(menu); - } + fOpenGroup.fillContextMenu(menu); } } diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorOpenEditorActionGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorOpenEditorActionGroup.java index 762c35bf3a1..8c974181b49 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorOpenEditorActionGroup.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorOpenEditorActionGroup.java @@ -12,8 +12,6 @@ package org.eclipse.cdt.internal.ui.navigator; -import org.eclipse.cdt.internal.ui.actions.SelectionConverter; -import org.eclipse.cdt.internal.ui.cview.CViewMessages; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; @@ -28,6 +26,11 @@ import org.eclipse.ui.actions.OpenInNewWindowAction; import org.eclipse.ui.actions.OpenWithMenu; import org.eclipse.ui.navigator.ICommonMenuConstants; +import org.eclipse.cdt.core.model.ICElement; + +import org.eclipse.cdt.internal.ui.actions.SelectionConverter; +import org.eclipse.cdt.internal.ui.cview.CViewMessages; + /** * This is basically a clone of {@link org.eclipse.cdt.internal.ui.cview.OpenFileGroup}, @@ -113,6 +116,9 @@ public class CNavigatorOpenEditorActionGroup extends AbstractCNavigatorActionGro return; } Object element= selection.getFirstElement(); + if (element instanceof ICElement) { + element= ((ICElement)element).getResource(); + } if (!(element instanceof IContainer)) { return; }