ST6RI-897 Moved overrides of isComposite into adapter postProcess.

- For UsageImpl and PortIsageImpl

Author: seidewitz

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) 2021, 2022, 2025 Model Driven Solutions, Inc.
+ * Copyright (c) 2021, 2022, 2025, 2026 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,6 +21,8 @@
 
 package org.omg.sysml.adapter;
 
+import org.eclipse.emf.ecore.EObject;
+import org.omg.sysml.lang.sysml.FeatureMembership;
 import org.omg.sysml.lang.sysml.PartDefinition;
 import org.omg.sysml.lang.sysml.PartUsage;
 import org.omg.sysml.lang.sysml.PortDefinition;
@@ -37,6 +39,21 @@ public PortUsage getTarget() {
 		return (PortUsage)super.getTarget();
 	}
 
+	/**
+	 * @satisfies validatePortUsageIsReference
+	 */
+	public void postProcess() {
+		super.postProcess();
+		PortUsage target = getTarget();
+		EObject container = target.eContainer();
+		if (container instanceof FeatureMembership) {
+			Type owningType = ((FeatureMembership)container).getOwningType();
+			if (!(owningType instanceof PortDefinition || owningType instanceof PortUsage)) {
+				target.setIsComposite(false);
+			}
+		}
+	}
+	
 	// Implicit Generalization
 
 	@Override

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) 2021-2025 Model Driven Solutions, Inc.
+ * Copyright (c) 2021-2025, 2026 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
@@ -53,13 +53,21 @@ public Usage getTarget() {
 
 	// Post-processing
 
+	/**
+	 * @satisfies validateUsageIsReferential
+	 */
 	@Override
 	public void postProcess () {
 		super.postProcess();
 		Usage target = getTarget();
 		if (target.isVariation()) {
 			target.setIsAbstract(true);
 		}
+		if (target.getDirection() != null || target.isEnd() || 
+			// Note: A parsed Usage can only get a featuring type if it is owned via a FeatureMembership.
+			!(target.eContainer() instanceof FeatureMembership)) {
+			target.setIsComposite(false);
+		}
 	}
 
 	@Override

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

@@ -85,12 +85,6 @@ protected static UsageAdapter getUsageAdapter(Usage usage) {
 		return (UsageAdapter)ElementUtil.getElementAdapter(usage);
 	}
 
-	// References
-	
-	public static boolean isComposite(Usage usage, boolean isComposite) {
-		return isComposite && (usage.getOwningType() != null || !usage.getFeaturingType().isEmpty()) && usage.getDirection() == null && !usage.isEnd();
-	}
-	
 	// Time Varying
 
 	public static boolean mayTimeVary(Usage usage) {

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) 2020-2022 Model Driven Solutions, Inc.
+ * Copyright (c) 2020-2022, 2026 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
@@ -29,7 +29,6 @@
 import org.omg.sysml.lang.sysml.PortDefinition;
 import org.omg.sysml.lang.sysml.PortUsage;
 import org.omg.sysml.lang.sysml.SysMLPackage;
-import org.omg.sysml.lang.sysml.Type;
 
 /**
  * <!-- begin-user-doc -->
@@ -115,22 +114,6 @@ public boolean isSetOccurrenceDefinition() {
   		return false;
 	}
 
-	// Additional overrides	
-	
-	/**
-	 * @generated NOT
-	 */
-	@Override
-	public boolean isComposite() {
-		Type owningType = getOwningType();
-		return owningType != null &&
-			   (owningType instanceof PortDefinition ||
-			    owningType instanceof PortUsage) &&
-			   super.isComposite();
-	}
-	
-	//
-
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) 2020-2024 Model Driven Solutions, Inc.
+ * Copyright (c) 2020-2024, 2026 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
@@ -18,8 +18,7 @@
  * @license LGPL-3.0-or-later <http://spdx.org/licenses/LGPL-3.0-or-later>
  *  
  *******************************************************************************/
-/**
- */
+
 package org.omg.sysml.lang.sysml.impl;
 
 import java.lang.reflect.InvocationTargetException;
@@ -66,7 +65,6 @@
 import org.omg.sysml.lang.sysml.VerificationCaseUsage;
 import org.omg.sysml.lang.sysml.ViewUsage;
 import org.omg.sysml.lang.sysml.ViewpointUsage;
-import org.omg.sysml.util.UsageUtil;
 
 /**
  * <!-- begin-user-doc -->
@@ -1044,18 +1042,6 @@ public boolean isSetIsVariable() {
   		return false;
 	}
 
-	// Additional overrides
-	
-	/**
-	 * @generated NOT
-	 */
-	@Override
-	public boolean isComposite() {
-		return UsageUtil.isComposite(this, isComposite);
-	}
-	
-	//
-	
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->