ST6RI-829 Updated qualifiedName derivation per resolution to KERML_-36.

Author: seidewitz

org.omg.sysml.interactive.tests/src/org/omg/sysml/interactive/tests/DerivedPropertyAndOperationTest.java

@@ -23,12 +23,14 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import java.util.List;
 
 import org.junit.Test;
 import org.omg.sysml.interactive.SysMLInteractive;
+import org.omg.sysml.interactive.SysMLInteractiveResult;
 import org.omg.sysml.lang.sysml.AcceptActionUsage;
 import org.omg.sysml.lang.sysml.ActionUsage;
 import org.omg.sysml.lang.sysml.AttributeUsage;
@@ -88,6 +90,26 @@ public void testViewExpose() throws Exception {
 		assertEquals(1, exposed.size());
 	}
 
+	public final String qualifiedNameTest =
+			"package Test {\n"
+			+ "    package P {\n"
+			+ "        item x;\n"
+			+ "        item x;\n"
+			+ "    }"
+			+ "}";
+	
+	@Test
+	public void testQualifiedName() throws Exception {
+		SysMLInteractive instance = getSysMLInteractiveInstance();
+		SysMLInteractiveResult result = instance.process(qualifiedNameTest);
+		Element root = result.getRootElement();
+		List<Element> elements = ((Namespace)root).getOwnedMember();
+		Namespace P = (Namespace)((Namespace)elements.get(0)).getOwnedMember().get(0);
+		List<Element> P_ownedMembers = P.getOwnedMember();
+		assertEquals("Test::P::x", P_ownedMembers.get(0).getQualifiedName());
+		assertNull(P_ownedMembers.get(1).getQualifiedName());
+	}
+	
 	public final String pathTest =
 			  "// Path of package: TopLevel\n"
 			+ "// Path of owning membership: TopLevel/owningMembership\n"

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) 2022-2023 Model Driven Solutions, Inc.
+ * Copyright (c) 2022-2023, 2025 Model Driven Solutions, Inc.
  * Copyright (c) 2022 Siemens AG
  *    
  * This program is free software: you can redistribute it and/or modify
@@ -35,16 +35,21 @@ public Element_qualifiedName_SettingDelegate(EStructuralFeature eStructuralFeatu
 
 	@Override
 	protected Object basicGet(InternalEObject owner) {
-		Namespace owningNamespace = ((Element) owner).getOwningNamespace();
+		Element self = (Element)owner;
+		Namespace owningNamespace = self.getOwningNamespace();
 		if (owningNamespace == null) {
 			return null;
 		} else {
-			String name = ((Element) owner).escapedName();
-			if (name == null || owningNamespace.getOwner() == null) {
-				return name;
+			String name = self.getName();
+			if (name == null || owningNamespace.getOwnedMember().stream().
+					filter(m->name.equals(m.getName())).
+					findFirst().orElse(null) != self) {
+				return null;
+			} else if (owningNamespace.getOwner() == null) {
+				return self.escapedName();
 			} else {
 				String qualification = owningNamespace.getQualifiedName();
-				return qualification == null? null: qualification + "::" + name;
+				return qualification == null? null: qualification + "::" + self.escapedName();
 			}
 		}
 	}