# HG changeset patch
# Parent de97dede8ae91563b33f879d7a2e88c0d9132e3a
#189320: Select in Projects on editor tab context menu.
Requires API for adding actions to this area rather than reflection hacks.
Also rework UI of Select in... actions a bit: make top level action in editor pane, do not use submenu, show only ...Projects.

diff --git a/core.ui/manifest.mf b/core.ui/manifest.mf
--- a/core.ui/manifest.mf
+++ b/core.ui/manifest.mf
@@ -4,5 +4,5 @@
 OpenIDE-Module-Layer: org/netbeans/core/ui/resources/layer.xml
 AutoUpdate-Show-In-Client: false
 AutoUpdate-Essential-Module: true
-OpenIDE-Module-Specification-Version: 1.23
+OpenIDE-Module-Specification-Version: 1.24
 
diff --git a/core.ui/src/org/netbeans/core/ui/resources/layer.xml b/core.ui/src/org/netbeans/core/ui/resources/layer.xml
--- a/core.ui/src/org/netbeans/core/ui/resources/layer.xml
+++ b/core.ui/src/org/netbeans/core/ui/resources/layer.xml
@@ -824,6 +824,15 @@
 
     </folder>
 
+    <folder name="Editors">
+        <folder name="TabActions">
+            <file name="org-openide-actions-FileSystemAction.shadow">
+                <attr name="originalFile" stringvalue="Actions/System/org-openide-actions-FileSystemAction.instance"/>
+                <attr name="position" intvalue="200"/>
+            </file>
+        </folder>
+    </folder>
+
     <folder name="OptionsExport">
         <folder name="General">
             <attr name="displayName" bundlevalue="org.netbeans.core.ui.options.general.Bundle#General.Options.Export.Category.displayName"/>
diff --git a/diff/nbproject/project.properties b/diff/nbproject/project.properties
--- a/diff/nbproject/project.properties
+++ b/diff/nbproject/project.properties
@@ -43,7 +43,7 @@
 javac.compilerargs=-Xlint:unchecked
 javac.source=1.6
 
-spec.version.base=1.29.0
+spec.version.base=1.30.0
 javadoc.apichanges=${basedir}/apichanges.xml
 javadoc.arch=${basedir}/arch.xml
 
diff --git a/diff/nbproject/project.xml b/diff/nbproject/project.xml
--- a/diff/nbproject/project.xml
+++ b/diff/nbproject/project.xml
@@ -238,7 +238,7 @@
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>6.16</specification-version>
+                        <specification-version>6.32</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/diff/src/org/netbeans/modules/diff/mf-layer.xml b/diff/src/org/netbeans/modules/diff/mf-layer.xml
--- a/diff/src/org/netbeans/modules/diff/mf-layer.xml
+++ b/diff/src/org/netbeans/modules/diff/mf-layer.xml
@@ -83,6 +83,12 @@
     <folder name="Editors">
         <file name="org-netbeans-modules-diff-builtin-visualizer-editable-DiffHighlightsLayerFactory.instance"/>
         <file name="org-netbeans-modules-merge-builtin-visualizer-MergeHighlightsLayerFactory.instance"/>
+        <folder name="TabActions">
+              <file name="org-netbeans-modules-diff-DiffAction.shadow">
+                  <attr name="originalFile" stringvalue="Actions/Tools/org-netbeans-modules-diff-DiffAction.instance"/>
+                  <attr name="position" intvalue="300"/>
+              </file>
+        </folder>
         <folder name="UpToDateStatusProvider">
             <file name="org-netbeans-modules-diff-builtin-visualizer-editable-DiffMarkProviderCreator.instance">
                 <attr name="instanceClass" stringvalue="org.netbeans.modules.diff.builtin.visualizer.editable.DiffMarkProviderCreator"/>                                                               
diff --git a/editor/nbproject/project.properties b/editor/nbproject/project.properties
--- a/editor/nbproject/project.properties
+++ b/editor/nbproject/project.properties
@@ -42,7 +42,7 @@
 
 javac.compilerargs=-Xlint:unchecked
 javac.source=1.6
-spec.version.base=1.51.0
+spec.version.base=1.52.0
 is.autoload=true
 
 javadoc.arch=${basedir}/arch.xml
