Merge pull request #218 from vitruv-tools/cleanup-reactions-language

Adaptation to cleanup of Reactions language
vitruv-tools · Aug 3, 2022 · c08b0b4 · c08b0b4
2 parents ddad487 + 48d8baa
commit c08b0b4
Show file tree

Hide file tree

Showing 38 changed files with 143 additions and 101 deletions.
diff --git a/...applications/cbs/commonalities/domaincommon/operators/AbstractTypeReferenceOperator.xtend b/...applications/cbs/commonalities/domaincommon/operators/AbstractTypeReferenceOperator.xtend
@@ -7,12 +7,11 @@ import tools.vitruv.applications.cbs.commonalities.domaincommon.CommonPrimitiveT
 import tools.vitruv.dsls.commonalities.runtime.helper.IntermediateModelHelper
 import tools.vitruv.dsls.commonalities.runtime.intermediatemodelbase.Intermediate
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AbstractAttributeMappingOperator
-import tools.vitruv.dsls.reactions.runtime.ReactionExecutionState
+import tools.vitruv.dsls.reactions.runtime.state.ReactionExecutionState
 
 import static com.google.common.base.Preconditions.*
 import static tools.vitruv.dsls.commonalities.runtime.helper.XtendAssertHelper.*
-
-import static extension tools.vitruv.dsls.reactions.runtime.helper.ReactionsCorrespondenceHelper.*
+import static extension tools.vitruv.dsls.reactions.runtime.helper.ReactionsCorrespondenceHelper.getCorrespondingElements
 
 /**
  * Abstract base class for operators mapping between a domain specific
@@ -192,8 +191,8 @@ abstract class AbstractTypeReferenceOperator<R, T> extends AbstractAttributeMapp
 		assertTrue(domainType !== null)
 		assertTrue(domainType instanceof EObject)
 		// We get the corresponding intermediate type via the correspondence model:
-		val intermediateTypes = correspondenceModel.getCorrespondingObjectsOfType(domainType as EObject, null,
-			Intermediate).toList
+		val intermediateTypes = correspondenceModel.getCorrespondingElements(domainType as EObject, Intermediate, null).
+			toList
 		checkState(intermediateTypes.size <= 1, '''Found more than one corresponding intermediate for «
 			participationDomainName» type '«domainType.asString»'!''')
 		val intermediateType = intermediateTypes.head // can be null
@@ -209,8 +208,7 @@ abstract class AbstractTypeReferenceOperator<R, T> extends AbstractAttributeMapp
 	protected def T getCorrespondingDomainType(Intermediate intermediateType) {
 		assertTrue(intermediateType !== null)
 		// We get the corresponding domain type via the correspondence model:
-		val domainTypes = correspondenceModel.getCorrespondingObjectsOfType(intermediateType, null,
-			domainTypeClass).toList
+		val domainTypes = correspondenceModel.getCorrespondingElements(intermediateType, domainTypeClass, null).toList
 		checkState(domainTypes.size <= 1, '''Found more than one corresponding «participationDomainName» type for«
 			» intermediate type '«intermediateType»': «domainTypes»''')
 		val domainType = domainTypes.head // can be null

diff --git a/...ols/vitruv/applications/cbs/commonalities/domaincommon/operators/FirstUpperOperator.xtend b/...ols/vitruv/applications/cbs/commonalities/domaincommon/operators/FirstUpperOperator.xtend
@@ -4,7 +4,7 @@ import org.apache.log4j.Logger
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AbstractAttributeMappingOperator
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AttributeMappingOperator
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AttributeType
-import tools.vitruv.dsls.reactions.runtime.ReactionExecutionState
+import tools.vitruv.dsls.reactions.runtime.state.ReactionExecutionState
 
 /**
  * Converts between a String with a lower case character at the front on the

diff --git a/.../tools/vitruv/applications/cbs/commonalities/domaincommon/operators/InverseOperator.xtend b/.../tools/vitruv/applications/cbs/commonalities/domaincommon/operators/InverseOperator.xtend
@@ -4,7 +4,7 @@ import org.apache.log4j.Logger
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AbstractAttributeMappingOperator
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AttributeMappingOperator
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AttributeType
-import tools.vitruv.dsls.reactions.runtime.ReactionExecutionState
+import tools.vitruv.dsls.reactions.runtime.state.ReactionExecutionState
 
 import static tools.vitruv.dsls.commonalities.runtime.helper.XtendAssertHelper.*
 

diff --git a/...c/tools/vitruv/applications/cbs/commonalities/domaincommon/operators/PrefixOperator.xtend b/...c/tools/vitruv/applications/cbs/commonalities/domaincommon/operators/PrefixOperator.xtend
@@ -4,7 +4,7 @@ import org.apache.log4j.Logger
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AbstractAttributeMappingOperator
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AttributeMappingOperator
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AttributeType
-import tools.vitruv.dsls.reactions.runtime.ReactionExecutionState
+import tools.vitruv.dsls.reactions.runtime.state.ReactionExecutionState
 
 import static com.google.common.base.Preconditions.*
 

diff --git a/...s/vitruv/applications/cbs/commonalities/java/operators/AbstractJavaModifierOperator.xtend b/...s/vitruv/applications/cbs/commonalities/java/operators/AbstractJavaModifierOperator.xtend
@@ -7,7 +7,7 @@ import org.emftext.language.java.modifiers.AnnotableAndModifiable
 import org.emftext.language.java.modifiers.AnnotationInstanceOrModifier
 import org.emftext.language.java.modifiers.Modifier
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AbstractAttributeMappingOperator
-import tools.vitruv.dsls.reactions.runtime.ReactionExecutionState
+import tools.vitruv.dsls.reactions.runtime.state.ReactionExecutionState
 
 import static com.google.common.base.Preconditions.*
 

diff --git a/...s/vitruv/applications/cbs/commonalities/java/operators/JavaAbstractModifierOperator.xtend b/...s/vitruv/applications/cbs/commonalities/java/operators/JavaAbstractModifierOperator.xtend
@@ -7,7 +7,7 @@ import org.emftext.language.java.modifiers.Modifier
 import org.emftext.language.java.modifiers.ModifiersFactory
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AttributeMappingOperator
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AttributeType
-import tools.vitruv.dsls.reactions.runtime.ReactionExecutionState
+import tools.vitruv.dsls.reactions.runtime.state.ReactionExecutionState
 
 @AttributeMappingOperator(
 	name='javaAbstractModifier',

diff --git a/...itruv/applications/cbs/commonalities/java/operators/JavaCompilationUnitNameOperator.xtend b/...itruv/applications/cbs/commonalities/java/operators/JavaCompilationUnitNameOperator.xtend
@@ -6,7 +6,7 @@ import org.emftext.language.java.containers.CompilationUnit
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AbstractAttributeMappingOperator
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AttributeMappingOperator
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AttributeType
-import tools.vitruv.dsls.reactions.runtime.ReactionExecutionState
+import tools.vitruv.dsls.reactions.runtime.state.ReactionExecutionState
 
 import static com.google.common.base.Preconditions.*
 

diff --git a/...ools/vitruv/applications/cbs/commonalities/java/operators/JavaFinalModifierOperator.xtend b/...ools/vitruv/applications/cbs/commonalities/java/operators/JavaFinalModifierOperator.xtend
@@ -7,7 +7,7 @@ import org.emftext.language.java.modifiers.Modifier
 import org.emftext.language.java.modifiers.ModifiersFactory
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AttributeMappingOperator
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AttributeType
-import tools.vitruv.dsls.reactions.runtime.ReactionExecutionState
+import tools.vitruv.dsls.reactions.runtime.state.ReactionExecutionState
 
 @AttributeMappingOperator(
 	name='javaFinalModifier',

diff --git a/...v/applications/cbs/commonalities/java/operators/JavaInverseAbstractModifierOperator.xtend b/...v/applications/cbs/commonalities/java/operators/JavaInverseAbstractModifierOperator.xtend
@@ -5,7 +5,7 @@ import org.emftext.language.java.modifiers.AnnotableAndModifiable
 import org.emftext.language.java.modifiers.AnnotationInstanceOrModifier
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AttributeMappingOperator
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AttributeType
-import tools.vitruv.dsls.reactions.runtime.ReactionExecutionState
+import tools.vitruv.dsls.reactions.runtime.state.ReactionExecutionState
 
 import static tools.vitruv.dsls.commonalities.runtime.helper.XtendAssertHelper.*
 

diff --git a/...v/applications/cbs/commonalities/java/operators/JavaPackageCompilationUnitsOperator.xtend b/...v/applications/cbs/commonalities/java/operators/JavaPackageCompilationUnitsOperator.xtend
@@ -9,7 +9,7 @@ import org.emftext.language.java.containers.Package
 import tools.vitruv.applications.util.temporary.java.JavaPersistenceHelper
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.reference.AbstractReferenceMappingOperator
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.reference.ReferenceMappingOperator
-import tools.vitruv.dsls.reactions.runtime.ReactionExecutionState
+import tools.vitruv.dsls.reactions.runtime.state.ReactionExecutionState
 
 import static com.google.common.base.Preconditions.*
 import static tools.vitruv.dsls.commonalities.runtime.helper.XtendAssertHelper.*

diff --git a/...plications/cbs/commonalities/java/operators/JavaPackageResourcePathFromNameOperator.xtend b/...plications/cbs/commonalities/java/operators/JavaPackageResourcePathFromNameOperator.xtend
@@ -5,7 +5,7 @@ import org.emftext.language.java.containers.Package
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AbstractAttributeMappingOperator
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AttributeMappingOperator
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AttributeType
-import tools.vitruv.dsls.reactions.runtime.ReactionExecutionState
+import tools.vitruv.dsls.reactions.runtime.state.ReactionExecutionState
 
 import static com.google.common.base.Preconditions.*
 

diff --git a/...ols/vitruv/applications/cbs/commonalities/java/operators/JavaStaticModifierOperator.xtend b/...ols/vitruv/applications/cbs/commonalities/java/operators/JavaStaticModifierOperator.xtend
@@ -7,7 +7,7 @@ import org.emftext.language.java.modifiers.ModifiersFactory
 import org.emftext.language.java.modifiers.Static
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AttributeMappingOperator
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AttributeType
-import tools.vitruv.dsls.reactions.runtime.ReactionExecutionState
+import tools.vitruv.dsls.reactions.runtime.state.ReactionExecutionState
 
 @AttributeMappingOperator(
 	name='javaStaticModifier',

diff --git a/.../tools/vitruv/applications/cbs/commonalities/java/operators/JavaSubPackagesOperator.xtend b/.../tools/vitruv/applications/cbs/commonalities/java/operators/JavaSubPackagesOperator.xtend
@@ -10,7 +10,7 @@ import org.emftext.language.java.containers.Package
 import tools.vitruv.applications.util.temporary.java.JavaPersistenceHelper
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.reference.AbstractReferenceMappingOperator
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.reference.ReferenceMappingOperator
-import tools.vitruv.dsls.reactions.runtime.ReactionExecutionState
+import tools.vitruv.dsls.reactions.runtime.state.ReactionExecutionState
 import static extension edu.kit.ipd.sdq.commons.util.org.eclipse.emf.common.util.URIUtil.createFileURI
 
 import static com.google.common.base.Preconditions.*

diff --git a/...ools/vitruv/applications/cbs/commonalities/java/operators/JavaTypeReferenceOperator.xtend b/...ools/vitruv/applications/cbs/commonalities/java/operators/JavaTypeReferenceOperator.xtend
@@ -16,7 +16,7 @@ import tools.vitruv.applications.cbs.commonalities.domaincommon.operators.Abstra
 import tools.vitruv.applications.util.temporary.java.JavaModificationUtil
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AttributeMappingOperator
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AttributeType
-import tools.vitruv.dsls.reactions.runtime.ReactionExecutionState
+import tools.vitruv.dsls.reactions.runtime.state.ReactionExecutionState
 
 import static tools.vitruv.dsls.commonalities.runtime.helper.XtendAssertHelper.*
 

diff --git a/...itruv/applications/cbs/commonalities/java/operators/JavaTypeReferenceOrNullOperator.xtend b/...itruv/applications/cbs/commonalities/java/operators/JavaTypeReferenceOrNullOperator.xtend
@@ -4,7 +4,7 @@ import org.emftext.language.java.types.TypeReference
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AbstractAttributeMappingOperator
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AttributeMappingOperator
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AttributeType
-import tools.vitruv.dsls.reactions.runtime.ReactionExecutionState
+import tools.vitruv.dsls.reactions.runtime.state.ReactionExecutionState
 
 /**
  * Similar to {@link JavaTypeReferenceOperator}, but maps to <code>null</code>

diff --git a/...ols/vitruv/applications/cbs/commonalities/java/operators/JavaTypeReferencesOperator.xtend b/...ols/vitruv/applications/cbs/commonalities/java/operators/JavaTypeReferencesOperator.xtend
@@ -6,7 +6,7 @@ import org.emftext.language.java.types.TypeReference
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AbstractAttributeMappingOperator
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AttributeMappingOperator
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AttributeType
-import tools.vitruv.dsls.reactions.runtime.ReactionExecutionState
+import tools.vitruv.dsls.reactions.runtime.state.ReactionExecutionState
 
 /**
  * Maps between multiple Java type references and multiple corresponding

diff --git a/...c/tools/vitruv/applications/cbs/commonalities/java/operators/JavaVisibilityOperator.xtend b/...c/tools/vitruv/applications/cbs/commonalities/java/operators/JavaVisibilityOperator.xtend
@@ -8,7 +8,7 @@ import tools.vitruv.applications.cbs.commonalities.oo.Visibility
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AbstractAttributeMappingOperator
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AttributeMappingOperator
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AttributeType
-import tools.vitruv.dsls.reactions.runtime.ReactionExecutionState
+import tools.vitruv.dsls.reactions.runtime.state.ReactionExecutionState
 
 import static com.google.common.base.Preconditions.*
 import static tools.vitruv.dsls.commonalities.runtime.helper.XtendAssertHelper.*

diff --git a/...rc/tools/vitruv/applications/cbs/commonalities/oo/operators/OOTypeReferenceOperator.xtend b/...rc/tools/vitruv/applications/cbs/commonalities/oo/operators/OOTypeReferenceOperator.xtend
@@ -5,7 +5,7 @@ import tools.vitruv.applications.cbs.commonalities.domaincommon.operators.Abstra
 import tools.vitruv.dsls.commonalities.runtime.intermediatemodelbase.Intermediate
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AttributeMappingOperator
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AttributeType
-import tools.vitruv.dsls.reactions.runtime.ReactionExecutionState
+import tools.vitruv.dsls.reactions.runtime.state.ReactionExecutionState
 
 import static tools.vitruv.dsls.commonalities.runtime.helper.XtendAssertHelper.*
 

diff --git a/...c/tools/vitruv/applications/cbs/commonalities/oo/operators/OOTypeReferencesOperator.xtend b/...c/tools/vitruv/applications/cbs/commonalities/oo/operators/OOTypeReferencesOperator.xtend
@@ -5,7 +5,7 @@ import org.apache.log4j.Logger
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AbstractAttributeMappingOperator
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AttributeMappingOperator
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AttributeType
-import tools.vitruv.dsls.reactions.runtime.ReactionExecutionState
+import tools.vitruv.dsls.reactions.runtime.state.ReactionExecutionState
 
 /**
  * Maps between multiple type references of the ObjectOrientedDesign concept

diff --git a/...ls/vitruv/applications/cbs/commonalities/pcm/operators/PcmDataTypeReferenceOperator.xtend b/...ls/vitruv/applications/cbs/commonalities/pcm/operators/PcmDataTypeReferenceOperator.xtend
@@ -4,7 +4,7 @@ import org.palladiosimulator.pcm.repository.DataType
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AbstractAttributeMappingOperator
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AttributeMappingOperator
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AttributeType
-import tools.vitruv.dsls.reactions.runtime.ReactionExecutionState
+import tools.vitruv.dsls.reactions.runtime.state.ReactionExecutionState
 
 /**
  * Maps between references to PCM {@link DataType}s and an intermediate

diff --git a/.../tools/vitruv/applications/cbs/commonalities/pcm/operators/PcmProvidedRolesOperator.xtend b/.../tools/vitruv/applications/cbs/commonalities/pcm/operators/PcmProvidedRolesOperator.xtend
@@ -9,7 +9,7 @@ import org.palladiosimulator.pcm.repository.RepositoryFactory
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AbstractAttributeMappingOperator
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AttributeMappingOperator
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AttributeType
-import tools.vitruv.dsls.reactions.runtime.ReactionExecutionState
+import tools.vitruv.dsls.reactions.runtime.state.ReactionExecutionState
 
 /**
  * Maps between PCM {@link OperationProvidedRole}s and their interfaces and

diff --git a/.../tools/vitruv/applications/cbs/commonalities/pcm/operators/PcmTypeReferenceOperator.xtend b/.../tools/vitruv/applications/cbs/commonalities/pcm/operators/PcmTypeReferenceOperator.xtend
@@ -10,7 +10,7 @@ import tools.vitruv.applications.cbs.commonalities.domaincommon.operators.Abstra
 import tools.vitruv.applications.cbs.commonalities.pcm.PcmPrimitiveDataType
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AttributeMappingOperator
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AttributeType
-import tools.vitruv.dsls.reactions.runtime.ReactionExecutionState
+import tools.vitruv.dsls.reactions.runtime.state.ReactionExecutionState
 
 import static tools.vitruv.dsls.commonalities.runtime.helper.XtendAssertHelper.*
 

diff --git a/...ools/vitruv/applications/cbs/commonalities/uml/operators/UmlGeneralizationsOperator.xtend b/...ools/vitruv/applications/cbs/commonalities/uml/operators/UmlGeneralizationsOperator.xtend
@@ -8,7 +8,7 @@ import org.eclipse.uml2.uml.UMLFactory
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AbstractAttributeMappingOperator
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AttributeMappingOperator
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AttributeType
-import tools.vitruv.dsls.reactions.runtime.ReactionExecutionState
+import tools.vitruv.dsls.reactions.runtime.state.ReactionExecutionState
 
 /**
  * Maps between UML {@link Generalization}s and intermediate type references.

diff --git a/...itruv/applications/cbs/commonalities/uml/operators/UmlInterfaceRealizationsOperator.xtend b/...itruv/applications/cbs/commonalities/uml/operators/UmlInterfaceRealizationsOperator.xtend
@@ -8,7 +8,7 @@ import org.eclipse.uml2.uml.UMLFactory
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AbstractAttributeMappingOperator
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AttributeMappingOperator
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AttributeType
-import tools.vitruv.dsls.reactions.runtime.ReactionExecutionState
+import tools.vitruv.dsls.reactions.runtime.state.ReactionExecutionState
 
 /**
  * Maps between UML {@link InterfaceRealization}s and intermediate type

diff --git a/...src/tools/vitruv/applications/cbs/commonalities/uml/operators/UmlReturnTypeOperator.xtend b/...src/tools/vitruv/applications/cbs/commonalities/uml/operators/UmlReturnTypeOperator.xtend
@@ -10,7 +10,7 @@ import org.eclipse.uml2.uml.UMLFactory
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AbstractAttributeMappingOperator
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AttributeMappingOperator
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AttributeType
-import tools.vitruv.dsls.reactions.runtime.ReactionExecutionState
+import tools.vitruv.dsls.reactions.runtime.state.ReactionExecutionState
 
 import static com.google.common.base.Preconditions.*
 import static tools.vitruv.dsls.commonalities.runtime.helper.XtendAssertHelper.*

diff --git a/...vitruv/applications/cbs/commonalities/uml/operators/UmlSingleGeneralizationOperator.xtend b/...vitruv/applications/cbs/commonalities/uml/operators/UmlSingleGeneralizationOperator.xtend
@@ -8,7 +8,7 @@ import org.eclipse.uml2.uml.UMLFactory
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AbstractAttributeMappingOperator
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AttributeMappingOperator
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AttributeType
-import tools.vitruv.dsls.reactions.runtime.ReactionExecutionState
+import tools.vitruv.dsls.reactions.runtime.state.ReactionExecutionState
 
 /**
  * Similar to {@link UmlGeneralizationsOperator}, but only maps a single

diff --git a/.../tools/vitruv/applications/cbs/commonalities/uml/operators/UmlTypeReferenceOperator.xtend b/.../tools/vitruv/applications/cbs/commonalities/uml/operators/UmlTypeReferenceOperator.xtend
@@ -7,7 +7,7 @@ import tools.vitruv.applications.cbs.commonalities.domaincommon.operators.Abstra
 import tools.vitruv.applications.cbs.commonalities.uml.UmlPrimitiveType
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AttributeMappingOperator
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AttributeType
-import tools.vitruv.dsls.reactions.runtime.ReactionExecutionState
+import tools.vitruv.dsls.reactions.runtime.state.ReactionExecutionState
 
 import static tools.vitruv.dsls.commonalities.runtime.helper.XtendAssertHelper.*
 

diff --git a/...src/tools/vitruv/applications/cbs/commonalities/uml/operators/UmlVisibilityOperator.xtend b/...src/tools/vitruv/applications/cbs/commonalities/uml/operators/UmlVisibilityOperator.xtend
@@ -6,7 +6,7 @@ import tools.vitruv.applications.cbs.commonalities.oo.Visibility
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AbstractAttributeMappingOperator
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AttributeMappingOperator
 import tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute.AttributeType
-import tools.vitruv.dsls.reactions.runtime.ReactionExecutionState
+import tools.vitruv.dsls.reactions.runtime.state.ReactionExecutionState
 
 import static extension tools.vitruv.applications.cbs.commonalities.uml.UmlVisibilityHelper.*