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

Cleanup Reactions language
vitruv-tools · Aug 3, 2022 · 62e3827 · 62e3827
2 parents 248f6de + da3eb34
commit 62e3827
Show file tree

Hide file tree

Showing 59 changed files with 690 additions and 996 deletions.
diff --git a/....runtime/src/tools/vitruv/dsls/commonalities/runtime/helper/IntermediateModelHelper.xtend b/....runtime/src/tools/vitruv/dsls/commonalities/runtime/helper/IntermediateModelHelper.xtend
@@ -8,7 +8,7 @@ import tools.vitruv.change.correspondence.CorrespondenceModel
 
 import static com.google.common.base.Preconditions.*
 
-import static extension tools.vitruv.dsls.reactions.runtime.helper.ReactionsCorrespondenceHelper.*
+import static extension tools.vitruv.dsls.reactions.runtime.helper.ReactionsCorrespondenceHelper.getCorrespondingElements
 
 @Utility
 class IntermediateModelHelper {
@@ -28,13 +28,13 @@ class IntermediateModelHelper {
 	static def <I extends Intermediate> I getCorrespondingIntermediate(CorrespondenceModel correspondenceModel,
 		EObject object, Class<I> intermediateType) {
 		// Assumption: Each object has at most one Intermediate correspondence.
-		return correspondenceModel.getCorrespondingObjectsOfType(object, null, intermediateType).head
+		return correspondenceModel.getCorrespondingElements(object, intermediateType, null).head
 	}
 
 	static def IntermediateResourceBridge getCorrespondingResourceBridge(CorrespondenceModel correspondenceModel,
 		EObject object) {
 		checkArgument(!(object instanceof Intermediate), "object cannot be of type Intermediate")
 		// Assumption: Each object has at most one Resource correspondence.
-		return correspondenceModel.getCorrespondingObjectsOfType(object, null, IntermediateResourceBridge).head
+		return correspondenceModel.getCorrespondingElements(object, IntermediateResourceBridge, null).head
 	}
 }
diff --git a/...s.runtime/src/tools/vitruv/dsls/commonalities/runtime/matching/ParticipationMatcher.xtend b/...s.runtime/src/tools/vitruv/dsls/commonalities/runtime/matching/ParticipationMatcher.xtend
@@ -10,7 +10,7 @@ import tools.vitruv.dsls.commonalities.runtime.intermediatemodelbase.Intermediat
 import tools.vitruv.dsls.commonalities.runtime.intermediatemodelbase.IntermediateModelBasePackage
 import tools.vitruv.dsls.commonalities.runtime.resources.IntermediateResourceBridge
 import tools.vitruv.dsls.commonalities.runtime.resources.ResourcesFactory
-import tools.vitruv.dsls.reactions.runtime.helper.ReactionsCorrespondenceHelper
+import static extension tools.vitruv.dsls.reactions.runtime.helper.ReactionsCorrespondenceHelper.getCorrespondingElements
 import tools.vitruv.change.correspondence.CorrespondenceModel
 import tools.vitruv.change.propagation.ResourceAccess
 
@@ -217,8 +217,7 @@ class ParticipationMatcher {
 			return Collections.singleton(object)
 		}
 
-		if (!ReactionsCorrespondenceHelper.getCorrespondingObjectsOfType(correspondenceModel, object, null,
-			Intermediate).empty) {
+		if (!correspondenceModel.getCorrespondingElements(object, Intermediate, null).empty) {
 			val attributeReferenceRootNode = containmentContext.attributeReferenceRootNode
 			if (attributeReferenceRootNode !== null) {
 				if (followAttributeReferences && attributeReferenceRootNode.matchesObject(object,
@@ -376,8 +375,8 @@ class ParticipationMatcher {
 		// Note: Not checking for correspondences for our dynamically created (and only partially setup)
 		// ResourceBridge.
 		if (!object.isResourceBridge) {
-			var correspondingIntermediate = ReactionsCorrespondenceHelper.getCorrespondingObjectsOfType(
-				correspondenceModel, object, null, Intermediate).head
+			var correspondingIntermediate = correspondenceModel.getCorrespondingElements(
+				object, Intermediate, null).head
 			if (correspondingIntermediateType != correspondingIntermediate?.eClass) {
 				if (correspondingIntermediateType === null) {
 					logger.trace('''«indent(depth)»Node «node.toSimpleString»: Object already corresponds to an «

diff --git a/.../commonalities/runtime/operators/mapping/attribute/AbstractAttributeMappingOperator.xtend b/.../commonalities/runtime/operators/mapping/attribute/AbstractAttributeMappingOperator.xtend
@@ -1,6 +1,6 @@
 package tools.vitruv.dsls.commonalities.runtime.operators.mapping.attribute
 
-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/.../commonalities/runtime/operators/mapping/reference/AbstractReferenceMappingOperator.xtend b/.../commonalities/runtime/operators/mapping/reference/AbstractReferenceMappingOperator.xtend
@@ -1,6 +1,6 @@
 package tools.vitruv.dsls.commonalities.runtime.operators.mapping.reference
 
-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/...mmonalities/runtime/operators/mapping/reference/ContainmentReferenceMappingOperator.xtend b/...mmonalities/runtime/operators/mapping/reference/ContainmentReferenceMappingOperator.xtend
@@ -3,7 +3,7 @@ package tools.vitruv.dsls.commonalities.runtime.operators.mapping.reference
 import java.util.List
 import org.eclipse.emf.ecore.EObject
 import org.eclipse.emf.ecore.EReference
-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/.../tools/vitruv/dsls/commonalities/runtime/resources/impl/IntermediateResourceBridgeI.xtend b/.../tools/vitruv/dsls/commonalities/runtime/resources/impl/IntermediateResourceBridgeI.xtend
@@ -8,7 +8,7 @@ import tools.vitruv.dsls.commonalities.runtime.intermediatemodelbase.Intermediat
 import tools.vitruv.dsls.commonalities.runtime.resources.Resource
 import tools.vitruv.dsls.commonalities.runtime.resources.ResourcesPackage
 import tools.vitruv.dsls.reactions.runtime.helper.PersistenceHelper
-import tools.vitruv.dsls.reactions.runtime.helper.ReactionsCorrespondenceHelper
+import static extension tools.vitruv.dsls.reactions.runtime.helper.ReactionsCorrespondenceHelper.getCorrespondingElements
 
 import static com.google.common.base.Preconditions.*
 import static tools.vitruv.dsls.commonalities.runtime.helper.XtendAssertHelper.*
@@ -200,9 +200,9 @@ class IntermediateResourceBridgeI extends IntermediateResourceBridgeImpl {
 		intermediates += intermediateCorrespondenceContainer
 
 		val resourceHaving = intermediates.flatMap [
-			ReactionsCorrespondenceHelper.getCorrespondingModelElements(it, EObject, null, [
+			correspondenceModel.getCorrespondingElements(it, EObject, null, [
 				!(it instanceof Intermediate) && !(it instanceof Resource) && eResource !== null
-			], correspondenceModel)
+			])
 		].head
 		if (resourceHaving === null) {
 			throw new IllegalStateException('''Could not find any transitive correspondence or container of ‹«content
@@ -231,8 +231,7 @@ class IntermediateResourceBridgeI extends IntermediateResourceBridgeImpl {
 		// Collecting to Set removes duplicates and avoids a ConcurrentModificationException when adding the results to
 		// the result Set.
 		val transitiveIntermediates = foundIntermediates.flatMap [ intermediate |
-			ReactionsCorrespondenceHelper.getCorrespondingModelElements(intermediate, Intermediate, null, null,
-				correspondenceModel)
+			correspondenceModel.getCorrespondingElements(intermediate, Intermediate, null, null)
 		].toSet
 
 		// Add to result Set: This removes objects which we have already found before.
@@ -246,8 +245,7 @@ class IntermediateResourceBridgeI extends IntermediateResourceBridgeImpl {
 
 	private def findIntermediateCorrespondence(EObject object) {
 		if (correspondenceModel === null) return null; // TODO
-		val result = ReactionsCorrespondenceHelper.getCorrespondingModelElements(object, Intermediate, null, null,
-			correspondenceModel).head
+		val result = correspondenceModel.getCorrespondingElements(object, Intermediate, null, null).head
 		if (result === null) {
 			throw new IllegalStateException('''Could not find the intermediate correspondence of ‹«object»›!''')
 		}

diff --git a/bundles/tools.vitruv.dsls.reactions.runtime/META-INF/MANIFEST.MF b/bundles/tools.vitruv.dsls.reactions.runtime/META-INF/MANIFEST.MF
@@ -17,9 +17,12 @@ Require-Bundle: org.apache.log4j;visibility:=reexport,
  tools.vitruv.change.composite;visibility:=reexport,
  tools.vitruv.change.propagation;visibility:=reexport,
  tools.vitruv.change.interaction;visibility:=reexport,
- edu.kit.ipd.sdq.commons.util.emf
+ edu.kit.ipd.sdq.commons.util.emf,
+ edu.kit.ipd.sdq.activextendannotations
 Bundle-ActivationPolicy: lazy
-Export-Package: tools.vitruv.dsls.reactions.runtime,
+Export-Package: tools.vitruv.dsls.reactions.runtime.reactions,
+ tools.vitruv.dsls.reactions.runtime.routines,
+ tools.vitruv.dsls.reactions.runtime.state,
  tools.vitruv.dsls.reactions.runtime.helper,
  tools.vitruv.dsls.reactions.runtime.marker,
  tools.vitruv.dsls.reactions.runtime.structure,

diff --git a/...actions.runtime/src/tools/vitruv/dsls/reactions/runtime/AbstractReactionRealization.xtend b/...actions.runtime/src/tools/vitruv/dsls/reactions/runtime/AbstractReactionRealization.xtend
diff --git a/...tools/vitruv/dsls/reactions/runtime/AbstractReactionsChangePropagationSpecification.xtend b/...tools/vitruv/dsls/reactions/runtime/AbstractReactionsChangePropagationSpecification.xtend
diff --git a/...reactions.runtime/src/tools/vitruv/dsls/reactions/runtime/AbstractReactionsExecutor.xtend b/...reactions.runtime/src/tools/vitruv/dsls/reactions/runtime/AbstractReactionsExecutor.xtend