Bug 510387 - [GMFT] Expose template for easy override

 - override methods while keeping the same value
 - fix unused import
 - fix bad format

Change-Id: I2ba43900182af0fccdcb861b66698361c296f6c8
Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>

5 files changed, 30 insertions, 20 deletions

diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/actions/LoadResourceAction.xtend b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/actions/LoadResourceAction.xtend
new file mode 100755
index 00000000000..2548ea799e7
--- /dev/null
+++ b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/actions/LoadResourceAction.xtend
@@ -0,0 +1,21 @@
+/*****************************************************************************
+ * Copyright (c) 2017 CEA LIST.
+ *
+ * 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:
+ *  Benoit Maggi (CEA LIST) benoit.maggi@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package aspects.impl.actions
+
+import com.google.inject.Singleton
+
+@Singleton class LoadResourceAction extends impl.actions.LoadResourceAction{
+
+	override def extendsList(org.eclipse.gmf.codegen.gmfgen.LoadResourceAction it) //
+	''' extends org.eclipse.gmf.tooling.runtime.actions.DefaultLoadResourceAction'''
+
+}
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/ExternalNodeLabelEditPart.xtend b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/ExternalNodeLabelEditPart.xtend
index 2a80b048294..f6b5f6168ce 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/ExternalNodeLabelEditPart.xtend
+++ b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/ExternalNodeLabelEditPart.xtend
@@ -13,9 +13,7 @@
 

 package aspects.impl.diagram.editparts

 

-import xpt.diagram.editparts.Common

 import org.eclipse.gmf.codegen.gmfgen.GenExternalNodeLabel

-import com.google.inject.Inject

 

 /**

  * @author Mickael ADAM

diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/NodeLabelEditPart.xtend b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/NodeLabelEditPart.xtend
index b76784eca1f..de9c24071e8 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/NodeLabelEditPart.xtend
+++ b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/NodeLabelEditPart.xtend
@@ -11,6 +11,7 @@
  *    Alexander Shatalin (Borland) - initial API and implementation
  *    Michael Golubev (Montages) - #386838 - migrate to Xtend2
  *    Thibault Landre (Atos Origin) - initial API and implementation
+ *    Benoit Maggi (CEA LIST) -#510281 change dependency to replace gmft-runtime
  */
 package aspects.impl.diagram.editparts

 

@@ -18,12 +19,15 @@ import com.google.inject.Inject
 import com.google.inject.Singleton

 import org.eclipse.gmf.codegen.gmfgen.GenNodeLabel

 import xpt.diagram.editparts.Common

-import xpt.diagram.editparts.Utils_qvto

+import xpt.diagram.editparts.Utils_qvto
+import org.eclipse.gmf.codegen.gmfgen.GenDiagram

 

 @Singleton class NodeLabelEditPart extends impl.diagram.editparts.NodeLabelEditPart {
 	@Inject extension Utils_qvto;
 
 	@Inject Common xptEditpartsCommon;
+
+	override def nodeLabelDragPolicyQualifiedClassName(GenDiagram it) '''org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy'''
 	
 
 	override handleNotificationEventBody(GenNodeLabel it) '''
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/TextAware.xtend b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/TextAware.xtend
index b549cfb7a4b..2a0ed0ffce3 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/TextAware.xtend
+++ b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/TextAware.xtend
@@ -13,7 +13,6 @@
  */
 package aspects.impl.diagram.editparts
 
-import aspects.xpt.editor.VisualIDRegistry
 import com.google.inject.Inject
 import com.google.inject.Singleton
 import org.eclipse.gmf.codegen.gmfgen.DesignLabelModelFacet
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/parsers/ParserProvider.xtend b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/parsers/ParserProvider.xtend
index ac61395cc9b..7d21bab98fb 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/parsers/ParserProvider.xtend
+++ b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/parsers/ParserProvider.xtend
@@ -19,24 +19,12 @@ import com.google.inject.Inject
 import com.google.inject.Singleton
 import impl.parsers.expression_qvto
 import metamodel.MetaModel
-import org.eclipse.emf.codegen.ecore.genmodel.GenClass
-import org.eclipse.emf.codegen.ecore.genmodel.GenFeature
-import org.eclipse.gmf.codegen.gmfgen.CustomParser
-import org.eclipse.gmf.codegen.gmfgen.ExpressionLabelParser
-import org.eclipse.gmf.codegen.gmfgen.ExternalParser
-import org.eclipse.gmf.codegen.gmfgen.FeatureLabelModelFacet
 import org.eclipse.gmf.codegen.gmfgen.GenChildLabelNode
-import org.eclipse.gmf.codegen.gmfgen.GenCommonBase
 import org.eclipse.gmf.codegen.gmfgen.GenLink
 import org.eclipse.gmf.codegen.gmfgen.GenNode
-import org.eclipse.gmf.codegen.gmfgen.GenParserImplementation
 import org.eclipse.gmf.codegen.gmfgen.GenParsers
-import org.eclipse.gmf.codegen.gmfgen.LabelModelFacet
-import org.eclipse.gmf.codegen.gmfgen.LabelTextAccessMethod
-import org.eclipse.gmf.codegen.gmfgen.OclChoiceParser
-import org.eclipse.gmf.codegen.gmfgen.PredefinedEnumParser
-import org.eclipse.gmf.codegen.gmfgen.PredefinedParser
-import org.eclipse.gmf.codegen.gmfgen.ValueExpression
+import parsers.ExpressionLabelParser
+import parsers.PredefinedParser
 import plugin.Activator
 import xpt.Common
 import xpt.Common_qvto
@@ -54,8 +42,8 @@ import xpt.providers.ParserUtils_qvto
 	@Inject extension ParserUtils_qvto
 	@Inject extension expression_qvto
 
-	@Inject extension parsers.ExpressionLabelParser;
-	@Inject extension parsers.PredefinedParser;
+	@Inject extension ExpressionLabelParser;
+	@Inject extension PredefinedParser;
 
 	@Inject getExpression xptGetExpression;
 	@Inject MetaModel xptMetaModel;