updated main menu

plugins/org.polarsys.chess.cdo/plugin.xml

@@ -59,27 +59,26 @@
   <extension point="org.eclipse.ui.menus">
   	<menuContribution
     	allPopups="false"
-        locationURI="menu:org.polarsys.chess.mainMenu?after=org.polarsys.chess.codegen.adaerationMenu">
+        locationURI="menu:org.polarsys.chess.mainMenu?after=chess.menu.basicoperations.id">
  		
             <menu
-            	id="org.polarsys.chess.mainMenu.cdo"
-            	label="CDO">
-				<command
-					commandId="org.polarsys.chess.cdo.import"
-			    	label="Import from CDO"
-			    	style="push">
-			  	</command>
-			  	<command
-					commandId="org.polarsys.chess.cdo.export"
-			    	label="Export to CDO"
-			    	style="push">
-			  	</command>
-			  	
-          	</menu>
-          	<separator
-       				name="separator-id"
-       				visible="true">
-				</separator>
+                  id="chess.menu.importexport.id"
+                  label="Import/Export">
+               <menu
+                     id="chess.menu.cdo.id"
+                     label="CDO">
+                  <command
+                        commandId="org.polarsys.chess.cdo.import"
+                        label="Import from CDO"
+                        style="push">
+                  </command>
+                  <command
+                        commandId="org.polarsys.chess.cdo.export"
+                        label="Export to CDO"
+                        style="push">
+                  </command>
+               </menu>
+            </menu>
           
       	
 	</menuContribution>

plugins/org.polarsys.chess.codegen.ada/plugin.xml

@@ -14,41 +14,36 @@
          point="org.eclipse.ui.menus">
       <menuContribution
             allPopups="false"
-            locationURI="menu:org.eclipse.ui.main.menu">
+            locationURI="menu:org.polarsys.chess.mainMenu?after=org.polarsys.chess.mainmenu.separator4">
          <menu
-               id="org.polarsys.chess.mainMenu"
-               label="CHESS"
-               mnemonic="E">
-            <menu
-                  id="org.polarsys.chess.codegen.adaerationMenu"
-                  label="Code generation">
-               <command
-                     commandId="org.polarsys.chess.codegen.ada.ada.id"
-                     label="Ada infrastructural code generator"
-                     style="push">
-                  <visibleWhen
-                        checkEnabled="false">
-                     <or>
-                        <with
-                              variable="activeEditorId">
-                           <equals
-                                 value="org.eclipse.uml2.uml.editor.presentation.UMLEditorID">
-                           </equals>
-                        </with>
-                        <with
-                              variable="activeEditorInput">
-                           <adapt
-                                 type="org.eclipse.core.resources.IResource">
-                              <test
-                                    property="org.eclipse.core.resources.projectNature"
-                                    value="org.polarsys.chess.CHESSNature">
-                              </test>
-                           </adapt>
-                        </with>
-                     </or>
-                  </visibleWhen>
-               </command>
-            </menu>
+               id="chess.menu.codegen.id"
+               label="Code generation">
+            <command
+                  commandId="org.polarsys.chess.codegen.ada.ada.id"
+                  label="Ada infrastructural code generator"
+                  style="push">
+               <visibleWhen
+                     checkEnabled="false">
+                  <or>
+                     <with
+                           variable="activeEditorId">
+                        <equals
+                              value="org.eclipse.uml2.uml.editor.presentation.UMLEditorID">
+                        </equals>
+                     </with>
+                     <with
+                           variable="activeEditorInput">
+                        <adapt
+                              type="org.eclipse.core.resources.IResource">
+                           <test
+                                 property="org.eclipse.core.resources.projectNature"
+                                 value="org.polarsys.chess.CHESSNature">
+                           </test>
+                        </adapt>
+                     </with>
+                  </or>
+               </visibleWhen>
+            </command>
          </menu>
       </menuContribution>
    </extension>

