1 files changed, 40 insertions, 14 deletions
diff --git a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/plugin.xml b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/plugin.xml
index b49d94fdaa0..2f76edd5d0b 100644
--- a/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/plugin.xml
+++ b/extraplugins/adl4eclipse/org.eclipse.papyrus.adl4eclipsetool.assistant/plugin.xml
@@ -20,18 +20,32 @@
             allPopups="false"
             locationURI="popup:com.cea.papyrus.adl4eclipse.menu">
          <command
-               commandId="org.eclipse.papyrus.adltool.assistant.BundlesImportHandler"
-               id="org.eclipse.papyrus.adltool.assistant.BundlesImportHandler.popup"
-               label="Simple Architecture Snapshot"
+               commandId="org.eclipse.papyrus.adltool.assistant.SimplePluginModelHandler"
+               id="org.eclipse.papyrus.adltool.assistant.SimplePluginModelHandler.popup"
+               label="Model plugin architecture from Workspace"
                style="push"
-               tooltip="Architecture Snapshot from the workspace">
+               tooltip="Model Plugin Architecture from Workspace">
          </command>
          <command
-               commandId="org.eclipse.papyrus.adltool.assistant.CompleteArchitectureHandler"
-               id="org.eclipse.papyrus.adltool.assistant.CompleteArchitectureHandler.popup"
-               label="Complete Architecture Snapshot"
+               commandId="org.eclipse.papyrus.adltool.assistant.CompletePluginModelHandler"
+               id="org.eclipse.papyrus.adltool.assistantCompletePluginModelHandler.popup"
+               label="Model plugin architecture from all possible plugins"
                style="push"
-               tooltip="Architecture Snapshot from the workspace">
+               tooltip="Model Plugin Architecture from all possible plugins (workpace + platform)">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.adltool.assistant.SimpleFeatureModelHandler"
+               id="org.eclipse.papyrus.adltool.assistant.SimpleFeatureModelHandler.popup"
+               label="Model features architecture from Workspace"
+               style="push"
+               tooltip="Model features architecture from Workspace">
+         </command>
+         <command
+               commandId="org.eclipse.papyrus.adltool.assistant.ModelCompleteFeatureArchitectureHandler"
+               id="org.eclipse.papyrus.adltool.assistant.ModelCompleteFeatureArchitectureHandler.popup"
+               label="Model features architecture"
+               style="push"
+               tooltip="Model features architecture ( Workspace + Platform)">
          </command>
       </menuContribution>
    </extension>
@@ -39,15 +53,27 @@
          point="org.eclipse.ui.commands">
       <command
             categoryId="org.eclipse.papyrus.editor.category"
-            defaultHandler="org.eclipse.papyrus.adltool.assistant.SimpleArchitecrureHandler"
-            id="org.eclipse.papyrus.adltool.assistant.BundlesImportHandler"
-            name="Simple Architecture Snapshot">
+            defaultHandler="org.eclipse.papyrus.adltool.assistant.ModelPluginArchitectureFromWorkspaceHandler"
+            id="org.eclipse.papyrus.adltool.assistant.SimplePluginModelHandler"
+            name="Simple plugins architecture snapshot">
+      </command>
+      <command
+            categoryId="org.eclipse.papyrus.editor.category"
+            defaultHandler="org.eclipse.papyrus.adltool.assistant.ModelCompletePluginArchitectureHandler"
+            id="org.eclipse.papyrus.adltool.assistant.CompletePluginModelHandler"
+            name="Complete plugins architecture snapshot">
+      </command>
+      <command
+            categoryId="org.eclipse.papyrus.editor.category"
+            defaultHandler="org.eclipse.papyrus.adltool.assistant.ModelFeatureArchitectureFromWorkspaceHandler"
+            id="org.eclipse.papyrus.adltool.assistant.SimpleFeatureModelHandler"
+            name="Simple Feature architecture snapshot">
       </command>
       <command
             categoryId="org.eclipse.papyrus.editor.category"
-            defaultHandler="org.eclipse.papyrus.adltool.assistant.CompleteArchitectureHandler"
-            id="org.eclipse.papyrus.adltool.assistant.CompleteArchitectureHandler"
-            name="Complete Architecture Snapshot">
+            defaultHandler="org.eclipse.papyrus.adltool.assistant.ModelCompleteFeatureArchitectureHandler"
+            id="org.eclipse.papyrus.adltool.assistant.ModelCompleteFeatureArchitectureHandler"
+            name="Complete Feature architecture snapshot">
       </command>
    </extension>
      <extension