438033: [Moka] oepm.composite.utils shall not contribute to extension

point startup
https://bugs.eclipse.org/bugs/show_bug.cgi?id=438033

Fixed

Change-Id: I04f9662fc8b354a09848ab9cdf06f6bf388d2af4

3 files changed, 67 insertions, 14 deletions

diff --git a/extraplugins/moka/org.eclipse.papyrus.moka.composites.utils/META-INF/MANIFEST.MF b/extraplugins/moka/org.eclipse.papyrus.moka.composites.utils/META-INF/MANIFEST.MF
index 4d90b7803da..ad12bc1d6b9 100644
--- a/extraplugins/moka/org.eclipse.papyrus.moka.composites.utils/META-INF/MANIFEST.MF
+++ b/extraplugins/moka/org.eclipse.papyrus.moka.composites.utils/META-INF/MANIFEST.MF
@@ -16,7 +16,8 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.papyrus.moka.fuml;bundle-version="0.10.0",
  org.eclipse.ui;bundle-version="3.106.0",
  org.eclipse.gmf.runtime.diagram.ui,
- org.eclipse.papyrus.uml.icons;bundle-version="1.0.0"
+ org.eclipse.papyrus.uml.icons;bundle-version="1.0.0",
+ org.eclipse.papyrus.editor;bundle-version="1.0.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.eclipse.jdt.internal.ui.actions,
diff --git a/extraplugins/moka/org.eclipse.papyrus.moka.composites.utils/build.properties b/extraplugins/moka/org.eclipse.papyrus.moka.composites.utils/build.properties
index b5c529a3c31..d1ab18abe16 100644
--- a/extraplugins/moka/org.eclipse.papyrus.moka.composites.utils/build.properties
+++ b/extraplugins/moka/org.eclipse.papyrus.moka.composites.utils/build.properties
@@ -3,4 +3,6 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                plugin.xml,\
-               build.properties
+               build.properties,\
+               icons/
+src.includes = icons/
diff --git a/extraplugins/moka/org.eclipse.papyrus.moka.composites.utils/plugin.xml b/extraplugins/moka/org.eclipse.papyrus.moka.composites.utils/plugin.xml
index 4196d87d5ef..71957fcf99a 100644
--- a/extraplugins/moka/org.eclipse.papyrus.moka.composites.utils/plugin.xml
+++ b/extraplugins/moka/org.eclipse.papyrus.moka.composites.utils/plugin.xml
@@ -7,9 +7,25 @@
             allPopups="false"
             locationURI="popup:org.eclipse.papyrus.views.modelexplorer.popup.moka">
        		<menu
-               icon="icons/PapyrusLogo16x16.png"
+               icon="platform:/plugin/org.eclipse.papyrus.editor/icons/papyrus/Papyrus_16x16.gif"
                id="org.eclipse.papyrus.views.modelexplorer.popup.moka.utils"
                label="Modeling Utils">
+            <visibleWhen
+                  checkEnabled="false">
+               <with
+                     variable="selection">
+                  <iterate
+                        ifEmpty="false"
+                        operator="and">
+                     <adapt
+                           type="org.eclipse.emf.ecore.EObject">
+                        <instanceof
+                              value="org.eclipse.uml2.uml.Element">
+                        </instanceof>
+                     </adapt>
+                  </iterate>
+               </with>
+            </visibleWhen>
          </menu> 
       </menuContribution>
        <menuContribution
@@ -17,7 +33,7 @@
             locationURI="popup:org.eclipse.papyrus.views.modelexplorer.popup.moka.utils">
        		<command
                commandId="org.eclipse.papyrus.moka.composites.utils.handlers.GenerateFactoryHandlerCommand"
-               icon="icons/Activity.gif"
+               icon="platform:/plugin/org.eclipse.papyrus.uml.icons/resource/gif/Activity.gif"
                id="org.eclipse.papyrus.moka.composites.utils.handlers.GenerateFactoryHandlerMenu"
                label="Generate Factory"
                style="push"