plugins/org.polarsys.chess.mainmenu/plugin.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-
-  <extension
-         point="org.eclipse.ui.menus">
-      <menuContribution
-            allPopups="false"
-            locationURI="menu:org.eclipse.ui.main.menu">
-         <menu
-               id="org.polarsys.chess.mainMenu"
-               label="CHESS"
-               mnemonic="E">
-   <menu
-		id="chess.menu.argumentation.id"
-		label="Argumentation">
-   </menu>
-   <separator
-         name="org.polarsys.chess.mainmenu.separator1"
-         visible="true">
-   </separator>
-   <menu
-   		id="chess.menu.basicoperations.id"
-   		label="Basic Operations">
-   </menu>
-   <menu
-         id="chess.menu.safetycase.id"
-         label="Safety Case">
-   </menu>
-   <menu
-         id="chess.menu.multicore.id"
-         label="Multicore Support">
-   </menu>
-   <separator
-         name="org.polarsys.chess.mainmenu.separator2"
-         visible="true">
-   </separator>
-   <menu
-         id="chess.menu.validation.id"
-         label="Validation">
-   </menu>
-   <menu
-         id="chess.menu.functverification.id"
-         label="Functional Verification">
-      <separator
-            name="org.polarsys.chess.mainmenu.functverification.separator1"
-            visible="true">
-      </separator>
-   </menu>
-   <menu
-         id="chess.menu.dependability.id"
-         label="Dependability">
-      <separator
-            name="org.polarsys.chess.mainmenu.dependability.separator1"
-            visible="true">
-      </separator>
-      <separator
-            name="org.polarsys.chess.mainmenu.dependability.separator2"
-            visible="true">
-      </separator>
-   </menu>
-   <menu
-         id="chess.menu.realtime.id"
-         label="Real-Time">
-   </menu>
-   <separator
-         name="org.polarsys.chess.mainmenu.separator3"
-         visible="true">
-   </separator>
-   <menu
-         id="chess.menu.filters.id"
-         label="Filters">
-   </menu>
-   <menu
-         id="chess.menu.tests.id"
-         label="Tests">
-   </menu>
-         </menu>
-      </menuContribution>
-  </extension> 
-
-</plugin>
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+
+  <extension
+         point="org.eclipse.ui.menus">
+      <menuContribution
+            allPopups="false"
+            locationURI="menu:org.eclipse.ui.main.menu">
+         <menu
+               id="org.polarsys.chess.mainMenu"
+               label="CHESS"
+               mnemonic="E">
+   <menu
+		id="chess.menu.argumentation.id"
+		label="Argumentation">
+   </menu>
+   <separator
+         name="org.polarsys.chess.mainmenu.separator1"
+         visible="true">
+   </separator>
+   <menu
+   		id="chess.menu.basicoperations.id"
+   		label="Basic Operations">
+   </menu>
+   <menu
+         id="chess.menu.importexport.id"
+         label="Import/Export">
+   </menu>
+   <menu
+         id="chess.menu.safetycase.id"
+         label="Safety Case">
+   </menu>
+   <menu
+         id="chess.menu.multicore.id"
+         label="Multicore Support">
+   </menu>
+   <separator
+         name="org.polarsys.chess.mainmenu.separator2"
+         visible="true">
+   </separator>
+   <menu
+         id="chess.menu.validation.id"
+         label="Validation">
+   </menu>
+   <menu
+         id="chess.menu.functverification.id"
+         label="Functional Verification">
+      <separator
+            name="org.polarsys.chess.mainmenu.functverification.separator1"
+            visible="true">
+      </separator>
+   </menu>
+   <menu
+         id="chess.menu.dependability.id"
+         label="Dependability">
+      <separator
+            name="org.polarsys.chess.mainmenu.dependability.separator1"
+            visible="true">
+      </separator>
+      <separator
+            name="org.polarsys.chess.mainmenu.dependability.separator2"
+            visible="true">
+      </separator>
+   </menu>
+   <menu
+         id="chess.menu.realtime.id"
+         label="Real-Time">
+   </menu>
+   <separator
+         name="org.polarsys.chess.mainmenu.separator4"
+         visible="true">
+   </separator>
+   <menu
+         id="chess.menu.codegen.id"
+         label="Code Generation">
+   </menu>
+   <separator
+         name="org.polarsys.chess.mainmenu.separator3"
+         visible="true">
+   </separator>
+   <menu
+         id="chess.menu.filters.id"
+         label="Filters">
+   </menu>
+   <menu
+         id="chess.menu.tests.id"
+         label="Tests">
+   </menu>
+         </menu>
+      </menuContribution>
+  </extension> 
+
+</plugin>