ST6RI-799 Traced semantic constraints in adapters

TheKorpos · TheKorpos · commit cf0784c01882 · 2025-06-16T17:27:10.000+02:00
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/AssertConstraintUsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/AssertConstraintUsageAdapter.java
@@ -36,9 +36,11 @@ public AssertConstraintUsage getTarget() {
 		return (AssertConstraintUsage)super.getTarget();
 	}
 	
+	/**
+	 * @satisfies checkAssertConstraintUsageSpecialization
+	 */
 	@Override
 	protected String getDefaultSupertype() {
-		//checkAssertConstraintUsageSpecialization
 		return getTarget().isNegated()?
 				getDefaultSupertype("negated"):
 				getDefaultSupertype("base");						
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/AssignmentActionUsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/AssignmentActionUsageAdapter.java
@@ -34,11 +34,13 @@ public AssignmentActionUsage getTarget() {
 		return (AssignmentActionUsage)super.getTarget();
 	}
 	
+	/**
+	 * @satisfies checkAssignmentActionUsageReferentRedefinition
+	 * @satisfies checkAssignmentActionUsageAccessedFeatureRedefinition
+	 * @satisfies checkAssignmentActionUsageStartingAtRedefinition
+	 */
 	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/CalculationUsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/CalculationUsageAdapter.java
@@ -38,10 +38,12 @@ public CalculationUsage getTarget() {
 		return (CalculationUsage)super.getTarget();
 	}
 	
+	/**
+	 * @satisfies checkCalculationUsageSpecialization
+	 * @satisfies checkCalculationUsageSubcalculationSpecialization
+	 */
 	@Override
 	protected String getSubactionType() {
-		//checkCalculationUsageSpecialization
-		//checkCalculationUsageSubcalculationSpecialization
 		return isSubcalculation()? "subcalculation": super.getSubactionType();	
 	}		
 		
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/CaseUsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/CaseUsageAdapter.java
@@ -47,10 +47,12 @@ public boolean hasRelevantSubjectParameter() {
 	
 	// Implicit Generalization
 	
+	/**
+	 * @satisfies checkCaseUsageSpecialization
+	 * @satisfies checkCaseUsageSubcaseSpecialization
+	 */
 	@Override
 	protected String getSubactionType() {
-		//checkCaseUsageSpecialization
-		//checkCaseUsageSubcaseSpecialization
 		return isSubcase()? "subcase": super.getSubactionType();	
 	}
 		
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/ConcernUsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/ConcernUsageAdapter.java
@@ -47,10 +47,13 @@ public void addDefaultGeneralType() {
 	protected String getDefaultSupertype() {
 		return getDefaultSupertype("base");
 	}
+	
+	/**
+	 * @satisfies checkConcernUsageFramedConcernSpecialization
+	 */
 	@Override
 	public void addRequirementConstraintSubsetting() {
 		if (UsageUtil.isFramedConcern(getTarget())) {
-			//checkConcernUsageFramedConcernSpecialization
 			addSubsetting(getDefaultSupertype("concern"));
 		} else {
 			super.addRequirementConstraintSubsetting();
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/ConstraintUsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/ConstraintUsageAdapter.java
@@ -26,6 +26,7 @@
 import org.omg.sysml.lang.sysml.ItemDefinition;
 import org.omg.sysml.lang.sysml.ItemUsage;
 import org.omg.sysml.lang.sysml.RequirementConstraintKind;
+import org.omg.sysml.lang.sysml.SysMLPackage;
 import org.omg.sysml.lang.sysml.Type;
 import org.omg.sysml.util.UsageUtil;
 
@@ -44,13 +45,15 @@ public ConstraintUsage getTarget() {
 	
 	// Implicit Generalization
 	
+	/**
+	 * @satisfies checkConstraintUsageRequirementConstraintSpecialization
+	 * @satisfies checkConstraintUsageCheckedConstraintSpecialization
+	 */
 	@Override
 	public void computeImplicitGeneralTypes() {
-		//checkConstraintUsageRequirementConstraintSpecialization
 		addRequirementConstraintSubsetting();
 		super.computeImplicitGeneralTypes();
 		if (isCheckedConstraint()) {
-			//checkConstraintUsageCheckedConstraintSpecialization
 			addDefaultGeneralType("checkedConstraint");
 		}
 		if (isStructureOwnedComposite()) {
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/EventOccurrenceUsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/EventOccurrenceUsageAdapter.java
@@ -42,13 +42,12 @@ public void addDefaultGeneralType() {
 		super.addDefaultGeneralType();
 		if (isSuboccurrence()) {
 			addImplicitGeneralType(getSpecializationEClass(), 
-					getLibraryType(getDefaultSupertype("suboccurrence")));;
+					getLibraryType(getDefaultSupertype("suboccurrence")));
 		}
 	}
-
+	
 	@Override
 	protected String getDefaultSupertype() {
-		//checkEventOccurrenceUsageSpecialization
 		return isSuboccurrence()? 
 				getDefaultSupertype("suboccurrence"):
 				super.getDefaultSupertype();
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/ExhibitStateUsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/ExhibitStateUsageAdapter.java
@@ -33,12 +33,14 @@ public ExhibitStateUsageAdapter(ExhibitStateUsage element) {
 	public ExhibitStateUsage getTarget() {
 		return (ExhibitStateUsage)super.getTarget();
 	}
-
+	
+	/**
+	 * @satisfies checkExhibitStateUsageSpecialization
+	 */
 	@Override
 	public void addDefaultGeneralType() {
 		super.addDefaultGeneralType();
 		if (isPerformedAction()) {
-			//checkExhibitStateUsageSpecialization
 			addDefaultGeneralType("performedAction");
 		}
 	}
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/FeatureAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/FeatureAdapter.java
@@ -229,6 +229,9 @@ public void addDefaultGeneralType() {
 		addOwnedCrossFeatureSpecialization();
 	}
 	
+	/**
+	 * @satisfies checkFeatureValuationSpecialization
+	 */
 	protected void addBoundValueSubsetting() {
 		Feature target = getTarget();
 		Feature result = getBoundValueResult();
@@ -310,22 +313,24 @@ public static Feature getCrossFeatureOf(Feature feature) {
 		return crossFeature;
 	}
 	
+	/**
+	 * @satisfies checkFeatureObjectSpecialization
+	 * @satisfies checkFeatureSubobjectSpecialization
+	 * @satisfies checkFeatureSuboccurrenceSpecialization
+	 * @satisfies checkFeaturePortionSpecialization
+	 * @satisfies checkFeatureOccurrenceSpecialization
+	 * @satisfies checkFeatureDataValueSpecialization
+	 * @satisfies checkFeatureSpecialization
+	 */
 	@Override
 	protected String getDefaultSupertype() {
 		return getDefaultSupertype(
-				//checkFeatureObjectSpecialization
-				//checkFeatureSubobjectSpecialization
 			hasStructureType()? isSubobject()? "subobject": "object":
-				//checkFeatureSuboccurrenceSpecialization
-				//checkFeaturePortionSpecialization
-				//checkFeatureOccurrenceSpecialization
 			hasClassType()?
 					isSuboccurrence()? "suboccurrence":
 					isPortion()? "portion":
 					"occurrence":
-				//checkFeatureDataValueSpecialization
 			hasDataType()? "dataValue":
-				//checkFeatureSpecialization
 			"base");
 	}
 	
@@ -544,6 +549,8 @@ public void addComputedRedefinitions(Element skip) {
 	 * owning Type, then it is paired with relevant Features in the same position in Generalizations of the 
 	 * owning Type. The determination of what are relevant Categories and Features can be adjusted by
 	 * overriding getGeneralCategories and getRelevantFeatures.
+	 * 
+	 * @satisfies checkFeatureParameterRedefinition
 	 */
 	protected void addRedefinitions(Element skip) {
 		Feature target = getTarget();
@@ -593,6 +600,9 @@ protected List<? extends Feature> getRelevantFeatures(Type type, Element skip) {
 			   Collections.emptyList();
 	}
 	
+	/**
+	 * @satisfies checkConstructorExpressionResultFeatureRedefinition
+	 */
 	protected List<? extends Feature> getConstructorRelevantFeatures(Type type) {
 		Type owningType = getTarget().getOwningType();
 		if (type == owningType) {
@@ -734,9 +744,13 @@ protected void addFeatureWriteTypes(List<Feature> parameters, Feature referent)
 			}
 		}
 	}
-
+	
+	/**
+	 * @satisfies checkFeatureValueBindingConnector
+	 */
 	protected void computeValueConnector() {
 		Feature target = getTarget();
+		//returns null if valuation isDefault is true
 		Feature result = getBoundValueResult();
 		if (result != null) {
 			List<Type> featuringTypes;
@@ -751,7 +765,9 @@ protected void computeValueConnector() {
 		}
 	}
 	
-	// checkFeatureOwnedCrossFeatureTypeFeaturing
+	/**
+	 * @satisfies checkFeatureOwnedCrossFeatureTypeFeaturing
+	 */
 	public void addOwnedCrossFeatureTypeFeaturing() {
 		Feature target = getTarget();
 		if (FeatureUtil.isOwnedCrossFeature(target) && target.getOwnedTypeFeaturing().isEmpty() && isImplicitFeaturingTypesEmpty()) {
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/FeatureReferenceExpressionAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/FeatureReferenceExpressionAdapter.java
@@ -59,6 +59,9 @@ protected boolean isInFilterExpression() {
 		return root.getOwningMembership() instanceof ElementFilterMembership;
 	}
 	
+	/**
+	 * @satisfies checkFeatureReferenceExpressionBindingConnector
+	 */
 	protected void addReferenceConnector() {
 		if (!isInFilterExpression()) {
 			FeatureReferenceExpression target = getTarget();
@@ -69,9 +72,11 @@ protected void addReferenceConnector() {
 			}
 		}
 	}
-
+	
+	/**
+	 * @satisfies checkFeatureFeatureReferenceResultSpecialization
+	 */
 	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/FunctionAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/FunctionAdapter.java
@@ -33,11 +33,13 @@ public FunctionAdapter(Function element) {
 	public Function getTarget() {
 		return (Function)super.getTarget();
 	}
-
+	
+	/**
+	 * @satisfies checkFunctionResultBindingConnector
+	 */
 	@Override
 	public void doTransform() {
 		super.doTransform();
-		//checkFunctionResultBindingConnector
 		createResultConnector(getTarget().getResult());		
 	}
 	
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/IndexExpressionAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/IndexExpressionAdapter.java
@@ -43,7 +43,10 @@ public IndexExpressionAdapter(IndexExpression element) {
 	public IndexExpression getTarget() {
 		return (IndexExpression)super.getTarget();
 	}
-
+	
+	/**
+	 * @satisfies checkIndexExpressionResultSpecialization
+	 */
 	@Override
 	protected void addResultTyping() {
 		IndexExpression target = getTarget();
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/InvariantAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/InvariantAdapter.java
@@ -34,9 +34,11 @@ public Invariant getTarget() {
 		return (Invariant)super.getTarget();
 	}
 	
+	/**
+	 * @satisfies checkInvariantSpecialization
+	 */
 	@Override
 	protected String getDefaultSupertype() {
-		//checkInvariantSpecialization
 		return getTarget().isNegated()?
 				getDefaultSupertype("negated"):
 				getDefaultSupertype("base");
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/ItemUsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/ItemUsageAdapter.java
@@ -37,13 +37,15 @@ public ItemUsage getTarget() {
 
 	// Implicit Generalization
 	
+	/**
+	 * @satisfies checkItemUsageSubitemSpecialization
+	 * @satisfies checkPartUsageSubpartSpecialization
+	 * @satisfies checkItemUsageSpecialization
+	 */
 	@Override
 	protected String getDefaultSupertype() {
 		return isSubitem()?
-					//checkItemUsageSubitemSpecialization
-					//checkPartUsageSubpartSpecialization
 					getDefaultSupertype("subitem"):
-					//checkItemUsageSpecialization
 					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
@@ -42,15 +42,18 @@ public MultiplicityAdapter(Multiplicity element) {
 	public Multiplicity getTarget() {
 		return (Multiplicity)super.getTarget();
 	}
-
+	
+	/**
+	 * @satisfies checkOccurrenceDefinitionMultiplicitySpecialization, Note: SysML grammar adds the empty multiplicity
+	 * @satisfies checkMultiplicitySpecialization
+	 */
 	@Override
 	protected String getDefaultSupertype() {
 		Element owner = getTarget().getOwner();
 		return owner instanceof Classifier?
 					getDefaultSupertype("classifier"):
 			   owner instanceof Feature?
 					getDefaultSupertype("feature"):
-						//checkMultiplicitySpecialization
 					getDefaultSupertype("base");
 	}
 	
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/OccurrenceUsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/OccurrenceUsageAdapter.java
@@ -48,7 +48,12 @@ public void postProcess() {
 	}
 	
 	// Implicit Generalization
-
+	
+	/**
+	 * @satisfies checkOccurrenceUsageSnapshotSpecialization
+	 * @satisfies checkOccurrenceUsageSuboccurrenceSpecialization
+	 * @satisfies checkOccurrenceUsageTimeSliceSpecialization
+	 */
 	@Override
 	public void addDefaultGeneralType() {
 		super.addDefaultGeneralType();
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/PayloadFeatureAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/PayloadFeatureAdapter.java
@@ -38,6 +38,9 @@ public PayloadFeature getTarget() {
 		return (PayloadFeature)super.getTarget();
 	}
 	
+	/**
+	 * @satisfies checkPayloadFeatureRedefinition
+	 */
 	@Override
 	public void addRedefinitions(Element skip) {
 		Feature redefinedFeature = (Feature)SysMLLibraryUtil.getLibraryType(getTarget(), getDefaultSupertype("payload"));
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/SelectExpressionAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/SelectExpressionAdapter.java
@@ -39,6 +39,9 @@ public SelectExpression getTarget() {
 		return (SelectExpression)super.getTarget();
 	}
 
+	/**
+	 * @satisfies checkSelectExpressionResultSpecialization
+	 */
 	@Override
 	protected void addResultTyping() {
 		SelectExpression target = getTarget();

Original file line number	Diff line number	Diff line change
`@@ -38,10 +38,12 @@ public CalculationUsage getTarget() {`
`38`	`38`	`return (CalculationUsage)super.getTarget();`
`39`	`39`	`}`
`40`	`40`
	`41`	`+ /**`
	`42`	`+ * @satisfies checkCalculationUsageSpecialization`
	`43`	`+ * @satisfies checkCalculationUsageSubcalculationSpecialization`
	`44`	`+ */`
`41`	`45`	`@Override`
`42`	`46`	`protected String getSubactionType() {`
`43`		`- //checkCalculationUsageSpecialization`
`44`		`- //checkCalculationUsageSubcalculationSpecialization`
`45`	`47`	`return isSubcalculation()? "subcalculation": super.getSubactionType();`
`46`	`48`	`}`
`47`	`49`
Original file line number	Diff line number	Diff line change
`@@ -33,12 +33,14 @@ public ExhibitStateUsageAdapter(ExhibitStateUsage element) {`
`33`	`33`	`public ExhibitStateUsage getTarget() {`
`34`	`34`	`return (ExhibitStateUsage)super.getTarget();`
`35`	`35`	`}`
`36`		`-`
	`36`	`+`
	`37`	`+ /**`
	`38`	`+ * @satisfies checkExhibitStateUsageSpecialization`
	`39`	`+ */`
`37`	`40`	`@Override`
`38`	`41`	`public void addDefaultGeneralType() {`
`39`	`42`	`super.addDefaultGeneralType();`
`40`	`43`	`if (isPerformedAction()) {`
`41`		`- //checkExhibitStateUsageSpecialization`
`42`	`44`	`addDefaultGeneralType("performedAction");`
`43`	`45`	`}`
`44`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,9 @@ protected boolean isInFilterExpression() {`
`59`	`59`	`return root.getOwningMembership() instanceof ElementFilterMembership;`
`60`	`60`	`}`
`61`	`61`
	`62`	`+ /**`
	`63`	`+ * @satisfies checkFeatureReferenceExpressionBindingConnector`
	`64`	`+ */`
`62`	`65`	`protected void addReferenceConnector() {`
`63`	`66`	`if (!isInFilterExpression()) {`
`64`	`67`	`FeatureReferenceExpression target = getTarget();`
`@@ -69,9 +72,11 @@ protected void addReferenceConnector() {`
`69`	`72`	`}`
`70`	`73`	`}`
`71`	`74`	`}`
`72`		`-`
	`75`	`+`
	`76`	`+ /**`
	`77`	`+ * @satisfies checkFeatureFeatureReferenceResultSpecialization`
	`78`	`+ */`
`73`	`79`	`protected void addResultSubsetting() {`
`74`		`- //checkFeatureFeatureReferenceResultSpecialization`
`75`	`80`	`FeatureReferenceExpression expression = getTarget();`
`76`	`81`	`Feature result = expression.getResult();`
`77`	`82`	`// Note: Use getReferentFor here to avoid "self reference" default.`