Bug 462256: [menu]: migration of main menu in

org.eclipse.papyrus.infra.ui

Change-Id: I1cac9421f36ec5bc20b2e1d7c08c27422571fe21
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=462256
Signed-off-by: Francois Le Fevre - CEA <francois.le-fevre@cea.fr>

3 files changed, 22 insertions, 22 deletions

diff --git a/plugins/editor/org.eclipse.papyrus.editor/META-INF/MANIFEST.MF b/plugins/editor/org.eclipse.papyrus.editor/META-INF/MANIFEST.MF
index c233d353a00..5717c6bb66f 100644
--- a/plugins/editor/org.eclipse.papyrus.editor/META-INF/MANIFEST.MF
+++ b/plugins/editor/org.eclipse.papyrus.editor/META-INF/MANIFEST.MF
@@ -7,7 +7,8 @@ Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="1.1.0",
  org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.1.0",

  org.eclipse.ui.ide;bundle-version="3.8.0",

  org.eclipse.papyrus.infra.core.log;bundle-version="1.1.0",

- com.google.guava;bundle-version="11.0.0"

+ com.google.guava;bundle-version="11.0.0",

+ org.eclipse.papyrus.infra.ui;bundle-version="1.1.0"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.1.0.qualifier

diff --git a/plugins/editor/org.eclipse.papyrus.editor/plugin.xml b/plugins/editor/org.eclipse.papyrus.editor/plugin.xml
index 7c29634428c..e93975eabfb 100644
--- a/plugins/editor/org.eclipse.papyrus.editor/plugin.xml
+++ b/plugins/editor/org.eclipse.papyrus.editor/plugin.xml
@@ -14,25 +14,6 @@
       </editor>

    </extension>

    <extension

-         point="org.eclipse.ui.menus">

-      <menuContribution

-            locationURI="menu:org.eclipse.ui.main.menu?after=navigate">

-         <menu

-               id="org.eclipse.papyrus.ui.menu"

-               label="Papyrus"

-               tooltip="Papyrus Editor Menu">

-            <visibleWhen>

-               <with

-                     variable="activeEditorId">

-                  <equals

-                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

-                  </equals>

-               </with>

-            </visibleWhen>

-         </menu>

-      </menuContribution>

-   </extension>

-   <extension

          point="org.eclipse.ui.commands">

       <category

             description="this a category of papyrus commands"

diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui/plugin.xml b/plugins/infra/org.eclipse.papyrus.infra.ui/plugin.xml
index bde227d60f4..65aa1c32a60 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui/plugin.xml
+++ b/plugins/infra/org.eclipse.papyrus.infra.ui/plugin.xml
@@ -8,13 +8,31 @@
  $Id$
 -->

 <plugin>

- 	

+ <extension

+         point="org.eclipse.ui.menus">

+      <menuContribution

+            locationURI="menu:org.eclipse.ui.main.menu?after=navigate">

+         <menu

+               id="org.eclipse.papyrus.ui.menu"

+               label="Papyrus"

+               tooltip="Papyrus Editor Menu">

+            <visibleWhen>

+               <with

+                     variable="activeEditorId">

+                  <equals

+                        value="org.eclipse.papyrus.infra.core.papyrusEditor">

+                  </equals>

+               </with>

+            </visibleWhen>

+         </menu>

+      </menuContribution>

+  </extension>

   <extension

         point="org.eclipse.ui.menus">

       

         <menuContribution

               allPopups="false"

-              locationURI="menu:org.eclipse.ui.main.menu?after=additions">

+              locationURI="menu:org.eclipse.papyrus.ui.menu">

                 <menu

             label="&amp;Quick Formatting..."

             tooltip="Quick formatting for labels">