Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCamille Letavernier2015-09-17 12:20:06 +0000
committerCamille Letavernier2015-09-17 12:20:06 +0000
commit53b24a7a990de4877d9de245e93cd39c36f4c157 (patch)
treeecefdb7c441691308d52b7b7659515ac32020f95 /plugins/views/modelexplorer
parentfb8ee92509cdf5526fc1e36e1a279965f8d8f113 (diff)
downloadorg.eclipse.papyrus-53b24a7a990de4877d9de245e93cd39c36f4c157.tar.gz
org.eclipse.papyrus-53b24a7a990de4877d9de245e93cd39c36f4c157.tar.xz
org.eclipse.papyrus-53b24a7a990de4877d9de245e93cd39c36f4c157.zip
476625: [GEF4] Implement an "Open with..." action for Papyrus Diagrams
https://bugs.eclipse.org/bugs/show_bug.cgi?id=476625 Change-Id: Ibe9a085bca197c8ef6aae2a37c044ca8429b3fee Signed-off-by: Camille Letavernier <camille.letavernier@cea.fr>
Diffstat (limited to 'plugins/views/modelexplorer')
-rw-r--r--plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/.classpath14
-rw-r--r--plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/.settings/org.eclipse.jdt.core.prefs6
-rw-r--r--plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF2
-rw-r--r--plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/plugin.xml4
-rw-r--r--plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/actions/OpenWithMenu.java143
5 files changed, 158 insertions, 11 deletions
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/.classpath b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/.classpath
index 2d1a4302f04..eca7bdba8f0 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/.classpath
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/.settings/org.eclipse.jdt.core.prefs b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/.settings/org.eclipse.jdt.core.prefs
index 4759947300a..62a08f4494d 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF
index e1d3883a4f5..30333282c2b 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF
@@ -62,4 +62,4 @@ Bundle-Activator: org.eclipse.papyrus.views.modelexplorer.Activator
Bundle-ManifestVersion: 2
Bundle-Description: %pluginDescription
Bundle-SymbolicName: org.eclipse.papyrus.views.modelexplorer;singleton:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/plugin.xml b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/plugin.xml
index 3803b31198b..c1d38f6b4ba 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/plugin.xml
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/plugin.xml
@@ -182,6 +182,10 @@
<visibleWhen checkEnabled="true">
</visibleWhen>
</command>
+ <dynamic
+ class="org.eclipse.papyrus.views.modelexplorer.actions.OpenWithMenu"
+ id="org.eclipse.papyrus.views.modelexplorer.dynamicOpenWith">
+ </dynamic>
<command commandId="org.eclipse.papyrus.views.modelexplorer.popup.close.command" icon="icons/etool16/close.png" id="org.eclipse.papyrus.views.modelexplorer.modelexplorer.popup.close" label="&amp;Close" style="push" tooltip="Close">
<visibleWhen checkEnabled="true">
</visibleWhen>
diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/actions/OpenWithMenu.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/actions/OpenWithMenu.java
new file mode 100644
index 00000000000..aa3338a97b0
--- /dev/null
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/actions/OpenWithMenu.java
@@ -0,0 +1,143 @@
+package org.eclipse.papyrus.views.modelexplorer.actions;
+
+import java.util.Iterator;
+import java.util.Map;
+
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.jface.action.ContributionItem;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.infra.core.sasheditor.contentprovider.IPageManager;
+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.DiSashModelManager;
+import org.eclipse.papyrus.infra.core.sasheditor.di.contentprovider.IOpenable;
+import org.eclipse.papyrus.infra.core.services.ServiceException;
+import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
+import org.eclipse.papyrus.views.modelexplorer.Activator;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.MenuItem;
+import org.eclipse.ui.ISelectionService;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.menus.IWorkbenchContribution;
+import org.eclipse.ui.services.IServiceLocator;
+
+public class OpenWithMenu extends ContributionItem implements IWorkbenchContribution {
+
+ private IServiceLocator serviceLocator;
+
+ public OpenWithMenu() {
+ super();
+ }
+
+ public OpenWithMenu(String id) {
+ super(id);
+ }
+
+ /**
+ * @see org.eclipse.jface.action.ContributionItem#fill(org.eclipse.swt.widgets.Menu, int)
+ *
+ * @param menu
+ * @param index
+ */
+ @Override
+ public void fill(Menu menu, int index) {
+ ISelectionService selectionService = serviceLocator.getService(ISelectionService.class);
+ if (selectionService == null) {
+ return;
+ }
+
+ ISelection currentSelection = selectionService.getSelection();
+ if (!(currentSelection instanceof IStructuredSelection)) {
+ return;
+ }
+
+ IStructuredSelection selection = (IStructuredSelection) currentSelection;
+ if (selection.isEmpty()) {
+ return;
+ }
+
+ IWorkbenchPart part = serviceLocator.getService(IWorkbenchPart.class);
+ if (part == null) {
+ return;
+ }
+ ServicesRegistry registry = part.getAdapter(ServicesRegistry.class);
+ if (registry == null) {
+ return;
+ }
+
+ IPageManager pageManager;
+ try {
+ pageManager = registry.getService(IPageManager.class);
+ if (pageManager == null) {
+ return;
+ }
+ } catch (ServiceException ex) {
+ // Ignore and stop
+ return;
+ }
+
+ Iterator<?> iterator = selection.iterator();
+ while (iterator.hasNext()) {
+ final EObject selectedElement = EMFHelper.getEObject(iterator.next());
+ if (selectedElement == null) {
+ continue;
+ }
+
+ IOpenable papyrusPage = Platform.getAdapterManager().getAdapter(selectedElement, IOpenable.class);
+ if (papyrusPage == null) {
+ continue;
+ }
+
+ Map<String, String> editorIDs;
+ try {
+ DiSashModelManager modelManager = registry.getService(DiSashModelManager.class);
+ editorIDs = modelManager.getEditorIDsFor(selectedElement);
+ } catch (ServiceException ex) {
+ Activator.log.error(ex);
+ return;
+ }
+
+ if (editorIDs == null || editorIDs.size() < 2) {
+ return;
+ }
+
+ MenuItem openWith = new MenuItem(menu, SWT.CASCADE);
+ openWith.setText("Open with...");
+
+ Menu subMenu = new Menu(menu);
+ openWith.setMenu(subMenu);
+
+ for (Map.Entry<String, String> editorID : editorIDs.entrySet()) {
+ MenuItem gmfItem = new MenuItem(subMenu, SWT.NONE);
+ gmfItem.setText(editorID.getValue());
+ gmfItem.addSelectionListener(new SelectionListener() {
+
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ pageManager.openPage(selectedElement, editorID.getKey());
+ }
+
+ @Override
+ public void widgetDefaultSelected(SelectionEvent e) {
+ // Nothing
+ }
+ });
+ }
+ }
+ }
+
+ /**
+ * @see org.eclipse.ui.menus.IWorkbenchContribution#initialize(org.eclipse.ui.services.IServiceLocator)
+ *
+ * @param serviceLocator
+ */
+ @Override
+ public void initialize(IServiceLocator serviceLocator) {
+ this.serviceLocator = serviceLocator;
+ }
+
+}

Back to the top