From 118787ae50dcb8f84dd5731352be3f0fc8b97fc5 Mon Sep 17 00:00:00 2001
From: Michael James <mjames@ucar.edu>
Date: Thu, 1 Dec 2016 10:32:35 -0700
Subject: [PATCH] move CAVE menu items to d2dFile

---
 cave/com.raytheon.uf.viz.alertview/plugin.xml |  2 +-
 cave/com.raytheon.uf.viz.archive/plugin.xml   |  2 +-
 cave/com.raytheon.uf.viz.d2d.ui/plugin.xml    | 26 ++++++++++++++++++-
 cave/com.raytheon.uf.viz.stats/plugin.xml     |  2 +-
 cave/com.raytheon.uf.viz.useradmin/plugin.xml |  2 +-
 5 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/cave/com.raytheon.uf.viz.alertview/plugin.xml b/cave/com.raytheon.uf.viz.alertview/plugin.xml
index 2ff4c8da2f..e44431646c 100644
--- a/cave/com.raytheon.uf.viz.alertview/plugin.xml
+++ b/cave/com.raytheon.uf.viz.alertview/plugin.xml
@@ -15,7 +15,7 @@
     <extension
          point="org.eclipse.ui.menus">
          <menuContribution
-            locationURI="menu:CAVE?after=browsers">
+            locationURI="menu:d2dFile?after=afterNewGroup">
             <command
               commandId="com.raytheon.uf.viz.alertview.openAlertView"
               label="Open AlertView"
diff --git a/cave/com.raytheon.uf.viz.archive/plugin.xml b/cave/com.raytheon.uf.viz.archive/plugin.xml
index 568f90f54d..427d326d2b 100644
--- a/cave/com.raytheon.uf.viz.archive/plugin.xml
+++ b/cave/com.raytheon.uf.viz.archive/plugin.xml
@@ -23,7 +23,7 @@
    <extension
          point="org.eclipse.ui.menus">
          <menuContribution
-               locationURI="menu:CAVE?after=group1">
+               locationURI="menu:d2dFile?after=group1">
                <menu
                      label="Archive"
                      id="archive">
diff --git a/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml b/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml
index 2eafcaf3f2..d5b38ae881 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml
+++ b/cave/com.raytheon.uf.viz.d2d.ui/plugin.xml
@@ -63,7 +63,7 @@
 <extension
          point="org.eclipse.ui.menus">
       <menuContribution
-            locationURI="menu:org.eclipse.ui.main.menu?after=CAVE">
+            locationURI="menu:org.eclipse.ui.main.menu">
           <menu id="d2dFile" label="File" mnemonic="F">
              <visibleWhen>
                 <reference
@@ -131,6 +131,30 @@
                       value="current">
                 </parameter>
              </command>
+             <separator
+                   name="afterNewGroup"
+                   visible="true">
+             </separator>
+             <separator
+                   name="group1"
+                   visible="true">
+             </separator>
+             <separator
+                   name="group2"
+                   visible="true">
+             </separator>
+             <separator
+                   name="group3"
+                   visible="true">
+             </separator>
+             <separator
+                   name="group4"
+                   visible="true">
+             </separator>
+             <separator
+                   name="group5"
+                   visible="true">
+             </separator>
           </menu>
           <menu
                 id="view"
diff --git a/cave/com.raytheon.uf.viz.stats/plugin.xml b/cave/com.raytheon.uf.viz.stats/plugin.xml
index 0c3c85699f..386ec7c064 100644
--- a/cave/com.raytheon.uf.viz.stats/plugin.xml
+++ b/cave/com.raytheon.uf.viz.stats/plugin.xml
@@ -5,7 +5,7 @@
          point="org.eclipse.ui.menus">
       <menuContribution
             allPopups="false"
-            locationURI="menu:CAVE?after=group1">
+            locationURI="menu:d2dFile?after=group1">
          <command
                commandId="com.raytheon.uf.viz.stats.statsui"
                id="stats"
diff --git a/cave/com.raytheon.uf.viz.useradmin/plugin.xml b/cave/com.raytheon.uf.viz.useradmin/plugin.xml
index 0d4e87d34c..64866ea2a5 100644
--- a/cave/com.raytheon.uf.viz.useradmin/plugin.xml
+++ b/cave/com.raytheon.uf.viz.useradmin/plugin.xml
@@ -5,7 +5,7 @@
          point="org.eclipse.ui.menus">
       <menuContribution
             allPopups="false"
-            locationURI="menu:CAVE?after=group1">
+            locationURI="menu:d2dFile?after=group1">
          <command
                commandId="com.raytheon.uf.viz.useradmin.useradminui"
                label="AWIPS User Administration..."