diff --git a/editor/src/org/netbeans/modules/editor/Bundle.properties b/editor/src/org/netbeans/modules/editor/Bundle.properties
--- a/editor/src/org/netbeans/modules/editor/Bundle.properties
+++ b/editor/src/org/netbeans/modules/editor/Bundle.properties
@@ -53,7 +53,6 @@
 Templates/Services/IndentEngine/org-netbeans-modules-editor-html-LineWrapIndentEngine.settings=Line Wrapping Indentation Engine
 Menu/Source=&Source
 Menu/View/CodeFolds=&Code Folds
-Editors/text/base/Popup/org-netbeans-modules-editor-NbSelectInPopupAction.instance=Select in
 
 MSG_NegativeValue=Negative value is not allowed
 MSG_OutOfRange=Value is out of range
diff --git a/editor/src/org/netbeans/modules/editor/NbSelectInPopupAction.java b/editor/src/org/netbeans/modules/editor/NbSelectInPopupAction.java
deleted file mode 100644
--- a/editor/src/org/netbeans/modules/editor/NbSelectInPopupAction.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * Contributor(s):
- *
- * The Original Software is NetBeans. The Initial Developer of the Original
- * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
- * Microsystems, Inc. All Rights Reserved.
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- */
-package org.netbeans.modules.editor;
-
-import java.awt.event.ActionEvent;
-import java.io.IOException;
-import java.util.ArrayList;
-import javax.swing.Action;
-import javax.swing.JMenu;
-import javax.swing.JMenuItem;
-import javax.swing.JPopupMenu;
-import javax.swing.JSeparator;
-
-import org.openide.cookies.InstanceCookie;
-import org.openide.filesystems.FileObject;
-import org.openide.filesystems.FileUtil;
-import org.openide.loaders.DataFolder;
-import org.openide.loaders.DataObject;
-import org.openide.util.HelpCtx;
-import org.openide.util.NbBundle;
-import org.openide.util.actions.Presenter;
-import org.openide.util.actions.SystemAction;
-
-
-/**
- *
- * @author Dusan Balek
- */
-public final class NbSelectInPopupAction extends SystemAction implements Presenter.Popup {
-
-    private ArrayList actions = null;
-
-    public String getName() {
-        return NbBundle.getMessage(NbSelectInPopupAction.class, "Editors/text/base/Popup/org-netbeans-modules-editor-NbSelectInPopupAction.instance"); // NOI18N
-    }
-    
-    public void actionPerformed(ActionEvent ev) {
-        // do nothing - should never be called
-    }
-
-    public HelpCtx getHelpCtx() {
-        return HelpCtx.DEFAULT_HELP;
-    }
-    
-    public javax.swing.JMenuItem getPopupPresenter() {
-        return new SubMenu(getName());
-    }
-
-    public class SubMenu extends JMenu {
-
-        public SubMenu(String s){
-            super(s);
-        }
-        
-        /** Gets popup menu. Overrides superclass. Adds lazy menu items creation. */
-        public JPopupMenu getPopupMenu() {
-            JPopupMenu pm = super.getPopupMenu();
-            pm.removeAll();
-            FileObject fo = FileUtil.getConfigFile("Actions/Window/SelectDocumentNode"); // NOI18N
-            DataFolder df = fo != null ? DataFolder.findFolder(fo) : null;
-            
-            if (df != null) {
-                DataObject actionObjects[] = df.getChildren();
-                for (int i = 0; i < actionObjects.length; i++) {
-                    InstanceCookie ic = (InstanceCookie) actionObjects[i].getCookie(InstanceCookie.class);
-                    if (ic == null) continue;
-                    Object instance;
-                    try {
-                        instance = ic.instanceCreate();
-                    } catch (IOException e) {
-                        // ignore
-                        e.printStackTrace();
-                        continue;
-                    } catch (ClassNotFoundException e) {
-                        // ignore
-                        e.printStackTrace();
-                        continue;
-                    }
-                    if (instance instanceof JSeparator) {
-                        pm.add((JSeparator) instance);
-                    } else if (instance instanceof Presenter.Popup) {    
-                        pm.add(((Presenter.Popup)instance).getPopupPresenter());
-                    } else if (instance instanceof Presenter.Menu) {    
-                        JMenuItem temp = ((Presenter.Menu)instance).getMenuPresenter();
-                        temp.setIcon(null);
-                        pm.add(temp);
-                    } else if (instance instanceof Action) {                        
-                        JMenuItem temp = new JMenuItem((Action)instance);
-                        temp.setIcon(null);
-                        pm.add(temp);
-                    }
-                }
-            }
-            pm.pack();
-            return pm;
-        }
-    }
-}
diff --git a/editor/src/org/netbeans/modules/editor/resources/layer.xml b/editor/src/org/netbeans/modules/editor/resources/layer.xml
--- a/editor/src/org/netbeans/modules/editor/resources/layer.xml
+++ b/editor/src/org/netbeans/modules/editor/resources/layer.xml
@@ -249,7 +249,8 @@
                 <attr name="originalFile" stringvalue="Actions/Edit/org-openide-actions-CutAction.instance"/>
                 <attr name="position" intvalue="2000"/>
             </file>
