From 494a7bc745ca1e99855b78b0965a9069bd9e1cc8 Mon Sep 17 00:00:00 2001
From: Mark Peters <Mark.A.Peters@raytheon.com>
Date: Fri, 19 Sep 2014 11:57:29 -0500
Subject: [PATCH] Omaha #3300 Merge fixes for 14.4.1

Change-Id: I9a7e4131bfbd6503e70001594b93492c7cbad5fd

Former-commit-id: e99d90307bccd85c27f2c3916b622c96ae89b540 [formerly 048e8339fd3f4a510d3cd7ce7a4be7e876af4a2c] [formerly e99d90307bccd85c27f2c3916b622c96ae89b540 [formerly 048e8339fd3f4a510d3cd7ce7a4be7e876af4a2c] [formerly 26e4f862480c136b8c261d78df4160db4cbb60d3 [formerly 1ecf38ee8614f3df751fe9debbdfdb2771e5bea1]]]
Former-commit-id: 26e4f862480c136b8c261d78df4160db4cbb60d3
Former-commit-id: 16961860a834754b91320a1f9b138158db0801b3 [formerly c49df63363ee6d8a8916177e55568365f273e99e]
Former-commit-id: 08a3acb2d426240a4d90e75c048a3173a796d9ac
---
 .../fields/planview-timeseries/basic.xml      |  2 ++
 .../planview-timeseries/sfc2d/MSLPress.xml    | 10 ++++++++
 .../fields/planview-timeseries/sfc2d/misc.xml |  2 ++
 .../fields/planview-timeseries/wind.xml       |  2 ++
 .../planes/planviewtime-timeseries/misc.xml   |  2 ++
 .../localization/menus/xml/fieldsMenus.xml    | 24 -------------------
 .../menus/xml/planesMenusPlanView.xml         |  3 +--
 7 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/basic.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/basic.xml
index b40dcb2e14..64022c9f44 100644
--- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/basic.xml
+++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/basic.xml
@@ -25,6 +25,8 @@
         indentText="true" />
     <contribute xsi:type="menuItem" menuText="Pressure" key="P"
         indentText="true" />
+    <contribute xsi:type="menuItem" menuText="Pres Anl Uncertainty"
+        key="Perranl" indentText="true" />
     <contribute xsi:type="menuItem" menuText="MSL Press" key="msl-P"
         indentText="true" />
     <contribute xsi:type="menuItem" menuText="MSL Press (2)"
diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2d/MSLPress.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2d/MSLPress.xml
index 2739801573..3241e339d5 100644
--- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2d/MSLPress.xml
+++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2d/MSLPress.xml
@@ -31,4 +31,14 @@
         key="PGrdM" indentText="false" />
     <contribute xsi:type="menuItem" menuText="MSLP Grad Vec"
         key="PGrd1" indentText="false" />
+    <contribute xsi:type="menuItem" menuText="Max Updraft VV"
+        key="MAXUVV" indentText="true" />
+    <contribute xsi:type="menuItem" menuText="Max Downdraft VV"
+        key="MAXDVV" indentText="true" />
+    <contribute xsi:type="menuItem" menuText="Max Updraft Helicity"
+        key="MAXUPHL" indentText="true" />
+    <contribute xsi:type="menuItem" menuText="Most Unstable BL Parcel Level"
+        key="PLPL" indentText="true" />
+    <contribute xsi:type="menuItem" menuText="Max Lightning Threat"
+        key="LTNG" indentText="true" />
 </menuTemplate>
\ No newline at end of file
diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2d/misc.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2d/misc.xml
index 443b2abb2b..bfdc2253fc 100644
--- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2d/misc.xml
+++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2d/misc.xml
@@ -33,6 +33,8 @@
         indentText="false" />
     <contribute xsi:type="menuItem" menuText="Visibility"
         key="Vis" indentText="false" />
+    <contribute xsi:type="menuItem" menuText="Vsby Anl Uncertainty"
+        key="Viserranl" indentText="false" />
     <contribute xsi:type="menuItem" menuText="Altimeter" key="MSLSA"
         indentText="false" />
     <contribute xsi:type="menuItem" menuText="Fire Danger"
diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/wind.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/wind.xml
index f2fa1f642f..2b98f685e4 100644
--- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/wind.xml
+++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/wind.xml
@@ -35,6 +35,8 @@
         indentText="false" />
     <contribute xsi:type="menuItem" menuText="Gust Speed"
         key="WGS" indentText="true" />
+    <contribute xsi:type="menuItem" menuText="Max Gust Speed" key="MaxWHRRR"
+        indentText="true" />
     <contribute xsi:type="menuItem" menuText="Wind Direction"
         key="WD" indentText="true" />
     <contribute xsi:type="menuItem" menuText="WDir Anl Uncertainty"
diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/planes/planviewtime-timeseries/misc.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/planes/planviewtime-timeseries/misc.xml
index 299334aa6a..265ffe28c8 100644
--- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/planes/planviewtime-timeseries/misc.xml
+++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/planes/planviewtime-timeseries/misc.xml
@@ -53,6 +53,8 @@
         key="120agl" indentText="false" />
     <contribute xsi:type="menuItem" textLookup="LevelMapping"
         key="150agl" indentText="false" />
+    <contribute xsi:type="menuItem" textLookup="LevelMapping" 
+        key="400agl" indentText="false"/>
     <contribute xsi:type="menuItem" textLookup="LevelMapping"
         key="Mept" indentText="false" />
     <contribute xsi:type="menuItem" textLookup="LevelMapping"
diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
index aceefe32a7..c1d947f1b6 100644
--- a/cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
+++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
@@ -19,30 +19,6 @@
         further_licensing_information.
     -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-		<contribute xsi:type="menuItem" menuText="Pres Anl Uncertainty"
-			key="Perranl" indentText="true" />
-		<contribute xsi:type="menuItem" menuText="Max Gust Speed" key="MaxWHRRR"
-			 indentText="true" />
-			<contribute xsi:type="menuItem" menuText="Max Updraft VV"
-				key="MAXUVV"  indentText="true" />
-			<contribute xsi:type="menuItem" menuText="Max Downdraft VV"
-				key="MAXDVV"  indentText="true" />
-			<contribute xsi:type="menuItem" menuText="Max Updraft Helicity"
-				key="MAXUPHL"  indentText="true" />
-			<contribute xsi:type="menuItem" menuText="Most Unstable BL Parcel Level"
-				key="PLPL"  indentText="true" />
-			<contribute xsi:type="menuItem" menuText="Max Lightning Threat"
-				key="LTNG"  indentText="true" />
-			<contribute xsi:type="menuItem" menuText="Vsby Anl Uncertainty"
-				 key="Viserranl" indentText="false" />
-		<contribute xsi:type="menuItem" menuText="CAPPI"
-			key="REFD"  indentText="true" />
-		<contribute xsi:type="menuItem" menuText="MAX 1hr CAPPI"
-			key="MXREF"  indentText="true" />
-		<contribute xsi:type="menuItem" menuText="Derived VIL"
-			key="VILIQ"  indentText="true" />
-		<contribute xsi:type="menuItem" menuText="Derived Echo Top"
-			key="RETOP"  indentText="true" />
     <!-- 
         Don't override this file, it exists only to support legacy overrides. 
         Please override menus/volumebrowser/fields/planViewTimeSeries.xml instead. 
diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
index 42be7cbddb..36ae869430 100644
--- a/cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
+++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
@@ -21,8 +21,7 @@
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <!-- 
         Don't override this file, it exists only to support legacy overrides. 
-        Please override menus/volumebrowser/planes/planViewTime-timeSeries.xml instead. 
-	<contribute xsi:type="menuItem" textLookup="LevelMapping" key="400agl"  indentText="false"/>
+        Please override menus/volumebrowser/planes/planViewTime-timeSeries.xml instead.
     -->
     <contribute xsi:type="subinclude" fileName="menus/volumebrowser/planes/planViewTime-timeSeries.xml" />
 </menuTemplate>