Regenerated Component Diagram. Updated the Xtend templates which implied

regeneration of Class, Composite, StateMachine diagrams

4 files changed, 17 insertions, 17 deletions

diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/NodeEditPart.xtend b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/NodeEditPart.xtend
index 1167fa9ff00..fa0d6dd039d 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/NodeEditPart.xtend
+++ b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/NodeEditPart.xtend
@@ -49,7 +49,7 @@ import xpt.diagram.editparts.Utils_qvto
 //   GMF
 //---------
 	
-	override extendsListContents (GenNode it)'''
+	override dispatch extendsListContents (GenNode it)'''
 «««BEGIN: PapyrusGenCode
 «««Add own extension
 «IF it.eResource.allContents.filter(typeof(ExtendedGenView)).filter[v |v.genView.contains(it) && v.superOwnedEditPart!=null].size != 0»
@@ -58,11 +58,11 @@ import xpt.diagram.editparts.Utils_qvto
 «ENDFOR»
 «««END: BEGIN: PapyrusGenCode
 «ELSE»
-	«IF hasBorderItems(it)»org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart«ELSE»«IF it instanceof GenChildSideAffixedNode»org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart«ELSE»org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart«ENDIF»«ENDIF»
+	org.eclipse.papyrus.infra.gmfdiag.common.editpart.NodeEditPart
 «ENDIF»
 '''
 
-def extendsListContents (GenChildSideAffixedNode it)'''
+override dispatch extendsListContents (GenChildSideAffixedNode it)'''
 «««BEGIN: PapyrusGenCode
 «««Add own extension
 «IF it.eResource.allContents.filter(typeof(ExtendedGenView)).filter[v |v.genView.contains(it) && v.superOwnedEditPart!=null].size != 0»
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/VisualIDRegistry.xtend b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/VisualIDRegistry.xtend
index 88d3ec9c055..a6dfcc9fad0 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/VisualIDRegistry.xtend
+++ b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/editor/VisualIDRegistry.xtend
@@ -54,15 +54,15 @@ import org.eclipse.gmf.codegen.gmfgen.GenConstraint
 	 * 
 	 * FIXME don't use static fields, replace with instance/separate cache (e.g. accessible from Activator)
 	 */
-	//	override constraintMethods(GenDiagram it) '''
-	//		«IF null != editorGen.expressionProviders»
-	//			«FOR topNode : topLevelNodes.filter[n|!n.sansDomain].filter[n|n.modelFacet.modelElementSelector != null]»«constraintMethod(
-	//			topNode)»«ENDFOR»
-	//			«FOR childNode : childNodes.filter[n|!n.sansDomain].filter[n|n.modelFacet.modelElementSelector != null]»«constraintMethod(
-	//			childNode)»«ENDFOR»
-	//			«FOR link : links.filter[n|!n.sansDomain]»«constraintMethod(link.modelFacet, link)»«ENDFOR»
-	//		«ENDIF»
-	//	'''
+		override constraintMethods(GenDiagram it) '''
+			«IF null != editorGen.expressionProviders»
+				«FOR topNode : topLevelNodes.filter[n|!n.sansDomain].filter[n|n.modelFacet.modelElementSelector != null]»«constraintMethod(
+				topNode)»«ENDFOR»
+				«FOR childNode : childNodes.filter[n|!n.sansDomain].filter[n|n.modelFacet.modelElementSelector != null]»«constraintMethod(
+				childNode)»«ENDFOR»
+				«FOR link : links.filter[n|!n.sansDomain]»«constraintMethod(link.modelFacet, link)»«ENDFOR»
+			«ENDIF»
+		'''
 	//[ExtendedConstraint] Model selector constraint
 	override checkDomainElementConstraints(TypeModelFacet it, GenCommonBase commonBase) '''
 «««		«IF null != modelElementSelector»
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/plugin/manifest.xtend b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/plugin/manifest.xtend
index 203ef61fcaf..24aa64e88c3 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/plugin/manifest.xtend
+++ b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/plugin/manifest.xtend
@@ -64,13 +64,12 @@ Require-Bundle: org.eclipse.core.runtime,
 «FOR reqId : reqPlugins» «reqId»;visibility:=reexport,«extraLineBreak»
 «ENDFOR» org.eclipse.gef,
  org.eclipse.papyrus.infra.gmfdiag.preferences,
- «IF it.eResource.allContents.filter(typeof (EditPartUsingDeleteService)).size != 0 || it.eResource.allContents.filter(typeof (EditPartUsingReorientService)).size != 0»,
+ «IF it.eResource.allContents.filter(typeof (EditPartUsingDeleteService)).size != 0 || it.eResource.allContents.filter(typeof (EditPartUsingReorientService)).size != 0»
  org.eclipse.papyrus.extensionpoints.editors,
  org.eclipse.papyrus.infra.services.edit
  «ELSE»
  org.eclipse.papyrus.extensionpoints.editors
 «ENDIF»
-
 '''
 
 }
\ No newline at end of file
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/ViewProvider.xtend b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/ViewProvider.xtend
index 67d1310f569..ff69ecedb7d 100644
--- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/ViewProvider.xtend
+++ b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/providers/ViewProvider.xtend
@@ -141,9 +141,10 @@ import xpt.editor.VisualIDRegistry
 					In addition we check that visualID returned by VisualIDRegistry.getNodeVisualID() for
 					domainElement (if specified) is the same as in element type. */»
 				if(elementType instanceof org.eclipse.papyrus.infra.extendedtypes.types.IExtendedHintedElementType) {
-					org.eclipse.gmf.runtime.emf.type.core.IElementType closestNonExtendedType = org.eclipse.papyrus.infra.extendedtypes.util.ElementTypeUtils.getClosestDiagramType(elementType);
-					if(!«getElementTypesQualifiedClassName()».isKnownElementType(closestNonExtendedType) || (!(closestNonExtendedType instanceof org.eclipse.gmf.runtime.emf.type.core.IHintedType))) {
-						return false; // foreign element type.
+					if (domainElement != null) {
+						if (!«xptVisualIDRegistry.qualifiedClassName(it)».«checkNodeVisualIDMethodName(it)»(op.getContainerView(), domainElement, visualID)) {
+							return false;
+						}
 					}
 				} else {
 					if (!«getElementTypesQualifiedClassName()».isKnownElementType(elementType) || (!(elementType instanceof org.eclipse.gmf.runtime.emf.type.core.IHintedType))) {