D2D import/export menu reorganization + Save Bundle Locally addition

Conflicts:
	cave/com.raytheon.viz.geotiff/plugin.xml
	cave/com.raytheon.viz.lpi/plugin.xml
	cave/com.raytheon.viz.spi/plugin.xml

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

@@ -85,12 +85,10 @@
                    label="New Window"
                    style="push">
              </command>
-			 
              <separator
                    name="saveSeparator"
                    visible="true">
              </separator>
-             		
 			 <command
                    commandId="com.raytheon.viz.ui.loadSerialized"
                    label="Open Bundle"
@@ -101,79 +99,28 @@
 				   label="Save Bundle"
 				   style="push">
              </command>
-
-       		 <separator
-                   name="importSeparator"
-                   visible="true">
-             </separator>
-             
-	         <command
-	               commandId="com.raytheon.uf.viz.image.file.rsc"
-	               label="Import Image"
-	               style="push">
-	         </command>
-             <command
-	               commandId="com.raytheon.uf.viz.image.file.rsc"
-	               label="Import Background"
-	               style="push">
-	             <parameter
-	                   name="imageImportMode"
-	                   value="Background">
-	             </parameter>
-	         </command>
-	         <command
-	               commandId="com.raytheon.uf.viz.gisdatastore.actions.ImportGis"
-	               label="Import GIS Data"
-	               style="push">
-	         </command>
-	         <command
-	               commandId="com.raytheon.viz.bcd.openBCD"
-	               label="Import BCD File"
-	               style="push">
-	         </command>
-	         <command
-	               commandId="com.raytheon.viz.geotiff.openGeoTiff"
-	               label="Import GeoTIFF"
-	               style="push">
-	         </command>
-	         <command
-	               commandId="com.raytheon.viz.lpi.openLPI"
-	               label="Import LPI File"
-	               style="push">
-	         </command>
-	         <command
-	               commandId="com.raytheon.viz.spi.openSPI"
-	               label="Import SPI File"
-	               style="push">
-	         </command>
-	         
-             <separator
-                   name="exportSeparator"
-                   visible="true">
-             </separator>
-             
              <command
 				   commandId="com.raytheon.viz.ui.saveBundle"
-                   label="Export Bundle"
+				   label="Save Bundle Locally"
 				   style="push">
              </command>
+	         <separator
+                   name="importExportSeparator"
+                   visible="true">
+             </separator>
+             <menu
+                   id="import"
+                   label="Import">
+             </menu>
+             <menu
+                   id="export"
+                   label="Export">
 			     <command
-	             commandId="com.raytheon.uf.viz.image.export.save"
+		             commandId="com.raytheon.viz.ui.saveBundle"
-	             label="Export Image"
+		             label="Map Window"
 		             style="push">
 		         </command>
-             <command
+             </menu>
-                   commandId="com.raytheon.uf.viz.kml.export.exportKML"
-                   label="Export KML"
-                   style="push">
-             </command>
-	         <command
-	             commandId="com.raytheon.uf.viz.image.export.print"
-	             label="Print Screen"
-	             style="push">
-	             <parameter name="frameSelection" value="current">
-	             </parameter>
-	         </command>
           </menu>
           <menu
                 id="view"

cave/com.raytheon.uf.viz.drawing/plugin.xml

@@ -37,7 +37,20 @@
          point="org.eclipse.ui.menus">
       <menuContribution
             locationURI="menu:import">
-        
+           <command
+                commandId="com.raytheon.uf.viz.image.file.rsc"
+                label="Background"
+                style="push">
+              <parameter
+                    name="imageImportMode"
+                    value="Background">
+              </parameter>
+          </command>
+          <command
+                commandId="com.raytheon.uf.viz.image.file.rsc"
+                label="Image"
+                style="push">
+          </command>
          
          
       </menuContribution>

cave/com.raytheon.uf.viz.gisdatastore/plugin.xml

@@ -21,6 +21,11 @@
       <menuContribution
             allPopups="false"
             locationURI="menu:import">
+           <command
+                commandId="com.raytheon.uf.viz.gisdatastore.actions.ImportGis"
+                label="GIS Data/Shapefile"
+                style="push">
+          </command>
       </menuContribution>
    </extension>
    <extension

cave/com.raytheon.uf.viz.image.export/plugin.xml

@@ -66,7 +66,20 @@
       point="org.eclipse.ui.menus">
    <menuContribution
          locationURI="menu:export">
-       
+       <command
+             commandId="com.raytheon.uf.viz.image.export.save"
+             label="Image"
+             style="push">
+       </command>
+       <command
+             commandId="com.raytheon.uf.viz.image.export.print"
+             label="Print Screen"
+             style="push">
+             <parameter
+                   name="frameSelection"
+                   value="current">
+             </parameter>
+       </command>
    </menuContribution>
 </extension>
 </plugin>

cave/com.raytheon.uf.viz.kml.export/plugin.xml

@@ -1,6 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <plugin>
+<extension
+      point="org.eclipse.ui.menus">
+   <menuContribution
+         locationURI="menu:export">
+      <command
+            commandId="com.raytheon.uf.viz.kml.export.exportKML"
+            label="KML"
+            style="push">
+      </command>
+   </menuContribution>
+</extension>
 <extension
       point="org.eclipse.ui.commands">
       <command

cave/com.raytheon.viz.bcd/plugin.xml

@@ -38,6 +38,11 @@
          point="org.eclipse.ui.menus">
       <menuContribution
             locationURI="menu:import">
+            <command
+                 commandId="com.raytheon.viz.bcd.openBCD"
+                 label="BCD File..."
+                 style="push">
+            </command>
       </menuContribution>
    </extension>
    <extension

cave/com.raytheon.viz.geotiff/plugin.xml

@@ -48,7 +48,7 @@
             locationURI="menu:import">
             <command
                   commandId="com.raytheon.viz.geotiff.openGeoTiff"
-               label="GeoTIFF..."
+                  label="GeoTIFF"
                   style="push">
             </command>
       </menuContribution>

cave/com.raytheon.viz.lpi/plugin.xml

@@ -41,7 +41,7 @@
             locationURI="menu:import">
             <command
                  commandId="com.raytheon.viz.lpi.openLPI"
-               label="LPI File..."
+                 label="LPI File"
                  style="push">
            </command>
       </menuContribution>

cave/com.raytheon.viz.spi/plugin.xml

@@ -40,7 +40,7 @@
             locationURI="menu:import">
             <command
                  commandId="com.raytheon.viz.spi.openSPI"
-               label="SPI File..."
+                 label="SPI File"
                  style="push">
            </command>
       </menuContribution>