File menu reorg + radar menu fix + renaming in bundle delete

Former-commit-id: 6c08f4e474b4b5e0fcaa8a50fe38d3023efbff85 [formerly 4286609de3875bd8c298549695db8c2cbfa64f5f] [formerly 16520fd68f [formerly ff5add010b]]
Former-commit-id: 16520fd68f
Former-commit-id: 07c918b72e

cave/com.raytheon.uf.viz.d2d.ui/plugin.xml

@@ -80,13 +80,18 @@
                    label="Load Map..."
                    style="push">
              </command>
+             <command
+                   commandId="com.raytheon.viz.ui.openAWIPSProcedure"
+                   label="Load Bundle"
+                   style="push">
+             </command>
              <separator
                    name="bundleSeparator"
                    visible="true">
              </separator>
              <command
-                   commandId="com.raytheon.viz.ui.openAWIPSProcedure"
+                   commandId="com.raytheon.viz.ui.saveBundle"
-                   label="Load Bundle"
+                   label="Save Map"
                    style="push">
              </command>
              <command
@@ -95,22 +100,21 @@
                    style="push">
              </command>
              <command
-                   commandId="com.raytheon.viz.ui.deleteAWIPSProcedure"
+                   commandId="com.raytheon.viz.ui.saveProcedure"
-                   label="Delete Bundle"
+                   label="Save Bundle Locally"
                    style="push">
              </command>
+             <menu
+                   id="export"
+                   label="Export">
+             </menu>
              <separator
                    name="saveSeparator"
                    visible="true">
              </separator>
              <command
-                   commandId="com.raytheon.viz.ui.saveBundle"
+                   commandId="com.raytheon.viz.ui.deleteAWIPSProcedure"
-                   label="Save Map Locally"
+                   label="Manage Bundles"
-                   style="push">
-             </command>
-             <command
-                   commandId="com.raytheon.viz.ui.saveProcedure"
-                   label="Save Bundle Locally"
                    style="push">
              </command>
              <separator
@@ -121,10 +125,6 @@
                    id="import"
                    label="Import">
              </menu>
-             <menu
-                   id="export"
-                   label="Export">
-             </menu>
           </menu>
           <menu
                 id="view"

cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/DeleteAWIPSProcedure.java

@@ -70,7 +70,7 @@ public class DeleteAWIPSProcedure extends AbstractHandler {
     public Object execute(ExecutionEvent event) throws ExecutionException {
         if (listDlg == null || listDlg.getShell() == null
                 || listDlg.isDisposed()) {
-            listDlg = new ProcedureListDlg("Delete Procedure",
+            listDlg = new ProcedureListDlg("Delete Bundle",
                     HandlerUtil.getActiveShell(event), Mode.DELETE);
             listDlg.setCloseCallback(new ICloseCallback() {
 
@@ -83,7 +83,7 @@ public class DeleteAWIPSProcedure extends AbstractHandler {
                         } catch (LocalizationOpFailedException e) {
                             statusHandler.handle(
                                     Priority.PROBLEM,
-                                    "Error deleting procedure: "
+                                    "Error deleting bundle: "
                                             + selectedFile.getName());
                         }
                     }

cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/OpenProcedureListDlg.java

@@ -63,7 +63,7 @@ public class OpenProcedureListDlg extends ProcedureListDlg {
      *            Parent shell.
      */
     public OpenProcedureListDlg(Shell parent) {
-        super("Open Bundle", parent, Mode.OPEN);
+        super("Load Bundle", parent, Mode.OPEN);
     }
 
     @Override

cave/com.raytheon.viz.radar/localization/menus/radar/baseRadarMenu.xml

@@ -60,24 +60,25 @@
 		<substitute key="name" value="N0Q - Base Reflectivity" />
 	</contribute>
 	<contribute xsi:type="bundleItem" file="bundles/DefaultRadarMosaic.xml"
-        menuText="0.5 Differential Refl" id="Radar05ZDR">
+        menuText="N0X - Differential Refl" id="Radar05ZDR">
         <substitute key="product" value="159,158" />
         <substitute key="elevation" value="0.5" />
-        <substitute key="name" value="0.5 Diff Reflectivity" />
+        <substitute key="name" value="N0X - Diff Reflectivity" />
     </contribute>
     <contribute xsi:type="bundleItem" file="bundles/DefaultRadarMosaic.xml"
-        menuText="0.5 Specific Diff Phase" id="Radar05KDP">
+        menuText="N0K - Specific Diff Phase" id="Radar05KDP">
         <substitute key="product" value="163,162" />
         <substitute key="elevation" value="0.5" />
-        <substitute key="name" value="0.5 Specific Diff Phase" />
+        <substitute key="name" value="N0K - Specific Diff Phase" />
     </contribute>
     <contribute xsi:type="bundleItem" file="bundles/DefaultRadarMosaic.xml"
-        menuText="0.5 Correlation Coeff" id="Radar05CC">
+        menuText="N0C - Correlation Coefficient" id="Radar05CC">
         <substitute key="product" value="161,160" />
         <substitute key="elevation" value="0.5" />
-        <substitute key="name" value="0.5 Correlation Coefficient" />
+        <substitute key="name" value="N0C - Correlation Coefficient" />
     </contribute>
 	<contribute xsi:type="bundleItem" file="bundles/DefaultRadarMosaic.xml"
+		menuText="DHR - Digital Hybrid Reflectivity" id="RadarHybridScanRefl">
 		<substitute key="product" value="32,33" />
 		<substitute key="elevation" value="0.0" />
 		<substitute key="name" value="DHR - Digital Hybrid Reflectivity" />