ST6RI-864 Removed ActionUsageAdapter.isNonExitEntryComposite method.

- For subtypes of ActionUsage other than StateUsage, this check is
unnecessary, because the conditions it was used in only applied in
cases in which the owningType was other than a StateDefinition or
StateUsage.

Author: seidewitz

org.omg.sysml/src/org/omg/sysml/adapter/AnalysisCaseUsageAdapter.java

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) 2021, 2023 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
@@ -44,8 +44,9 @@ protected String getSubactionType() {
 	}
 
 	public boolean isSubAnalysisCase() {
-		Type owningType = getTarget().getOwningType();
-		return isNonEntryExitComposite() &&
+		AnalysisCaseUsage target = getTarget();
+		Type owningType = target.getOwningType();
+		return target.isComposite() &&
 			   (owningType instanceof AnalysisCaseDefinition || owningType instanceof AnalysisCaseUsage);
 	}
 

org.omg.sysml/src/org/omg/sysml/adapter/CalculationUsageAdapter.java

@@ -48,16 +48,10 @@ protected String getSubactionType() {
 	}		
 
 	public boolean isSubcalculation() {
-		/*
-		 * TODO: Update checkCalculationUsageSubcalculationSpecialization
-		 * 
-    	 * isNonEntryExitComposite check is not part of the OCL
-    	 * See SYSML12-298
-		 */
 		CalculationUsage target = getTarget();
 		Type owningType = target.getOwningType();
-		return isNonEntryExitComposite() &&
-			   owningType instanceof CalculationDefinition || owningType instanceof CalculationUsage;
+		return target.isComposite() &&
+			   (owningType instanceof CalculationDefinition || owningType instanceof CalculationUsage);
 	}
 
 	@Override

org.omg.sysml/src/org/omg/sysml/adapter/CaseUsageAdapter.java

@@ -57,15 +57,9 @@ protected String getSubactionType() {
 	}
 
 	public boolean isSubcase() {
-		/*
-		 * TODO: Update checkCaseUsageSubcaseSpecialization
-		 * 
-		 * nonEntryExit part of the check is not reflected of the OCL
-    	 * See SYSML21-298
-		 */
 		CaseUsage target = getTarget();
 		Type owningType = target.getOwningType();
-		return isNonEntryExitComposite() &&
+		return target.isComposite() &&
 			   (owningType instanceof CaseDefinition || owningType instanceof CaseUsage);
 	}
 

org.omg.sysml/src/org/omg/sysml/adapter/PartUsageAdapter.java

@@ -62,9 +62,10 @@ protected boolean isRequirementActor() {
 
 	protected boolean isRequirementStakeholder() {
 		/*
-		 * TODO: Update checkPartUsageStakeholderSpecialization?
-		 *
-		 * OCL doesn't require the owningType to be ReqDef or ReqUsage 
+		 * Note: checkPartUsageStakeholderSpecialization OCL doesn't explicitly require the owningType 
+		 * to be a RequirmentDefinition or RequirementUsage. However, a valid stakeholder must be owned
+		 * by a RequirementDefinition or RequirementUsage and, if it isn't the implied subsetting won't
+		 * be valid, so don't add it.
 		 */
 		PartUsage target = getTarget();
 		Type owningType = target.getOwningType();

org.omg.sysml/src/org/omg/sysml/adapter/UsageAdapter.java

@@ -96,10 +96,6 @@ public boolean hasRelevantSubjectParameter() {
 		return false;
 	}
 
-	public boolean isNonEntryExitComposite() {
-		return getTarget().isComposite() && !isEntryExitAction();
-	}
-	
 	public boolean isActionOwnedComposite() {
 		Usage target = getTarget();
 		Type owningType = target.getOwningType();

org.omg.sysml/src/org/omg/sysml/adapter/UseCaseUsageAdapter.java

@@ -31,6 +31,11 @@ public UseCaseUsageAdapter(UseCaseUsage element) {
 		super(element);
 	}
 
+	@Override
+	public UseCaseUsage getTarget() {
+		return (UseCaseUsage)super.getTarget();
+	}
+	
 	/**
 	 * @satisfies checkIncludeUseCaseSpecialization
 	 * @satisfies checkUseCaseUsageSpecialization
@@ -41,23 +46,11 @@ protected String getSubactionType() {
 		return isSubUseCase()? "subUseCase": super.getSubactionType();	
 	}
 
-	public boolean isSubUseCase() {		
-		Type owningType = getTarget().getOwningType();
-		
-		/*
-		 * TODO: Update checkUseCaseSubUseCaseSpecialization
-		 * 
-		 * OCL does not include isNonEntryExitComposite.
-    	 * See SYSML21-298
-		 */
-		
-		return isNonEntryExitComposite() && 
+	public boolean isSubUseCase() {	
+		UseCaseUsage target = getTarget();
+		Type owningType = target.getOwningType();		
+		return target.isComposite() &&
 			   (owningType instanceof UseCaseDefinition || owningType instanceof UseCaseUsage);
 	}
 
-	@Override
-	public UseCaseUsage getTarget() {
-		return (UseCaseUsage)super.getTarget();
-	}
-	
 }

org.omg.sysml/src/org/omg/sysml/adapter/VerificationCaseUsageAdapter.java

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) 2021, 2023 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
@@ -46,8 +46,9 @@ protected String getSubactionType() {
 	}
 
 	public boolean isSubVerificationCase() {
-		Type owningType = getTarget().getOwningType();
-		return isNonEntryExitComposite() && 
+		VerificationCaseUsage target = getTarget();
+		Type owningType = target.getOwningType();
+		return target.isComposite() && 
 			   (owningType instanceof VerificationCaseDefinition || owningType instanceof VerificationCaseUsage);
 	}