[hg] main-silver: #227637 - Window menu reorg

  • From: "S. Aubrecht" < >
  • To: , , , , , , , , , , , , , ,
  • Subject: [hg] main-silver: #227637 - Window menu reorg
  • Date: Sun, 24 Mar 2013 08:08:28 -0700

changeset afec6317d038 in main-silver ((none))
details: http://hg.netbeans.org/main-silver/rev/afec6317d038
description:
        #227637 - Window menu reorg

diffstat:

 api.search/src/org/netbeans/modules/search/ResultView.java                   
              |   3 +-
 
cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/CallGraphAction.java
             |   1 -
 
cnd.debugger.common2/src/org/netbeans/modules/cnd/debugger/common2/resources/layer.xml
     |   2 +-
 
cnd.navigation/src/org/netbeans/modules/cnd/navigation/docview/DocViewAction.java
          |   2 +-
 
cnd.navigation/src/org/netbeans/modules/cnd/navigation/hierarchy/HierarchyAction.java
      |   1 -
 
cnd.navigation/src/org/netbeans/modules/cnd/navigation/macroview/MacroExpansionAction.java
 |   1 -
 
code.analysis/src/org/netbeans/modules/analysis/ui/AnalysisResultTopComponent.java
         |   1 -
 core.ide/src/org/netbeans/core/ide/ServicesTab.java                          
              |   2 +-
 core.io.ui/src/org/netbeans/core/io/ui/Bundle.properties                     
              |   3 --
 core.io.ui/src/org/netbeans/core/io/ui/IOWindowAction.java                   
              |   2 +-
 core.io.ui/src/org/netbeans/core/io/ui/layer.xml                             
              |   9 ------
 core.ui/src/org/netbeans/core/ui/resources/Bundle.properties                 
              |   1 +
 core.ui/src/org/netbeans/core/ui/resources/layer.xml                         
              |  14 ++++++++-
 core.windows/src/org/netbeans/core/windows/resources/layer.xml               
              |   2 +-
 css.visual/src/org/netbeans/modules/css/visual/api/CssStylesTC.java          
              |   2 +-
 
dlight.terminal/src/org/netbeans/modules/dlight/terminal/action/ShowTerminalAction.java
    |   2 +-
 
editor.bookmarks/src/org/netbeans/modules/editor/bookmarks/resources/layer.xml
             |   4 +-
 favorites/src/org/netbeans/modules/favorites/Tab.java                        
              |   2 +-
 gsf.testrunner/src/org/netbeans/modules/gsf/testrunner/layer.xml             
              |  10 -------
 java.hints/src/org/netbeans/modules/java/hints/resources/layer.xml           
              |   9 ------
 
java.navigation/src/org/netbeans/modules/java/navigation/actions/Bundle.properties
         |   2 +-
 java.navigation/src/org/netbeans/modules/java/navigation/resources/layer.xml 
              |  10 +++---
 
mercurial/src/org/netbeans/modules/mercurial/ui/status/OpenVersioningAction.java
           |   1 -
 profiler/src/org/netbeans/modules/profiler/mf-layer.xml                      
              |   2 +-
 progress.ui/src/org/netbeans/modules/progress/ui/ProgressListAction.java     
              |   2 +-
 refactoring.api/src/org/netbeans/modules/refactoring/api/resources/layer.xml 
              |  13 ---------
 spi.debugger.ui/src/org/netbeans/modules/debugger/resources/mf-layer.xml     
              |   2 +-
 spi.navigator/src/org/netbeans/modules/navigator/Bundle.properties           
              |   3 --
 spi.navigator/src/org/netbeans/modules/navigator/resources/layer.xml         
              |   6 +---
 spi.palette/src/org/netbeans/modules/palette/ShowPaletteAction.java          
              |   2 +-
 
subversion/src/org/netbeans/modules/subversion/ui/status/OpenVersioningAction.java
         |   1 -
 tasklist.ui/src/org/netbeans/modules/tasklist/ui/layer.xml                   
              |   2 +-
 uihandler/src/org/netbeans/modules/uihandler/layer.xml                       
              |   4 +-
 versioning.core/src/org/netbeans/modules/versioning/core/Bundle.properties   
              |   1 -
 versioning.core/src/org/netbeans/modules/versioning/resources/layer.xml      
              |   7 -----
 versioning.util/src/org/netbeans/modules/versioning/util/resources/layer.xml 
              |  11 -------
 web.inspect/src/org/netbeans/modules/web/inspect/ui/DomTC.java               
              |   3 --
 web.monitor/src/org/netbeans/modules/web/monitor/resources/layer.xml         
              |  11 -------
 38 files changed, 38 insertions(+), 118 deletions(-)

diffs (545 lines):

diff --git a/api.search/src/org/netbeans/modules/search/ResultView.java 
b/api.search/src/org/netbeans/modules/search/ResultView.java
--- a/api.search/src/org/netbeans/modules/search/ResultView.java
+++ b/api.search/src/org/netbeans/modules/search/ResultView.java
@@ -95,8 +95,7 @@
 @ActionID(id = "org.netbeans.modules.search.ResultViewOpenAction", category 
= "Window")
 
