ST6RI-843 Annotated semantic constraints in adapters

TheKorpos · TheKorpos · commit 9ba4b197b0e4 · 2025-06-23T16:23:16.000+02:00
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/AssociationAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/AssociationAdapter.java
@@ -33,15 +33,17 @@ public AssociationAdapter(Association element) {
 	public Association getTarget() {
 		return (Association)super.getTarget();
 	}
-
+	
+	/**
+	 * @satisfies checkAssociationSpecialization
+	 * @satisfies checkAssociationBinarySpecialization
+	 * @satisfies checkAssociationStructureSpecialization
+	 * @satisfies checkAssociationStructureBinarySpecialization
+	 */
 	@Override
 	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/CalculationDefinitionAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/CalculationDefinitionAdapter.java
@@ -33,6 +33,9 @@ public CalculationDefinition getTarget() {
 		return (CalculationDefinition)super.getTarget();
 	}
 	
+	/**
+	 * @satisfies checkFunctionResultBindingConnector
+	 */
 	@Override
 	public void doTransform() {
 		super.doTransform();
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/ConnectionDefinitionAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/ConnectionDefinitionAdapter.java
@@ -33,17 +33,19 @@ public ConnectionDefinitionAdapter(ConnectionDefinition element) {
 	public ConnectionDefinition getTarget() {
 		return (ConnectionDefinition)super.getTarget();
 	}
-
+	
+	/**
+	 * @satisfies checkConnectionDefinitionSpecializations
+	 * @satisfies checkInterfaceDefinitionSpecialization
+	 * @satisfies checkAllocationDefinitionSpecialization
+	 * @satisfies checkConnectionDefinitionBinarySpecialization
+	 * @satisfies checkInterfaceDefinitionBinarySpecialization
+	 * @satisfies checkAllocationDefinitionSpecialization
+	 */
 	@Override
 	protected String getDefaultSupertype() {
 		return getTarget().getOwnedEndFeature().size() != 2 ?
-				//checkConnectionDefinitionSpecializations
-				//checkInterfaceDefinitionSpecialization
-				//checkAllocationDefinitionSpecialization
 				getDefaultSupertype("base") :
-				//checkConnectionDefinitionBinarySpecialization
-				//checkInterfaceDefinitionBinarySpecialization
-				//checkAllocationDefinitionSpecialization
 				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
@@ -39,7 +39,13 @@ public ConnectorAdapter(Connector feature) {
 	public Connector getTarget() {
 		return (Connector)super.getTarget();
 	}
-
+	
+	/**
+	 * @satisfies checkConnectorBinaryObjectSpecialization
+	 * @satisfies checkConnectorBinarySpecialization
+	 * @satisfies checkConnectorObjectSpecialization
+	 * @satisfies checkConnectorSpecialization
+	 */
 	@Override
 	protected String getDefaultSupertype() {
 		Connector target = getTarget();
@@ -52,7 +58,10 @@ protected String getDefaultSupertype() {
 					getDefaultSupertype("base"):
 					getDefaultSupertype("binary");
 	}
-		
+	
+	/**
+	 * @satisfies checkConnectorTypeFeaturing
+	 */
 	protected void addContextFeaturingType() {
 		addFeaturingTypeIfNecessary(ConnectorUtil.getContextTypeFor(getTarget()));
 	}
@@ -72,6 +81,9 @@ public static void addEndSubsetting(Connector target) {
 		}
 	}
 	
+	/**
+	 * @satisfies checkConnectorTypeFeaturing
+	 */
 	@Override
 	public void doTransform() {
 		Connector target = getTarget();
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/ConstraintDefinitionAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/ConstraintDefinitionAdapter.java
@@ -33,7 +33,10 @@ public ConstraintDefinitionAdapter(ConstraintDefinition element) {
 	public ConstraintDefinition getTarget() {
 		return (ConstraintDefinition)super.getTarget();
 	}
-
+	
+	/**
+	 * @satisfies checkFunctionResultBindingConnector
+	 */
 	@Override
 	public void doTransform() {
 		super.doTransform();
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/ExpressionAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/ExpressionAdapter.java
@@ -60,7 +60,7 @@ public void addDefaultGeneralType() {
 			addDefaultGeneralType("enclosedPerformance");
 		}
 	}
-
+	
 	@Override
 	protected String getDefaultSupertype() {
 		//checkExpressionSpecialization
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/FeatureAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/FeatureAdapter.java
@@ -219,6 +219,13 @@ protected Feature getBoundValueResult() {
 		return null;
 	}
 	
+	/**
+	 * @satisfies checkFeatureValuationSpecialization
+	 * @satisfies checkFeatureCrossingSpecialization
+	 * @satisfies checkFeatureOwnedCrossFeatureSpecialization
+	 * @satisfies checkFeatureOwnedCrossFeatureRedefinitionSpecialization
+	 * 
+	 */
 	@Override
 	public void addDefaultGeneralType() {
 		super.addDefaultGeneralType();
@@ -229,9 +236,7 @@ public void addDefaultGeneralType() {
 		addOwnedCrossFeatureSpecialization();
 	}
 	
-	/**
-	 * @satisfies checkFeatureValuationSpecialization
-	 */
+
 	protected void addBoundValueSubsetting() {
 		Feature target = getTarget();
 		Feature result = getBoundValueResult();
@@ -247,7 +252,6 @@ protected void addParticipantSubsetting() {
 		}
 	}
 	
-	// checkFeatureCrossingSpecialization 
 	public void addCrossingSpecialization() {
 		Feature target = getTarget();
 		Feature ownedCrossFeature = FeatureUtil.getOwnedCrossFeatureOf(target);
@@ -280,17 +284,19 @@ public void addCrossingSpecialization() {
 			}
 		}
 	}
-	 
+	
+	/**
+	 * @satisfies checkFeatureOwnedCrossFeatureSpecialization
+	 * @satisfies checkFeatureOwnedCrossFeatureRedefinitionSpecialization
+	 */
 	protected void addOwnedCrossFeatureSpecialization() {
 		Feature target = getTarget();
 		Namespace owner = target.getOwningNamespace();
 		if (FeatureUtil.isOwnedCrossFeature(target)) {
-			// checkFeatureOwnedCrossFeatureSpecialization
 			for (Type type: ((Feature)owner).getType()) {
 				addImplicitGeneralType(SysMLPackage.eINSTANCE.getFeatureTyping(), type);
 			}
 			
-			// checkFeatureOwnedCrossFeatureRedefinitionSpecialization
 			for (Feature redefinedFeature: FeatureUtil.getRedefinedFeaturesWithComputedOf((Feature)owner, null)) {
 				if (redefinedFeature.isEnd()) {
 					Feature crossFeature = getCrossFeatureOf(redefinedFeature);
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/FlowAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/FlowAdapter.java
@@ -35,19 +35,21 @@ public Flow getTarget() {
 		return (Flow)super.getTarget();
 	}
 	
+	/**
+	 * @satisfies checkStepOwnedPerformanceSpecialization
+	 * @satisfies checkStepSubperformanceSpecialization
+	 * @satisfies checkStepEnclosedPerformanceSpecialization
+	 */
 	@Override
 	public void addDefaultGeneralType() {
 		super.addDefaultGeneralType();
 		if (isStructureOwnedComposite()) {
-			//checkStepOwnedPerformanceSpecialization
 			addDefaultGeneralType("ownedPerformance");
 		}
 		if (isBehaviorOwnedComposite()) {
-			//checkStepSubperformanceSpecialization
 			addDefaultGeneralType("subperformance");
 		}
 		if (isBehaviorOwned()) {
-			//checkStepSubperformanceSpecialization
 			addDefaultGeneralType("enclosedPerformance");
 		}
 	}
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/FlowDefinitionAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/FlowDefinitionAdapter.java
@@ -32,7 +32,11 @@ public FlowDefinitionAdapter(FlowDefinition element) {
 	public FlowDefinition getTarget() {
 		return (FlowDefinition)super.getTarget();
 	}
-
+	
+	/**
+	 * @satisfies checkFlowDefinitionBinarySpecialization
+	 * @satisfies checkFlowDefinitionSpecialization
+	 */
 	// From AssociationAdapter
 	@Override
 	protected String getDefaultSupertype() {
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/FunctionAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/FunctionAdapter.java
@@ -40,7 +40,7 @@ public Function getTarget() {
 	@Override
 	public void doTransform() {
 		super.doTransform();
-		createResultConnector(getTarget().getResult());		
+		createResultConnector(getTarget().getResult());
 	}
 	
 }
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/OccurrenceDefinitionAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/OccurrenceDefinitionAdapter.java
@@ -34,6 +34,11 @@ public OccurrenceDefinition getTarget() {
 		return (OccurrenceDefinition)super.getTarget();
 	}
 	
+	/**
+	 * @satisfies checkOccurrenceDefinitionIndividualSpecialization
+	 * @satisfies checkClassSpecialization
+	 * @satisfies checkCalculationDefinitionSpecialization
+	 */
 	protected String getDefaultSupertype() {
 		return getTarget().isIndividual()? getDefaultSupertype("life"):
 			getDefaultSupertype("base");
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/PartUsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/PartUsageAdapter.java
@@ -39,9 +39,11 @@ public PartUsage getTarget() {
 		return (PartUsage)super.getTarget();
 	}
 	
+	/**
+	 * @satisfies checkPartUsageActorSpecialization
+	 */
 	@Override
 	protected String getDefaultSupertype() {
-		//checkPartUsageActorSpecialization
 		//checkPartUsageStakeholderSpecialization
 		//checkPartUsageSubpartSpecialization
 		//checkPartUsageSpecialization
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/PerformActionUsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/PerformActionUsageAdapter.java
@@ -34,11 +34,13 @@ public PerformActionUsage getTarget() {
 		return (PerformActionUsage)super.getTarget();
 	}
 	
+	/**
+	 * @satisfies checkPerformActionUsageSpecialization
+	 */
 	@Override
 	public void addDefaultGeneralType() {
 		super.addDefaultGeneralType();
 		if (isPerformedAction()) {
-			//checkPerformActionUsageSpecialization
 			addDefaultGeneralType("performedAction");
 		}
 	}
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/PortUsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/PortUsageAdapter.java
@@ -38,16 +38,18 @@ public PortUsage getTarget() {
 	}
 	
 	// Implicit Generalization
-
+	
+	/**
+	 * @satisfies checkPortUsageOwnedPortSpecialization
+	 * @satisfies checkPortUsageSubportSpecialization
+	 * @satisfies checkPortUsageSpecialization
+	 */
 	@Override
 	protected String getDefaultSupertype() {
 		return isOwnedPort()?
-					//checkPortUsageOwnedPortSpecialization
 					getDefaultSupertype("ownedPort"):
 			   isSubport()?
-					//checkPortUsageSubportSpecialization
 					getDefaultSupertype("subport"):
-					//checkPortUsageSpecialization
 					getDefaultSupertype("base");
 	}
 	
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/RenderingUsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/RenderingUsageAdapter.java
@@ -40,21 +40,25 @@ public RenderingUsage getTarget() {
 		return (RenderingUsage)super.getTarget();
 	}
 	
+	/**
+	 * @satisfies checkRenderingUsageRedefinition
+	 */
 	@Override
 	public void addRedefinitions(Element skip) {
 		super.addRedefinitions(skip);
 		if (isViewRendering()) {
-			//checkRenderingUsageRedefinition
 			addImplicitGeneralType(SysMLPackage.eINSTANCE.getRedefinition(), getLibraryType(getDefaultSupertype("viewRendering")));
 		}
 	}
-
+	
+	/**
+	 * @satisfies checkRenderingUsageSubrenderingSpecialization
+	 * @satisfies checkRenderingUsageSpecialization
+	 */
 	@Override
 	protected String getDefaultSupertype() {
 		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
@@ -52,19 +52,23 @@ public boolean hasRelevantSubjectParameter() {
 	
 	// Implicit Generalization
 	
+	/**
+	 * @satisfies checkRequirementUsageSubrequirementSpecialization
+	 * @satisfies checkRequirementUsageSpecialization
+	 */
 	@Override
 	protected String getDefaultSupertype() {
 		return UsageUtil.isSubrequirement(getTarget())? 
-					//checkRequirementUsageSubrequirementSpecialization
 				getDefaultSupertype("subrequirement"):
-					//checkRequirementUsageSpecialization
 				getDefaultSupertype("base");
 	}
 	
+	/**
+	 * @satisfies checkRequirementUsageRequirementVerificationSpecialization
+	 */
 	@Override
 	public void addRequirementConstraintSubsetting() {
 		if (UsageUtil.isVerifiedRequirement(getTarget())) {
-			//checkRequirementUsageRequirementVerificationSpecialization
 			addDefaultGeneralType("verification");
 		} else {
 			super.addRequirementConstraintSubsetting();
@@ -73,10 +77,12 @@ public void addRequirementConstraintSubsetting() {
 	
 	// Computed Redefinition
 	
+	/**
+	 * @satisfies checkRequirementUsageObjectiveRedefinition
+	 */
 	@Override
 	protected List<? extends Feature> getRelevantFeatures(Type type, Element skip) {
 		return UsageUtil.isObjective(getTarget())?
-				//checkRequirementUsageObjectiveRedefinition
 				Collections.singletonList(UsageUtil.getObjectiveRequirementOf(type)):
 			    super.getRelevantFeatures(type, skip);
 	}
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/SatisfyRequirementUsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/SatisfyRequirementUsageAdapter.java
@@ -47,13 +47,17 @@ public void computeImplicitGeneralTypes() {
 		super.computeImplicitGeneralTypes();
 	}
 	
+	/**
+	 * @satisfies checkSatisfyRequirementUsageSpecialization
+	 */
 	@Override
 	protected String getDefaultSupertype() {
 		return getTarget().isNegated()?
 				getDefaultSupertype("negated"):
 				getDefaultSupertype("base");						
 	}
 	
+	//TODO: check why this is needed
 	protected void addSatisfiedViewpointSubsetting() {
 		SatisfyRequirementUsage target = getTarget();
 		Type owningType = target.getOwningType();
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/StateUsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/StateUsageAdapter.java
@@ -33,12 +33,14 @@ public StateUsageAdapter(StateUsage element) {
 	public StateUsage getTarget() {
 		return (StateUsage)super.getTarget();
 	}
-
+	
+	/**
+	 * @satisfies checkStateUsageExclusiveStateSpecialization
+	 * @satisfies checkStateUsageSubstateSpecialization
+	 */
 	@Override
 	protected String getSubactionType() {
-		//checkStateUsageExclusiveStateSpecialization
 		return isExclusiveState()? "exclusiveState":
-			//checkStateUsageSubstateSpecialization
 			   isSubstate()? "substate": 
 			   super.getSubactionType();	
 	}
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/StepAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/StepAdapter.java
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/TransitionUsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/TransitionUsageAdapter.java
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/TypeAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/TypeAdapter.java
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/UsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/UsageAdapter.java
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/VerificationCaseUsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/VerificationCaseUsageAdapter.java

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,9 @@ public CalculationDefinition getTarget() {`
`33`	`33`	`return (CalculationDefinition)super.getTarget();`
`34`	`34`	`}`
`35`	`35`
	`36`	`+ /**`
	`37`	`+ * @satisfies checkFunctionResultBindingConnector`
	`38`	`+ */`
`36`	`39`	`@Override`
`37`	`40`	`public void doTransform() {`
`38`	`41`	`super.doTransform();`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public void addDefaultGeneralType() {`
`60`	`60`	`addDefaultGeneralType("enclosedPerformance");`
`61`	`61`	`}`
`62`	`62`	`}`
`63`		`-`
	`63`	`+`
`64`	`64`	`@Override`
`65`	`65`	`protected String getDefaultSupertype() {`
`66`	`66`	`//checkExpressionSpecialization`
Original file line number	Diff line number	Diff line change
`@@ -35,19 +35,21 @@ public Flow getTarget() {`
`35`	`35`	`return (Flow)super.getTarget();`
`36`	`36`	`}`
`37`	`37`
	`38`	`+ /**`
	`39`	`+ * @satisfies checkStepOwnedPerformanceSpecialization`
	`40`	`+ * @satisfies checkStepSubperformanceSpecialization`
	`41`	`+ * @satisfies checkStepEnclosedPerformanceSpecialization`
	`42`	`+ */`
`38`	`43`	`@Override`
`39`	`44`	`public void addDefaultGeneralType() {`
`40`	`45`	`super.addDefaultGeneralType();`
`41`	`46`	`if (isStructureOwnedComposite()) {`
`42`		`- //checkStepOwnedPerformanceSpecialization`
`43`	`47`	`addDefaultGeneralType("ownedPerformance");`
`44`	`48`	`}`
`45`	`49`	`if (isBehaviorOwnedComposite()) {`
`46`		`- //checkStepSubperformanceSpecialization`
`47`	`50`	`addDefaultGeneralType("subperformance");`
`48`	`51`	`}`
`49`	`52`	`if (isBehaviorOwned()) {`
`50`		`- //checkStepSubperformanceSpecialization`
`51`	`53`	`addDefaultGeneralType("enclosedPerformance");`
`52`	`54`	`}`
`53`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public Function getTarget() {`
`40`	`40`	`@Override`
`41`	`41`	`public void doTransform() {`
`42`	`42`	`super.doTransform();`
`43`		`- createResultConnector(getTarget().getResult());`
	`43`	`+ createResultConnector(getTarget().getResult());`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`}`