Merge pull request #735 from Systems-Modeling/ST6RI-903

ST6RI-903 Comment.getLocale() returns a quoted locale name

Author: seidewitz

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

@@ -35,7 +35,9 @@
 import org.omg.sysml.lang.sysml.AcceptActionUsage;
 import org.omg.sysml.lang.sysml.ActionUsage;
 import org.omg.sysml.lang.sysml.AttributeUsage;
+import org.omg.sysml.lang.sysml.Comment;
 import org.omg.sysml.lang.sysml.Definition;
+import org.omg.sysml.lang.sysml.Documentation;
 import org.omg.sysml.lang.sysml.Element;
 import org.omg.sysml.lang.sysml.EnumerationDefinition;
 import org.omg.sysml.lang.sysml.EnumerationUsage;
@@ -330,4 +332,23 @@ public void testCircularRecursiveImport() throws Exception {
 		assertArrayEquals("P2.importedMembers", new String[] {"P1", "P2", "X", "Test", "Y"}, 
 				importedMemberships.stream().map(Membership::getMemberElement).map(Element::getName).toArray());
 	}
+	
+	public final String localeTest =
+			  "package Test {\n"
+			+ "    comment locale \"en_US\" /* doc */\n"
+			+ "    doc locale \"en_US\" /* doc */\\n"
+			+ "}";
+	
+	@Test
+	public void testLocale() throws Exception {
+		SysMLInteractive instance = getSysMLInteractiveInstance();
+		SysMLInteractiveResult result = instance.process(localeTest);
+		Element root = result.getRootElement();
+		List<Element> elements = ((Namespace)root).getOwnedMember();
+		List<Element> ownedMembers = ((Namespace)elements.get(0)).getOwnedMember();
+		Comment comment = (Comment)ownedMembers.get(0);
+		Documentation doc = (Documentation)ownedMembers.get(1);
+		assertEquals("comment.locale", "en_US", comment.getLocale());
+		assertEquals("doc.locale", "en_US", doc.getLocale());
+	}
 }

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

@@ -37,6 +37,7 @@ public Comment getTarget() {
 	public void postProcess() {
 		super.postProcess();
 		Comment target = getTarget();
+		target.setLocale(ElementUtil.unescapeString(target.getLocale()));
 		target.setBody(ElementUtil.processCommentBody(target.getBody()));
 	}
 }