sfc/warn/hydro menu reorganization

Former-commit-id: 1a598543ad
Former-commit-id: 262f365abd

cave/com.raytheon.uf.viz.d2d.ui.awips.feature/feature.xml

@@ -25,13 +25,13 @@
       <import feature="com.raytheon.viz.text.feature" version="1.0.0.qualifier"/>
       <import feature="com.raytheon.uf.viz.d2d.nsharp.feature" version="1.0.0.qualifier"/>
    </requires>
-
+	<!--
    <plugin
          id="com.raytheon.uf.viz.d2d.ui.local"
          download-size="0"
          install-size="0"
          version="0.0.0"/>
-
+	-->
    <plugin
          id="com.raytheon.uf.viz.d2d.ui.ncephydro"
          download-size="0"

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

@@ -104,10 +104,6 @@
                    name="xyx"
                    visible="true">
              </separator>
-             <command 
-                   commandId="com.raytheon.viz.ui.actions.titleAction"
-                   label="------ Local Analyses/Statistical Guidance ------">
-             </command>
           </menu>
 	</menuContribution>
 </extension>

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

@@ -52,13 +52,6 @@
                       name="USPLNPLACEHOLDER"
                       visible="false">
                 </separator>
-                <command commandId="com.raytheon.viz.ui.actions.titleAction"
-                    label="------ Local data ------">
-                </command>
-                <separator name="LocalData" visible="false">
-                </separator>
-                <separator name="EndOfLocalData" visible="true">
-                </separator>
                 <command commandId="com.raytheon.viz.ui.actions.titleAction"
                     label="------ Maritime ------" id="MARITIME">
                 </command>

cave/com.raytheon.viz.pointdata/localization/menus/obs/baseMaritime.xml

@@ -25,6 +25,24 @@
 			menuText="Moving Maritime" id="MovingMaritime"/>
     <contribute xsi:type="bundleItem" file="bundles/maritimeMAROB.xml" 
 			menuText="MAROB" id="MAROB"/>
+	<!-- 
+	<contribute xsi:type="bundleItem" file="bundles/Scatterometer_quikscat.xml" 
+           menuText="QuikSCAT Winds 12.5 km" id="QuikSCAT">
+        <substitute key="legend" value="QUIKSCAT"/>
+        <substitute key="svg" value="quikScatPlotDesign.svg"/>
+        <substitute key="plugin" value="bufrquikscat"/>
+        <substitute key="posOffset" value="0"/>
+        <substitute key="negOffset" value="5400"/>
+    </contribute>
+    -->
+    <contribute xsi:type="bundleItem" file="bundles/Scatterometer.xml" 
+           menuText="ASCAT Winds 25 km" id="ASCATWinds">
+        <substitute key="legend" value="ASCAT"/>
+        <substitute key="svg" value="ascatPlotDesign.svg"/>
+        <substitute key="plugin" value="bufrascat"/>
+        <substitute key="posOffset" value="0"/>
+        <substitute key="negOffset" value="5400"/>
+    </contribute>
 	<contribute xsi:type="subMenu" menuText="Other Maritime Plots">
 		<contribute xsi:type="bundleItem" file="bundles/SeaStatePlot.xml" 
                menuText="Fixed Sea State" id="FixedSeaState">
@@ -56,25 +74,5 @@
 	        <substitute key="legend" value="MAROB Clouds and Visibility"/>
 	        <substitute key="reportType" value="1007"/>
 	    </contribute>	
-		<contribute xsi:type="subMenu" menuText="Scatterometer Winds">
-			<!-- 
-			<contribute xsi:type="bundleItem" file="bundles/Scatterometer_quikscat.xml" 
-	               menuText="QuikSCAT Winds 12.5 km" id="QuikSCAT">
-		        <substitute key="legend" value="QUIKSCAT"/>
-		        <substitute key="svg" value="quikScatPlotDesign.svg"/>
-		        <substitute key="plugin" value="bufrquikscat"/>
-		        <substitute key="posOffset" value="0"/>
-		        <substitute key="negOffset" value="5400"/>
-		    </contribute>
-		    -->
-		    <contribute xsi:type="bundleItem" file="bundles/Scatterometer.xml" 
-	               menuText="ASCAT Winds 25 km" id="ASCATWinds">
-		        <substitute key="legend" value="ASCAT"/>
-		        <substitute key="svg" value="ascatPlotDesign.svg"/>
-		        <substitute key="plugin" value="bufrascat"/>
-		        <substitute key="posOffset" value="0"/>
-		        <substitute key="negOffset" value="5400"/>
-		    </contribute>
-        </contribute>   
     </contribute>
 </menuTemplate>

cave/com.raytheon.viz.pointdata/localization/menus/obs/baseMetar.xml

@@ -82,10 +82,5 @@
 	        <substitute key="posOffset" value="1800"/>
 	        <substitute key="negOffset" value="1800"/>       
 	    </contribute>
-	    
-	    <contribute xsi:type="separator" id="msasSeparator"/>
-	    <contribute xsi:type="titleItem" 
-			titleText="------ MSAS Obs------" id="msasLine"/>
-		<contribute xsi:type="subinclude" fileName="menus/obs/baseMSASObs.xml"/>
     </contribute>
 </menuTemplate>

cave/com.raytheon.viz.pointdata/localization/menus/obs/baseSynoptic.xml

@@ -40,4 +40,7 @@
 		<substitute key="posOffset" value="0"/>
 	    <substitute key="negOffset" value="43200"/> 
 	</contribute>
+	<contribute xsi:type="bundleItem" file="bundles/CoopPrecip.xml" 
+        	menuText="Coop Precip" id="localCoopPrecip">
+	</contribute>
 </menuTemplate>

cave/com.raytheon.viz.pointdata/localization/menus/obs/index.xml

@@ -25,8 +25,10 @@
              fileName="menus/obs/baseMetar.xml"/>
     <include installTo="menu:obs?after=SYNOPTIC" 
              fileName="menus/obs/baseSynoptic.xml"/>
+			 <!--
     <include installTo="menu:obs?after=LocalData" 
              fileName="menus/obs/baseLocalData.xml"/>
+			 -->
     <include installTo="menu:obs?after=MARITIME" 
              fileName="menus/obs/baseMaritime.xml"/>
 </menuContributionFile>