ST6RI-897 Updated custom importer so elementId is not used as an EMF ID.

- This avoids a possible infinite recursion in the construction of
elementIds on demand.

Author: seidewitz

org.omg.kerml.xtext/src/org/omg/kerml/xtext/scoping/KerMLLinker.java

@@ -1,6 +1,6 @@
 /*****************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) 2020-2021, 2024 Model Driven Solutions, Inc.
+ * Copyright (c) 2020-2021, 2024, 2026 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
@@ -47,14 +47,6 @@ public class KerMLLinker extends LazyLinker {
 	@Inject
 	private OnChangeEvictingCache cache;
 
-	@Override
-	protected void clearReferences(EObject obj) {
-		super.clearReferences(obj);
-		if (obj instanceof Element) {
-			ElementUtil.clean((Element)obj);
-		}
-	}
-	
 	@Override
 	protected void clearReference(EObject obj, EReference ref) {
 		if (
@@ -72,10 +64,10 @@ protected void clearReference(EObject obj, EReference ref) {
 	@Override
 	protected void doLinkModel(EObject model, IDiagnosticConsumer consumer) {
 		super.doLinkModel(model, consumer);
-		postProcessAllCrossReferences(model);
+		postProcessAll(model);
 	}
 
-	protected void postProcessAllCrossReferences(EObject model) {
+	protected void postProcessAll(EObject model) {
 		cache.execWithoutCacheClear(model.eResource(), new IUnitOfWork.Void<Resource>() {
 			@Override
 			public void process(Resource state) throws Exception {

org.omg.sysml.uml.ecore.importer/src/org/omg/sysml/uml/ecore/importer/CustomUML2EcoreConverter.java

@@ -47,17 +47,25 @@ private void customConvert(DiagnosticChain diagnostics) {
 					(((Property)element).isDerived() && !((Property)element).isDerivedUnion() || 
 					"elementId".equals(((Property)element).getName())) ||
 				element instanceof Operation && modelElement instanceof EOperation) {
+				// Add SysML EAnnotation to derived properties (but not derived unions) and all operations
 				String qualifiedName = ((NamedElement)element).getQualifiedName();
 				addSysMLAnnotation(qualifiedName.substring(qualifiedName.indexOf("::") + 2), modelElement);
+				if (element instanceof Property && "elementId".equals(((Property)element).getName())) {
+					// Since elementId is to be treated as effectively derived, don't use it as an ID
+					// internally to Eclipse.
+					((EAttribute)modelElement).setID(false);
+				}
 			} else if (element instanceof org.eclipse.uml2.uml.Class && modelElement instanceof EClass) {
 				String name = ((org.eclipse.uml2.uml.Class)element).getName();
 				EClass eClass = (EClass)modelElement;
 				if ("Feature".equals(name)) {
+					// Add the "isNonunique" attribute as the effective logical inverse of "isUnique".
 					EClassifier booleanType = eClass.getEStructuralFeature("isUnique").getEType();
 					EAttribute isNonUniqueAttribute = EcoreFactory.eINSTANCE.createEAttribute();
 					addStructuralFeature(eClass, isNonUniqueAttribute, "isNonunique", booleanType, 1, 1, "false", false);
 					addSysMLAnnotation("Feature::isNonUnique", isNonUniqueAttribute);
 				} else if ("InvocationExpression".equals(name)) {
+					// Add the "operand" reference as a workaround for parsing operator expression arguments.
 					EClassifier expressionClass = eClass.getEStructuralFeature("argument").getEType();
 					EReference operandReference = EcoreFactory.eINSTANCE.createEReference();
 					addStructuralFeature(eClass, operandReference, "operand", expressionClass, 0, -1, null, true);

org.omg.sysml/model/SysML.ecore

@@ -977,7 +977,7 @@
       <eAnnotations source="http://www.omg.org/spec/SysML"/>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="elementId" ordered="false"
-        lowerBound="1" eType="ecore:EDataType types.ecore#//String" iD="true">
+        lowerBound="1" eType="ecore:EDataType types.ecore#//String">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="&lt;p>The globally unique identifier for this Element. This is intended to be set by tooling, and it must not change during the lifetime of the Element.&lt;/p>"/>
       </eAnnotations>

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

@@ -124,7 +124,6 @@ public boolean isTransformed() {
 	}
 
 	public void clearCaches() {
-		elementId = null;
 	}
 
 	public void transform() {

org.omg.sysml/syntax-gen/org/omg/sysml/lang/sysml/Element.java

@@ -210,7 +210,7 @@ public interface Element extends EObject {
 	 * @return the value of the '<em>Element Id</em>' attribute.
 	 * @see #setElementId(String)
 	 * @see org.omg.sysml.lang.sysml.SysMLPackage#getElement_ElementId()
-	 * @model id="true" dataType="org.omg.sysml.lang.types.String" required="true" ordered="false"
+	 * @model dataType="org.omg.sysml.lang.types.String" required="true" ordered="false"
 	 *        annotation="http://www.omg.org/spec/SysML"
 	 * @generated
 	 */

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

@@ -9578,7 +9578,7 @@ public void initializePackageContents() {
 		initEReference(getElement_OwnedRelationship(), this.getRelationship(), this.getRelationship_OwningRelatedElement(), "ownedRelationship", null, 0, -1, Element.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getElement_OwningRelationship(), this.getRelationship(), this.getRelationship_OwnedRelatedElement(), "owningRelationship", null, 0, 1, Element.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEReference(getElement_OwningNamespace(), this.getNamespace(), this.getNamespace_OwnedMember(), "owningNamespace", null, 0, 1, Element.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getElement_ElementId(), theTypesPackage.getString(), "elementId", null, 1, 1, Element.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getElement_ElementId(), theTypesPackage.getString(), "elementId", null, 1, 1, Element.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEReference(getElement_Owner(), this.getElement(), this.getElement_OwnedElement(), "owner", null, 0, 1, Element.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED);
 		initEReference(getElement_OwnedElement(), this.getElement(), this.getElement_Owner(), "ownedElement", null, 0, -1, Element.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
 		initEReference(getElement_Documentation(), this.getDocumentation(), this.getDocumentation_DocumentedElement(), "documentation", null, 0, -1, Element.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);