@@ -28,7 +44,7 @@
          	</command>
          	<command
                 commandId="org.eclipse.papyrus.moka.composites.utils.generatorconstructorusingfieldscommand"
-                icon="icons/Operation.gif"
+                icon="platform:/plugin/org.eclipse.papyrus.uml.icons/resource/gif/Operation.gif"
                 label="Generate Constructor Using Fields"
                 style="push"
                 tooltip="Generate Constructor Using Fields">
@@ -41,7 +57,7 @@
             allPopups="false"
             locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu.moka">
          <menu
-               icon="icons/PapyrusLogo16x16.png"
+               icon="platform:/plugin/org.eclipse.papyrus.editor/icons/papyrus/Papyrus_16x16.gif"
                id="org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu.moka.utils"
                label="Modeling Utils">
          </menu>
@@ -51,7 +67,7 @@
             locationURI="popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu.moka.utils">
        		<command
                commandId="org.eclipse.papyrus.moka.composites.utils.handlers.GenerateFactoryHandlerCommand"
-               icon="icons/Activity.gif"
+               icon="platform:/plugin/org.eclipse.papyrus.uml.icons/resource/gif/Activity.gif"
                id="org.eclipse.papyrus.moka.composites.utils.handlers.GenerateFactoryHandlerMenu"
                label="Generate Factory"
                style="push">
@@ -61,7 +77,7 @@
          	</command>
          	<command
                 commandId="org.eclipse.papyrus.moka.composites.utils.generatorconstructorusingfieldscommand"
-                icon="icons/Operation.gif"
+                icon="platform:/plugin/org.eclipse.papyrus.uml.icons/resource/gif/Operation.gif"
                 label="Generate Constructor Using Fields"
                 style="push"
                 tooltip="Generate Constructor Using Fields">
@@ -75,23 +91,57 @@
          point="org.eclipse.ui.commands">
       <command
             categoryId="org.eclipse.papyrus.editor.category"
-            defaultHandler="org.eclipse.papyrus.moka.composites.utils.handlers.GenerateFactoryHandler"
             description="Generate Factory"
             id="org.eclipse.papyrus.moka.composites.utils.handlers.GenerateFactoryHandlerCommand"
             name="Generate Factory">
       </command>
       <command
             categoryId="org.eclipse.papyrus.editor.category"
-            defaultHandler="org.eclipse.papyrus.moka.composites.utils.handlers.GenerateConstructorUsingFieldsHandler"
             description="Generate Constructor Using Fields"
             id="org.eclipse.papyrus.moka.composites.utils.generatorconstructorusingfieldscommand"
             name="Generate Constructor Using Fields">
       </command>
    </extension>
-     <extension
-         point="org.eclipse.ui.startup">
-      <startup
-            class="org.eclipse.papyrus.moka.composites.utils.Activator"></startup>
+   <extension
+         point="org.eclipse.ui.handlers">
+      <handler
+            class="org.eclipse.papyrus.moka.composites.utils.handlers.GenerateFactoryHandler"
+            commandId="org.eclipse.papyrus.moka.composites.utils.handlers.GenerateFactoryHandlerCommand">
+         <enabledWhen>
+            <with
+                  variable="selection">
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.emf.ecore.EObject">
+                     <instanceof
+                           value="org.eclipse.uml2.uml.Class">
+                     </instanceof>
+                  </adapt>
+               </iterate>
+            </with>
+         </enabledWhen>
+      </handler>
+      <handler
+            class="org.eclipse.papyrus.moka.composites.utils.handlers.GenerateConstructorUsingFieldsHandler"
+            commandId="org.eclipse.papyrus.moka.composites.utils.generatorconstructorusingfieldscommand">
+         <enabledWhen>
+            <with
+                  variable="selection">
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <adapt
+                        type="org.eclipse.emf.ecore.EObject">
+                     <instanceof
+                           value="org.eclipse.uml2.uml.Class">
+                     </instanceof>
+                  </adapt>
+               </iterate>
+            </with>
+         </enabledWhen>
+      </handler>
    </extension>
    
 </plugin>