355075: [Wizards] Add shortcuts for Papyrus wizards in Papyrus

perspective
https://bugs.eclipse.org/bugs/show_bug.cgi?id=355075

3 files changed, 31 insertions, 4 deletions

diff --git a/plugins/uml/org.eclipse.papyrus.uml.perspective/META-INF/MANIFEST.MF b/plugins/uml/org.eclipse.papyrus.uml.perspective/META-INF/MANIFEST.MF
index bd878a5244f..232e30b8f4c 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.perspective/META-INF/MANIFEST.MF
+++ b/plugins/uml/org.eclipse.papyrus.uml.perspective/META-INF/MANIFEST.MF
@@ -4,7 +4,8 @@ Require-Bundle: org.eclipse.papyrus.uml.diagram.wizards;bundle-version="1.1.0",
  org.eclipse.ui;bundle-version="3.7.0",

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

  org.eclipse.core.runtime;bundle-version="3.6.100",

- org.eclipse.papyrus.views.validation;bundle-version="1.1.0"

+ org.eclipse.papyrus.views.validation;bundle-version="1.1.0",

+ org.eclipse.ui.navigator;bundle-version="3.5.500"

 Bundle-Vendor: %providerName

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.1.0.qualifier

diff --git a/plugins/uml/org.eclipse.papyrus.uml.perspective/plugin.xml b/plugins/uml/org.eclipse.papyrus.uml.perspective/plugin.xml
index 03e3dc83df5..01e6e9bd89d 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.perspective/plugin.xml
+++ b/plugins/uml/org.eclipse.papyrus.uml.perspective/plugin.xml
@@ -10,5 +10,30 @@
             name="Papyrus">

       </perspective>

    </extension>

+   <extension

+         point="org.eclipse.ui.navigator.navigatorContent">

+      <commonWizard

+            type="new"

+            wizardId="org.eclipse.papyrus.uml.diagram.wizards.1createproject">

+         <enablement>

+            <with

+                  variable="activeWorkbenchWindow.activePerspective">

+               <equals

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

+               </equals>

+            </with></enablement>

+      </commonWizard>

+      <commonWizard

+            type="new"

+            wizardId="org.eclipse.papyrus.uml.diagram.wizards.createmodel">

+         <enablement>

+            <with

+                  variable="activeWorkbenchWindow.activePerspective">

+               <equals

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

+               </equals>

+            </with></enablement>

+      </commonWizard>

+   </extension>

 

 </plugin>

diff --git a/plugins/uml/org.eclipse.papyrus.uml.perspective/src/org/eclipse/papyrus/uml/perspective/PapyrusPerspective.java b/plugins/uml/org.eclipse.papyrus.uml.perspective/src/org/eclipse/papyrus/uml/perspective/PapyrusPerspective.java
index 4a53194e7bb..b398feb39ee 100644
--- a/plugins/uml/org.eclipse.papyrus.uml.perspective/src/org/eclipse/papyrus/uml/perspective/PapyrusPerspective.java
+++ b/plugins/uml/org.eclipse.papyrus.uml.perspective/src/org/eclipse/papyrus/uml/perspective/PapyrusPerspective.java
@@ -88,9 +88,6 @@ public class PapyrusPerspective implements IPerspectiveFactory {
 		// Place the ModelExplorer under the Navigator

 		layout.addView(ID_MODELEXPLORER, IPageLayout.BOTTOM, 0.33f, IPageLayout.ID_PROJECT_EXPLORER);

 

-		// place outline under the model explorer

-		layout.addView(IPageLayout.ID_OUTLINE, IPageLayout.BOTTOM, 0.5f, ID_MODELEXPLORER);

-

 		// place properties and problem views under the editor

 		IFolderLayout bottomFolder = layout.createFolder(ID_BOTTOM_FOLDER, IPageLayout.BOTTOM, 0.70f, editorArea);

 

@@ -98,5 +95,9 @@ public class PapyrusPerspective implements IPerspectiveFactory {
 		bottomFolder.addView(ModelValidationView.VIEW_ID);

 

 		// bottom.addView("org.eclipse.pde.runtime.LogView");

+

+		// place outline under the model explorer

+		// open the outline after all other views, since it is slower to refresh

+		layout.addView(IPageLayout.ID_OUTLINE, IPageLayout.BOTTOM, 0.5f, ID_MODELEXPLORER);

 	}

 }