-            <file name="org-netbeans-modules-editor-NbSelectInPopupAction.instance">
+            <file name="org-netbeans-modules-project-ui-SelectInProjects.shadow">
+                <attr name="originalFile" stringvalue="Actions/Window/SelectDocumentNode/org-netbeans-modules-project-ui-SelectInProjects.instance"/>
                 <attr name="position" intvalue="9000"/>
             </file>
             <file name="org-openide-actions-PasteAction.shadow">
diff --git a/favorites/manifest.mf b/favorites/manifest.mf
--- a/favorites/manifest.mf
+++ b/favorites/manifest.mf
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.netbeans.modules.favorites/1
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/favorites/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.21
+OpenIDE-Module-Specification-Version: 1.22
 OpenIDE-Module-Layer: org/netbeans/modules/favorites/resources/layer.xml
 AutoUpdate-Show-In-Client: false
 AutoUpdate-Essential-Module: true
diff --git a/favorites/src/org/netbeans/modules/favorites/Actions.java b/favorites/src/org/netbeans/modules/favorites/Actions.java
--- a/favorites/src/org/netbeans/modules/favorites/Actions.java
+++ b/favorites/src/org/netbeans/modules/favorites/Actions.java
@@ -58,7 +58,6 @@
 import javax.swing.Action;
 import javax.swing.ImageIcon;
 import javax.swing.JFileChooser;
-import javax.swing.JMenuItem;
 import javax.swing.SwingUtilities;
 import org.netbeans.modules.favorites.api.Favorites;
 import org.openide.DialogDisplayer;
@@ -169,14 +168,6 @@
             return NbBundle.getMessage(Select.class, "ACT_Select_Main_Menu"); // NOI18N
         }
 
