diff options
| author | Patrick Tessier | 2015-01-21 08:38:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org | 2015-01-21 08:38:16 +0000 |
| commit | aa8eb21473291d598baf87a2d2ccec62f01aa69e (patch) | |
| tree | d00a0dcb510146ae777300d9070fb2c845538eed /plugins/developer/org.eclipse.papyrus.def | |
| parent | 901e0abd2cd00c8d3ce673b47ebfff9b61bf18f7 (diff) | |
| parent | bb6cab6fbf83614412326c8da04ac0a7f5d66907 (diff) | |
| download | org.eclipse.papyrus-aa8eb21473291d598baf87a2d2ccec62f01aa69e.tar.gz org.eclipse.papyrus-aa8eb21473291d598baf87a2d2ccec62f01aa69e.tar.xz org.eclipse.papyrus-aa8eb21473291d598baf87a2d2ccec62f01aa69e.zip | |
Merge "358625: [All diagrams] Duplicate of an Element creates two Elements https://bugs.eclipse.org/bugs/show_bug.cgi?id=358625"
Diffstat (limited to 'plugins/developer/org.eclipse.papyrus.def')
2 files changed, 13 insertions, 13 deletions
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/CompartmentEditPart.xtend b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/CompartmentEditPart.xtend index 4763a0e4abe..67223ec08c0 100644 --- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/CompartmentEditPart.xtend +++ b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/CompartmentEditPart.xtend @@ -35,7 +35,7 @@ import xpt.diagram.editparts.Common «IF ! childNodes.empty» installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE, new org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy()); installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE, new org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy()); - installEditPolicy(org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy.PASTE_ROLE, new org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy()); + installEditPolicy(org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy.PASTE_ROLE, new org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy()); «ENDIF» «xptEditpartsCommon.installCanonicalEditPolicy(it)» «xptEditpartsCommon.behaviour(it)» diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/DiagramEditPart.xtend b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/DiagramEditPart.xtend index c34a0ef1353..9e34d385780 100644 --- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/DiagramEditPart.xtend +++ b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/DiagramEditPart.xtend @@ -11,17 +11,17 @@ * Alexander Shatalin (Borland) - initial API and implementation * Michael Golubev (Montages) - #386838 - migrate to Xtend2 */ -package aspects.impl.diagram.editparts
-
-import com.google.inject.Inject
-import com.google.inject.Singleton
-import metamodel.MetaModel
-import org.eclipse.gmf.codegen.gmfgen.GenDiagram
-import org.eclipse.gmf.codegen.gmfgen.GenNode
-import xpt.diagram.commands.CreateShortcutDecorationsCommand
-import xpt.diagram.editparts.Common
-import xpt.diagram.editparts.Utils_qvto
-
+package aspects.impl.diagram.editparts + +import com.google.inject.Inject +import com.google.inject.Singleton +import metamodel.MetaModel +import org.eclipse.gmf.codegen.gmfgen.GenDiagram +import org.eclipse.gmf.codegen.gmfgen.GenNode +import xpt.diagram.commands.CreateShortcutDecorationsCommand +import xpt.diagram.editparts.Common +import xpt.diagram.editparts.Utils_qvto + /** * Revisit: [MG]: @Inject extension same-named-api-class -> template extends api-class? */ @@ -45,7 +45,7 @@ override createDefaultEditPoliciesBody(GenDiagram it) ''' super.createDefaultEditPolicies(); installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE, new org.eclipse.papyrus.uml.diagram.common.editpolicies.PapyrusCreationEditPolicy()); - installEditPolicy(org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy.PASTE_ROLE, new org.eclipse.papyrus.uml.diagram.common.editpolicies.DuplicatePasteEditPolicy()); + installEditPolicy(org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy.PASTE_ROLE, new org.eclipse.papyrus.uml.diagram.common.editpolicies.PasteEditPolicy()); «xptEditpartsCommon.installSemanticEditPolicy(it)» «xptEditpartsCommon.installCanonicalEditPolicy(it)» |