Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Lorenzo2017-08-11 04:30:45 -0400
committerVincent Lorenzo2017-08-11 05:10:01 -0400
commit9d49622a1f4be2a935aba3efddd32f7bf7be7947 (patch)
tree424dcb2a5ed47e5d2042614414cede16291add91 /plugins/developer
parentded9fc8eb76f4a41df0e980d425fedbf78a0d096 (diff)
downloadorg.eclipse.papyrus-9d49622a1f4be2a935aba3efddd32f7bf7be7947.tar.gz
org.eclipse.papyrus-9d49622a1f4be2a935aba3efddd32f7bf7be7947.tar.xz
org.eclipse.papyrus-9d49622a1f4be2a935aba3efddd32f7bf7be7947.zip
Bug 520882: [AllDiagram][Generation] contribution to org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings must be removed.
Change-Id: Ic9abdb056b06d480a99f392d408fa204bdc89d8b Signed-off-by: Vincent Lorenzo <vincent.lorenzo@cea.fr>
Diffstat (limited to 'plugins/developer')
-rw-r--r--plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/extensions.xtend69
1 files changed, 35 insertions, 34 deletions
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/extensions.xtend b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/extensions.xtend
index c8aaa051e6c..b02c8b5d3d3 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/extensions.xtend
+++ b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/extensions.xtend
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2007, 2010, 2013 Borland Software Corporation and others
+ * Copyright (c) 2007, 2010, 2013, 2017 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
@@ -9,6 +9,7 @@
* Contributors:
* Dmitry Stadnik (Borland) - initial API and implementation
* Michael Golubev (Montages) - #386838 - migrate to Xtend2
+ * Vincent Lorenzo (CEA-LIST) - Bug 520882
*/
package aspects.xpt.providers
@@ -20,7 +21,6 @@ import org.eclipse.gmf.codegen.gmfgen.GenDiagram
import org.eclipse.gmf.codegen.gmfgen.MetamodelType
import org.eclipse.gmf.codegen.gmfgen.NotationType
import org.eclipse.gmf.codegen.gmfgen.SpecializationType
-import org.eclipse.papyrus.papyrusgmfgenextension.GenerateUsingElementTypeCreationCommand
import parsers.ParserProvider
import xpt.diagram.Utils_qvto
import xpt.diagram.edithelpers.EditHelper
@@ -113,38 +113,39 @@ import xpt.providers.ShortcutsDecoratorProvider
«tripleSpace(2)»</decoratorProvider>
«tripleSpace(1)»</extension>
«ENDIF»
-
- «IF !getLocalDefineTypedElements(it).empty»
- «tripleSpace(1)»<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes" id="element-types">
- «tripleSpace(2)»«xmlGeneratedTag»
- «FOR e : getLocalDefineTypedElements(it)»
- «elementTypeSafe(e.elementType)»
- «ENDFOR»
- «tripleSpace(1)»</extension>
- «ENDIF»
-
- «tripleSpace(1)»<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings" id="element-types-bindings">
- «tripleSpace(2)»«xmlGeneratedTag»
- «IF it.eResource.allContents.filter(typeof (GenerateUsingElementTypeCreationCommand)).size<1»
- «tripleSpace(2)»<clientContext id="«editorGen.plugin.ID».TypeContext">
- «tripleSpace(3)»<enablement>
- «tripleSpace(4)»<test
- «tripleSpace(5)»property="org.eclipse.gmf.runtime.emf.core.editingDomain"
- «tripleSpace(5)»value="«editingDomainID»"/>
- «tripleSpace(3)»</enablement>
- «tripleSpace(2)»</clientContext>
- «tripleSpace(2)»<binding context="«editorGen.plugin.ID».TypeContext">
- «ENDIF»
- «IF it.eResource.allContents.filter(typeof (GenerateUsingElementTypeCreationCommand)).size>0»
-
- <binding context="org.eclipse.papyrus.infra.services.edit.TypeContext">
- «ENDIF»
- «FOR e : getLocalDefineTypedElements(it)»
- «tripleSpace(3)»<elementType ref="«e.elementType.uniqueIdentifier»"/>
- «ENDFOR»
- «tripleSpace(3)»<advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>
- «tripleSpace(2)»</binding>
- «tripleSpace(1)»</extension>
+
+««« commented for bug 520882
+««« «IF !getLocalDefineTypedElements(it).empty»
+««« «tripleSpace(1)»<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes" id="element-types">
+««« «tripleSpace(2)»«xmlGeneratedTag»
+««« «FOR e : getLocalDefineTypedElements(it)»
+««« «elementTypeSafe(e.elementType)»
+««« «ENDFOR»
+««« «tripleSpace(1)»</extension>
+««« «ENDIF»
+«««
+««« «tripleSpace(1)»<extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings" id="element-types-bindings">
+««« «tripleSpace(2)»«xmlGeneratedTag»
+««« «IF it.eResource.allContents.filter(typeof (GenerateUsingElementTypeCreationCommand)).size<1»
+««« «tripleSpace(2)»<clientContext id="«editorGen.plugin.ID».TypeContext">
+««« «tripleSpace(3)»<enablement>
+««« «tripleSpace(4)»<test
+««« «tripleSpace(5)»property="org.eclipse.gmf.runtime.emf.core.editingDomain"
+««« «tripleSpace(5)»value="«editingDomainID»"/>
+««« «tripleSpace(3)»</enablement>
+««« «tripleSpace(2)»</clientContext>
+««« «tripleSpace(2)»<binding context="«editorGen.plugin.ID».TypeContext">
+««« «ENDIF»
+««« «IF it.eResource.allContents.filter(typeof (GenerateUsingElementTypeCreationCommand)).size>0»
+«««
+««« <binding context="org.eclipse.papyrus.infra.services.edit.TypeContext">
+««« «ENDIF»
+««« «FOR e : getLocalDefineTypedElements(it)»
+««« «tripleSpace(3)»<elementType ref="«e.elementType.uniqueIdentifier»"/>
+««« «ENDFOR»
+««« «tripleSpace(3)»<advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>
+««« «tripleSpace(2)»</binding>
+««« «tripleSpace(1)»</extension>
«extraLineBreak»
«tripleSpace(1)»<extension point="org.eclipse.papyrus.infra.gmfdiag.common.visualTypeProviders">

Back to the top