@TopComponent.OpenActionRegistration(displayName="#TEXT_ACTION_SEARCH_RESULTS",
 preferredID=ResultView.ID)
 @ActionReferences({
-    @ActionReference(path = "Shortcuts", name = "DS-0"),
-    @ActionReference(path = "Menu/Window/Output", name = 
"ResultViewOpenAction", position = 200)
+    @ActionReference(path = "Shortcuts", name = "DS-0")
 })
 public final class ResultView extends TopComponent {
 
diff --git 
a/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/CallGraphAction.java
 
b/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/CallGraphAction.java
--- 
a/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/CallGraphAction.java
+++ 
b/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/CallGraphAction.java
@@ -59,7 +59,6 @@
  */
 @ActionID(id = "org.netbeans.modules.cnd.callgraph.impl.CallGraphAction", 
category = "Window")
 @ActionRegistration(lazy = true, displayName = "#CTL_CallGraphAction", 
iconBase=CallGraphTopComponent.ICON_PATH)
-@ActionReference(path = "Menu/Window/Output", name = "CallGraphAction", 
position = 2500)
 public class CallGraphAction extends CallableSystemAction {
 
     public CallGraphAction() {
diff --git 
a/cnd.debugger.common2/src/org/netbeans/modules/cnd/debugger/common2/resources/layer.xml
 
b/cnd.debugger.common2/src/org/netbeans/modules/cnd/debugger/common2/resources/layer.xml
--- 
a/cnd.debugger.common2/src/org/netbeans/modules/cnd/debugger/common2/resources/layer.xml
+++ 
b/cnd.debugger.common2/src/org/netbeans/modules/cnd/debugger/common2/resources/layer.xml
@@ -451,7 +451,7 @@
                  SourcesView @ 900
                  -->
 
-               <attr name="position" intvalue="1400"/>
+               <attr name="position" intvalue="1000"/>
 
 
                <!-- after LocalsView and WatchesView -->
diff --git 
a/cnd.navigation/src/org/netbeans/modules/cnd/navigation/docview/DocViewAction.java
 
b/cnd.navigation/src/org/netbeans/modules/cnd/navigation/docview/DocViewAction.java
--- 
a/cnd.navigation/src/org/netbeans/modules/cnd/navigation/docview/DocViewAction.java
+++ 
b/cnd.navigation/src/org/netbeans/modules/cnd/navigation/docview/DocViewAction.java
@@ -51,7 +51,7 @@
 
 @ActionID(category = "Window", id = DocViewAction.ID)
 @ActionRegistration(displayName = "#CTL_ShowDocViewAction", lazy=true)
-@ActionReference(path = "Menu/Window/Other", position = 570)
+@ActionReference(path = "Menu/Window/Tools", position = 500)
 @Messages("CTL_ShowDocViewAction=C/C++ Documentation")
 public final class DocViewAction implements ActionListener {
     static final String ID = 
"org.netbeans.modules.cnd.navigation.docview.DocViewAction"; //NOI18N
diff --git 
a/cnd.navigation/src/org/netbeans/modules/cnd/navigation/hierarchy/HierarchyAction.java
 
b/cnd.navigation/src/org/netbeans/modules/cnd/navigation/hierarchy/HierarchyAction.java
--- 
a/cnd.navigation/src/org/netbeans/modules/cnd/navigation/hierarchy/HierarchyAction.java
+++ 
b/cnd.navigation/src/org/netbeans/modules/cnd/navigation/hierarchy/HierarchyAction.java
@@ -60,7 +60,6 @@
  */
 @ActionID(id = 
"org.netbeans.modules.cnd.navigation.hierarchy.HierarchyAction", category = 
"Window")
 @ActionRegistration(lazy = true, displayName = "#CTL_HierarchyAction", 
iconBase=HierarchyTopComponent.ICON_PATH)
-@ActionReference(path = "Menu/Window/Navigator", name = "HierarchyAction", 
position = 1100)
 public class HierarchyAction extends CallableSystemAction {
 
     public HierarchyAction() {
diff --git 
a/cnd.navigation/src/org/netbeans/modules/cnd/navigation/macroview/MacroExpansionAction.java
 
b/cnd.navigation/src/org/netbeans/modules/cnd/navigation/macroview/MacroExpansionAction.java
--- 
a/cnd.navigation/src/org/netbeans/modules/cnd/navigation/macroview/MacroExpansionAction.java
+++ 
b/cnd.navigation/src/org/netbeans/modules/cnd/navigation/macroview/MacroExpansionAction.java
@@ -64,7 +64,6 @@
  */
 @ActionID(id = 
"org.netbeans.modules.cnd.navigation.macroview.MacroExpansionAction", 
category = "Window")
 @ActionRegistration(lazy = true, displayName = "#CTL_MacroExpansionAction", 
iconBase=MacroExpansionTopComponent.ICON_PATH)
-@ActionReference(path = "Menu/Window/Other", name = "MacroExpansionAction", 
position = 1100)
 public class MacroExpansionAction extends CallableSystemAction {
 
     public MacroExpansionAction() {
diff --git 
a/code.analysis/src/org/netbeans/modules/analysis/ui/AnalysisResultTopComponent.java
 
b/code.analysis/src/org/netbeans/modules/analysis/ui/AnalysisResultTopComponent.java
--- 
a/code.analysis/src/org/netbeans/modules/analysis/ui/AnalysisResultTopComponent.java
+++ 
b/code.analysis/src/org/netbeans/modules/analysis/ui/AnalysisResultTopComponent.java
@@ -89,7 +89,6 @@
 persistenceType = TopComponent.PERSISTENCE_ALWAYS)
 @TopComponent.Registration(mode = "output", openAtStartup = false, 
position=12000)
 @ActionID(category = "Window", id = 
"org.netbeans.modules.analysis.ui.AnalysisResultTopComponent")
-@ActionReference(path = "Menu/Window/Output", position = 330)
 @TopComponent.OpenActionRegistration(displayName = 
"#CTL_AnalysisResultAction",
 preferredID = "AnalysisResultTopComponent")
 @Messages({
diff --git a/core.ide/src/org/netbeans/core/ide/ServicesTab.java 
b/core.ide/src/org/netbeans/core/ide/ServicesTab.java
--- a/core.ide/src/org/netbeans/core/ide/ServicesTab.java
+++ b/core.ide/src/org/netbeans/core/ide/ServicesTab.java
@@ -77,7 +77,7 @@
 @TopComponent.Description(preferredID=ServicesTab.ID, 
iconBase="org/netbeans/core/ide/resources/services.gif", 
persistenceType=TopComponent.PERSISTENCE_ALWAYS)
 @TopComponent.Registration(mode="explorer", position=500, 
openAtStartup=false)
 @ActionID(category="Window", id="org.netbeans.core.ide.ServicesTabAction")
-@ActionReference(path="Menu/Window", position=400)
+@ActionReference(path="Menu/Window", position=500)
 @TopComponent.OpenActionRegistration(displayName="#CTL_ServicesTabAction", 
preferredID=ServicesTab.ID)
 public class ServicesTab extends TopComponent implements 
ExplorerManager.Provider {
 
diff --git a/core.io.ui/src/org/netbeans/core/io/ui/Bundle.properties 
b/core.io.ui/src/org/netbeans/core/io/ui/Bundle.properties
--- a/core.io.ui/src/org/netbeans/core/io/ui/Bundle.properties
+++ b/core.io.ui/src/org/netbeans/core/io/ui/Bundle.properties
@@ -13,6 +13,3 @@
 LBL_Close=Close Tab
 LBL_CloseAll=Close All Tabs
 LBL_CloseOthers=Close Other Tabs
-
-# Localization of Window/Output submenu
-Menu/Window/Output=&Output
diff --git a/core.io.ui/src/org/netbeans/core/io/ui/IOWindowAction.java 
b/core.io.ui/src/org/netbeans/core/io/ui/IOWindowAction.java
--- a/core.io.ui/src/org/netbeans/core/io/ui/IOWindowAction.java
+++ b/core.io.ui/src/org/netbeans/core/io/ui/IOWindowAction.java
@@ -58,7 +58,7 @@
 @ActionRegistration(displayName = "#IOWindow", 
iconBase="org/netbeans/core/io/ui/output.png")
 @ActionReferences({
     @ActionReference(name = "D-4", path = "Shortcuts"),
-    @ActionReference(position = 100, path = "Menu/Window/Output")
+    @ActionReference(position = 800, path = "Menu/Window")
 })
 public final class IOWindowAction implements ActionListener {
 
diff --git a/core.io.ui/src/org/netbeans/core/io/ui/layer.xml 
b/core.io.ui/src/org/netbeans/core/io/ui/layer.xml
--- a/core.io.ui/src/org/netbeans/core/io/ui/layer.xml
+++ b/core.io.ui/src/org/netbeans/core/io/ui/layer.xml
@@ -1,15 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.1//EN" 
"http://www.netbeans.org/dtds/filesystem-1_1.dtd";>
 <filesystem>
-    <folder name="Menu">
-        <folder name="Window">
-            <folder name="Output">
-                <attr name="SystemFileSystem.localizingBundle" 
stringvalue="org.netbeans.core.io.ui.Bundle"/>
-                <attr name="position" intvalue="1200"/>
-            </folder>
-        </folder>
-    </folder>
-
     <folder name="Windows2">
         <folder name="Modes">
             <file name="output.wsmode" url="resources/output.wsmode"/>
diff --git a/core.ui/src/org/netbeans/core/ui/resources/Bundle.properties 
b/core.ui/src/org/netbeans/core/ui/resources/Bundle.properties
--- a/core.ui/src/org/netbeans/core/ui/resources/Bundle.properties
+++ b/core.ui/src/org/netbeans/core/ui/resources/Bundle.properties
@@ -62,6 +62,7 @@
 Menu/Tools=&Tools
 Menu/View=&View
 Menu/Window/Web=&Web
+Menu/Window/Tools=&Tools
 Menu/Window/SelectDocumentNode=Select Docume&nt in
 Services/Browsers=Web Browsers
 Templates/Services/Browsers=Web Browsers
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
@@ -339,14 +339,24 @@
         </folder>
 
         <folder name="Window">
+            <folder name="Tools">
+                <attr name="SystemFileSystem.localizingBundle" 
stringvalue="org.netbeans.core.ui.resources.Bundle"/>
+                <attr name="position" intvalue="1300"/>
+
             <file 
name="org-netbeans-core-windows-actions-GlobalPropertiesAction.shadow">
                 <attr name="originalFile" 
stringvalue="Actions/Window/org-netbeans-core-windows-actions-GlobalPropertiesAction.instance"/>
-                <attr name="position" intvalue="800"/>
+                    <attr name="position" intvalue="200"/>
             </file>
 
+                <file name="Separator1.instance">
+                    <attr name="instanceClass" 
stringvalue="javax.swing.JSeparator"/>
+                    <attr name="position" intvalue="600"/>
+                </file>
+            </folder>
+
             <folder name="Web">
                 <attr name="SystemFileSystem.localizingBundle" 
stringvalue="org.netbeans.core.ui.resources.Bundle"/>
-                <attr name="position" intvalue="1750"/>
+                <attr name="position" intvalue="1200"/>
                 <file name="org-netbeans-core-actions-HTMLViewAction.shadow">
                     <attr name="originalFile" 
stringvalue="Actions/View/org-netbeans-core-actions-HTMLViewAction.instance"/>
                     <attr name="position" intvalue="100"/>
diff --git a/core.windows/src/org/netbeans/core/windows/resources/layer.xml 
b/core.windows/src/org/netbeans/core/windows/resources/layer.xml
--- a/core.windows/src/org/netbeans/core/windows/resources/layer.xml
+++ b/core.windows/src/org/netbeans/core/windows/resources/layer.xml
@@ -162,7 +162,7 @@
             <attr name="position" intvalue="1200"/>
             <file name="SwitchToRecentDocumentAction.shadow">
                 <attr name="originalFile" 
stringvalue="Actions/Window/org-netbeans-core-windows-actions-SwitchToRecentDocumentAction.instance"/>
-                <attr name="position" intvalue="1800"/>
+                <attr name="position" intvalue="900"/>
             </file>
             <file name="Separator3.instance">
                <attr name="instanceClass" 
stringvalue="javax.swing.JSeparator"/>
diff --git 
a/css.visual/src/org/netbeans/modules/css/visual/api/CssStylesTC.java 
b/css.visual/src/org/netbeans/modules/css/visual/api/CssStylesTC.java
--- a/css.visual/src/org/netbeans/modules/css/visual/api/CssStylesTC.java
+++ b/css.visual/src/org/netbeans/modules/css/visual/api/CssStylesTC.java
@@ -76,7 +76,7 @@
 id = "org.netbeans.modules.css.visual.api.CssStylesTC.OpenAction") // NOI18N
 @ActionReference(
         path = "Menu/Window/Web", // NOI18N
-position = 180)
+position = 200)
 @TopComponent.OpenActionRegistration(
         displayName = "#CTL_CssStylesAction", // NOI18N
 preferredID = CssStylesTC.ID)
diff --git 
a/dlight.terminal/src/org/netbeans/modules/dlight/terminal/action/ShowTerminalAction.java
 
b/dlight.terminal/src/org/netbeans/modules/dlight/terminal/action/ShowTerminalAction.java
--- 
a/dlight.terminal/src/org/netbeans/modules/dlight/terminal/action/ShowTerminalAction.java
+++ 
b/dlight.terminal/src/org/netbeans/modules/dlight/terminal/action/ShowTerminalAction.java
@@ -55,7 +55,7 @@
  */
 @ActionID(id = "ShowTerminalTCAction", category = "Window")
 @ActionRegistration(iconInMenu = true, displayName = 
"#CTL_ShowTerminalAction", iconBase = 
"org/netbeans/modules/dlight/terminal/action/local_term.png")
-@ActionReference(path = "Menu/Window/Output", name = 
"org-netbeans-modules-dlight-terminal-action-ShowTerminal", position = 2600)
+@ActionReference(path = "Menu/Window/Tools", name = 
"org-netbeans-modules-dlight-terminal-action-ShowTerminal", position = 900)
 public class ShowTerminalAction implements ActionListener {
     @Override
     public void actionPerformed(ActionEvent e) {
diff --git 
a/editor.bookmarks/src/org/netbeans/modules/editor/bookmarks/resources/layer.xml
 
b/editor.bookmarks/src/org/netbeans/modules/editor/bookmarks/resources/layer.xml
--- 
a/editor.bookmarks/src/org/netbeans/modules/editor/bookmarks/resources/layer.xml
+++ 
b/editor.bookmarks/src/org/netbeans/modules/editor/bookmarks/resources/layer.xml
@@ -98,10 +98,10 @@
             </file>
         </folder>
         <folder name="Window">
-            <folder name="Navigator">
+            <folder name="Tools">
                 <file 
name="org-netbeans-modules-editor-bookmarks-ui-BookmarksViewOpenAction.shadow">
                     <attr name="originalFile" 
stringvalue="Actions/Edit/org-netbeans-modules-editor-bookmarks-ui-BookmarksViewOpenAction.instance"/>
-                    <attr name="position" intvalue="500"/>
+                    <attr name="position" intvalue="300"/>
                 </file>
             </folder>
         </folder>
diff --git a/favorites/src/org/netbeans/modules/favorites/Tab.java 
b/favorites/src/org/netbeans/modules/favorites/Tab.java
--- a/favorites/src/org/netbeans/modules/favorites/Tab.java
+++ b/favorites/src/org/netbeans/modules/favorites/Tab.java
@@ -356,7 +356,7 @@
     /** Finds default instance. Use in client code instead of {@link 
#getDefault()}. */
     @ActionID(id = "org.netbeans.modules.favorites.View", category = 
"Window")
     @OpenActionRegistration(displayName="#ACT_View")
-    @ActionReference(position = 350, path = "Menu/Window")
+    @ActionReference(position = 400, path = "Menu/Window")
     public static synchronized Tab findDefault() {
         if(DEFAULT == null) {
             TopComponent tc = 
WindowManager.getDefault().findTopComponent("favorites"); // NOI18N
diff --git a/gsf.testrunner/src/org/netbeans/modules/gsf/testrunner/layer.xml 
b/gsf.testrunner/src/org/netbeans/modules/gsf/testrunner/layer.xml
--- a/gsf.testrunner/src/org/netbeans/modules/gsf/testrunner/layer.xml
+++ b/gsf.testrunner/src/org/netbeans/modules/gsf/testrunner/layer.xml
@@ -13,16 +13,6 @@
         </folder>
 
     </folder>
-    <folder name="Menu">
-        <folder name="Window">
-            <folder name="Output">
-                <file name="GsfTestRunnerResultWindowOpenAction.shadow">
-                    <attr name="originalFile" 
stringvalue="Actions/Window/org-netbeans-modules-gsf-testrunner-api-ResultWindowOpenAction.instance"/>
-                    <attr name="position" intvalue="440"/>
-                </file>
-            </folder>
-        </folder> <!-- Window -->
-    </folder>
     <folder name="Windows2">
         <folder name="Modes">
             <folder name="output">        <!-- "output" is defined in 
core/ui -->
diff --git 
a/java.hints/src/org/netbeans/modules/java/hints/resources/layer.xml 
b/java.hints/src/org/netbeans/modules/java/hints/resources/layer.xml
--- a/java.hints/src/org/netbeans/modules/java/hints/resources/layer.xml
+++ b/java.hints/src/org/netbeans/modules/java/hints/resources/layer.xml
@@ -75,15 +75,6 @@
                 <attr name="position" intvalue="1840"/>
             </file>
         </folder>
-
-        <folder name="Window">
-            <folder name="Output">
-                <file name="AnalyzerAction.shadow">
-                    <attr name="originalFile" 
stringvalue="Actions/Window/org-netbeans-modules-java-hints-analyzer-ui-AnalyzerAction.instance"/>
-                    <attr name="position" intvalue="2467"/>
-                </file>
-            </folder>
-        </folder>
     </folder>
     <folder name="Windows2">
         <folder name="Components">
diff --git 
a/java.navigation/src/org/netbeans/modules/java/navigation/actions/Bundle.properties
 
b/java.navigation/src/org/netbeans/modules/java/navigation/actions/Bundle.properties
--- 
a/java.navigation/src/org/netbeans/modules/java/navigation/actions/Bundle.properties
+++ 
b/java.navigation/src/org/netbeans/modules/java/navigation/actions/Bundle.properties
@@ -56,5 +56,5 @@
 LBL_FilterSubmenu=Filters
 
 #Javadoc action
-CTL_JavadocAction=&Javadoc
+CTL_JavadocAction=&Javadoc Documentation
 
diff --git 
a/java.navigation/src/org/netbeans/modules/java/navigation/resources/layer.xml
 
b/java.navigation/src/org/netbeans/modules/java/navigation/resources/layer.xml
--- 
a/java.navigation/src/org/netbeans/modules/java/navigation/resources/layer.xml
+++ 
b/java.navigation/src/org/netbeans/modules/java/navigation/resources/layer.xml
@@ -119,15 +119,15 @@
             </folder>
         </folder>
         <folder name="Window">
-            <folder name="Other">
-            <attr name="position" intvalue="1700"/>
-            <attr name="SystemFileSystem.localizingBundle" 
stringvalue="org.netbeans.modules.java.navigation.Bundle"/>
+            <folder name="Tools">
                 <file name="JavadocAction.shadow">
                     <attr name="originalFile" 
stringvalue="Actions/Window/org-netbeans-modules-java-navigation-actions-JavadocAction.instance"/>
-                    <attr name="position" intvalue="500"/>
+                    <attr name="position" intvalue="400"/>
                 </file>
+            </folder>
+            <folder name="Debug">
                 <file name="AnalyzeStackAction.shadow">
-                    <attr name="position" intvalue="1000"/>
+                    <attr name="position" intvalue="1500"/>
                     <attr name="originalFile" 
stringvalue="Actions/Window/org-netbeans-modules-java-stackanalyzer-AnalyzeStackAction.instance"/>
                 </file>
             </folder>
diff --git 
a/mercurial/src/org/netbeans/modules/mercurial/ui/status/OpenVersioningAction.java
 
b/mercurial/src/org/netbeans/modules/mercurial/ui/status/OpenVersioningAction.java
--- 
a/mercurial/src/org/netbeans/modules/mercurial/ui/status/OpenVersioningAction.java
+++ 
b/mercurial/src/org/netbeans/modules/mercurial/ui/status/OpenVersioningAction.java
@@ -65,7 +65,6 @@
 @ActionID(id = 
"org.netbeans.modules.mercurial.ui.status.OpenVersioningAction", category = 
"Mercurial")
 @ActionRegistration(displayName = "#CTL_MenuItem_OpenVersioning", 
iconBase=OpenVersioningAction.ICON_BASE)
 @ActionReferences({
-   @ActionReference(path="Menu/Window/Versioning", position=400),
    @ActionReference(path="OptionsDialog/Actions/Mercurial")
 })
 public class OpenVersioningAction extends ShowAllChangesAction {
diff --git a/profiler/src/org/netbeans/modules/profiler/mf-layer.xml 
b/profiler/src/org/netbeans/modules/profiler/mf-layer.xml
--- a/profiler/src/org/netbeans/modules/profiler/mf-layer.xml
+++ b/profiler/src/org/netbeans/modules/profiler/mf-layer.xml
@@ -50,7 +50,7 @@
             <folder name="Profile">
                 <attr name="displayName" 
bundlevalue="org.netbeans.modules.profiler.actions.Bundle#Menu/Window/Profile"/>
                 <attr name="iconBase" 
stringvalue="org/netbeans/modules/profiler/impl/icons/empty.gif"/>
-                <attr name="position" intvalue="1500"/>
+                <attr name="position" intvalue="1100"/>
             </folder>
         </folder>
 
diff --git 
a/progress.ui/src/org/netbeans/modules/progress/ui/ProgressListAction.java 
b/progress.ui/src/org/netbeans/modules/progress/ui/ProgressListAction.java
--- a/progress.ui/src/org/netbeans/modules/progress/ui/ProgressListAction.java
+++ b/progress.ui/src/org/netbeans/modules/progress/ui/ProgressListAction.java
@@ -60,7 +60,7 @@
  */
 @ActionID(id = "org.netbeans.modules.progress.ui.ProgressListAction", 
category = "Window")
 @ActionRegistration(displayName = "#CTL_ProcessListAction", lazy=false)
-@ActionReference(position = 1900, name = "ProgressListAction", path = 
"Menu/Window")
+@ActionReference(position = 1000, name = "ProgressListAction", path = 
"Menu/Window/Tools")
 public class ProgressListAction extends AbstractAction implements 
ListDataListener, Runnable {
 
     /** Creates a new instance of ProcessListAction */
diff --git 
a/refactoring.api/src/org/netbeans/modules/refactoring/api/resources/layer.xml
 
b/refactoring.api/src/org/netbeans/modules/refactoring/api/resources/layer.xml
--- 
a/refactoring.api/src/org/netbeans/modules/refactoring/api/resources/layer.xml
+++ 
b/refactoring.api/src/org/netbeans/modules/refactoring/api/resources/layer.xml
@@ -56,19 +56,6 @@
             </file>
         </folder>
         
-        <folder name="Window">
-            <folder name="Output">
-                <file name="FindUsagesOpenAction.shadow">
-                    <attr name="originalFile" 
stringvalue="Actions/Window/org-netbeans-modules-refactoring-spi-impl-FindUsagesOpenAction.instance"/>
-                    <attr name="position" intvalue="300"/>
-                </file>
-
-                <file name="RefactoringPreviewOpenAction.shadow">
-                    <attr name="originalFile" 
stringvalue="Actions/Window/org-netbeans-modules-refactoring-spi-impl-RefactoringPreviewOpenAction.instance"/>
-                    <attr name="position" intvalue="500"/>
-                </file>
-            </folder>
-        </folder> <!-- Window -->
     </folder>
 
   <folder name="Actions">
diff --git 
a/spi.debugger.ui/src/org/netbeans/modules/debugger/resources/mf-layer.xml 
b/spi.debugger.ui/src/org/netbeans/modules/debugger/resources/mf-layer.xml
--- a/spi.debugger.ui/src/org/netbeans/modules/debugger/resources/mf-layer.xml
+++ b/spi.debugger.ui/src/org/netbeans/modules/debugger/resources/mf-layer.xml
@@ -215,7 +215,7 @@
             <folder name="Debug">
                 <attr name="SystemFileSystem.localizingBundle" 
stringvalue="org.netbeans.modules.debugger.resources.Bundle"/>
 
-                <attr name="position" intvalue="1400"/>
+                <attr name="position" intvalue="1000"/>
                 <file 
name="org-netbeans-modules-debugger-ui-actions-LocalsViewAction.shadow">
                     <attr name="originalFile" 
stringvalue="Actions/Window/Debug/org-netbeans-modules-debugger-ui-actions-LocalsViewAction.instance"/>
                     <attr name="position" intvalue="100"/>
diff --git 
a/spi.navigator/src/org/netbeans/modules/navigator/Bundle.properties 
b/spi.navigator/src/org/netbeans/modules/navigator/Bundle.properties
--- a/spi.navigator/src/org/netbeans/modules/navigator/Bundle.properties
+++ b/spi.navigator/src/org/netbeans/modules/navigator/Bundle.properties
@@ -46,6 +46,3 @@
 ACC_DESC_NavigatorTC=Navigator window shows structure and outline view for 
active document in the system.
 
 MSG_NotAvailable=<No View Available>
-
-# Localization of Window/Navigator submenu
-Menu/Window/Navigator=&Navigating
diff --git 
a/spi.navigator/src/org/netbeans/modules/navigator/resources/layer.xml 
b/spi.navigator/src/org/netbeans/modules/navigator/resources/layer.xml
--- a/spi.navigator/src/org/netbeans/modules/navigator/resources/layer.xml
+++ b/spi.navigator/src/org/netbeans/modules/navigator/resources/layer.xml
@@ -52,16 +52,12 @@
     </folder>
     <folder name="Menu">
         <folder name="Window">
-            <folder name="Navigator">
-            <attr name="SystemFileSystem.localizingBundle" 
stringvalue="org.netbeans.modules.navigator.Bundle"/>
-                <attr name="position" intvalue="1300"/>
                 <file 
name="org-netbeans-modules-navigator-ShowNavigatorAction.shadow">
                   <attr name="originalFile" 
stringvalue="Actions/Window/org-netbeans-modules-navigator-ShowNavigatorAction.instance"/>
-                    <attr name="position" intvalue="100"/>
+                <attr name="position" intvalue="600"/>
                 </file>
                 </folder>
             </folder>
-    </folder>
 
     <folder name="Navigator">
         <folder name="Panels"/>
diff --git 
a/spi.palette/src/org/netbeans/modules/palette/ShowPaletteAction.java 
b/spi.palette/src/org/netbeans/modules/palette/ShowPaletteAction.java
--- a/spi.palette/src/org/netbeans/modules/palette/ShowPaletteAction.java
+++ b/spi.palette/src/org/netbeans/modules/palette/ShowPaletteAction.java
@@ -64,7 +64,7 @@
  */
 @ActionID(id = "org.netbeans.modules.palette.ShowPaletteAction", category = 
"Window")
 @ActionRegistration(displayName = "#CTL_PaletteAction", iconBase = 
"org/netbeans/modules/palette/resources/palette.png")
-@ActionReference(position = 600, name = "ShowPaletteAction", path = 
"Menu/Window")
+@ActionReference(position = 100, name = "ShowPaletteAction", path = 
"Menu/Window/Tools")
 public class ShowPaletteAction implements ActionListener {
 
     /** Opens component palette. */
diff --git 
a/subversion/src/org/netbeans/modules/subversion/ui/status/OpenVersioningAction.java
 
b/subversion/src/org/netbeans/modules/subversion/ui/status/OpenVersioningAction.java
--- 
a/subversion/src/org/netbeans/modules/subversion/ui/status/OpenVersioningAction.java
+++ 
b/subversion/src/org/netbeans/modules/subversion/ui/status/OpenVersioningAction.java
@@ -67,7 +67,6 @@
 @ActionID(id = 
"org.netbeans.modules.subversion.ui.status.OpenVersioningAction", category = 
"Subversion")
 @ActionRegistration(displayName = "#CTL_MenuItem_OpenVersioning", 
iconBase=OpenVersioningAction.ICON_BASE)
 @ActionReferences({
-   @ActionReference(path="Menu/Window/Versioning", position=200),
    @ActionReference(path="OptionsDialog/Actions/Subversion")
 })
 public class OpenVersioningAction extends ShowAllChangesAction {
diff --git a/tasklist.ui/src/org/netbeans/modules/tasklist/ui/layer.xml 
b/tasklist.ui/src/org/netbeans/modules/tasklist/ui/layer.xml
--- a/tasklist.ui/src/org/netbeans/modules/tasklist/ui/layer.xml
+++ b/tasklist.ui/src/org/netbeans/modules/tasklist/ui/layer.xml
@@ -15,7 +15,7 @@
         <folder name="Window">
             <file 
name="org-netbeans-modules-tasklist-ui-TaskListAction.shadow">
                 <attr name="originalFile" 
stringvalue="Actions/Window/org-netbeans-modules-tasklist-ui-TaskListAction.instance"/>
-                <attr name="position" intvalue="550"/>
+                <attr name="position" intvalue="700"/>
             </file>
             
             </folder>
diff --git a/uihandler/src/org/netbeans/modules/uihandler/layer.xml 
b/uihandler/src/org/netbeans/modules/uihandler/layer.xml
--- a/uihandler/src/org/netbeans/modules/uihandler/layer.xml
+++ b/uihandler/src/org/netbeans/modules/uihandler/layer.xml
@@ -14,9 +14,9 @@
     </folder>
     <folder name="Menu">
         <folder name="Window">
-            <folder name="Other">
+            <folder name="Tools">
                 <file name="ReporterResultAction.shadow">
-                    <attr name="position" intvalue="450"/>
+                    <attr name="position" intvalue="800"/>
                     <attr name="originalFile" 
stringvalue="Actions/Window/org-netbeans-modules-exceptions-ReporterResultAction.instance"/>
                 </file>
             </folder>
diff --git 
a/versioning.core/src/org/netbeans/modules/versioning/core/Bundle.properties 
b/versioning.core/src/org/netbeans/modules/versioning/core/Bundle.properties
--- 
a/versioning.core/src/org/netbeans/modules/versioning/core/Bundle.properties
+++ 
b/versioning.core/src/org/netbeans/modules/versioning/core/Bundle.properties
@@ -47,7 +47,6 @@
 
 Actions/Versioning=Versioning
 Menu/Versioning=Tea&m
-Menu/Window/Versioning=&Versioning
 
 CTL_MenuItem_ShowTextAnnotations = Show &Versioning Labels
 CTL_MenuItem_VersioningMenu = Versioning
diff --git 
a/versioning.core/src/org/netbeans/modules/versioning/resources/layer.xml 
b/versioning.core/src/org/netbeans/modules/versioning/resources/layer.xml
--- a/versioning.core/src/org/netbeans/modules/versioning/resources/layer.xml
+++ b/versioning.core/src/org/netbeans/modules/versioning/resources/layer.xml
@@ -83,12 +83,5 @@
             </file>
         </folder>
         
-        <folder name="Window">
-            <folder name="Versioning">
-                <attr name="position" intvalue="1550"/>
-                <attr name="SystemFileSystem.localizingBundle" 
stringvalue="org.netbeans.modules.versioning.core.Bundle"/>
-            </folder>
-        </folder>
-        
     </folder>   
 </filesystem>
diff --git 
a/versioning.util/src/org/netbeans/modules/versioning/util/resources/layer.xml
 
b/versioning.util/src/org/netbeans/modules/versioning/util/resources/layer.xml
--- 
a/versioning.util/src/org/netbeans/modules/versioning/util/resources/layer.xml
+++ 
b/versioning.util/src/org/netbeans/modules/versioning/util/resources/layer.xml
@@ -71,17 +71,6 @@
         </folder>
     </folder>
     
-    <folder name="Menu">
-        <folder name="Window">
-            <folder name="Output">
-                <file 
name="org-netbeans-modules-versioning-util-OpenVersioningOutputAction.shadow">
-                    <attr name="originalFile" 
stringvalue="Actions/Versioning/org-netbeans-modules-versioning-util-OpenVersioningOutputAction.instance"/>
-                    <attr name="position" intvalue="450"/>
-                </file>
-            </folder>
-        </folder>
-    </folder>
-    
     <folder name="Windows2">
         <folder name="Components">
             <file name="versioning_output.settings" 
url="components/versioning_output.settings"/>
diff --git a/web.inspect/src/org/netbeans/modules/web/inspect/ui/DomTC.java 
b/web.inspect/src/org/netbeans/modules/web/inspect/ui/DomTC.java
--- a/web.inspect/src/org/netbeans/modules/web/inspect/ui/DomTC.java
+++ b/web.inspect/src/org/netbeans/modules/web/inspect/ui/DomTC.java
@@ -71,9 +71,6 @@
 @ActionID(
         category = "Window", // NOI18N
         id = "org.netbeans.modules.web.inspect.ui.DomTC") // NOI18N
-@ActionReference(
-        path = "Menu/Window/Navigator", // NOI18N
-        position = 600)
 @TopComponent.OpenActionRegistration(
         displayName = "#CTL_DomAction", // NOI18N
         preferredID = DomTC.ID)
diff --git 
a/web.monitor/src/org/netbeans/modules/web/monitor/resources/layer.xml 
b/web.monitor/src/org/netbeans/modules/web/monitor/resources/layer.xml
--- a/web.monitor/src/org/netbeans/modules/web/monitor/resources/layer.xml
+++ b/web.monitor/src/org/netbeans/modules/web/monitor/resources/layer.xml
@@ -57,17 +57,6 @@
         </folder>
     </folder>
 
-    <folder name="Menu">
-        <folder name="Window">
-            <folder name="Debug">
-                <file 
name="org-netbeans-modules-web-monitor-client-MonitorAction.shadow">
-                    <attr name="originalFile" 
stringvalue="Actions/Window/org-netbeans-modules-web-monitor-client-MonitorAction.instance"/>
-                    <attr name="position" intvalue="1000"/>
-                </file>
-                </folder>
-        </folder>
-    </folder>
-
     <folder name="Shortcuts">
         <file name="DS-5.shadow">
             <attr name="originalFile" 
stringvalue="Actions/Window/org-netbeans-modules-web-monitor-client-MonitorAction.instance"/>

[hg] main-silver: #227637 - Window menu reorg

S. Aubrecht 03/25/2013

Project Features

About this Project

Debugger was started in November 2009, is owned by tpavek, and has 29 members.
By use of this website, you agree to the NetBeans Policies and Terms of Use (revision 20131025.e7cbc9d). © 2013, Oracle Corporation and/or its affiliates. Sponsored by Oracle logo
 
 
Close
loading
Please Confirm
Close