ST6RI-799 Marked more semantic constraints in SysML/KerML adapters

TheKorpos · TheKorpos · commit 977c785d86b5 · 2024-12-11T15:28:52.000+01:00
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/AssignmentActionUsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/AssignmentActionUsageAdapter.java
@@ -37,6 +37,8 @@ public AssignmentActionUsage getTarget() {
 	protected void addTargetRedefinitions() {
 		AssignmentActionUsage target = getTarget();
 		//checkAssignmentActionUsageAccessedFeatureRedefinition
+		//checkAssignmentActionUsageReferentRedefinition
+		//checkAssignmentActionUsageStartingAtRedefinition
 		addFeatureWriteTypes(TypeUtil.getOwnedParametersOf(target), target.getReferent());
 	}
 	
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/AssociationAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/AssociationAdapter.java
@@ -38,8 +38,10 @@ public Association getTarget() {
 	protected String getDefaultSupertype() {
 		return getTarget().getOwnedEndFeature().size() != 2 ? 
 					//checkAssociationSpecialization
+					//checkAssociationStructureSpecialization
 				getDefaultSupertype("base") :
 					//checkAssociationBinarySpecialization
+					//checkAssociationStructureBinarySpecialization
 				getDefaultSupertype("binary");
 	}
 
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/FeatureAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/FeatureAdapter.java
@@ -504,6 +504,7 @@ protected List<? extends Feature> getRelevantFeatures(Type type, Element skip) {
 	 * Expression.
 	 */
 	public List<? extends Feature> getParameterRelevantFeatures(Type type, Element skip) {
+		//checkFeatureResultRedefinition
 		if (type != null) {
 			if (FeatureUtil.isResultParameter(getTarget())) {
 				Feature resultParameter = TypeUtil.getResultParameterOf(type);
@@ -571,6 +572,7 @@ protected void addFeatureWriteTypes(List<Feature> parameters, Feature referent)
 			Feature targetFeature = parameters.get(0);
 			List<Feature> features = targetFeature.getOwnedFeature();
 			if (!features.isEmpty()) {
+				//checkAssignmentActionUsageStartingAtRedefinition
 				Feature startingAtFeature = features.get(0);
 				TypeUtil.addDefaultGeneralTypeTo(startingAtFeature, SysMLPackage.eINSTANCE.getRedefinition(), getDefaultSupertype("startingAt"));
 				TypeUtil.setIsAddImplicitGeneralTypesFor(startingAtFeature, false);
@@ -579,6 +581,7 @@ protected void addFeatureWriteTypes(List<Feature> parameters, Feature referent)
 					Feature accessedFeature = features.get(0);
 					//checkAssignmentActionUsageAccessedFeatureRedefinition
 					TypeUtil.addDefaultGeneralTypeTo(accessedFeature, SysMLPackage.eINSTANCE.getRedefinition(), getDefaultSupertype("accessedFeature"));
+					//checkAssignmentActionUsageReferentRedefinition
 					if (referent != null) {
 						TypeUtil.addImplicitGeneralTypeTo(accessedFeature, SysMLPackage.eINSTANCE.getRedefinition(), referent);
 					}
@@ -589,6 +592,7 @@ protected void addFeatureWriteTypes(List<Feature> parameters, Feature referent)
 	}
 
 	protected void computeValueConnector() {
+		//checkFeatureValueBindingConnector
 		Feature target = getTarget();
 		Feature result = getBoundValueResult();
 		if (result != null) {
@@ -606,6 +610,7 @@ protected void computeValueConnector() {
 	
 	@Override
 	public void doTransform() {
+		//checkFeatureValueBindingConnector
 		computeValueConnector();
 		forceComputeRedefinitions();
 		super.doTransform();
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/FeatureReferenceExpressionAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/FeatureReferenceExpressionAdapter.java
@@ -67,6 +67,7 @@ protected void addReferenceConnector() {
 	}
 
 	protected void addResultSubsetting() {
+		//checkFeatureFeatureReferenceResultSpecialization
 		FeatureReferenceExpression expression = getTarget();
 		Feature result = expression.getResult();
 		// Note: Use getReferentFor here to avoid "self reference" default.
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/FlowConnectionUsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/FlowConnectionUsageAdapter.java
@@ -44,21 +44,27 @@ public FlowConnectionUsage getTarget() {
 	public void addDefaultGeneralType() {
 		super.addDefaultGeneralType();
 		if (isPartOwnedComposite()) {
+			//checkActionUsageOwnedActionSpecialization
 			addDefaultGeneralType("ownedAction");
 		} else if (isStructureOwnedComposite()) {
+			//checkStepOwnedPerformanceSpecialization
 			addDefaultGeneralType("ownedPerformance");
 		}
 		if (isActionOwnedComposite()) {
+			//checkActionUsageSubactionSpecialization
 			addDefaultGeneralType("subaction");
 		} else if (isBehaviorOwnedComposite()) {
+			//checkStepSubperformanceSpecialization
 			addDefaultGeneralType("subperformance");
 		} else if (isBehaviorOwned()) {
+			//checkStepEnclosedPerformanceSpecialization
 			addDefaultGeneralType("enclosedPerformance");
 		}
 	}
 	
 	@Override
 	protected String getDefaultSupertype() {
+		//checkSuccessionFlowConnectionUsageSpecialization
 		//checkFlowConnectionUsageSpecialization
 		return UsageUtil.isMessageConnection(getTarget())?
 				getDefaultSupertype("message"):
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/InvocationExpressionAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/InvocationExpressionAdapter.java
@@ -113,6 +113,7 @@ protected void createSelfResultConnector() {
 	}
 	
 	protected void addResultTyping() {
+		//checkFeatureInvocationExpressionResultSpecialization
 		Type expressionType = getExpressionType();
 		if (expressionType != null && 
 				!(expressionType instanceof Function || expressionType instanceof Expression)) {
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/ItemFlowEndAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/ItemFlowEndAdapter.java
@@ -97,6 +97,7 @@ public void addItemFlowFeatureRedefinition() {
 	@Override
 	public void doTransform() {
 		addItemFlowEndSubsetting();
+		//checkFeatureItemFlowFeatureRedefinition
 		addItemFlowFeatureRedefinition();
 		super.doTransform();
 	}
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/MetadataFeatureAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/MetadataFeatureAdapter.java
@@ -50,6 +50,7 @@ protected List<Type> getBaseTypes() {
 	@Override
 	public void doTransform() {
 		super.doTransform();
+		//checkMetadataFeatureSemanticSpecialization
 		AnnotatingElementAdapter.transformAnnotatingElement(getTarget());
 	}
 
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/OccurrenceUsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/OccurrenceUsageAdapter.java
@@ -103,6 +103,7 @@ protected void addOccurrenceFeaturing() {
 	public void computeImplicitGeneralTypes() {
 		//checkOccurrenceUsageTypeFeaturing
 		addOccurrenceTyping();
+		//checkPortioningFeatureSpecialization
 		addOccurrenceFeaturing();
 		super.computeImplicitGeneralTypes();
 	}
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/RequirementUsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/RequirementUsageAdapter.java
@@ -85,9 +85,7 @@ protected List<? extends Feature> getRelevantFeatures(Type type, Element skip) {
 	
 	@Override
 	public void addAdditionalMembers() {
-		//checkSatisfyRequirementUsageBindingConnector?
 		UsageUtil.addSubjectParameterTo(getTarget());
 		super.addAdditionalMembers();
 	}
-	
 }
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/TriggerInvocationExpressionAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/TriggerInvocationExpressionAdapter.java
@@ -55,6 +55,7 @@ public void computeImplicitGeneralTypes() {
 	}
 	
 	public void addReceiverBinding() {
+		//checkAcceptActionUsageReceiverBindingConnector
 		TriggerInvocationExpression target = getTarget();
 		Feature receiverParameter = TypeUtil.getOwnedParameterOf(target, 1, Feature.class);
 		if (receiverParameter != null) {
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/UsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/UsageAdapter.java
@@ -145,6 +145,7 @@ protected void computeValueConnector() {
 		FeatureValue valuation = FeatureUtil.getValuationFor(usage);
 		if (valuation == null && UsageUtil.isSubjectParameter(usage)){
 			Feature subjectParameter = getRelevantSubjectParameterFor(usage);
+			//checkSatisfyRequirementUsageBindingConnector
 			if (subjectParameter != null) {
 				addBindingConnector(subjectParameter, usage);
 			}
diff --git a/org.omg.sysml/src/org/omg/sysml/util/ImplicitGeneralizationMap.java b/org.omg.sysml/src/org/omg/sysml/util/ImplicitGeneralizationMap.java
@@ -82,6 +82,7 @@ protected ImplicitGeneralizationMap() {
 		
 		//checkExpressionSpecialization
 		put(ExpressionImpl.class, "base", "Performances::evaluations");
+		//checkStepSubperformanceSpecialization
 		put(ExpressionImpl.class, "enclosedPerformance", "Performances::Performance::enclosedPerformances");
 		
 		//checkFeatureSpecialization
@@ -122,8 +123,11 @@ protected ImplicitGeneralizationMap() {
 		
 		//checkItemFlowSpecialization
 		put(ItemFlowImpl.class, "base", "Transfers::flowTransfers");
+		//checkStepEnclosedPerformanceSpecialization
 		put(ItemFlowImpl.class, "enclosedPerformance", "Performances::Performance::enclosedPerformances");
+		//checkStepSubperformanceSpecialization
 		put(ItemFlowImpl.class, "subperformance", "Performances::Performance::subperformances");
+		//checkStepOwnedPerformanceSpecialization
 		put(ItemFlowImpl.class, "ownedPerformance", "Objects::Object::ownedPerformances");
 		
 		put(ItemFlowEndImpl.class, "sourceOutput", "Transfers::Transfer::source::sourceOutput");
@@ -189,8 +193,11 @@ protected ImplicitGeneralizationMap() {
 		
 		//checkSuccessionItemFlowSpecialization
 		put(SuccessionItemFlowImpl.class, "base", "Transfers::flowTransfersBefore");
+		//checkStepEnclosedPerformanceSpecialization
 		put(SuccessionItemFlowImpl.class, "enclosedperformance", "Performances::Performance::enclosedPerformances");
+		//checkStepSubperformanceSpecialization
 		put(SuccessionItemFlowImpl.class, "subperformance", "Performances::Performance::subperformances");
+		//checkStepOwnedPerformanceSpecialization
 		put(SuccessionItemFlowImpl.class, "ownedPerformance", "Objects::Object::ownedPerformances");
 		
 		//checkTypeSpecialization
@@ -212,7 +219,9 @@ protected ImplicitGeneralizationMap() {
 		put(ActionUsageImpl.class, "subaction", "Actions::Action::subactions");
 		//checkActionUsageOwnedActionSpecialization
 		put(ActionUsageImpl.class, "ownedAction", "Parts::Part::ownedActions");
+		//checkStepEnclosedPerformanceSpecialization
 		put(ActionUsageImpl.class, "enclosedPerformance", "Performances::Performance::enclosedPerformances");
+		//checkStepOwnedPerformanceSpecialization
 		put(ActionUsageImpl.class, "ownedPerformance", "Objects::Object::ownedPerformances");
 		//checkActionUsageStateActionRedefinition
 		put(ActionUsageImpl.class, "entry", "States::StateAction::entryAction");
@@ -259,7 +268,9 @@ protected ImplicitGeneralizationMap() {
 		//checkAttributeUsageSpecialization
 		put(AttributeUsageImpl.class, "base", "Base::dataValues");
 		
+		//checkConnectorSpecialization
 		put(BindingConnectorAsUsageImpl.class, "base", "Links::links");
+		//??
 		put(BindingConnectorAsUsageImpl.class, "binary", "Links::selfLinks");
 		
 		//checkCalculationDefinitionSpecialization
@@ -298,8 +309,11 @@ protected ImplicitGeneralizationMap() {
 		put(ConstraintUsageImpl.class, "base", "Constraints::constraintChecks");
 		//checkConstraintUsageCheckedConstraintSpecialization
 		put(ConstraintUsageImpl.class, "checkedConstraint", "Items::Item::checkedConstraints");
+		//checkStepEnclosedPerformanceSpecialization
 		put(ConstraintUsageImpl.class, "enclosedPerformance", "Performances::Performance::enclosedPerformances");
+		//checkStepSubperformanceSpecialization
 		put(ConstraintUsageImpl.class, "subperformance", "Performances::Performance::subperformances");
+		//checkStepOwnedPerformanceSpecialization
 		put(ConstraintUsageImpl.class, "ownedPerformance", "Objects::Object::ownedPerformances");
 		//checkConstraintUsageRequirementConstraintSpecialization
 		put(ConstraintUsageImpl.class, "assumption", "Requirements::RequirementCheck::assumptions");
@@ -322,10 +336,15 @@ protected ImplicitGeneralizationMap() {
 		//checkFlowConnectionUsageSpecialization
 		put(FlowConnectionUsageImpl.class, "message", "Connections::messageConnections");
 		
+		//checkActionUsageSubactionSpecialization
 		put(FlowConnectionUsageImpl.class, "subaction", "Actions::Action::subactions");
+		//checkActionUsageOwnedActionSpecialization
 		put(FlowConnectionUsageImpl.class, "ownedAction", "Parts::Part::ownedActions");
+		//checkStepEnclosedPerformanceSpecialization
 		put(FlowConnectionUsageImpl.class, "enclosedPerformance", "Performances::Performance::enclosedPerformances");
+		//checkStepSubperformanceSpecialization
 		put(FlowConnectionUsageImpl.class, "subperformance", "Performances::Performance::subperformances");
+		//checkStepOwnedPerformanceSpecialization
 		put(FlowConnectionUsageImpl.class, "ownedPerformance", "Objects::Object::ownedPerformances");
 		
 		//checkForLoopActionUsageSpecialization
@@ -383,6 +402,7 @@ protected ImplicitGeneralizationMap() {
 		//checkMergeNodeSpecialization
 		put(MergeNodeImpl.class, "subaction", "Actions::Action::merges");
 		
+		//checkOccurrenceDefinitionSpecialization
 		put(OccurrenceDefinitionImpl.class, "base", "Occurrences::Occurrence");
 		
 		//checkOccurrenceUsageSpecialization
@@ -425,6 +445,7 @@ protected ImplicitGeneralizationMap() {
 		put(RenderingUsageImpl.class, "base", "Views::renderings");
 		//checkRenderingUsageSubrenderingSpecialization
 		put(RenderingUsageImpl.class, "subrendering", "Views::Rendering::subrenderings");
+		//checkRenderingUsageRedefinition
 		put(RenderingUsageImpl.class, "viewRendering", "Views::View::viewRendering");
 		
 		//checkRequirementDefinitionSpecialization
@@ -436,7 +457,9 @@ protected ImplicitGeneralizationMap() {
 		//checkRequirementUsageRequirementVerificationSpecialization
 		put(RequirementUsageImpl.class, "verification", "Verifications::VerificationCase::obj::requirementVerifications");
 		
+		//Missing from specification
 		put(SatisfyRequirementUsageImpl.class, "base", "Requirements::satisfiedRequirementChecks");
+		//Missing from specification
 		put(SatisfyRequirementUsageImpl.class, "negated", "Requirements::notSatisfiedRequirementChecks");
 		
 		//checkSendActionUsageSpecialization
@@ -455,12 +478,14 @@ protected ImplicitGeneralizationMap() {
 		//checkStateUsageOwnedStateSpecialization
 		put(StateUsageImpl.class, "ownedAction", "Parts::Part::ownedStates");
 		
+		//checkConnectorSpecialization
 		put(SuccessionAsUsageImpl.class, "base", "Links::links");
+		//checkSuccessionSpecialization
 		put(SuccessionAsUsageImpl.class, "binary", "Occurrences::happensBeforeLinks");
 		
 		//checkSuccessionFlowConnectionUsageSpecialization
 		put(SuccessionFlowConnectionUsageImpl.class, "base", "Connections::successionFlowConnections");
-		//TODO: find semantic constraint
+		//checkSuccessionFlowConnectionUsageSpecialization
 		put(SuccessionFlowConnectionUsageImpl.class, "message", "Connections::successionFlowConnections");
 		
 		//checkTransitionUsageSpecialization

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,8 @@ public AssignmentActionUsage getTarget() {`
`37`	`37`	`protected void addTargetRedefinitions() {`
`38`	`38`	`AssignmentActionUsage target = getTarget();`
`39`	`39`	`//checkAssignmentActionUsageAccessedFeatureRedefinition`
	`40`	`+ //checkAssignmentActionUsageReferentRedefinition`
	`41`	`+ //checkAssignmentActionUsageStartingAtRedefinition`
`40`	`42`	`addFeatureWriteTypes(TypeUtil.getOwnedParametersOf(target), target.getReferent());`
`41`	`43`	`}`
`42`	`44`
Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,7 @@ protected void addReferenceConnector() {`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`protected void addResultSubsetting() {`
	`70`	`+ //checkFeatureFeatureReferenceResultSpecialization`
`70`	`71`	`FeatureReferenceExpression expression = getTarget();`
`71`	`72`	`Feature result = expression.getResult();`
`72`	`73`	`// Note: Use getReferentFor here to avoid "self reference" default.`
Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,7 @@ protected void createSelfResultConnector() {`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`protected void addResultTyping() {`
	`116`	`+ //checkFeatureInvocationExpressionResultSpecialization`
`116`	`117`	`Type expressionType = getExpressionType();`
`117`	`118`	`if (expressionType != null &&`
`118`	`119`	`!(expressionType instanceof Function \|\| expressionType instanceof Expression)) {`
Original file line number	Diff line number	Diff line change
`@@ -97,6 +97,7 @@ public void addItemFlowFeatureRedefinition() {`
`97`	`97`	`@Override`
`98`	`98`	`public void doTransform() {`
`99`	`99`	`addItemFlowEndSubsetting();`
	`100`	`+ //checkFeatureItemFlowFeatureRedefinition`
`100`	`101`	`addItemFlowFeatureRedefinition();`
`101`	`102`	`super.doTransform();`
`102`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ protected List<Type> getBaseTypes() {`
`50`	`50`	`@Override`
`51`	`51`	`public void doTransform() {`
`52`	`52`	`super.doTransform();`
	`53`	`+ //checkMetadataFeatureSemanticSpecialization`
`53`	`54`	`AnnotatingElementAdapter.transformAnnotatingElement(getTarget());`
`54`	`55`	`}`
`55`	`56`
Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,7 @@ protected void addOccurrenceFeaturing() {`
`103`	`103`	`public void computeImplicitGeneralTypes() {`
`104`	`104`	`//checkOccurrenceUsageTypeFeaturing`
`105`	`105`	`addOccurrenceTyping();`
	`106`	`+ //checkPortioningFeatureSpecialization`
`106`	`107`	`addOccurrenceFeaturing();`
`107`	`108`	`super.computeImplicitGeneralTypes();`
`108`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,9 +85,7 @@ protected List<? extends Feature> getRelevantFeatures(Type type, Element skip) {`
`85`	`85`
`86`	`86`	`@Override`
`87`	`87`	`public void addAdditionalMembers() {`
`88`		`- //checkSatisfyRequirementUsageBindingConnector?`
`89`	`88`	`UsageUtil.addSubjectParameterTo(getTarget());`
`90`	`89`	`super.addAdditionalMembers();`
`91`	`90`	`}`
`92`		`-`
`93`	`91`	`}`