ST6RI-752 Removed non-generated code for Relationship::source / target.

- Moved special handling of ownedRelatedElements for Dependencies to
post-processing in an adapter.

Author: seidewitz

kerml/src/examples/Simple Tests/Dependencies.kerml

@@ -8,8 +8,8 @@ package Dependencies {
 
 	import System::*;
 
-//	dependency Use from 'Application Layer' to 'Service Layer';
-//	dependency from 'Service Layer' to 'Data Layer';
+	dependency Use from 'Application Layer' to 'Service Layer';
+	dependency from 'Service Layer' to 'Data Layer';
 
 	feature x;
 	feature y;

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

@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * 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.adapter;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+import org.omg.sysml.lang.sysml.Dependency;
+import org.omg.sysml.lang.sysml.Element;
+
+public class DependencyAdapter extends RelationshipAdapter {
+
+	public DependencyAdapter(Dependency element) {
+		super(element);
+	}
+	
+	public Dependency getTarget() {
+		return (Dependency)super.getTarget();
+	}
+	
+	public void postProcess() {
+		Dependency target = getTarget();
+		
+		// Add all ownedRelatedElements to supplier.
+		EObjectResolvingEList<Element> suppliers = (EObjectResolvingEList<Element>)target.getSupplier();
+		EList<Element> ownedRelatedElements = target.getOwnedRelatedElement();
+		ownedRelatedElements.stream().forEachOrdered(suppliers::addUnique);
+	}
+
+}

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

@@ -192,6 +192,11 @@ public ElementAdapter caseDefinition(Definition element) {
 			return new DefinitionAdapter(element);
 		}
 
+		@Override
+		public ElementAdapter caseDependency(Dependency element) {
+			return new DependencyAdapter(element);
+		}
+		
 		@Override
 		public ElementAdapter caseDifferencing(Differencing element) {
 			return new DifferencingAdapter(element);

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

@@ -153,12 +153,11 @@ public boolean isSetSource() {
 	/**
 	 * <!-- begin-user-doc -->
 	 * Xtext workaround:
-	 * getTarget() is inherited from Relationship.
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
-	public EList<Element> getTargetGen() {
+	public EList<Element> getTarget() {
 		return getSupplier();
 	}
 

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

@@ -238,25 +238,11 @@ else if (eNotificationRequired())
 
 	/**
 	 * <!-- begin-user-doc --> 
-	 * Xtext workaround:
-	 * Add all ownedRelatedElements to target.
 	 * <!-- end-user-doc -->
-	 * @generated NOT
+	 * @generated
 	 */
 	@Override
 	public EList<Element> getTarget() {
-		EList<Element> targets = getTargetGen();
-		EList<Element> ownedRelatedElements = getOwnedRelatedElement();
-		ownedRelatedElements.stream().filter(e->!targets.contains(e)).forEachOrdered(targets::add);
-		return targets;
-	}	
-
-	/**
-	 * <!-- begin-user-doc --> 
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<Element> getTargetGen() {
 		if (target == null) {
 			target = new EObjectResolvingEList<Element>(Element.class, this, SysMLPackage.RELATIONSHIP__TARGET);
 		}
@@ -265,27 +251,11 @@ public EList<Element> getTargetGen() {
 
 	/**
 	 * <!-- begin-user-doc --> 
-	 * Xtext workaround:
-	 * If source is empty, then add all owningRelatedElements to it.
 	 * <!-- end-user-doc -->
-	 * @generated NOT
+	 * @generated
 	 */
 	@Override
 	public EList<Element> getSource() {
-		EList<Element> sources = getSourceGen();
-		Element owningRelatedElement = getOwningRelatedElement();
-		if (sources.isEmpty() && owningRelatedElement != null && !getTarget().contains(owningRelatedElement)) {
-			sources.add(owningRelatedElement);
-		}
-		return sources;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> 
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<Element> getSourceGen() {
 		if (source == null) {
 			source = new EObjectResolvingEList<Element>(Element.class, this, SysMLPackage.RELATIONSHIP__SOURCE);
 		}