1 files changed, 38 insertions, 22 deletions
diff --git a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/plugin.xml b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/plugin.xml
index 518938f551f..bda059b0aab 100644
--- a/extraplugins/facade/org.eclipse.papyrus.facade.codegen/plugin.xml
+++ b/extraplugins/facade/org.eclipse.papyrus.facade.codegen/plugin.xml
@@ -1,28 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
 <plugin>
- <extension
-         point="org.eclipse.ui.popupMenus">
-         <objectContribution
-               adaptable="true"
-               id="org.eclipse.emf.eef.codegen.ecore.ui.launcher"
-               objectClass="org.eclipse.emf.codegen.ecore.genmodel.GenModel">
-          <menu
-               id="org.eclipse.emf.eef.ui.menu"
-               label="EEF"
-               path="edit">
-             <groupMarker
-                   name="facade-generation">
-             </groupMarker>
-         </menu>
-         <action
-               class="org.eclipse.papyrus.facade.codegen.ui.launcher.GenerateFacadeAction"
-               enablesFor="*"
-               id="org.eclipse.papyrus.facade.codegen"
-               label="Generate Facade Code"
-               menubarPath="org.eclipse.emf.eef.ui.menu/facade-generation">
-         </action>
-      </objectContribution>
+   
+    <extension
+         point="org.eclipse.ui.commands">
+      <command
+            categoryId="org.eclipse.papyrus.facade.category"
+            id="org.eclipse.papyrus.facade.codegen.generateFacadeCodeCommand"
+            name="Generate Facade Code">
+      </command>
+   </extension>
+   <extension
+         point="org.eclipse.ui.handlers">
+      <handler
+            class="org.eclipse.papyrus.facade.codegen.handlers.GenerateFacadeHandler"
+            commandId="org.eclipse.papyrus.facade.codegen.generateFacadeCodeCommand">
+      </handler>
+   </extension>
+ 
+   <extension
+         point="org.eclipse.ui.menus">
+      <menuContribution
+            locationURI="popup:org.eclipse.emf.codegen.ecore.genmodel.presentation.GenModelEditorID">
+            <command
+                  commandId="org.eclipse.papyrus.facade.codegen.generateFacadeCodeCommand"
+                  icon="icons/facade.png"
+                  id="org.eclipse.papyrus.facade.codegen.menu.generateFacadeCodeCommand">
+ 
+                    <visibleWhen>
+				           <with variable="activeMenuSelection">
+				            <iterate
+				                 ifEmpty="false">
+				             <adapt type="org.eclipse.emf.codegen.ecore.genmodel.GenModel">
+
+				             </adapt>
+				            </iterate>
+				           </with>
+         			</visibleWhen>
+            </command>
+      </menuContribution>
    </extension>
 
 </plugin>