ST6RI-843 Identified adapter TODOs as spec updates vs. impl fixes.

seidewitz · seidewitz · commit 6d68d375f2ca · 2025-06-29T18:55:44.000-04:00
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/CalculationUsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/CalculationUsageAdapter.java
@@ -49,16 +49,10 @@ protected String getSubactionType() {
 		
 	public boolean isSubcalculation() {
 		/*
-		 * TODO: ST6RI-843
+		 * TODO: Update checkCalculationUsageSubcalculationSpecialization
 		 * 
-		 * checkCalculationUsageSubcalculationSpecialization
-		 * 
-		 * owningType <> null and
-		 * (owningType.oclIsKindOf(CalculationDefinition) or
- 		 * owningType.oclIsKindOf(CalculationUsage)) implies
-    	 * specializesFromLibrary('Calculations::Calculation::subcalculations')
-    	 * 
     	 * isNonEntryExitComposite check is not part of the OCL
+    	 * See SYSML12-298
 		 */
 		CalculationUsage target = getTarget();
 		Type owningType = target.getOwningType();
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/CaseUsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/CaseUsageAdapter.java
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) 2021, 2023-2024 Model Driven Solutions, Inc.
+ * Copyright (c) 2021, 2023-2025 Model Driven Solutions, Inc.
  *    
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -57,16 +57,11 @@ protected String getSubactionType() {
 	}
 		
 	public boolean isSubcase() {
-		/*TODO: ST6RI-843
-		 * 
-		 * checkCaseUsageSubcaseSpecialization
-		 * 
-		 * isComposite and owningType <> null and 
-    	 * (owningType.oclIsKindOf(CaseDefinition) or
-         * owningType.oclIsKindOf(CaseUsage)) implies
-         * specializesFromLibrary('Cases::Case::subcases')
+		/*
+		 * TODO: Update checkCaseUsageSubcaseSpecialization
 		 * 
 		 * nonEntryExit part of the check is not reflected of the OCL
+    	 * See SYSML21-298
 		 */
 		CaseUsage target = getTarget();
 		Type owningType = target.getOwningType();
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/ConstraintUsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/ConstraintUsageAdapter.java
@@ -86,14 +86,7 @@ protected String getDefaultSupertype() {
 	
 	protected boolean isCheckedConstraint() {
 		/*
-		 * TODO: ST6RI-843
-		 * 
-		 *  checkConstraintUsageCheckedConstraintSpecialization
-		 *  
-		 *  owningType <> null and
-		 *	(owningType.oclIsKindOf(ItemDefinition) or
-		 * owningType.oclIsKindOf(ItemUsage)) implies
-		 * specializesFromLibrary('Items::Item::checkedConstraints')
+		 * TODO: Update checkConstraintUsageCheckedConstraintSpecialization
 		 * 
 		 * OCL doesn't require composite
 		 *  
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/EventOccurrenceUsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/EventOccurrenceUsageAdapter.java
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) 2021 Model Driven Solutions, Inc.
+ * Copyright (c) 2021, 2025 Model Driven Solutions, Inc.
  *    
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -37,30 +37,8 @@ public EventOccurrenceUsage getTarget() {
 		return (EventOccurrenceUsage)super.getTarget();
 	}
 	
-	/*
-	 * TODO: ST6RI-843
-	 * 
-	 * All general semantic constraints on an OccurrenceUsage
-	 * (see 8.4.5.2 ) also apply to an EventOccurrenceUsage.
-	 * 
-	 * addDefaultGeneralType and getDefaultSuperType overrides look redundant
-	 * as they both check for subOccurrence which is also done by OccurrenceUsageAdapter
-	 */
-	
-	/**
-	 * @satisfies checkOccurrenceUsageSuboccurrenceSpecialization
-	 */
-	@Override
-	public void addDefaultGeneralType() {
-		super.addDefaultGeneralType();
-		if (isSuboccurrence()) {
-			addImplicitGeneralType(getSpecializationEClass(), 
-					getLibraryType(getDefaultSupertype("suboccurrence")));
-		}
-	}
-	
 	/**
-	 * @satisfies checkOccurrenceUsageSuboccurrenceSpecialization
+	 * @satisfies checkEventOccurrenceUsageSpecialization
 	 */
 	@Override
 	protected String getDefaultSupertype() {
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/FeatureAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/FeatureAdapter.java
@@ -238,18 +238,6 @@ public void addDefaultGeneralType() {
 	
 
 	protected void addBoundValueSubsetting() {
-		/*
-		 * TODO: ST6RI-843
-		 * 
-		 * direction = null and
-		 * ownedSpecializations->forAll(isImplied) implies
-		 * ownedMembership->
-         * selectByKind(FeatureValue)->
-         * forAll(fv | specializes(fv.value.result))
-		 * 
-		 * 
-		 */
-		
 		Feature target = getTarget();
 		Feature result = getBoundValueResult();
 
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/FeatureReferenceExpressionAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/FeatureReferenceExpressionAdapter.java
@@ -64,11 +64,9 @@ protected boolean isInFilterExpression() {
 	 */
 	protected void addReferenceConnector() {
 		/*
-		 * TODO: ST6RI-843
-		 * 
-		 * ownedMember->selectByKind(BindingConnector)->exists(b |
-		 * b.relatedFeatures->includes(targetFeature) and
-         * b.relatedFeatures->includes(result))
+		 * TODO: Update checkFeatureReferenceExpressionBindingConnector?
+         * 
+         * OCL does not include !isInFilterExpression check.
 		 * 
 		 */
 		if (!isInFilterExpression()) {
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/IncludeUseCaseUsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/IncludeUseCaseUsageAdapter.java
@@ -37,6 +37,13 @@ public IncludeUseCaseUsage getTarget() {
 		return (IncludeUseCaseUsage)super.getTarget();
 	}
 	
+	/**
+	 * TODO: checkIncludeUseCaseUsageSpecialization
+	 * 
+	 * TODO: Rename checkIncludeUseCaseSpecialization
+	 * See SYSML21-299
+	 */
+	
 	/**
 	 * @satisfies checkPerformActionUsageSpecialization
 	 */
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/IndexExpressionAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/IndexExpressionAdapter.java
@@ -58,13 +58,10 @@ protected void addResultTyping() {
 			Type arrayType = getLibraryType(ARRAY_TYPE);
 			Type scalarValueType = getLibraryType(SCALAR_VALUE_TYPE);
 			/*
-			 * TODO: ST6RI-843
-			 * checkIndexExpressionResultSpecialization:
-			 * arguments->notEmpty() and 
-			 * not arguments->first().result.specializesFromLibrary('Collections::Array') implies
-    		 * result.specializes(arguments->first().result)
+			 * TODO: Update checkIndexExpressionResultSpecialization
+			 * See KERML11-69.
     		 * 
-    		 * '|| TypeUtil.specializes(target, scalarValueType)' part is not reflected by the OCL 
+    		 * TODO: Generalize to handle all types other than Collection types?
 			 */
 			if (!TypeUtil.specializes(target, arrayType) || TypeUtil.specializes(target, scalarValueType)) {
 				Feature resultFeature = target.getResult();
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/PartUsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/PartUsageAdapter.java
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) 2021 Model Driven Solutions, Inc.
+ * Copyright (c) 2021, 2025 Model Driven Solutions, Inc.
  *    
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -62,13 +62,7 @@ protected boolean isRequirementActor() {
 
 	protected boolean isRequirementStakeholder() {
 		/*
-		 * TODO: ST6RI-843
-		 * 
-		 * checkPartUsageStakeholderSpecialization
-		 * 
-		 * owningFeatureMembership <> null and
-		 * owningFeatureMembership.oclIsKindOf(StakeholderMembership) implies
-		 * specializesFromLibrary('Requirements::RequirementCheck::stakeholders')
+		 * TODO: Update checkPartUsageStakeholderSpecialization?
 		 *
 		 * OCL doesn't require the owningType to be ReqDef or ReqUsage 
 		 */
diff --git a/org.omg.sysml/src/org/omg/sysml/adapter/UseCaseUsageAdapter.java b/org.omg.sysml/src/org/omg/sysml/adapter/UseCaseUsageAdapter.java
@@ -45,17 +45,10 @@ public boolean isSubUseCase() {
 		Type owningType = getTarget().getOwningType();
 		
 		/*
-		 * TODO: ST6RI-843
+		 * TODO: Update checkUseCaseSubUseCaseSpecialization
 		 * 
-		 * checkIncludeUseCaseSpecialization
-		 * 
-		 * owningType <> null and
-		 * (owningType.oclIsKindOf(UseCaseDefinition) or
-		 * owningType.oclIsKindOf(UseCaseUsage) implies
-		 * specializesFromLibrary('UseCases::UseCase::includedUseCases')
-		 * 
-		 * the semantic constraint doens't require the IncludeUseCaseUsage to be composite, also
-		 * IncludeUseCaseUsageImpl overrides isComposite to always return false
+		 * OCL does not include isNonEntryExitComposite.
+    	 * See SYSML21-298
 		 */
 		
 		return isNonEntryExitComposite() && 
diff --git a/org.omg.sysml/src/org/omg/sysml/util/ImplicitGeneralizationMap.java b/org.omg.sysml/src/org/omg/sysml/util/ImplicitGeneralizationMap.java
@@ -124,6 +124,10 @@ protected ImplicitGeneralizationMap() {
 		//checkPayloadFeatureRedefinition
 		put(PayloadFeatureImpl.class, "payload", "Transfers::Transfer::payload");
 		
+		/*
+		 * TODO: checkFlowSpecialization
+		 * specializesFromLibrary('Transfers::transfers')
+		 */		
 		//checkFlowWithEndsSpecialization
 		put(FlowImpl.class, "base", "Transfers::flowTransfers");
 		//checkStepEnclosedPerformanceSpecialization
@@ -133,15 +137,6 @@ protected ImplicitGeneralizationMap() {
 		//checkStepOwnedPerformanceSpecialization
 		put(FlowImpl.class, "ownedPerformance", "Objects::Object::ownedPerformances");
 		
-		/*
-		 * TODO: ST6RI-843
-		 * checkFlowSpecialization
-		 * specializesFromLibrary('Transfers::transfers')
-		 * 
-		 * This case is missing from the implementation
-		 */
-		
-		
 		//checkFeatureFlowFeatureRedefinition
 		put(FlowEndImpl.class, "sourceOutput", "Transfers::Transfer::source::sourceOutput");
 		//checkFeatureFlowFeatureRedefinition
@@ -566,17 +561,9 @@ protected ImplicitGeneralizationMap() {
 		put(ViewpointUsageImpl.class, "satisfied", "Views::View::viewpointSatisfactions");
 		
 		/*
-		 * TODO: ST6RI-843
-		 * 
-		 * checkViewpointDefinitionSpecialization
-		 * specializesFromLibrary('Views::Viewpoint')
-		 * 
-		 * TODO: ST6RI-843
-		 * 
-		 * checkViewpointUsageSpecialization
-		 * specializesFromLibrary('Views::viewpoints')
+		 * TODO: Update checkViewpointDefinitionSpecialization and checkViewpointUsageSpecialization
 		 * 
-		 * OCL doesn't match with the implementation
+		 * See SYSML21-301
 		 */
 		
 		//checkWhileLoopActionUsageSpecialization
diff --git a/org.omg.sysml/src/org/omg/sysml/util/UsageUtil.java b/org.omg.sysml/src/org/omg/sysml/util/UsageUtil.java
@@ -265,16 +265,10 @@ public static RequirementConstraintKind getRequirementConstraintKindOf(Constrain
 	public static boolean isSubrequirement(RequirementUsage requirement) {
 		Type owningType = requirement.getOwningType();
 		/*
-		 * TODO: ST6RI-843
-		 * 
-		 * checkRequirementUsageSubrequirementSpecialization
-		 * 
-		 * isComposite and owningType <> null and
-		 * (owningType.oclIsKindOf(RequirementDefinition) or
-		 * owningType.oclIsKindOf(RequirementUsage)) implies
-		 * specializesFromLibrary('Requirements::RequirementCheck::subrequirements')
+		 * TODO: Update checkRequirementUsageSubrequirementSpecialization
 		 * 
 		 * !isAssumptionConstraint is not in the OCL
+		 * See SYSML21-300
 		 * 
 		 */
 		return !isAssumptionConstraint(requirement) && requirement.isComposite() &&
diff --git a/org.omg.sysml/syntax-gen/org/omg/sysml/lang/sysml/impl/RenderingUsageImpl.java b/org.omg.sysml/syntax-gen/org/omg/sysml/lang/sysml/impl/RenderingUsageImpl.java
@@ -120,7 +120,11 @@ public boolean isSetRenderingDefinition() {
 	
 	// Additional overrides
 	
-	// TODO: Add this override to the SysML abstract syntax.
+	/**
+	 * TODO: Update RenderingUsage with namingFeature redefinition.
+	 * 
+	 * See SYSML21-302
+	 */	
 	@Override
 	public Feature namingFeature() {
 		FeatureMembership membership = getOwningFeatureMembership();
