From 7e5a0bb437978700f4ca89c69841d36f7bfb1281 Mon Sep 17 00:00:00 2001
From: Peter Gromov <peter@jetbrains.com>
Date: Wed, 23 Sep 2009 21:51:54 +0400
Subject: [PATCH] add framework support in navbar

---
 .../intellij/ide/navigationToolbar/NavBarPanel.java   | 11 +++++++++--
 platform/platform-resources/src/idea/LangActions.xml  |  2 +-
 resources/src/idea/IdeaActions.xml                    |  1 +
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPanel.java b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPanel.java
index 5a935ce52124..9e1d77324ece 100644
--- a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPanel.java
+++ b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPanel.java
@@ -22,6 +22,7 @@ import com.intellij.ide.DataManager;
 import com.intellij.ide.IdeView;
 import com.intellij.ide.projectView.ProjectView;
 import com.intellij.ide.projectView.impl.AbstractProjectViewPane;
+import com.intellij.ide.projectView.impl.ProjectRootsUtil;
 import com.intellij.ide.ui.customization.CustomActionsSchema;
 import com.intellij.ide.util.DeleteHandler;
 import com.intellij.ide.util.DirectoryChooserUtil;
@@ -617,8 +618,14 @@ public class NavBarPanel extends JPanel implements DataProvider, PopupOwner {
       return null;
     }
     if (dataId.equals(DataConstants.MODULE_CONTEXT)) {
-      final Module module = getSelectedElement(Module.class);
-      return module != null && module.isDisposed() ? null : module;
+      final PsiDirectory directory = getSelectedElement(PsiDirectory.class);
+      if (directory != null) {
+        final VirtualFile dir = directory.getVirtualFile();
+        if (ProjectRootsUtil.isModuleContentRoot(dir, myProject)) {
+          return ModuleUtil.findModuleForPsiElement(directory);
+        }
+      }
+      return null;
     }
     if (dataId.equals(DataConstants.PSI_ELEMENT)) {
       final PsiElement element = getSelectedElement(PsiElement.class);
diff --git a/platform/platform-resources/src/idea/LangActions.xml b/platform/platform-resources/src/idea/LangActions.xml
index 1e74ee18494e..fe919a1b16c4 100644
--- a/platform/platform-resources/src/idea/LangActions.xml
+++ b/platform/platform-resources/src/idea/LangActions.xml
@@ -424,7 +424,7 @@
     </group>
 
     <group id="NavbarPopupMenu">
-      <reference ref="NewGroup"/>
+      <reference ref="WeighingNewGroup"/>
       <reference ref="AssociateWithFileType"/>
       <separator/>
       <reference ref="CutCopyPasteGroup"/>
diff --git a/resources/src/idea/IdeaActions.xml b/resources/src/idea/IdeaActions.xml
index 3610841adf85..901e57784660 100644
--- a/resources/src/idea/IdeaActions.xml
+++ b/resources/src/idea/IdeaActions.xml
@@ -650,6 +650,7 @@
 
     <action id="AddFrameworkSupport" class="com.intellij.ide.util.frameworkSupport.AddFrameworkSupportAction">
       <add-to-group group-id="ProjectViewPopupMenu" anchor="after" relative-to-action="WeighingNewGroup"/>
+      <add-to-group group-id="NavbarPopupMenu" anchor="after" relative-to-action="WeighingNewGroup"/>
     </action>