1 files changed, 83 insertions, 0 deletions
diff --git a/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/DiagramEditorContextMenuProvider.xtend b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/DiagramEditorContextMenuProvider.xtend
new file mode 100644
index 00000000000..07c5e97ef5f
--- /dev/null
+++ b/plugins/toolsmiths/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/DiagramEditorContextMenuProvider.xtend
@@ -0,0 +1,83 @@
+/**
+ * Copyright (c) 2008, 2009, 2013 Borland Software Corporation and others
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Dmitry Stadnik (Borland) - initial API and implementation
+ *    Michael Golubev (Montages) - #386838 - migrate to Xtend2
+ * 	  Vincent Lorenzo (CEA LIST)
+ */
+package aspects.xpt.editor
+
+import com.google.inject.Inject
+import com.google.inject.Singleton
+import org.eclipse.gmf.codegen.gmfgen.GenDiagram
+import plugin.Activator
+import xpt.Common
+import xpt.CodeStyle
+
+//We remove the dependance with DeleteElementAction. Now this action is added to the popup menu with the extension point org.eclipse.ui.popup 
+//in org.eclipse.papyrus.uml.diagram.common 
+@Singleton class DiagramEditorContextMenuProvider extends xpt.editor.DiagramEditorContextMenuProvider {
+	@Inject extension Common;
+	@Inject extension CodeStyle
+
+	@Inject Activator xptActivator;
+
+
+	override DiagramEditorContextMenuProvider(GenDiagram it) '''
+		�copyright(editorGen)�
+		package �packageName(it)�;
+		
+		�generatedClassComment�
+		public class �className(it)� extends org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider {
+		
+			�generatedMemberComment�
+			private org.eclipse.ui.IWorkbenchPart part;
+		
+		���			�generatedMemberComment�
+		���			private �xptDeleteElementAction.qualifiedClassName(it)� deleteAction;
+		
+			�generatedMemberComment�
+			public DiagramEditorContextMenuProvider(org.eclipse.ui.IWorkbenchPart part, org.eclipse.gef.EditPartViewer viewer) {
+				super(part, viewer);
+				this.part = part;
+				���				deleteAction = new �xptDeleteElementAction.qualifiedClassName(it)�(part);
+				���				deleteAction.init();
+			}
+		
+		���			�generatedMemberComment�
+		���			public void dispose() {
+		���				if (deleteAction != null) {
+		���					deleteAction.dispose();
+		���					deleteAction = null;
+		���				}
+		���				super.dispose();
+		���			}
+		
+			�generatedMemberComment�
+			public void buildContextMenu(final org.eclipse.jface.action.IMenuManager menu) {
+				getViewer().flush();
+				try {
+					org.eclipse.emf.transaction.util.TransactionUtil.getEditingDomain(
+							(org.eclipse.emf.ecore.EObject) getViewer().getContents().getModel()).runExclusive(new Runnable() {
+		
+						�overrideI(it.editorGen.diagram)�
+						public void run() {
+							org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.ContributionItemService.getInstance().contributeToPopupMenu(
+									DiagramEditorContextMenuProvider.this, part);
+							menu.remove(org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds.ACTION_DELETE_FROM_MODEL);
+		���							menu.appendToGroup("editGroup", deleteAction);
+						}
+					});
+				} catch (Exception e) {
+			�xptActivator.qualifiedClassName(editorGen.plugin)�.getInstance().logError("Error building context menu", e);
+			}
+			}
+			�additions(it)�
+		}
+	'''
+}