Separate change propagation from VirtualModel

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

@@ -18,6 +18,7 @@ import tools.vitruv.dsls.reactions.builder.FluentReactionsSegmentBuilder
 import tools.vitruv.framework.domains.VitruvDomainProviderRegistry
 
 import static extension tools.vitruv.dsls.commonalities.language.extensions.CommonalitiesLanguageModelExtensions.*
+import static extension tools.vitruv.dsls.commonalities.generator.intermediatemodel.IntermediateModelConstants.*
 import tools.vitruv.dsls.commonalities.generator.GenerationContext
 
 /**
@@ -39,7 +40,7 @@ class ReactionsGenerator implements SubGenerator {
 	@Inject MatchParticipationReactionsBuilder.Factory matchParticipationReactionsBuilder
 	@Inject MatchParticipationReferencesReactionsBuilder.Factory matchParticipationReferencesReactionsBuilder
 	@Inject ParticipationAttributeChangeReactionsBuilder.Factory participationAttributeChangeReactionsBuilder
-	
+
 	override beforeGenerate() {
 		// Prepare the Reactions language:
 		if (isNewResourceSet) {
@@ -124,17 +125,19 @@ class ReactionsGenerator implements SubGenerator {
 	}
 
 	private def generateCommonalityFromParticipationSegment(Participation participation) {
-		val segment = create.reactionsSegment('''«commonality.name»From«participation.name»''')
-			.inReactionToChangesIn(participation.domain.vitruvDomain)
-			.executeActionsIn(commonalityFile.concept.name)
+		val segment = create.reactionsSegment('''«commonality.name»From«participation.name»''') //
+		.inReactionToChangesIn(participation.domain.vitruvDomain) //
+		.executeActionsIn(commonalityFile.concept.name) //
+		.withInitializedMetamodel(commonality.concept.intermediateMetamodelPackageClassName.qualifiedName)
 		participation.generateParticipationChangeReactions(segment)
 		return segment
 	}
 
 	private def generateCommonalityToParticipationSegment(Participation participation) {
-		val segment = create.reactionsSegment('''«commonality.name»To«participation.name»''')
-			.inReactionToChangesIn(commonalityFile.concept.vitruvDomain)
-			.executeActionsIn(participation.domain.vitruvDomain)
+		val segment = create.reactionsSegment('''«commonality.name»To«participation.name»''') //
+		.inReactionToChangesIn(commonalityFile.concept.vitruvDomain) //
+		.executeActionsIn(participation.domain.vitruvDomain) //
+		.withInitializedMetamodel(commonality.concept.intermediateMetamodelPackageClassName.qualifiedName)
 		participation.generateCommonalityChangeReactions(segment)
 		return segment
 	}
@@ -160,8 +163,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.ecore

@@ -23,6 +23,8 @@
         eType="#//Reaction" containment="true" eOpposite="#//Reaction/reactionsSegment"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="routines" upperBound="-1"
         eType="#//Routine" containment="true" eOpposite="#//Routine/reactionsSegment"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="additionalInitializedMetamodelPackageQualifiedClassNames"
+        upperBound="-1" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="ReactionsImport">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="routinesOnly" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

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

@@ -20,6 +20,7 @@
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference TopLevelElements.ecore#//ReactionsSegment/reactionsImports"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference TopLevelElements.ecore#//ReactionsSegment/reactions"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference TopLevelElements.ecore#//ReactionsSegment/routines"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TopLevelElements.ecore#//ReactionsSegment/additionalInitializedMetamodelPackageQualifiedClassNames"/>
     </genClasses>
     <genClasses ecoreClass="TopLevelElements.ecore#//ReactionsImport">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute TopLevelElements.ecore#//ReactionsImport/routinesOnly"/>
@@ -34,7 +35,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 +66,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 {
@@ -103,13 +103,18 @@ class FluentReactionsSegmentBuilder extends FluentReactionElementBuilder {
 		}
 	}
 
+	def withInitializedMetamodel(String metamodelPackageClassQualfiedName) {
+		segment.additionalInitializedMetamodelPackageQualifiedClassNames += metamodelPackageClassQualfiedName
+		this
+	}
+
 	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 +129,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 +144,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,21 @@ 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]
+				metamodelPackageClassQualifiedNames +=
+					reactionsSegment.additionalInitializedMetamodelPackageQualifiedClassNames
 				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

@@ -8,9 +8,8 @@ import tools.vitruv.framework.propagation.impl.CompositeChangePropagationSpecifi
  * 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(sourceDomain.nsUris, targetDomain.nsUris);
 		this.setup();
 	}
 

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

@@ -17,7 +17,7 @@ abstract class AbstractReactionsExecutor extends AbstractChangePropagationSpecif
 	List<IReactionRealization> reactions;
 
 	new(VitruvDomain sourceDomain, VitruvDomain targetDomain) {
-		super(sourceDomain, targetDomain);
+		super(sourceDomain.nsUris, targetDomain.nsUris);
 		this.reactions = newArrayList;
 		this.routinesFacadesProvider = this.createRoutinesFacadesProvider();
 		this.setup();
@@ -37,7 +37,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 " + sourceMetamodelRootNsUris + " to " + targetMetamodelRootNsUris);
 		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/src/tools/vitruv/framework/change/description/VitruviusChange.xtend

@@ -57,6 +57,12 @@ interface VitruviusChange {
 	 * change or if this change was not resolved yet.
 	 */
 	def Set<URI> getChangedURIs()