-        /** Overriden to have different title in popup menu, works but ugly a bit */
-        @Override
-        public JMenuItem getPopupPresenter() {
-            JMenuItem mi = super.getPopupPresenter();
-            mi.setText(NbBundle.getMessage(Select.class, "ACT_Select")); // NOI18N
-            return mi;
-        }
-
         @Override
         protected String iconResource() {
             return "org/netbeans/modules/favorites/resources/actionView.png"; // NOI18N
diff --git a/favorites/src/org/netbeans/modules/favorites/Bundle.properties b/favorites/src/org/netbeans/modules/favorites/Bundle.properties
--- a/favorites/src/org/netbeans/modules/favorites/Bundle.properties
+++ b/favorites/src/org/netbeans/modules/favorites/Bundle.properties
@@ -44,7 +44,6 @@
 ACT_AddOnFavoritesNode=&Add to Favorites...
 ACT_Remove=&Remove from Favorites
 ACT_View=Favor&ites
-ACT_Select=Favorites
 ACT_Select_Main_Menu=Select in F&avorites
 
 Favorites=Favorites
diff --git a/openide.text/apichanges.xml b/openide.text/apichanges.xml
--- a/openide.text/apichanges.xml
+++ b/openide.text/apichanges.xml
@@ -49,6 +49,21 @@
 <apidef name="text">Text API</apidef>
 </apidefs>
 <changes>
+    <change id="Editors-TabActions">
+        <api name="text"/>
+        <summary>Ability to inject actions into editor tab context menus</summary>
+        <version major="6" minor="32"/>
+        <date day="16" month="8" year="2010"/>
+        <author login="jglick"/>
+        <compatibility addition="yes"/>
+        <description>
+            <p>
+                Actions may now be placed in <code>Editors/TabActions</code> to add
+                them to the context menu of the tab of an editor window.
+            </p>
+        </description>
+        <issue number="189320"/>
+    </change>
     <change id="NbDocument-style-constants-deprecated">
         <api name="text"/>
         <summary>Deprecating style constants in NbDocument</summary>
diff --git a/openide.text/arch.xml b/openide.text/arch.xml
--- a/openide.text/arch.xml
+++ b/openide.text/arch.xml
@@ -765,7 +765,9 @@
         </question>
 -->
 <answer id="resources-read">
-No.
+<api type="export" category="devel" group="layer" name="Editors-TabActions">
+    Actions for the editor tab (window) context menu can be injected into <code>Editors/TabActions</code>.
+</api>
 </answer>
 
 <!--
diff --git a/openide.text/manifest.mf b/openide.text/manifest.mf
--- a/openide.text/manifest.mf
+++ b/openide.text/manifest.mf
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.openide.text
 OpenIDE-Module-Install: org/netbeans/modules/openide/text/Installer.class
-OpenIDE-Module-Specification-Version: 6.31
+OpenIDE-Module-Specification-Version: 6.32
 OpenIDE-Module-Localizing-Bundle: org/openide/text/Bundle.properties
 AutoUpdate-Essential-Module: true
 
diff --git a/openide.text/src/org/openide/text/CloneableEditor.java b/openide.text/src/org/openide/text/CloneableEditor.java
--- a/openide.text/src/org/openide/text/CloneableEditor.java
+++ b/openide.text/src/org/openide/text/CloneableEditor.java
@@ -53,6 +53,7 @@
 import java.awt.event.ActionListener;
 import java.io.*;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.Callable;
@@ -61,14 +62,16 @@
 import javax.swing.*;
 import javax.swing.border.Border;
 import javax.swing.border.EmptyBorder;
-import javax.swing.text.*;
+import javax.swing.text.Caret;
+import javax.swing.text.DefaultEditorKit;
+import javax.swing.text.Document;
+import javax.swing.text.EditorKit;
 import org.netbeans.modules.openide.text.Installer;
 import org.openide.DialogDisplayer;
 import org.openide.NotifyDescriptor;
 import org.openide.awt.UndoRedo;
 import org.openide.cookies.EditorCookie;
 import org.openide.util.*;
-import org.openide.util.actions.SystemAction;
 import org.openide.windows.*;
 
 /** Cloneable top component to hold the editor kit.
@@ -879,32 +882,11 @@
 
     @Override
     public Action[] getActions() {
-        Action[] a = super.getActions();
-
-        try {
-            ClassLoader l = Lookup.getDefault().lookup(ClassLoader.class);
-
-            if (l == null) {
-                l = getClass().getClassLoader();
-            }
-
-            Class<? extends SystemAction> c = Class.forName("org.openide.actions.FileSystemAction", true, l).asSubclass(SystemAction.class); // NOI18N
-            SystemAction ra = SystemAction.findObject(c, true);
-
-            Class<? extends SystemAction> c2 = Class.forName("org.netbeans.modules.diff.DiffAction", true, l).asSubclass(SystemAction.class); // NOI18N
-            SystemAction ra2 = SystemAction.findObject(c2, true);           
-            
-            Action[] a2 = new Action[a.length + 2];
-            System.arraycopy(a, 0, a2, 0, a.length);
-            a2[a.length] = ra;
-            a2[a.length + 1] = ra2;
-
-            return a2;
-        } catch (Exception ex) {
-            // ok, we no action like this I guess
-        }
-
-        return a;
+        List<Action> actions = new ArrayList<Action>(Arrays.asList(super.getActions()));
+        // XXX might be nice to use MimeLookup for type-specific actions, but this seems to provide no way to only look in a subfolder
+        actions.add(null);
+        actions.addAll(Utilities.actionsForPath("Editors/TabActions"));
+        return actions.toArray(new Action[actions.size()]);
     }
 
     /** Transfer the focus to the editor pane.
diff --git a/projectui/nbproject/project.properties b/projectui/nbproject/project.properties
--- a/projectui/nbproject/project.properties
+++ b/projectui/nbproject/project.properties
@@ -42,7 +42,7 @@
 
 javac.compilerargs=-Xlint:unchecked
 javac.source=1.6
-spec.version.base=1.22.0
+spec.version.base=1.23.0
 
 javadoc.arch=${basedir}/arch.xml
 javadoc.apichanges=${basedir}/apichanges.xml
diff --git a/projectui/nbproject/project.xml b/projectui/nbproject/project.xml
--- a/projectui/nbproject/project.xml
+++ b/projectui/nbproject/project.xml
@@ -180,7 +180,7 @@
                     <build-prerequisite/>
                     <compile-dependency/>
                     <run-dependency>
-                        <specification-version>6.16</specification-version>
+                        <specification-version>6.32</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
diff --git a/projectui/src/org/netbeans/modules/project/ui/actions/Bundle.properties b/projectui/src/org/netbeans/modules/project/ui/actions/Bundle.properties
--- a/projectui/src/org/netbeans/modules/project/ui/actions/Bundle.properties
+++ b/projectui/src/org/netbeans/modules/project/ui/actions/Bundle.properties
@@ -62,10 +62,6 @@
 MNE_RecentProjectsAction_Name=j
 LBL_SaveProjectAction_Name=Save Project
 LBL_SetAsMainProjectAction_Name=Set as Main Project
-LBL_SelectInProjectsAction_Name=Select Node in Projects
-LBL_SelectInFilesAction_Name=Select Node in Files
-LBL_SelectInProjectsAction_MenuName=Projects
-LBL_SelectInFilesAction_MenuName=Files
 LBL_SelectInProjectsAction_MainMenuName=Select in Pro&jects
 LBL_SelectInFilesAction_MainMenuName=Sele&ct in Files
 
diff --git a/projectui/src/org/netbeans/modules/project/ui/actions/SelectNodeAction.java b/projectui/src/org/netbeans/modules/project/ui/actions/SelectNodeAction.java
--- a/projectui/src/org/netbeans/modules/project/ui/actions/SelectNodeAction.java
+++ b/projectui/src/org/netbeans/modules/project/ui/actions/SelectNodeAction.java
@@ -46,39 +46,20 @@
 
 import javax.swing.Action;
 import javax.swing.Icon;
-import javax.swing.JMenuItem;
-import org.netbeans.api.project.Project;
 import org.netbeans.modules.project.ui.ProjectTab;
-import org.netbeans.spi.project.ui.support.ProjectActionPerformer;
-import org.openide.awt.Mnemonics;
 import org.openide.filesystems.FileObject;
 import org.openide.loaders.DataObject;
 import org.openide.util.ImageUtilities;
 import org.openide.util.Lookup;
 import org.openide.util.NbBundle;
-import org.openide.util.actions.Presenter;
 
-/** Action sensitive to current project
- * 
- * @author Pet Hrebejk 
- */
-public class SelectNodeAction extends LookupSensitiveAction implements Presenter.Menu, Presenter.Popup {
+public class SelectNodeAction extends LookupSensitiveAction {
     
-    // XXX Better icons
     private static final Icon SELECT_IN_PROJECTS_ICON = ImageUtilities.loadImageIcon("org/netbeans/modules/project/ui/resources/projectTab.png", false); //NOI18N
     private static final Icon SELECT_IN_FILES_ICON = ImageUtilities.loadImageIcon("org/netbeans/modules/project/ui/resources/filesTab.png", false); //NOI18N
     
-    private static final String SELECT_IN_PROJECTS_NAME = NbBundle.getMessage( CloseProject.class, "LBL_SelectInProjectsAction_Name" ); // NOI18N
-    private static final String SELECT_IN_FILES_NAME = NbBundle.getMessage( CloseProject.class, "LBL_SelectInFilesAction_Name" ); // NOI18N
-    
-    private static final String SELECT_IN_PROJECTS_NAME_MENU = NbBundle.getMessage( CloseProject.class, "LBL_SelectInProjectsAction_MenuName" ); // NOI18N
-    private static final String SELECT_IN_FILES_NAME_MENU = NbBundle.getMessage( CloseProject.class, "LBL_SelectInFilesAction_MenuName" ); // NOI18N
-    private static final String SELECT_IN_PROJECTS_NAME_MAIN_MENU = NbBundle.getMessage( CloseProject.class, "LBL_SelectInProjectsAction_MainMenuName" ); // NOI18N
-    private static final String SELECT_IN_FILES_NAME_MAIN_MENU = NbBundle.getMessage( CloseProject.class, "LBL_SelectInFilesAction_MainMenuName" ); // NOI18N
-    
-    private String command;
-    private ProjectActionPerformer performer;
-    private String namePattern;
+    private static final String SELECT_IN_PROJECTS_NAME = NbBundle.getMessage(CloseProject.class, "LBL_SelectInProjectsAction_MainMenuName"); // NOI18N
+    private static final String SELECT_IN_FILES_NAME = NbBundle.getMessage(CloseProject.class, "LBL_SelectInFilesAction_MainMenuName"); // NOI18N
     
     private String findIn;
     
@@ -100,11 +81,6 @@
         return a;
     }
     
-    /** 
-     * Constructor for global actions. E.g. actions in main menu which 
-     * listen to the global context.
-     *
-     */
     public SelectNodeAction( Icon icon, String name ) {
         this(icon, name, null);
     }
@@ -112,17 +88,8 @@
         super( icon, lookup, new Class[] { DataObject.class, FileObject.class } );
         this.setDisplayName( name );
     }
-    
-    private SelectNodeAction(String command, ProjectActionPerformer performer, String namePattern, Icon icon, Lookup lookup) {
-        super( icon, lookup, new Class[] { Project.class, DataObject.class, FileObject.class } );
-        this.command = command;
-        this.performer = performer;
-        this.namePattern = namePattern;
-        refresh(getLookup(), true);
-    }
        
     protected void actionPerformed( Lookup context ) {
-        
         FileObject fo = getFileFromLookup( context );
         if ( fo != null ) {
             ProjectTab pt  = ProjectTab.findDefault( findIn );      
@@ -135,37 +102,6 @@
         setEnabled( fo != null );        
     }
     
-    protected final String getCommand() {
-        return command;
-    }
-    
-    protected final String getNamePattern() {
-        return namePattern;
-    }
-    
-    // Presenter.Menu implementation ------------------------------------------
-    
-    public JMenuItem getMenuPresenter () {
-        if (ProjectTab.ID_LOGICAL.equals (this.findIn)) {
-            return buildPresenter(SELECT_IN_PROJECTS_NAME_MAIN_MENU);
-        } else {
-            return buildPresenter(SELECT_IN_FILES_NAME_MAIN_MENU);
-        }
-    }
-
-    // Presenter.Popup implementation ------------------------------------------
-    
-    public JMenuItem getPopupPresenter() {
-        if (ProjectTab.ID_LOGICAL.equals (this.findIn)) {
-            return buildPresenter(SELECT_IN_PROJECTS_NAME_MENU);
-        } else {
-            return buildPresenter(SELECT_IN_FILES_NAME_MENU);
-        }
-    }
-
-    
-   // Private methods ---------------------------------------------------------
-    
     private FileObject getFileFromLookup( Lookup context ) {
    
         FileObject fo = context.lookup(FileObject.class);     
@@ -178,13 +114,4 @@
         return dobj == null ? null : dobj.getPrimaryFile();
     }
     
-    private JMenuItem buildPresenter (String title) {
-        JMenuItem menuPresenter = new JMenuItem (this);
-        Mnemonics.setLocalizedText(menuPresenter, title);
-        menuPresenter.setIcon(null);
-        
-        return menuPresenter;
-    }
-
-    
 }
diff --git a/projectui/src/org/netbeans/modules/project/ui/resources/layer.xml b/projectui/src/org/netbeans/modules/project/ui/resources/layer.xml
--- a/projectui/src/org/netbeans/modules/project/ui/resources/layer.xml
+++ b/projectui/src/org/netbeans/modules/project/ui/resources/layer.xml
@@ -186,21 +186,13 @@
         <folder name="Window">
             <folder name="SelectDocumentNode">
                 <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.project.ui.Bundle"/>
-                <!-- Searching nodes in projects/files tab -->
-                
                 <file name="org-netbeans-modules-project-ui-SelectInProjects.instance">
                     <attr name="instanceCreate" methodvalue="org.netbeans.modules.project.ui.actions.SelectNodeAction.inProjects"/>
-                    <attr name="position" intvalue="100"/>
                 </file>
-
-                
-                
                 <file name="org-netbeans-modules-project-ui-SelectInFiles.instance">
                     <attr name="instanceCreate" methodvalue="org.netbeans.modules.project.ui.actions.SelectNodeAction.inFiles"/>
-                    <attr name="position" intvalue="200"/>
                 </file>
-                
-                </folder>
+            </folder>
         </folder>
         
     </folder>
@@ -581,6 +573,12 @@
                     </folder>
             </folder>
         </folder>
+        <folder name="TabActions">
+            <file name="org-netbeans-modules-project-ui-SelectInProjects.shadow">
+                <attr name="originalFile" stringvalue="Actions/Window/SelectDocumentNode/org-netbeans-modules-project-ui-SelectInProjects.instance"/>
+                <attr name="position" intvalue="100"/>
+            </file>
+        </folder>
     </folder>
     
     <folder name="Loaders">