KERML_-119 Updated adapters for Annotation and AnnotatingElement.

Author: seidewitz

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) 2022, 2024 Model Driven Solutions, Inc.
+ * Copyright (c) 2022, 2024, 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
@@ -19,11 +19,7 @@
  *******************************************************************************/
 package org.omg.sysml.adapter;
 
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.util.InternalEList;
 import org.omg.sysml.lang.sysml.AnnotatingElement;
-import org.omg.sysml.lang.sysml.Annotation;
-import org.omg.sysml.lang.sysml.Relationship;
 
 public class AnnotatingElementAdapter extends ElementAdapter {
 
@@ -34,25 +30,4 @@ public AnnotatingElementAdapter(AnnotatingElement element) {
 	public AnnotatingElement getTarget() {
 		return (AnnotatingElement)super.getTarget();
 	}
-	
-	public static void transformAnnotatingElement(AnnotatingElement annotatingElement) {
-		EList<Annotation> annotations = annotatingElement.getAnnotation();
-		if (annotations.isEmpty()) {
-			Relationship owningRelationship = annotatingElement.getOwningRelationship();
-			if (owningRelationship instanceof Annotation) {
-				annotations.add((Annotation)owningRelationship);
-			} else {
-				annotatingElement.getOwnedRelationship().stream().
-					filter(Annotation.class::isInstance).
-					forEachOrdered(a->((InternalEList<Annotation>)annotations).basicAdd((Annotation)a, null));
-			}
-		}
-	}
-	
-	@Override
-	public void doTransform() {
-		super.doTransform();
-		transformAnnotatingElement(getTarget());
-	}
-
 }

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) 2024 Model Driven Solutions, Inc.
+ * Copyright (c) 2024, 2025 Model Driven Solutions, Inc.
  * Copyright (c) 2024 Budapest University of Technology and Economics
  *    
  * This program is free software: you can redistribute it and/or modify
@@ -50,19 +50,6 @@ public void postProcess() {
 				obj.setAnnotatedElement(owningRelatedElement);
 			}
 		}
-		
-		// If there is no annotatingElement set, then set the AnnotatingElement to the owningRelatedElement,
-		// if it is an AnnotatingElement, otherwise set it to the first ownedRelatedElement that is an
-		// AnnotatingElement (if any).
-		Object annotatingElement = obj.eGet(SysMLPackage.Literals.ANNOTATION__ANNOTATING_ELEMENT, false);
-		if (annotatingElement == null) {
-			Element owner = obj.getOwningRelatedElement();
-			obj.setAnnotatingElement((AnnotatingElement)
-					(owner instanceof AnnotatingElement? owner: 
-						obj.getOwnedRelatedElement().stream().
-							filter(AnnotatingElement.class::isInstance).
-							findFirst().orElse(null)));
-		}
 	}
 
 }

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

@@ -63,7 +63,6 @@ public MetadataFeature getMetaclassFeature() {
 				typing.setType(metaclass);
 				typing.setTypedFeature(metaclassFeature);
 				Annotation annotation = SysMLFactory.eINSTANCE.createAnnotation();
-				annotation.setAnnotatingElement(metaclassFeature);
 				annotation.setAnnotatedElement(element);
 				metaclassFeature.getOwnedRelationship().add(typing);
 				metaclassFeature.getOwnedRelationship().add(annotation);

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) 2022 Model Driven Solutions, Inc.
+ * Copyright (c) 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
@@ -46,11 +46,5 @@ protected String getDefaultSupertype() {
 	protected List<Type> getBaseTypes() {
 		return Collections.emptyList();
 	}
-	
-	@Override
-	public void doTransform() {
-		super.doTransform();
-		AnnotatingElementAdapter.transformAnnotatingElement(getTarget());
-	}
 
 }

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) 2022 Model Driven Solutions, Inc.
+ * Copyright (c) 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
@@ -38,10 +38,4 @@ protected String getDefaultSupertype() {
 		return getDefaultSupertype("base");
 	}
 
-	@Override
-	public void doTransform() {
-		super.doTransform();
-		AnnotatingElementAdapter.transformAnnotatingElement(getTarget());
-	}
-
 }