+
+	/**
+	 * Returns the namespace URIs of the metamodel packages of the metamodel elements whose instances have been
+	 * modified in this change. These elements are the {@link EObject}s returned by {@link getAffectedEObjects}.
+	 */
+	def Set<String> getAffectedEObjectsMetamodelRootNsUris()
 
 	/**
 	 * Returns all user interactions performed during application of this change and performing consistency preservation.

bundles/framework/tools.vitruv.framework.change/src/tools/vitruv/framework/change/description/impl/AbstractCompositeChangeImpl.xtend

@@ -5,6 +5,8 @@ import tools.vitruv.framework.change.description.CompositeChange
 import tools.vitruv.framework.change.description.VitruviusChange
 import static extension edu.kit.ipd.sdq.commons.util.java.lang.IterableUtil.*
 import java.util.LinkedHashSet
+import java.util.Set
+import java.util.HashSet
 
 abstract class AbstractCompositeChangeImpl<C extends VitruviusChange> implements CompositeChange<C> {
 	List<C> changes
@@ -24,6 +26,10 @@ abstract class AbstractCompositeChangeImpl<C extends VitruviusChange> implements
 	override getChangedURIs() {
 		changes.flatMapFixedTo(new LinkedHashSet) [changedURIs]
 	}
+
+	override Set<String> getAffectedEObjectsMetamodelRootNsUris() {
+		changes.flatMapFixedTo(new HashSet) [affectedEObjectsMetamodelRootNsUris]
+	}
 
 	override getEChanges() {
 		return changes.flatMapFixed [EChanges]

bundles/framework/tools.vitruv.framework.change/src/tools/vitruv/framework/change/description/impl/TransactionalChangeImpl.xtend

@@ -35,6 +35,8 @@ import tools.vitruv.framework.change.description.TransactionalChange
 import java.util.Collections
 import org.eclipse.emf.ecore.resource.ResourceSet
 import tools.vitruv.framework.change.echange.id.IdResolver
+import java.util.HashSet
+import static com.google.common.base.Preconditions.checkState
 
 class TransactionalChangeImpl implements TransactionalChange {
 	var List<? extends EChange> eChanges
@@ -63,6 +65,21 @@ class TransactionalChangeImpl implements TransactionalChange {
 	override getChangedURIs() {
 		eChanges.map[changedURI].filterNull.toSet
 	}
+
+	override Set<String> getAffectedEObjectsMetamodelRootNsUris() {
+		val namespaceUrisOfChangedPackages = affectedEObjects.fold(new HashSet<String>) [ namespaceUrisOfAffectedPackages, changedObject |
+			var currentPackage = changedObject.eClass.EPackage
+			while (currentPackage.ESuperPackage !== null)
+				currentPackage = currentPackage.ESuperPackage
+			if (currentPackage !== null) {
+				namespaceUrisOfAffectedPackages += currentPackage.nsURI
+			}
+			namespaceUrisOfAffectedPackages
+		]
+		checkState(!namespaceUrisOfChangedPackages.empty, "Cannot identify the packages of this change:%s%s",
+			System.lineSeparator, this)
+		return namespaceUrisOfChangedPackages
+	}
 
 	override resolveAndApply(ResourceSet resourceSet) {
 		val idResolver = IdResolver.create(resourceSet)

bundles/framework/tools.vitruv.framework.domains/src/tools/vitruv/framework/domains/VitruvDomainProviderRegistry.xtend

@@ -10,6 +10,7 @@ import java.lang.annotation.Target
 import java.lang.annotation.Retention
 import edu.kit.ipd.sdq.activextendannotations.Lazy
 import static extension edu.kit.ipd.sdq.commons.util.java.lang.IterableUtil.*
+import java.util.Set
 
 /**
  * Registry of all {@linkplain VitruvDomainProvider DomainProviders} known to
@@ -107,6 +108,11 @@ final class VitruvDomainProviderRegistry {
 		return potentialDomainProviders.get(0);
 	}
 
+
+	def static Set<VitruvDomain> findDomainsForMetamodelRootNsUri(String nsUri) {
+		return allDomainProviders.map[domain].filter [it.nsUris.contains(nsUri)].toSet
+	}
+
 	/**
 	 * Retrieves all providers for domain from the extensions registered to the VitruvDomain
 	 * extension point.

bundles/framework/tools.vitruv.framework.domains/src/tools/vitruv/framework/domains/repository/VitruvDomainRepository.java

@@ -9,5 +9,7 @@ public interface VitruvDomainRepository extends Iterable<VitruvDomain> {
 
 	VitruvDomain getDomain(EObject object);
 
-	VitruvDomain getDomain(String fileExtension);
+	VitruvDomain getDomainForFileExtension(String fileExtension);
+
+	VitruvDomain getDomainForNsUri(String nsUri);
 }

bundles/framework/tools.vitruv.framework.domains/src/tools/vitruv/framework/domains/repository/VitruvDomainRepositoryImpl.java

@@ -39,9 +39,14 @@ public VitruvDomainRepositoryImpl(Iterable<VitruvDomain> domains) {
 	}
 
 	@Override
-	public VitruvDomain getDomain(final String fileExtension) {
+	public VitruvDomain getDomainForFileExtension(final String fileExtension) {
 		return this.fileExtension2Domain.get(fileExtension);
 	}
+
+	@Override
+	public VitruvDomain getDomainForNsUri(final String nsUri) {
+		return this.nsUri2Domain.get(nsUri);
+	}
 
 	@Override
 	public Iterator<VitruvDomain> iterator() {

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

@@ -10,7 +10,6 @@ Require-Bundle: org.apache.log4j,
  tools.vitruv.framework.correspondence;visibility:=reexport,
  tools.vitruv.framework.userinteraction;visibility:=reexport,
  tools.vitruv.framework.change;visibility:=reexport,
- tools.vitruv.framework.domains,
  tools.vitruv.framework.util
 Export-Package: tools.vitruv.framework.propagation,
  tools.vitruv.framework.propagation.impl

bundles/framework/tools.vitruv.framework.propagation/src/tools/vitruv/framework/propagation/ChangeInPropagation.xtend

@@ -0,0 +1,19 @@
+package tools.vitruv.framework.propagation
+
+import org.eclipse.xtend.lib.annotations.FinalFieldsConstructor
+import tools.vitruv.framework.change.description.TransactionalChange
+import org.eclipse.xtend.lib.annotations.Accessors
+
+/**
+ * Encapsulates a change that emerged from change propagation together
+ * with the information whether this change shall be further propagated,
+ * i.e., whether it should be used as an input for further change 
+ * propagation specifications or not.
+ */
+@FinalFieldsConstructor
+class ChangeInPropagation {
+	@Accessors(PUBLIC_GETTER)
+	val TransactionalChange change
+	@Accessors(PUBLIC_GETTER)
+	val Boolean shouldBeFurtherPropagated
+}