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

TheKorpos · TheKorpos · commit acdb08348af9 · 2024-11-27T14:26:31.000+01:00
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/ActionUsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/ActionUsageAdapter.java
@@ -65,6 +65,9 @@ public void addDefaultGeneralType() {
 	
 	@Override
 	protected String getDefaultSupertype() {
+		//checkAcceptActionUsageSpecialization
+		//checkSendActionUsageSpecialization
+		//checkWhileLoopActionUsageSpecialization
 		return getDefaultSupertype("base");
 	}
 	
@@ -74,8 +77,6 @@ protected boolean isSuboccurrence() {
 	}
 	
 	protected String getSubactionType() {
-		//TODO checkAcceptActionUsageSpecialization?
-		
 		//checkAcceptActionUsageSubactionSpecialization
 		//checkActionUsageSubactionSpecialization
 		//checkDecisionNodeSpecialization
@@ -84,6 +85,9 @@ protected String getSubactionType() {
 		//checkIfActionUsageSubactionSpecialization
 		//checkJoinNodeSpecialization
 		//checkMergeNodeSpecialization
+		//checkAssignmentActionUsageSubactionSpecialization
+		//checkSendActionUsageSubactionSpecialization
+		//checkWhileLoopActionUsageSubactionSpecialization
 		return isActionOwnedComposite()? "subaction": 
 			//checkActionUsageOwnedActionSpecialization
 			//checkStateUsageOwnedStateSpecialization
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/AnalysisCaseUsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/AnalysisCaseUsageAdapter.java
@@ -38,6 +38,8 @@ public AnalysisCaseUsage getTarget() {
 	
 	@Override
 	protected String getSubactionType() {
+		//checkAnalysisCaseUsageSpecialization
+		//checkAnalysisCaseUsageSubAnalysisCaseSpecialization
 		return isSubAnalysisCase()? "subAnalysisCase": super.getSubactionType();	
 	}
 		
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/AssociationAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/AssociationAdapter.java
@@ -37,7 +37,9 @@ public Association getTarget() {
 	@Override
 	protected String getDefaultSupertype() {
 		return getTarget().getOwnedEndFeature().size() != 2 ? 
+					//checkAssociationSpecialization
 				getDefaultSupertype("base") :
+					//checkAssociationBinarySpecialization
 				getDefaultSupertype("binary");
 	}
 
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/CaseUsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/CaseUsageAdapter.java
@@ -49,6 +49,8 @@ public boolean hasRelevantSubjectParameter() {
 	
 	@Override
 	protected String getSubactionType() {
+		//checkCaseUsageSpecialization
+		//checkCaseUsageSubcaseSpecialization
 		return isSubcase()? "subcase": super.getSubactionType();	
 	}
 		
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/ConnectionUsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/ConnectionUsageAdapter.java
@@ -42,9 +42,11 @@ protected String getDefaultSupertype() {
 		return numEnds != 2?
 				//checkConnectionUsageSpecialization
 				//checkAllocationUsageSpecialization
+				//checkInterfaceDefinitionSpecialization
 				getDefaultSupertype("base"):
 				//checkConnectionUsageBinarySpecialization
 				//checkAllocationUsageSpecialization
+				//checkInterfaceDefinitionBinarySpecialization
 				getDefaultSupertype("binary");
 	}
 	
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/ConnectorAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/ConnectorAdapter.java
@@ -46,10 +46,13 @@ protected String getDefaultSupertype() {
 		int numEnds = TypeUtil.getOwnedEndFeaturesOf(target).size();
 		return hasStructureType()?
 				numEnds != 2? 
+						//checkConnectorObjectSpecialization
 					getDefaultSupertype("object"):
+						//checkConnectorBinaryObjectSpecialization
 					getDefaultSupertype("binaryObject"):
 				numEnds != 2? 
 					getDefaultSupertype("base"):
+						//checkConnectorBinarySpecialization
 					getDefaultSupertype("binary");
 	}
 	
@@ -72,6 +75,7 @@ public static void addEndSubsetting(Connector target) {
 	public void doTransform() {
 		Connector target = getTarget();
 		super.doTransform();
+		//checkConnectorTypeFeaturing
 		addFeaturingTypeIfNecessary(ConnectorUtil.getContextTypeFor(target));
 		addEndSubsetting(target);
 	}
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/ExhibitStateUsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/ExhibitStateUsageAdapter.java
@@ -38,6 +38,7 @@ public ExhibitStateUsage getTarget() {
 	public void addDefaultGeneralType() {
 		super.addDefaultGeneralType();
 		if (isPerformedAction()) {
+			//checkExhibitStateUsageSpecialization
 			addDefaultGeneralType("performedAction");
 		}
 	}
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/ExpressionAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/ExpressionAdapter.java
@@ -85,6 +85,7 @@ public void addDefaultGeneralType() {
 
 	@Override
 	protected String getDefaultSupertype() {
+		//checkExpressionSpecialization
 		return getDefaultSupertype("base");
 	}
 	
@@ -140,8 +141,10 @@ public void doTransform() {
 		super.doTransform();
 		if (expression.getOwningNamespace() instanceof Multiplicity || 
 				expression.getOwningMembership() instanceof FeatureValue) {
+			//checkExpressionTypeFeaturing
 			addImplicitFeaturingTypesIfNecessary();
 		}
+		////checkExpressionResultBindingConnector
 		createResultConnector(expression.getResult());
 	}
 		
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/FeatureAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/FeatureAdapter.java
@@ -237,24 +237,33 @@ public void addDefaultGeneralType() {
 		Feature target = getTarget();
 		Feature result = getBoundValueResult();
 		if (result != null && target.getOwnedSpecialization().isEmpty() && target.getDirection() == null) {
+			//checkFeatureValuationSpecialization
 			addImplicitGeneralType(SysMLPackage.eINSTANCE.getSubsetting(), result);
 		}
 		
 		if (isAssociationEnd() && 
 				!isImplicitSpecializationDeclaredFor(SysMLPackage.eINSTANCE.getRedefinition())) {
+			//checkFeatureEndSpecialization
 			addDefaultGeneralType("participant");
 		}
 	}
 	
 	@Override
 	protected String getDefaultSupertype() {
 		return getDefaultSupertype(
+			//checkFeatureObjectSpecialization
+			//checkFeatureSubobjectSpecialization
 			hasStructureType()? isSubobject()? "subobject": "object":
 			hasClassType()? 
+					//checkFeatureSuboccurrenceSpecialization
 					isSuboccurrence()? "suboccurrence": 
+					//checkFeaturePortionSpecialization
 					isPortion()? "portion":
+					//checkFeatureOccurrenceSpecialization
 					"occurrence":
+			//checkFeatureDataValueSpecialization
 			hasDataType()? "dataValue":
+			//checkFeatureSpecialization
 			"base");
 	}
 	
@@ -483,6 +492,7 @@ protected List<Type> getGeneralTypes(Type type, Element skip) {
 	protected List<? extends Feature> getRelevantFeatures(Type type, Element skip) {
 		Feature target = getTarget();
 		return type == null? Collections.emptyList():
+				//checkFeatureEndRedefinition
 			   target.isEnd()? TypeUtil.getAllEndFeaturesOf(type):
 			   FeatureUtil.isParameter(target)? getParameterRelevantFeatures(type, skip):
 			   TypeUtil.getRelevantFeaturesOf(type);
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/FeatureChainExpressionAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/FeatureChainExpressionAdapter.java
@@ -67,8 +67,10 @@ protected void addTargetRedefinition() {
 				TypeUtil.addOwnedFeatureTo(sourceParameter, sourceTarget);
 			}
 			TypeUtil.addImplicitGeneralTypeTo(sourceTarget,
-					SysMLPackage.eINSTANCE.getRedefinition(), 
+					SysMLPackage.eINSTANCE.getRedefinition(),
+					//checkFeatureChainExpressionTargetRedefinition
 					getLibraryType(ImplicitGeneralizationMap.getDefaultSupertypeFor(target.getClass(), "target")));
+			//checkFeatureChainExpressionSourceTargetRedefinition
 			TypeUtil.addImplicitGeneralTypeTo(sourceTarget,
 					SysMLPackage.eINSTANCE.getRedefinition(), target.getTargetFeature());
 			TypeUtil.setIsAddImplicitGeneralTypesFor(sourceTarget, false);
@@ -78,6 +80,8 @@ protected void addTargetRedefinition() {
 	@Override
 	public void doTransform() {
 		super.doTransform();
+		//checkFeatureChainExpressionSourceTargetRedefinition
+		//checkFeatureChainExpressionTargetRedefinition
 		addTargetRedefinition();
 	}
 	
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/FeatureReferenceExpressionAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/FeatureReferenceExpressionAdapter.java
@@ -80,6 +80,7 @@ protected void addResultSubsetting() {
 	@Override
 	public void doTransform() {
 		super.doTransform();
+		//checkFeatureReferenceExpressionBindingConnector
 		addReferenceConnector();
 		// Add subsetting in order to inherit typing of referent.
 		addResultSubsetting();
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/FunctionAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/FunctionAdapter.java
@@ -43,6 +43,7 @@ public void addAdditionalMembers() {
 	@Override
 	public void doTransform() {
 		super.doTransform();
+		//checkFunctionResultBindingConnector
 		createResultConnector(getTarget().getResult());		
 	}
 	
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/IncludeUseCaseUsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/IncludeUseCaseUsageAdapter.java
@@ -39,8 +39,10 @@ public IncludeUseCaseUsage getTarget() {
 	
 	@Override
 	public void addDefaultGeneralType() {
+		//checkIncludeUseCaseSpecialization
 		super.addDefaultGeneralType();
 		if (isPerformedAction()) {
+			////checkPerformActionUsageSpecialization
 			addDefaultGeneralType("performedAction");
 		}
 	}
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/InvariantAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/InvariantAdapter.java
@@ -36,6 +36,7 @@ public Invariant getTarget() {
 	
 	@Override
 	protected String getDefaultSupertype() {
+		//checkInvariantSpecialization
 		return getTarget().isNegated()?
 				getDefaultSupertype("negated"):
 				getDefaultSupertype("base");
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/InvocationExpressionAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/InvocationExpressionAdapter.java
@@ -130,7 +130,9 @@ protected void addResultTyping() {
 	@Override
 	public void doTransform() {
 		super.doTransform();
+		//checkInvocationExpressionConstructorBindingConnector
 		createSelfResultConnector();
+		//checkInvocationExpressionDefaultValueBindingConnector
 		addResultTyping();
 	}
 	
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/ItemFeatureAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/ItemFeatureAdapter.java
@@ -43,6 +43,7 @@ protected EClass getSpecializationEClass() {
 	
 	@Override
 	protected String getDefaultSupertype() {
+		//checkItemFeatureRedefinition
 		return getDefaultSupertype("payload");
 	}
 
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/ItemFlowAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/ItemFlowAdapter.java
@@ -55,6 +55,7 @@ public void addDefaultGeneralType() {
 
 	@Override
 	protected String getDefaultSupertype() {
+		//checkItemFlowSpecialization
 		return getDefaultSupertype("base");
 	}
 	
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/MultiplicityAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/MultiplicityAdapter.java
@@ -48,6 +48,7 @@ protected String getDefaultSupertype() {
 					getDefaultSupertype("classifier"):
 			   owner instanceof Feature?
 					getDefaultSupertype("feature"):
+						//checkMultiplicitySpecialization
 					getDefaultSupertype("base");
 	}
 	
@@ -59,6 +60,7 @@ protected List<Multiplicity> getRelevantFeatures(Type type, Element skip) {
 	@Override
 	public void doTransform() {
 		super.doTransform();
+		//checkMultiplicityTypeFeaturing
 		addImplicitFeaturingTypesIfNecessary();
 	}
 
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/OperatorExpressionAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/OperatorExpressionAdapter.java
@@ -74,6 +74,7 @@ public void computeImplicitGeneralTypes() {
 		OperatorExpression target = getTarget();
 		String operator = target.getOperator();
 		if (operator != null) {
+			//checkOperatorExpressionSpecialization
 			addDefaultGeneralType(SysMLPackage.eINSTANCE.getFeatureTyping(), ExpressionUtil.getOperatorQualifiedNames(operator));
 		}
 		super.computeImplicitGeneralTypes();
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/PerformActionUsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/PerformActionUsageAdapter.java
@@ -38,6 +38,7 @@ public PerformActionUsage getTarget() {
 	public void addDefaultGeneralType() {
 		super.addDefaultGeneralType();
 		if (isPerformedAction()) {
+			//checkPerformActionUsageSpecialization
 			addDefaultGeneralType("performedAction");
 		}
 	}
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/RenderingUsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/RenderingUsageAdapter.java
@@ -43,14 +43,17 @@ public RenderingUsage getTarget() {
 	public void addDefaultGeneralType() {
 		super.addDefaultGeneralType();
 		if (isViewRendering()) {
+			//checkRenderingUsageRedefinition
 			addImplicitGeneralType(SysMLPackage.eINSTANCE.getRedefinition(), getLibraryType(getDefaultSupertype("viewRendering")));
 		}
 	}
 
 	@Override
 	protected String getDefaultSupertype() {
-		return isSubrendering()? 
+		return isSubrendering()?
+						//checkRenderingUsageSubrenderingSpecialization
 					getDefaultSupertype("subrendering"):
+						//checkRenderingUsageSpecialization
 					getDefaultSupertype("base");
 	}
 	
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,7 +85,7 @@ protected List<? extends Feature> getRelevantFeatures(Type type, Element skip) {
 	
 	@Override
 	public void addAdditionalMembers() {
-		//checkSatisfyRequirementUsageBindingConnector
+		//checkSatisfyRequirementUsageBindingConnector?
 		UsageUtil.addSubjectParameterTo(getTarget());
 		super.addAdditionalMembers();
 	}
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/StepAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/StepAdapter.java
@@ -43,13 +43,17 @@ public Step getTarget() {
 	protected String getDefaultSupertype() {
 		return getDefaultSupertype(
 			isStructureOwnedComposite()?
+				//checkStepOwnedPerformanceSpecialization
 				"ownedPerformance":
 			isBehaviorOwnedComposite()?
+				//checkStepSubperformanceSpecialization
 				"subperformance":
 			isBehaviorOwned()? 
+				//checkStepEnclosedPerformanceSpecialization
 				"enclosedPerformance":
 			isIncomingTransfer()?
 				"incomingTransfer":
+				//checkStepSpecialization
 				"base");
 	}
 	
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/TriggerInvocationExpressionAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/TriggerInvocationExpressionAdapter.java
@@ -44,6 +44,7 @@ public TriggerInvocationExpression getTarget() {
 	
 	@Override
 	public void computeImplicitGeneralTypes() {
+		//checkTriggerInvocationExpressionSpecialization
 		TriggerInvocationExpression target = getTarget();
 		TriggerKind kind = target.getKind();
 		if (kind != null) {
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/UseCaseUsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/UseCaseUsageAdapter.java
@@ -33,6 +33,8 @@ public UseCaseUsageAdapter(UseCaseUsage element) {
 	
 	@Override
 	protected String getSubactionType() {
+		//checkUseCaseUsageSpecialization
+		//checkUseCaseUsageSubUseCaseSpecialization
 		return isSubUseCase()? "subUseCase": super.getSubactionType();	
 	}
 		
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/VerificationCaseUsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/VerificationCaseUsageAdapter.java
@@ -38,6 +38,8 @@ public VerificationCaseUsage getTarget() {
 	
 	@Override
 	protected String getSubactionType() {
+		//checkVerificationCaseUsageSpecialization
+		//checkVerificationCaseUsageSubVerification
 		return isSubVerificationCase()? "subVerificationCase": super.getSubactionType();	
 	}
 		
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/ViewUsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/ViewUsageAdapter.java
@@ -38,8 +38,10 @@ public ViewUsage getTarget() {
 
 	@Override
 	protected String getDefaultSupertype() {
-		return isSubview()? 
+		return isSubview()?
+						//checkViewUsageSubviewSpecialization
 					getDefaultSupertype("subview"):
+						//checkViewpointUsageSpecialization
 					getDefaultSupertype("base");
 	}
 	
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/ViewpointUsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/ViewpointUsageAdapter.java
@@ -40,7 +40,9 @@ public ViewpointUsage getTarget() {
 	@Override
 	protected String getDefaultSupertype() {
 		return isSatisfiedViewpoint()?
+						//checkViewpointUsageViewpointSatisfactionSpecialization
 					getDefaultSupertype("satisfied"):
+						//checkViewpointUsageSpecialization
 					getDefaultSupertype("base");
 	}
 	
diff --git a/org.omg.sysml/src/org/omg/sysml/util/ImplicitGeneralizationMap.java b/org.omg.sysml/src/org/omg/sysml/util/ImplicitGeneralizationMap.java

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,8 @@ public AnalysisCaseUsage getTarget() {`
`38`	`38`
`39`	`39`	`@Override`
`40`	`40`	`protected String getSubactionType() {`
	`41`	`+ //checkAnalysisCaseUsageSpecialization`
	`42`	`+ //checkAnalysisCaseUsageSubAnalysisCaseSpecialization`
`41`	`43`	`return isSubAnalysisCase()? "subAnalysisCase": super.getSubactionType();`
`42`	`44`	`}`
`43`	`45`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,9 @@ public Association getTarget() {`
`37`	`37`	`@Override`
`38`	`38`	`protected String getDefaultSupertype() {`
`39`	`39`	`return getTarget().getOwnedEndFeature().size() != 2 ?`
	`40`	`+ //checkAssociationSpecialization`
`40`	`41`	`getDefaultSupertype("base") :`
	`42`	`+ //checkAssociationBinarySpecialization`
`41`	`43`	`getDefaultSupertype("binary");`
`42`	`44`	`}`
`43`	`45`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,8 @@ public boolean hasRelevantSubjectParameter() {`
`49`	`49`
`50`	`50`	`@Override`
`51`	`51`	`protected String getSubactionType() {`
	`52`	`+ //checkCaseUsageSpecialization`
	`53`	`+ //checkCaseUsageSubcaseSpecialization`
`52`	`54`	`return isSubcase()? "subcase": super.getSubactionType();`
`53`	`55`	`}`
`54`	`56`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ public ExhibitStateUsage getTarget() {`
`38`	`38`	`public void addDefaultGeneralType() {`
`39`	`39`	`super.addDefaultGeneralType();`
`40`	`40`	`if (isPerformedAction()) {`
	`41`	`+ //checkExhibitStateUsageSpecialization`
`41`	`42`	`addDefaultGeneralType("performedAction");`
`42`	`43`	`}`
`43`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,7 @@ public void addDefaultGeneralType() {`
`85`	`85`
`86`	`86`	`@Override`
`87`	`87`	`protected String getDefaultSupertype() {`
	`88`	`+ //checkExpressionSpecialization`
`88`	`89`	`return getDefaultSupertype("base");`
`89`	`90`	`}`
`90`	`91`
`@@ -140,8 +141,10 @@ public void doTransform() {`
`140`	`141`	`super.doTransform();`
`141`	`142`	`if (expression.getOwningNamespace() instanceof Multiplicity \|\|`
`142`	`143`	`expression.getOwningMembership() instanceof FeatureValue) {`
	`144`	`+ //checkExpressionTypeFeaturing`
`143`	`145`	`addImplicitFeaturingTypesIfNecessary();`
`144`	`146`	`}`
	`147`	`+ ////checkExpressionResultBindingConnector`
`145`	`148`	`createResultConnector(expression.getResult());`
`146`	`149`	`}`
`147`	`150`