Separate change propagation from VirtualModel

bundles/dsls/tools.vitruv.dsls.commonalities/src/tools/vitruv/dsls/commonalities/generator/changepropagationspecification/ChangePropagationSpecificationConstants.xtend

@@ -1,16 +1,16 @@
 package tools.vitruv.dsls.commonalities.generator.changepropagationspecification
 
 import edu.kit.ipd.sdq.activextendannotations.Utility
-import tools.vitruv.framework.domains.VitruvDomain
+import org.eclipse.emf.ecore.EPackage
 
 @Utility
 class ChangePropagationSpecificationConstants {
 	static val CHANGE_PROPAGATION_PACKAGE_NAME = 'tools.vitruv.commonalities'
 	static val CHANGE_PROPAGATION_PROVIDER_NAME = "CommonalitiesChangePropagationSpecificationProvider"
 
 	@Pure
-	static def getChangePropagationSpecificationName(VitruvDomain sourceDomain, VitruvDomain targetDomain) {
-		sourceDomain.name.toFirstUpper + "To" + targetDomain.name.toFirstUpper + "ChangePropagationSpecification"
+	static def getChangePropagationSpecificationName(EPackage sourceMetamodel, EPackage targetMetamodel) {
+		sourceMetamodel.name.toFirstUpper + "To" + targetMetamodel.name.toFirstUpper + "ChangePropagationSpecification"
 	}
 
 	@Pure

bundles/dsls/tools.vitruv.dsls.commonalities/src/tools/vitruv/dsls/commonalities/generator/changepropagationspecification/ChangePropagationSpecificationGenerator.xtend

@@ -4,6 +4,7 @@ import com.google.inject.Inject
 import com.google.inject.Provider
 import java.util.Arrays
 import java.util.Set
+import org.eclipse.emf.ecore.EPackage
 import org.eclipse.xtend2.lib.StringConcatenationClient
 import org.eclipse.xtext.common.types.JvmDeclaredType
 import org.eclipse.xtext.common.types.JvmGenericType
@@ -20,16 +21,16 @@ import tools.vitruv.framework.propagation.impl.CompositeChangePropagationSpecifi
 
 import static extension tools.vitruv.dsls.commonalities.generator.changepropagationspecification.ChangePropagationSpecificationConstants.*
 import static extension tools.vitruv.dsls.commonalities.language.extensions.CommonalitiesLanguageModelExtensions.*
+import static extension tools.vitruv.dsls.commonalities.generator.intermediatemodel.IntermediateModelConstants.getIntermediateMetamodelPackageClassName
 import tools.vitruv.framework.propagation.ChangePropagationSpecification
 import java.util.HashSet
 import static extension tools.vitruv.dsls.commonalities.generator.reactions.ReactionsGeneratorConventions.*
 import tools.vitruv.dsls.reactions.language.toplevelelements.TopLevelElementsFactory
 import tools.vitruv.dsls.reactions.codegen.helper.ClassNamesGenerators
-import tools.vitruv.framework.domains.VitruvDomain
-import tools.vitruv.framework.domains.VitruvDomainProviderRegistry
-import tools.vitruv.framework.domains.VitruvDomainProvider
 import static com.google.common.base.Preconditions.checkState
 import org.eclipse.emf.common.util.URI
+import tools.vitruv.dsls.commonalities.language.Concept
+import tools.vitruv.framework.change.MetamodelDescriptor
 
 class ChangePropagationSpecificationGenerator implements SubGenerator {
 	@Inject extension GenerationContext generationContext
@@ -39,7 +40,7 @@ class ChangePropagationSpecificationGenerator implements SubGenerator {
 
 	override beforeGenerate() {
 		if (isNewResourceSet) {
-			resourceSet.resources += domainPairsForChangePropagation.map [
+			resourceSet.resources += metamodelPairsForChangePropagation.map [
 				getChangePropagationSpecificationName(key, value).newResource
 			]
 			resourceSet.resources += newResource(changePropagationSpecificationProviderName)
@@ -48,33 +49,36 @@ class ChangePropagationSpecificationGenerator implements SubGenerator {
 
 	override generate() {
 		if (isNewResourceSet) {
-			val changePropagationSpecifications = domainPairsForChangePropagation.map [ fromToDomain |
-				generateChangePropagationSpecification(fromToDomain.key, fromToDomain.value)
+			val changePropagationSpecifications = metamodelPairsForChangePropagation.map [ fromToMetamodel |
+				generateChangePropagationSpecification(fromToMetamodel.key, fromToMetamodel.value)
 			]
 			changePropagationSpecifications.forEach[generateType()]
 			changePropagationSpecifications.generateChangePropagationSpecificationsProvider().generateType()
 		}
 	}
 
-	private def JvmGenericType generateChangePropagationSpecification(VitruvDomain fromDomain, VitruvDomain toDomain) {
+	private def JvmGenericType generateChangePropagationSpecification(EPackage fromNamespace, EPackage toNamespace) {
 		val extension typeReferenceBuilder = typeReferenceFactory.create(resourceSet)
-		val dummyReactionsSegments = getReactionsSegmentNames(fromDomain, toDomain).map [ segmentName |
+		val intermediateMetamodelPackageQualifiedName = getConcept(fromNamespace, toNamespace).
+			intermediateMetamodelPackageClassName.qualifiedName
+		val dummyReactionsSegments = getReactionsSegmentNames(fromNamespace, toNamespace).map [ segmentName |
 			TopLevelElementsFactory.eINSTANCE.createReactionsSegment() => [name = segmentName]
 		]
 		TypesFactory.eINSTANCE.createJvmGenericType => [
-			simpleName = getChangePropagationSpecificationName(fromDomain, toDomain)
+			simpleName = getChangePropagationSpecificationName(fromNamespace, toNamespace)
 			packageName = changePropagationSpecificationPackageName
 			superTypes += CompositeChangePropagationSpecification.typeRef
 			visibility = JvmVisibility.PUBLIC
 			members += Arrays.asList(
 				TypesFactory.eINSTANCE.createJvmConstructor => [
 					visibility = JvmVisibility.PUBLIC
 					body = '''
-					super(new «fromDomain.domainProvider.canonicalNameForReference»().getDomain(),
-						new «toDomain.domainProvider.canonicalNameForReference»().getDomain());
-					«FOR reactionsSegment : dummyReactionsSegments»addChangeMainprocessor(new «
+						super(«MetamodelDescriptor».with("«fromNamespace.nsURI»"),
+							«MetamodelDescriptor».with("«toNamespace.nsURI»"));
+						«FOR reactionsSegment : dummyReactionsSegments»addChangeMainprocessor(new «
 							ClassNamesGenerators.getChangePropagationSpecificationClassNameGenerator(reactionsSegment).qualifiedName»());
-					«ENDFOR»'''
+						«ENDFOR»
+						«EPackage».Registry.INSTANCE.putIfAbsent(«intermediateMetamodelPackageQualifiedName».eNS_URI, «intermediateMetamodelPackageQualifiedName».eINSTANCE);'''
 				]
 			)
 		]
@@ -119,27 +123,28 @@ class ChangePropagationSpecificationGenerator implements SubGenerator {
 		delegate.doGenerate(typeResource, fsa)
 	}
 
-	private def Set<Pair<? extends VitruvDomain, ? extends VitruvDomain>> getDomainPairsForChangePropagation() {
+	private def Set<Pair<EPackage, EPackage>> getMetamodelPairsForChangePropagation() {
 		commonalityFiles.flatMap [ file |
 			file.commonality.participations.flatMap [
-				val firstPackage = domain.vitruvDomain
-				val secondPackage = file.concept.vitruvDomain
+				val firstPackage = domain.vitruvDomain.metamodelRootPackage
+				val secondPackage = file.concept.vitruvDomain.metamodelRootPackage
 				#[firstPackage -> secondPackage, secondPackage -> firstPackage]
 			]
 		].toSet
 	}
 
-	private def Set<String> getReactionsSegmentNames(VitruvDomain fromDomain, VitruvDomain toDomain) {
+
+	private def Set<String> getReactionsSegmentNames(EPackage fromMetamodel, EPackage toMetamodel) {
 		commonalityFiles.filter [ file |
-			val commonalityDomain = file.concept.vitruvDomain
-			return fromDomain == commonalityDomain || toDomain == commonalityDomain
+			val commonalityPackage = file.concept.vitruvDomain.metamodelRootPackage
+			return fromMetamodel == commonalityPackage || toMetamodel == commonalityPackage
 		].flatMap [ file |
 			file.commonality.participations.map [
-				val participationDomain = domain.vitruvDomain
-				return switch (participationDomain) {
-					case fromDomain:
+				val participationPackage = domain.vitruvDomain.metamodelRootPackage
+				return switch (participationPackage) {
+					case fromMetamodel:
 						getReactionsSegmentFromParticipationToCommonalityName(file.commonality, it)
-					case toDomain:
+					case toMetamodel:
 						getReactionsSegmentFromCommonalityToParticipationName(file.commonality, it)
 					default:
 						null
@@ -148,18 +153,19 @@ class ChangePropagationSpecificationGenerator implements SubGenerator {
 		].toSet
 	}
 
+	private def Concept getConcept(EPackage fromMetamodel, EPackage toMetamodel) {
+		for (file : commonalityFiles) {
+			if (fromMetamodel == file.concept.vitruvDomain.metamodelRootPackage ||
+				toMetamodel == file.concept.vitruvDomain.metamodelRootPackage) {
+				return file.concept
+			}
+		}
+	}
+
 	private def getCommonalityFiles() {
 		resourceSet.resources.map[optionalContainedCommonalityFile].filterNull
 	}
-
-	private def VitruvDomainProvider<?> getDomainProvider(VitruvDomain domain) {
-		if (VitruvDomainProviderRegistry.hasDomainProvider(domain.name)) {
-			VitruvDomainProviderRegistry.getDomainProvider(domain.name)
-		} else {
-			domain.name.vitruvDomain.provider
-		}
-	}
-
+
 	private static def setBody(JvmMember member, StringConcatenationClient body) {
 		member.eAdapters += new CompilationTemplateAdapter() => [compilationTemplate = body]
 	}
@@ -183,7 +189,7 @@ class ChangePropagationSpecificationGenerator implements SubGenerator {
 
 	private def ensureHasTrailingSlash(URI uri) {
 		val uriString = uri.toString
-		if (!uriString.endsWith("/")) {
+		if (uri.file && !uriString.endsWith("/")) {
 			URI.createURI(uriString + "/")
 		} else {
 			uri

bundles/dsls/tools.vitruv.dsls.commonalities/src/tools/vitruv/dsls/commonalities/generator/reactions/ReactionsGenerator.xtend

@@ -159,8 +159,8 @@ class ReactionsGenerator implements SubGenerator {
 	private def void generateReactionsForCommonalityAttributeChange(Participation targetParticipation,
 		FluentReactionsSegmentBuilder segment) {
 		commonality.attributes.forEach [ attribute |
-			commonalityAttributeChangeReactionsBuilder.createFor(attribute, targetParticipation)
-				.generateReactions(segment)
+			commonalityAttributeChangeReactionsBuilder.createFor(attribute, targetParticipation).
+				generateReactions(segment)
 		]
 	}
 

bundles/dsls/tools.vitruv.dsls.reactions/model/TopLevelElements.genmodel

@@ -34,7 +34,6 @@
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference TopLevelElements.ecore#//Reaction/callRoutine"/>
       <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference TopLevelElements.ecore#//Reaction/reactionsSegment"/>
     </genClasses>
-    <genClasses ecoreClass="TopLevelElements.ecore#//ReactionRoutineCall"/>
     <genClasses ecoreClass="TopLevelElements.ecore#//Trigger">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference TopLevelElements.ecore#//Trigger/precondition"/>
     </genClasses>
@@ -66,14 +65,12 @@
     <genClasses ecoreClass="TopLevelElements.ecore#//CodeBlock">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference TopLevelElements.ecore#//CodeBlock/code"/>
     </genClasses>
-    <genClasses ecoreClass="TopLevelElements.ecore#//RoutineCallBlock"/>
-    <genClasses ecoreClass="TopLevelElements.ecore#//NamedMetaclassReference">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TopLevelElements.ecore#//NamedMetaclassReference/name"/>
-    </genClasses>
     <genClasses ecoreClass="TopLevelElements.ecore#//PreconditionCodeBlock"/>
     <genClasses ecoreClass="TopLevelElements.ecore#//NamedJavaElementReference">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TopLevelElements.ecore#//NamedJavaElementReference/name"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference TopLevelElements.ecore#//NamedJavaElementReference/type"/>
     </genClasses>
+    <genClasses ecoreClass="TopLevelElements.ecore#//RoutineCallBlock"/>
+    <genClasses ecoreClass="TopLevelElements.ecore#//ReactionRoutineCall"/>
   </genPackages>
 </genmodel:GenModel>

bundles/dsls/tools.vitruv.dsls.reactions/src/tools/vitruv/dsls/reactions/builder/FluentReactionsSegmentBuilder.xtend

@@ -26,8 +26,8 @@ class FluentReactionsSegmentBuilder extends FluentReactionElementBuilder {
 
 	override protected attachmentPreparation() {
 		super.attachmentPreparation()
-		checkState(segment.routines.size + segment.reactions.size + segment.reactionsImports.size > 0,
-			'''Neither routines, nor reactions, nor imports were added to the reaction segment «segment.name»!''')
+		checkState(segment.routines.size + segment.reactions.size + segment.reactionsImports.size >
+			0, '''Neither routines, nor reactions, nor imports were added to the reaction segment «segment.name»!''')
 	}
 
 	static class ReactionsSegmentSourceBuilder {
@@ -104,12 +104,12 @@ class FluentReactionsSegmentBuilder extends FluentReactionElementBuilder {
 	}
 
 	def operator_add(FluentReactionBuilder[] reactionBuilders) {
-		reactionBuilders.forEach [this += it]
+		reactionBuilders.forEach[this += it]
 		this
 	}
 
 	def operator_add(FluentRoutineBuilder[] routineBuilders) {
-		routineBuilders.forEach [this += it]
+		routineBuilders.forEach[this += it]
 		this
 	}
 
@@ -124,10 +124,11 @@ class FluentReactionsSegmentBuilder extends FluentReactionElementBuilder {
 	def operator_add(FluentReactionBuilder reactionBuilder) {
 		checkNotYetAttached()
 		if (reactionBuilder.segmentBuilder !== this) {
-			checkArgument(reactionBuilder.segmentBuilder === null, '''The «reactionBuilder
-				» has already been added to the «reactionBuilder.segmentBuilder»''')
-			checkArgument(!segment.reactions.exists[it.name == reactionBuilder.reaction.name],
-				'''The «this» already contains a reaction with name '«reactionBuilder.reaction.name»'!''')
+			checkArgument(reactionBuilder.segmentBuilder ===
+				null, '''The «reactionBuilder» has already been added to the «reactionBuilder.segmentBuilder»''')
+			checkArgument(
+				!segment.reactions.
+					exists[it.name == reactionBuilder.reaction.name], '''The «this» already contains a reaction with name '«reactionBuilder.reaction.name»'!''')
 			segment.reactions += reactionBuilder.reaction
 			reactionBuilder.segmentBuilder = this
 			childBuilders += reactionBuilder
@@ -138,10 +139,11 @@ class FluentReactionsSegmentBuilder extends FluentReactionElementBuilder {
 	def operator_add(FluentRoutineBuilder routineBuilder) {
 		checkNotYetAttached()
 		if (routineBuilder.segmentBuilder !== this) {
-			checkArgument(routineBuilder.segmentBuilder === null, '''The «routineBuilder
-				» has already been added to the «routineBuilder.segmentBuilder»''')
-			checkArgument(!segment.routines.exists[it.name == routineBuilder.routine.name],
-				'''The «this» already contains a routine with name '«routineBuilder.routine.name»'!''')
+			checkArgument(routineBuilder.segmentBuilder ===
+				null, '''The «routineBuilder» has already been added to the «routineBuilder.segmentBuilder»''')
+			checkArgument(
+				!segment.routines.
+					exists[it.name == routineBuilder.routine.name], '''The «this» already contains a routine with name '«routineBuilder.routine.name»'!''')
 			segment.routines += routineBuilder.routine
 			routineBuilder.segmentBuilder = this
 			childBuilders += routineBuilder

bundles/dsls/tools.vitruv.dsls.reactions/src/tools/vitruv/dsls/reactions/codegen/classgenerators/ChangePropagationSpecificationClassGenerator.xtend

@@ -1,5 +1,7 @@
 package tools.vitruv.dsls.reactions.codegen.classgenerators
 
+import java.util.ArrayList
+import org.eclipse.emf.ecore.impl.EPackageImpl
 import org.eclipse.xtext.common.types.JvmGenericType
 import org.eclipse.xtext.common.types.JvmVisibility
 import tools.vitruv.dsls.reactions.codegen.typesbuilder.TypesBuilderExtensionProvider
@@ -14,17 +16,18 @@ import static extension tools.vitruv.dsls.reactions.codegen.helper.ReactionsElem
 class ChangePropagationSpecificationClassGenerator extends ClassGenerator {
 	final ReactionsSegment reactionsSegment;
 	var JvmGenericType generatedClass;
-	
+
 	new(ReactionsSegment reactionsSegment, TypesBuilderExtensionProvider typesBuilderExtensionProvider) {
 		super(typesBuilderExtensionProvider)
 		if (!reactionsSegment.isReferenceable) {
 			throw new IllegalArgumentException("incomplete");
 		}
 		this.reactionsSegment = reactionsSegment;
 	}
-	
+
 	override generateEmptyClass() {
-		generatedClass = reactionsSegment.toClass(reactionsSegment.changePropagationSpecificationClassNameGenerator.qualifiedName) [
+		generatedClass = reactionsSegment.toClass(
+			reactionsSegment.changePropagationSpecificationClassNameGenerator.qualifiedName) [
 			visibility = JvmVisibility.PUBLIC;
 		];
 	}
@@ -42,10 +45,19 @@ class ChangePropagationSpecificationClassGenerator extends ClassGenerator {
 			// register executor as change processor:
 			members += reactionsSegment.toMethod("setup", typeRef(Void.TYPE)) [
 				visibility = JvmVisibility.PROTECTED;
+				val metamodelPackageClassQualifiedNames = new ArrayList
+				metamodelPackageClassQualifiedNames +=
+					#[reactionsSegment.fromDomain.domainForReference.metamodelRootPackage.class,
+						reactionsSegment.toDomain.domainForReference.metamodelRootPackage.class].filter [
+						it !== EPackageImpl
+					].map[name]
 				body = '''
+					«FOR metamodelPackageClassQualifiedName : metamodelPackageClassQualifiedNames»org.eclipse.emf.ecore.EPackage.Registry.INSTANCE.putIfAbsent(«
+						metamodelPackageClassQualifiedName».eNS_URI, «metamodelPackageClassQualifiedName».eINSTANCE);
+					«ENDFOR»
 					this.addChangeMainprocessor(new «reactionsSegment.executorClassNameGenerator.qualifiedName»());
 				'''
 			]
 		]
 	}
-}
+}

bundles/extensions/dslsruntime/tools.vitruv.extensions.dslsruntime.reactions/src/tools/vitruv/extensions/dslsruntime/reactions/AbstractReactionsChangePropagationSpecification.xtend

@@ -2,15 +2,15 @@ package tools.vitruv.extensions.dslsruntime.reactions
 
 import tools.vitruv.framework.domains.VitruvDomain
 import tools.vitruv.framework.propagation.impl.CompositeChangePropagationSpecification
+import tools.vitruv.framework.change.MetamodelDescriptor
 
 /**
  * A {@link CompositeChangePropagationSpecification} that contains the reactions change processor.
  * To add further change processors extend the implementing class and override the setup method.
  */
 abstract class AbstractReactionsChangePropagationSpecification extends CompositeChangePropagationSpecification {
-
 	new(VitruvDomain sourceDomain, VitruvDomain targetDomain) {
-		super(sourceDomain, targetDomain);
+		super(MetamodelDescriptor.of(sourceDomain.metamodelRootPackage), MetamodelDescriptor.of(targetDomain.metamodelRootPackage));
 		this.setup();
 	}
 

bundles/extensions/dslsruntime/tools.vitruv.extensions.dslsruntime.reactions/src/tools/vitruv/extensions/dslsruntime/reactions/AbstractReactionsExecutor.xtend

@@ -9,6 +9,7 @@ import tools.vitruv.framework.domains.VitruvDomain
 import tools.vitruv.framework.propagation.ResourceAccess
 import java.util.List
 import tools.vitruv.framework.propagation.impl.AbstractChangePropagationSpecification
+import tools.vitruv.framework.change.MetamodelDescriptor
 
 abstract class AbstractReactionsExecutor extends AbstractChangePropagationSpecification {
 	static val LOGGER = Logger.getLogger(AbstractReactionsExecutor);
@@ -17,7 +18,7 @@ abstract class AbstractReactionsExecutor extends AbstractChangePropagationSpecif
 	List<IReactionRealization> reactions;
 
 	new(VitruvDomain sourceDomain, VitruvDomain targetDomain) {
-		super(sourceDomain, targetDomain);
+		super(MetamodelDescriptor.of(sourceDomain.metamodelRootPackage), MetamodelDescriptor.of(targetDomain.metamodelRootPackage));
 		this.reactions = newArrayList;
 		this.routinesFacadesProvider = this.createRoutinesFacadesProvider();
 		this.setup();
@@ -37,7 +38,7 @@ abstract class AbstractReactionsExecutor extends AbstractChangePropagationSpecif
 
 	override propagateChange(EChange change, CorrespondenceModel correspondenceModel,
 		ResourceAccess resourceAccess) {
-		LOGGER.trace("Call relevant reactions from " + sourceDomain.name + " to " + targetDomain.name);
+		LOGGER.trace("Call relevant reactions from " + sourceMetamodelDescriptor + " to " + targetMetamodelDescriptor);
 		for (reaction : reactions) {
 			LOGGER.trace("Calling reaction: " + reaction.class.simpleName + " with change: " + change);
 			val executionState = new ReactionExecutionState(userInteractor, correspondenceModel, resourceAccess, this);

bundles/framework/tools.vitruv.framework.change/META-INF/MANIFEST.MF

@@ -12,7 +12,8 @@ Require-Bundle: org.apache.log4j,
  tools.vitruv.framework.change.interaction;visibility:=reexport,
  tools.vitruv.framework.util,
  edu.kit.ipd.sdq.activextendannotations
-Export-Package: tools.vitruv.framework.change.description,
+Export-Package: tools.vitruv.framework.change,
+ tools.vitruv.framework.change.description,
  tools.vitruv.framework.change.propagation,
  tools.vitruv.framework.change.recording
 Bundle-Vendor: vitruv.tools