ST6RI-684 Implemented Namespace::qualificationOf and unqualifiedNameOf.

Author: seidewitz

org.omg.kerml.xtext/src/org/omg/kerml/xtext/naming/KerMLQualifiedNameConverter.xtend

@@ -42,52 +42,14 @@ class KerMLQualifiedNameConverter implements IQualifiedNameConverter {
 
 		Preconditions.checkArgument(!qualifiedNameAsText.empty, "Qualified name cannot be empty")
 
-		val segments = newArrayList		
-		var i = 0
-		var j = 0;
-		var n = qualifiedNameAsText.length()
-		var isDelimitable = true
-		
-		while (j < n) {
-			val c = qualifiedNameAsText.charAt(j)
-			val delim = "\'\\:".indexOf(c)
-			if (isDelimitable && delim > 1) {
-				if (j + 1 < n && ":". indexOf(qualifiedNameAsText.charAt(j + 1)) == 0) {
-					segments.add(ElementUtil.unescapeString(qualifiedNameAsText.substring(i, j)));
-					i = j + 2;
-					j = i - 1;
-				}
-			} else if (delim == 0) {
-				isDelimitable = !isDelimitable
-			} else if (delim == 1) {
-				j++
-			}
-			j++
-		}
-		if (i < n && j <= n) {
-			segments.add(ElementUtil.unescapeString(qualifiedNameAsText.substring(i, j)));
-		}
-		
+		val segments = ElementUtil.parseQualifiedName(qualifiedNameAsText)		
 		QualifiedName.create(segments)
 	}
 
 	override toString(QualifiedName name) {
-		if (name === null)
-			throw new IllegalArgumentException("Qualified name cannot be null")
-		val segmentCount = name.getSegmentCount
-		switch (segmentCount) {
-			case 0: return ""
-			case 1: return ElementUtil.escapeName(name.getFirstSegment)
-			default: {
-				val builder = new StringBuilder;
-				builder.append(ElementUtil.escapeName(name.getFirstSegment))
-				for (var i = 1; i < segmentCount; i++) {
-					builder.append("::")
-					builder.append(ElementUtil.escapeName(name.getSegment(i)))
-				}
-				return builder.toString()
-			}
-		}
+		Preconditions.checkArgument(name !== null, "Qualified name cannot be null")
+			
+		ElementUtil.toQualifiedNameString(name.segments)
 	}
 
 }

org.omg.sysml/src/org/omg/sysml/delegate/invocation/Namespace_qualificationOf_InvocationDelegate.java

@@ -22,12 +22,13 @@
 package org.omg.sysml.delegate.invocation;
 
 import java.lang.reflect.InvocationTargetException;
+import java.util.List;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EOperation;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.util.BasicInvocationDelegate;
-import org.omg.sysml.lang.sysml.Namespace;
+import org.omg.sysml.util.ElementUtil;
 
 public class Namespace_qualificationOf_InvocationDelegate extends BasicInvocationDelegate {
 
@@ -37,11 +38,11 @@ public Namespace_qualificationOf_InvocationDelegate(EOperation operation) {
 
 	@Override
 	public Object dynamicInvoke(InternalEObject target, EList<?> arguments) throws InvocationTargetException {
-		Namespace self = (Namespace) target;
 		String qualifiedName = (String) arguments.get(0);
 
-		// TODO: implement this method
-		throw new UnsupportedOperationException();
+		List<String> segments = ElementUtil.parseQualifiedName(qualifiedName);
+		int n = segments.size();
+		return n < 2? null: ElementUtil.toQualifiedNameString(segments.subList(0, n - 1));
 	}
 
 }

org.omg.sysml/src/org/omg/sysml/delegate/invocation/Namespace_unqualifiedNameOf_InvocationDelegate.java

@@ -22,12 +22,13 @@
 package org.omg.sysml.delegate.invocation;
 
 import java.lang.reflect.InvocationTargetException;
+import java.util.List;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EOperation;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.util.BasicInvocationDelegate;
-import org.omg.sysml.lang.sysml.Namespace;
+import org.omg.sysml.util.ElementUtil;
 
 public class Namespace_unqualifiedNameOf_InvocationDelegate extends BasicInvocationDelegate {
 
@@ -37,11 +38,11 @@ public Namespace_unqualifiedNameOf_InvocationDelegate(EOperation operation) {
 
 	@Override
 	public Object dynamicInvoke(InternalEObject target, EList<?> arguments) throws InvocationTargetException {
-		Namespace self = (Namespace) target;
 		String qualifiedName = (String) arguments.get(0);
 
-		// TODO: implement this method
-		throw new UnsupportedOperationException();
+		List<String> segments = ElementUtil.parseQualifiedName(qualifiedName);
+		int n = segments.size();
+		return n < 1? null: segments.get(n - 1);
 	}
 
 }

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

@@ -122,6 +122,53 @@ public static String escapeName(String name) {
 	public static boolean isIdentifier(String name) {
 		return name.matches("[a-zA-Z_]\\w*");
 	}
+	
+	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;
+			
+			while (j < n) {
+				char c = qualifiedNameText.charAt(j);
+				int delim = "\'\\:".indexOf(c);
+				if (isDelimitable && delim > 1) {
+					if (j + 1 < n && ":". indexOf(qualifiedNameText.charAt(j + 1)) == 0) {
+						segments.add(ElementUtil.unescapeString(qualifiedNameText.substring(i, j)));
+						i = j + 2;
+						j = i - 1;
+					}
+				} else if (delim == 0) {
+					isDelimitable = !isDelimitable;
+				} else if (delim == 1) {
+					j++;
+				}
+				j++;
+			}
+			if (i < n && j <= n) {
+				segments.add(ElementUtil.unescapeString(qualifiedNameText.substring(i, j)));
+			}
+			
+			return segments;
+	}
+	
+	public static String toQualifiedNameString(List<String> segments) {
+		int segmentCount = segments.size();
+		if (segmentCount == 0) {
+			return "";
+		} else if (segmentCount == 1)
+			return escapeName(segments.get(0));
+		else {
+			StringBuilder builder = new StringBuilder();
+			builder.append(ElementUtil.escapeName(segments.get(0)));
+			for (var i = 1; i < segmentCount; i++) {
+				builder.append("::");
+				builder.append(ElementUtil.escapeName(segments.get(i)));
+			}
+			return builder.toString();
+		}
+	}
 
 	/**
 	 * Get documentation text for this element, as given by the body of the first documentation comment