ST6RI-830 Updated to use a specific global scope symbol marker string.

Author: seidewitz

…rml/xtext/naming/QualifiedNamesUtil.java …erml/xtext/naming/QualifiedNameUtil.javaorg.omg.kerml.xtext/src/org/omg/kerml/xtext/naming/QualifiedNamesUtil.java renamed to org.omg.kerml.xtext/src/org/omg/kerml/xtext/naming/QualifiedNameUtil.java org.omg.kerml.xtext/src/org/omg/kerml/xtext/naming/QualifiedNamesUtil.java renamed to org.omg.kerml.xtext/src/org/omg/kerml/xtext/naming/QualifiedNameUtil.java

@@ -19,18 +19,19 @@
  * 
  * Contributors:
  *   Laszlo Gati, MDS
+ *   Ed Seidewitz. MDS
  */
 package org.omg.kerml.xtext.naming;
 
 import org.eclipse.xtext.naming.QualifiedName;
+import org.omg.sysml.util.ElementUtil;
 
-public class QualifiedNamesUtil {
-	
-	public static final String GLOBAL_CLASSIFIER_SYMBOL = "$";
+public class QualifiedNameUtil {
 
 	public static boolean isGlobalNameQualification(QualifiedName qualifiedName) {
 		return qualifiedName != null &&
 				qualifiedName.getSegmentCount() > 0 &&
-				GLOBAL_CLASSIFIER_SYMBOL.equals(qualifiedName.getFirstSegment()); 
+				ElementUtil.isGlobalScopeSymbol(qualifiedName.getFirstSegment()); 
 	}
+
 }

org.omg.kerml.xtext/src/org/omg/kerml/xtext/scoping/KerMLGlobalScope.xtend

@@ -38,7 +38,7 @@ import org.eclipse.xtext.scoping.impl.AbstractScope
 import org.omg.sysml.lang.sysml.Namespace
 import org.omg.sysml.lang.sysml.SysMLPackage
 import org.omg.sysml.lang.sysml.Element
-import org.omg.kerml.xtext.naming.QualifiedNamesUtil
+import org.omg.kerml.xtext.naming.QualifiedNameUtil
 
 class KerMLGlobalScope extends AbstractScope {
 
@@ -79,7 +79,7 @@ class KerMLGlobalScope extends AbstractScope {
 	}
 
 	override getSingleElement(QualifiedName name) {
-		val isGlobalQualification = QualifiedNamesUtil.isGlobalNameQualification(name)
+		val isGlobalQualification = QualifiedNameUtil.isGlobalNameQualification(name)
 		val qualifiedName = isGlobalQualification? name.skipFirst(1) : name
 
 		var IEObjectDescription result = null

org.omg.kerml.xtext/src/org/omg/kerml/xtext/scoping/KerMLScope.xtend

@@ -56,7 +56,7 @@ import com.google.inject.Inject
 import org.eclipse.xtext.naming.IQualifiedNameConverter
 import org.eclipse.emf.ecore.util.EcoreUtil
 import org.omg.sysml.util.NamespaceUtil
-import org.omg.kerml.xtext.naming.QualifiedNamesUtil
+import org.omg.kerml.xtext.naming.QualifiedNameUtil
 
 class KerMLScope extends AbstractScope implements ISysMLScope {
 
@@ -168,7 +168,7 @@ class KerMLScope extends AbstractScope implements ISysMLScope {
 	}
 
 	override getSingleElement(QualifiedName name) {
-		if (QualifiedNamesUtil.isGlobalNameQualification(name)){
+		if (QualifiedNameUtil.isGlobalNameQualification(name)){
 			parent.getSingleElement(name)
 		} else {
 			val result = resolveInScope(name, true);

org.omg.sysml/src/org/omg/sysml/util/ElementUtil.java

@@ -1,6 +1,6 @@
 /*****************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) 2019, 2020, 2022, 2024 Model Driven Solutions, Inc.
+ * Copyright (c) 2019, 2020, 2022, 2024, 2025 Model Driven Solutions, Inc.
  * Copyright (c) 2023 Mgnite Inc.
  *    
  * This program is free software: you can redistribute it and/or modify
@@ -122,13 +122,29 @@ public static boolean isIdentifier(String name) {
 		return name.matches("[a-zA-Z_]\\w*");
 	}
 
+	// Specific string used to identify a segment as a global scope qualifier
+	public static final String GLOBAL_SCOPE_SYMBOL = "$";
+	
+	public static boolean isGlobalScopeSymbol(String segment) {
+		return segment == GLOBAL_SCOPE_SYMBOL;
+	}
+	
 	public static List<String> parseQualifiedName(String qualifiedNameText) {
 			List<String> segments = new ArrayList<>();		
 			int i = 0;
 			int j = 0;
 			int n = qualifiedNameText.length();
 			boolean isDelimitable = true;
 
+			
+			if (qualifiedNameText.startsWith(GLOBAL_SCOPE_SYMBOL)) {
+				// Add the specific GLOBAL_SCOPE_SYMBOL string to identify 
+				// a global scope qualifier segment.
+				segments.add(GLOBAL_SCOPE_SYMBOL);
+				i = 3;
+				j = 3;
+			}
+			
 			while (j < n) {
 				char c = qualifiedNameText.charAt(j);
 				int delim = "\'\\:".indexOf(c);