SYSML2_-222 Implemented TransitionUsage::sourceFeature operation.

Author: seidewitz

org.omg.sysml/model/SysML.genmodel

@@ -1264,10 +1264,10 @@
   </genPackages>
   <genPackages xsi:type="genmodel:GenPackage" prefix="Types" basePackage="org.omg.sysml.lang"
       disposableProviderFactory="true" ecorePackage="types.ecore#/">
+    <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="types.ecore#//Boolean"/>
     <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="types.ecore#//Integer"/>
     <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="types.ecore#//Real"/>
-    <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="types.ecore#//String"/>
     <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="types.ecore#//UnlimitedNatural"/>
-    <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="types.ecore#//Boolean"/>
+    <genDataTypes xsi:type="genmodel:GenDataType" ecoreDataType="types.ecore#//String"/>
   </genPackages>
 </genmodel:GenModel>

org.omg.sysml/src/org/omg/sysml/delegate/invocation/TransitionUsage_sourceFeature_InvocationDelegate.java

@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * SysML 2 Pilot Implementation
+ * Copyright (c) 2024 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *  
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *  
+ * @license LGPL-3.0-or-later <http://spdx.org/licenses/LGPL-3.0-or-later>
+ *  
+ *******************************************************************************/
+
+package org.omg.sysml.delegate.invocation;
+
+import java.lang.reflect.InvocationTargetException;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EOperation;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.util.BasicInvocationDelegate;
+import org.omg.sysml.lang.sysml.Feature;
+import org.omg.sysml.lang.sysml.TransitionUsage;
+import org.omg.sysml.util.UsageUtil;
+
+public class TransitionUsage_sourceFeature_InvocationDelegate extends BasicInvocationDelegate {
+
+	public TransitionUsage_sourceFeature_InvocationDelegate(EOperation operation) {
+		super(operation);
+	}
+	
+	@Override
+	public Feature dynamicInvoke(InternalEObject target, EList<?> arguments) throws InvocationTargetException {
+		TransitionUsage self = (TransitionUsage) target;		
+		return UsageUtil.getSourceFeatureOf(self);
+	}
+
+}

org.omg.sysml/src/org/omg/sysml/delegate/setting/Feature_featureTarget_SettingDelegate.java

@@ -21,10 +21,10 @@
 
 package org.omg.sysml.delegate.setting;
 
-import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.omg.sysml.lang.sysml.Feature;
+import org.omg.sysml.util.FeatureUtil;
 
 public class Feature_featureTarget_SettingDelegate extends BasicDerivedObjectSettingDelegate {
 
@@ -35,8 +35,7 @@ public Feature_featureTarget_SettingDelegate(EStructuralFeature eStructuralFeatu
 	@Override
 	protected Feature basicGet(InternalEObject owner) {
 		Feature feature = (Feature)owner;
-		EList<Feature> chainingFeatures = feature.getChainingFeature();
-		return chainingFeatures.isEmpty()? feature: chainingFeatures.get(chainingFeatures.size() - 1);
+		return FeatureUtil.getBasicFeatureOf(feature);
 	}
 
 }

org.omg.sysml/src/org/omg/sysml/delegate/setting/TransitionUsage_source_SettingDelegate.java

@@ -22,13 +22,10 @@
 
 package org.omg.sysml.delegate.setting;
 
-import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.omg.sysml.lang.sysml.Feature;
 import org.omg.sysml.lang.sysml.TransitionUsage;
-import org.omg.sysml.util.FeatureUtil;
-import org.omg.sysml.util.UsageUtil;
 
 public class TransitionUsage_source_SettingDelegate extends BasicDerivedObjectSettingDelegate {
 
@@ -37,9 +34,9 @@ public TransitionUsage_source_SettingDelegate(EStructuralFeature eStructuralFeat
 	}
 
 	@Override
-	protected EObject basicGet(InternalEObject owner) {
-		Feature source = UsageUtil.getSourceFeatureOf((TransitionUsage)owner);
-		return source == null? null: FeatureUtil.getBasicFeatureOf(source);
+	protected Feature basicGet(InternalEObject owner) {
+		Feature source = ((TransitionUsage)owner).sourceFeature();
+		return source == null? null: source.getFeatureTarget();
 	}
 
 }

org.omg.sysml/src/org/omg/sysml/delegate/setting/TransitionUsage_target_SettingDelegate.java

@@ -1,6 +1,7 @@
 /*******************************************************************************
  * SysML 2 Pilot Implementation
  * Copyright (c) 2022 Siemens AG
+ * Copyright (c) 2024 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
@@ -28,7 +29,6 @@
 import org.omg.sysml.lang.sysml.ActionUsage;
 import org.omg.sysml.lang.sysml.Feature;
 import org.omg.sysml.lang.sysml.TransitionUsage;
-import org.omg.sysml.util.FeatureUtil;
 
 public class TransitionUsage_target_SettingDelegate extends BasicDerivedObjectSettingDelegate {
 
@@ -42,7 +42,7 @@ protected EObject basicGet(InternalEObject owner) {
 		if (relatedFeatures.size() < 2) {
 			return null;
 		} else {
-			Feature target = FeatureUtil.getBasicFeatureOf(relatedFeatures.get(1));
+			Feature target = relatedFeatures.get(1).getFeatureTarget();
 			return target instanceof ActionUsage? (ActionUsage)target: null;
 		}
 	}