ST6RI-521 Restored AnnotatingElement owning Annotation transform.

Author: seidewitz

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

@@ -0,0 +1,34 @@
+package org.omg.sysml.adapter;
+
+import org.eclipse.emf.common.util.EList;
+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 {
+	
+	public AnnotatingElementAdapter(AnnotatingElement element) {
+		super(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);
+			}
+		}
+	}
+	
+	@Override
+	public void doTransform() {
+		super.doTransform();
+		transformAnnotatingElement(getTarget());
+	}
+
+}

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

@@ -76,6 +76,11 @@ public ElementAdapter caseActionUsage(ActionUsage element) {
 			return new ActionUsageAdapter(element);
 		}
 
+		@Override
+		public ElementAdapter caseAnnotatingElement(AnnotatingElement element) {
+			return new AnnotatingElementAdapter(element);
+		}
+		
 		@Override
 		public ElementAdapter caseAssertConstraintUsage(AssertConstraintUsage element) {
 			return new AssertConstraintUsageAdapter(element);

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

@@ -46,4 +46,11 @@ 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

@@ -37,4 +37,11 @@ public MetadataUsage getTarget() {
 	protected String getDefaultSupertype() {
 		return getDefaultSupertype("base");
 	}
-}
+	
+	@Override
+	public void doTransform() {
+		super.doTransform();
+		AnnotatingElementAdapter.transformAnnotatingElement(getTarget());
+	}
+
+}