KERML_-99 Revised FeatureChainExpressionAdapter for result subsetting.

- Also moved adding of sourceTarget feature into addAdditionalMembers
method.

Author: seidewitz

org.omg.kerml.xtext/src/org/omg/kerml/xtext/validation/KerMLValidator.xtend

@@ -976,6 +976,8 @@ class KerMLValidator extends AbstractKerMLValidator {
 			)) {
 			error(INVALID_FEATURE_CHAIN_EXPRESSION_FEATURE_CONFORMANCE_MSG, e.ownedMembership.get(1), SysMLPackage.eINSTANCE.membership_MemberElement, INVALID_FEATURE_CHAIN_EXPRESSION_FEATURE_CONFORMANCE)
 		}
+		
+		// validateFeatureChainExpressionOperator is automatically satisfied
 	}
 
 	@Check

org.omg.sysml/src/org/omg/sysml/adapter/FeatureChainExpressionAdapter.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,13 +21,11 @@
 
 package org.omg.sysml.adapter;
 
-import java.util.List;
-
-import org.omg.sysml.lang.sysml.Element;
 import org.omg.sysml.lang.sysml.Feature;
 import org.omg.sysml.lang.sysml.FeatureChainExpression;
 import org.omg.sysml.lang.sysml.SysMLFactory;
 import org.omg.sysml.lang.sysml.SysMLPackage;
+import org.omg.sysml.util.FeatureUtil;
 import org.omg.sysml.util.ImplicitGeneralizationMap;
 import org.omg.sysml.util.TypeUtil;
 
@@ -46,26 +44,36 @@ public FeatureChainExpression getTarget() {
 	protected void addResultTyping() {
 		FeatureChainExpression target = getTarget();
 		Feature result = target.getResult();
-		Element targetFeature = target.getTargetFeature();
-		if (result != null) {
+		Feature sourceTarget = target.sourceTargetFeature();
+		if (result != null && sourceTarget != null) {
+			Feature sourceParameter = TypeUtil.getOwnedParameterOf(target, 0, Feature.class);
 			TypeUtil.addImplicitGeneralTypeTo(result,
-					SysMLPackage.eINSTANCE.getSubsetting(), (Feature)targetFeature);
+					SysMLPackage.eINSTANCE.getSubsetting(), 
+						FeatureUtil.chainFeatures(sourceParameter, sourceTarget));
 		}
 	}
 
-	protected void addTargetRedefinition() {
+	@Override
+	public void addAdditionalMembers() {
+		super.addAdditionalMembers();
+		
+		// Add sourceTarget feature.
 		FeatureChainExpression target = getTarget();
 		Feature sourceParameter = TypeUtil.getOwnedParameterOf(target, 0, Feature.class);
 		if (sourceParameter != null) {
-			Feature sourceTarget = null;
-			List<Feature> sourceFeatures = sourceParameter.getOwnedFeature();
-			if (!sourceFeatures.isEmpty()) {
-				sourceTarget = sourceFeatures.get(0);
-			} else {
-				sourceTarget = SysMLFactory.eINSTANCE.createFeature();
+			if (sourceParameter.getOwnedFeature().isEmpty()) {
+				Feature sourceTarget = SysMLFactory.eINSTANCE.createFeature();
 				sourceTarget.setDeclaredName(""); // To avoid effective naming.
 				TypeUtil.addOwnedFeatureTo(sourceParameter, sourceTarget);
 			}
+		}
+	}
+	
+	protected void addTargetRedefinition() {
+		FeatureChainExpression target = getTarget();
+		Feature sourceParameter = TypeUtil.getOwnedParameterOf(target, 0, Feature.class);
+		if (sourceParameter != null) {
+			Feature sourceTarget = target.sourceTargetFeature();
 			TypeUtil.addImplicitGeneralTypeTo(sourceTarget,
 					SysMLPackage.eINSTANCE.getRedefinition(), 
 					getLibraryType(ImplicitGeneralizationMap.getDefaultSupertypeFor(target.getClass(), "target")));

org.omg.sysml/syntax-gen/org/omg/sysml/lang/sysml/impl/FeatureChainExpressionImpl.java

@@ -47,6 +47,8 @@
  */
 public class FeatureChainExpressionImpl extends OperatorExpressionImpl implements FeatureChainExpression {
 
+	private static final String FEATURE_CHAIN_FUNCTION = ".";
+
 	/**
 	 * The cached setting delegate for the '{@link #getTargetFeature() <em>Target Feature</em>}' reference.
 	 * <!-- begin-user-doc -->
@@ -56,7 +58,6 @@ public class FeatureChainExpressionImpl extends OperatorExpressionImpl implement
 	 * @ordered
 	 */
 	protected EStructuralFeature.Internal.SettingDelegate TARGET_FEATURE__ESETTING_DELEGATE = ((EStructuralFeature.Internal)SysMLPackage.Literals.FEATURE_CHAIN_EXPRESSION__TARGET_FEATURE).getSettingDelegate();
-	private static final String FEATURE_CHAIN_FUNCTION = ".";
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -77,6 +78,9 @@ protected EClass eStaticClass() {
 		return SysMLPackage.Literals.FEATURE_CHAIN_EXPRESSION;
 	}
 
+	/**
+	 * @generated NOT
+	 */
 	@Override
 	public String getOperator() {
 		return FEATURE_CHAIN_FUNCTION;