ST6RI-818 Removed adding of result param for calcs and constraints.

- Updated TypeAdapter::getFeaturesRedefinedByType to add additional
members before getting redefined features.

Author: seidewitz

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) 2021, 2024 Model Driven Solutions, Inc.
+ * Copyright (c) 2021, 2024, 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
@@ -22,7 +22,6 @@
 package org.omg.sysml.adapter;
 
 import org.omg.sysml.lang.sysml.CalculationDefinition;
-import org.omg.sysml.util.UsageUtil;
 
 public class CalculationDefinitionAdapter extends ActionDefinitionAdapter {
 
@@ -34,12 +33,6 @@ public CalculationDefinition getTarget() {
 		return (CalculationDefinition)super.getTarget();
 	}
 
-	@Override
-	public void addAdditionalMembers() {
-		CalculationDefinition target = getTarget();
-		UsageUtil.addResultParameterTo(target);
-	}
-	
 	@Override
 	public void doTransform() {
 		super.doTransform();

org.omg.sysml/src/org/omg/sysml/adapter/CalculationUsageAdapter.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
@@ -25,7 +25,6 @@
 import org.omg.sysml.lang.sysml.CalculationDefinition;
 import org.omg.sysml.lang.sysml.CalculationUsage;
 import org.omg.sysml.lang.sysml.Type;
-import org.omg.sysml.util.UsageUtil;
 
 public class CalculationUsageAdapter extends ActionUsageAdapter {
 
@@ -51,11 +50,6 @@ public boolean isSubcalculation() {
 			   owningType instanceof CalculationDefinition || owningType instanceof CalculationUsage;
 	}
 
-	@Override
-	public void addAdditionalMembers() {
-		UsageUtil.addResultParameterTo(getTarget());
-	}
-	
 	@Override
 	public void doTransform() {
 		super.doTransform();

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) 2021, 2024 Model Driven Solutions, Inc.
+ * Copyright (c) 2021, 2024, 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
@@ -22,7 +22,6 @@
 package org.omg.sysml.adapter;
 
 import org.omg.sysml.lang.sysml.ConstraintDefinition;
-import org.omg.sysml.util.UsageUtil;
 
 public class ConstraintDefinitionAdapter extends OccurrenceDefinitionAdapter {
 
@@ -35,11 +34,6 @@ public ConstraintDefinition getTarget() {
 		return (ConstraintDefinition)super.getTarget();
 	}
 
-	@Override
-	public void addAdditionalMembers() {
-		UsageUtil.addResultParameterTo(getTarget());
-	}
-	
 	@Override
 	public void doTransform() {
 		super.doTransform();

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) 2021-2024 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
@@ -81,11 +81,6 @@ protected boolean isCheckedConstraint() {
 				(owningType instanceof ItemDefinition || owningType instanceof ItemUsage);				
 	}
 
-	@Override
-	public void addAdditionalMembers() {
-		UsageUtil.addResultParameterTo(getTarget());
-	}
-	
 	@Override
 	public void doTransform() {
 		super.doTransform();

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

@@ -197,6 +197,7 @@ public EList<Membership> getInheritedMembership() {
 	 */
 	protected Collection<Feature> getFeaturesRedefinedByType() {
 		if (redefinedFeatures == null) {
+			addAdditionalMembers();
 			redefinedFeatures = TypeUtil.getFeaturesRedefinedBy(getTarget(), null);
 		}
 		return redefinedFeatures;		

org.omg.sysml/src/org/omg/sysml/util/UsageUtil.java

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) 2021-2024 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
@@ -118,12 +118,6 @@ public static VariantMembership getOwningVariantMembershipFor(Usage usage) {
 		return owningMembership instanceof VariantMembership? (VariantMembership)owningMembership: null;
 	}
 
-	// Results
-	
-	public static void addResultParameterTo(Type type) {
-		TypeUtil.addResultParameterTo(type, SysMLFactory.eINSTANCE.createReferenceUsage());
-	}
-	
 	// Subjects
 
 	public static boolean isSubjectParameter(Usage usage) {