ST6RI-828 Removed old getRelevantFeatures mechanism for behaviors/steps.

Author: seidewitz

org.omg.sysml/src/org/omg/sysml/adapter/ActionDefinitionAdapter.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
@@ -21,11 +21,7 @@
 
 package org.omg.sysml.adapter;
 
-import java.util.Collections;
-import java.util.List;
-
 import org.omg.sysml.lang.sysml.ActionDefinition;
-import org.omg.sysml.lang.sysml.Feature;
 
 public class ActionDefinitionAdapter extends OccurrenceDefinitionAdapter {
 
@@ -38,9 +34,4 @@ public ActionDefinition getTarget() {
 		return (ActionDefinition)super.getTarget();
 	}
 
-	@Override
-	public List<Feature> getRelevantFeatures() {
-		return Collections.emptyList();
-	}
-
 }

org.omg.sysml/src/org/omg/sysml/adapter/ActionUsageAdapter.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
@@ -34,7 +34,6 @@
 import org.omg.sysml.lang.sysml.TransitionFeatureMembership;
 import org.omg.sysml.lang.sysml.Type;
 import org.omg.sysml.util.ImplicitGeneralizationMap;
-import org.omg.sysml.util.TypeUtil;
 
 public class ActionUsageAdapter extends OccurrenceUsageAdapter {
 
@@ -102,11 +101,6 @@ public boolean isComputeRedefinitions() {
 				super.isComputeRedefinitions();
 	}
 
-	@Override
-	public List<? extends Feature> getRelevantFeatures() {
-		return TypeUtil.getItemFeaturesOf(getTarget());
-	}	
-	
 	@Override
 	protected List<? extends Feature> getRelevantFeatures(Type type, Element skip) {
 		ActionUsage target = getTarget();

org.omg.sysml/src/org/omg/sysml/adapter/BehaviorAdapter.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
@@ -21,11 +21,7 @@
 
 package org.omg.sysml.adapter;
 
-import java.util.List;
-
 import org.omg.sysml.lang.sysml.Behavior;
-import org.omg.sysml.lang.sysml.Feature;
-import org.omg.sysml.util.TypeUtil;
 
 public class BehaviorAdapter extends ClassAdapter {
 
@@ -38,12 +34,4 @@ public Behavior getTarget() {
 		return (Behavior)super.getTarget();
 	}
 
-	/**
-	 * Return the non-parameter abstract features of the Behavior.
-	 */
-	@Override
-	public List<Feature> getRelevantFeatures() {
-		return TypeUtil.getNonParameterAbstractFeaturesFor(getTarget());
-	}
-	
 }

org.omg.sysml/src/org/omg/sysml/adapter/FeatureAdapter.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
@@ -561,7 +561,7 @@ protected List<? extends Feature> getRelevantFeatures(Type type, Element skip) {
 		return type == null? Collections.emptyList():
 			   target.isEnd()? TypeUtil.getAllEndFeaturesOf(type):
 			   FeatureUtil.isParameter(target)? getParameterRelevantFeatures(type, skip):
-			   TypeUtil.getRelevantFeaturesOf(type);
+			   Collections.emptyList();
 	}
 
 	/**

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) 2021, 2022 Model Driven Solutions, Inc.
+ * Copyright (c) 2021, 2022, 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
@@ -21,12 +21,8 @@
 
 package org.omg.sysml.adapter;
 
-import java.util.List;
-
-import org.omg.sysml.lang.sysml.Feature;
 import org.omg.sysml.lang.sysml.Flow;
 import org.omg.sysml.util.ConnectorUtil;
-import org.omg.sysml.util.TypeUtil;
 
 public class FlowAdapter extends ConnectorAdapter {
 
@@ -57,12 +53,7 @@ public void addDefaultGeneralType() {
 	protected String getDefaultSupertype() {
 		return getDefaultSupertype("base");
 	}
-	
-	@Override
-	public List<? extends Feature> getRelevantFeatures() {
-		return TypeUtil.getItemFeaturesOf(getTarget());
-	}
-	
+		
 	@Override
 	public void doTransform() {
 		ConnectorUtil.transformConnectorEndsOf(getTarget());

org.omg.sysml/src/org/omg/sysml/adapter/FlowUsageAdapter.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
@@ -21,14 +21,10 @@
 
 package org.omg.sysml.adapter;
 
-import java.util.List;
-
-import org.omg.sysml.lang.sysml.Feature;
 import org.omg.sysml.lang.sysml.FlowUsage;
 import org.omg.sysml.lang.sysml.OccurrenceUsage;
 import org.omg.sysml.lang.sysml.PortionKind;
 import org.omg.sysml.util.ConnectorUtil;
-import org.omg.sysml.util.TypeUtil;
 import org.omg.sysml.util.UsageUtil;
 
 public class FlowUsageAdapter extends ConnectorAsUsageAdapter {
@@ -88,12 +84,7 @@ protected String getDefaultSupertype() {
 				getDefaultSupertype("message"):
 				getDefaultSupertype("base");
 	}
-	
-	@Override
-	public List<? extends Feature> getRelevantFeatures() {
-		return TypeUtil.getItemFeaturesOf(getTarget());
-	}
-	
+		
 	@Override
 	public void doTransform() {
 		ConnectorUtil.transformConnectorEndsOf(getTarget());

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) 2021, 2022 Model Driven Solutions, Inc.
+ * Copyright (c) 2021, 2022, 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
@@ -21,12 +21,8 @@
 
 package org.omg.sysml.adapter;
 
-import java.util.List;
-
-import org.omg.sysml.lang.sysml.Feature;
 import org.omg.sysml.lang.sysml.PayloadFeature;
 import org.omg.sysml.lang.sysml.Step;
-import org.omg.sysml.util.TypeUtil;
 
 public class StepAdapter extends FeatureAdapter {
 
@@ -57,9 +53,4 @@ public boolean isIncomingTransfer() {
 		return getTarget().getOwnedFeature().stream().anyMatch(PayloadFeature.class::isInstance);
 	}
 
-	@Override
-	public List<? extends Feature> getRelevantFeatures() {
-		return TypeUtil.getItemFeaturesOf(getTarget());
-	}	
-	
 }

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

@@ -425,18 +425,6 @@ public Type getLibraryType(String... defaultNames) {
 		return SysMLLibraryUtil.getLibraryType(getTarget(), defaultNames);
 	}
 
-	// Computed Redefinitions
-	
-	/**
-	 * This method returns those features from the target type that should be automatically overridden in its usages.
-	 * By default, there are none.
-	 * 
-	 * @return	Relevant features from the target type that should be redefined in usages.
-	 */
-	public List<? extends Feature> getRelevantFeatures() {
-		return Collections.emptyList();
-	}
-	
 	// Extension
 
 	private boolean isGetBaseTypes = true;

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

@@ -43,7 +43,6 @@
 import org.omg.sysml.lang.sysml.FeatureChaining;
 import org.omg.sysml.lang.sysml.FeatureMembership;
 import org.omg.sysml.lang.sysml.Specialization;
-import org.omg.sysml.lang.sysml.PayloadFeature;
 import org.omg.sysml.lang.sysml.Membership;
 import org.omg.sysml.lang.sysml.Multiplicity;
 import org.omg.sysml.lang.sysml.Namespace;
@@ -489,30 +488,6 @@ public static void insertImplicitBindingConnectors(Type type) {
 		}
 	}
 
-	// Relevant features
-	
-	public static List<? extends Feature> getRelevantFeaturesOf(Type type) {
-		return getTypeAdapter(type).getRelevantFeatures();
-	}
-	
-	/**
-	 * Get the non-parameter abstract Features. (For use with Behaviors.)
-	 */
-	public static List<Feature> getNonParameterAbstractFeaturesFor(Type type) {
-		return type.getOwnedFeature().stream().
-				filter(feature -> !FeatureUtil.isParameter(feature) && feature.isAbstract()).
-				collect(Collectors.toList());
-	}
-	
-	/**
-	 * Get ItemFeatures. (For use with Steps.)
-	 */
-	public static List<? extends Feature> getItemFeaturesOf(Type type) {
-		return type.getOwnedFeature().stream().
-				filter(PayloadFeature.class::isInstance).
-				collect(Collectors.toList());
-	}
-
 	// Associations
 
 	public static Type getSourceTypeOf(Association association) {