Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adaptation to cleanup of Reactions language #218

Merged
merged 5 commits into from
Aug 3, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.*

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.*

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.*

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.*

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.*

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.*

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.*

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.*

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.*

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.*

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.*

Expand Down
Loading