Merge pull request #352 from Systems-Modeling/ST6RI-531

ST6RI-531: Non-ASCII characters may not be parsed properly in Jupyter

Author: seidewitz

org.omg.sysml.jupyter.kernel/src/main/java/org/omg/sysml/jupyter/kernel/ISysML.java

@@ -35,11 +35,17 @@ public class ISysML {
 
     private static volatile SysMLKernel kernel;
 
+    public static void initialize() {
+        kernel = new SysMLKernel();
+    }
+
     public static void main(String[] args) throws Exception {
         if (args.length < 1) {
             throw new IllegalArgumentException("Missing connection file argument");
         }
 
+        initialize();
+
         Path connectionFile = Paths.get(args[0]);
 
         if (!Files.isRegularFile(connectionFile))
@@ -52,8 +58,6 @@ public static void main(String[] args) throws Exception {
         KernelConnectionProperties connProps = KernelConnectionProperties.parse(contents);
         JupyterConnection connection = new JupyterConnection(connProps);
 
-
-        kernel = new SysMLKernel();
         kernel.becomeHandlerForConnection(connection);
 
         connection.connect();

org.omg.sysml.jupyter.kernel/src/main/java/org/omg/sysml/jupyter/kernel/SysMLKernel.java

@@ -45,6 +45,10 @@ public class SysMLKernel extends BaseKernel {
     private final Magics magics;
     private final MyMagicParser magicParser;
 
+    public Magics getMagics() {
+        return magics;
+    }
+
     public SysMLKernel() {
         this.interactive = SysMLInteractive.getInstance();
         Optional<String> libraryPath = Optional.ofNullable(System.getenv(ISysML.LIBRARY_PATH_KEY));

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

@@ -1,6 +1,6 @@
 /*****************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) 2019, 2020 Model Driven Solutions, Inc.
+ * Copyright (c) 2019-2022 Model Driven Solutions, Inc.
  *    
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -38,6 +38,7 @@
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.xtext.resource.IResourceDescription.Manager;
 import org.eclipse.xtext.resource.IResourceServiceProvider;
+import org.eclipse.xtext.resource.XtextResource;
 import org.eclipse.xtext.resource.impl.ResourceDescriptionsData;
 import org.omg.sysml.lang.sysml.SysMLPackage;
 
@@ -68,6 +69,7 @@ protected SysMLUtil() {
 	protected SysMLUtil(ResourceDescriptionsData resourceDescriptionData) {
 		SysMLPackage.eINSTANCE.getName();
 		this.resourceSet = new ResourceSetImpl();
+		this.resourceSet.getLoadOptions().put(XtextResource.OPTION_ENCODING, "UTF-8");
 		this.index = resourceDescriptionData;
 		ResourceDescriptionsData.ResourceSetAdapter.installResourceDescriptionsData(this.resourceSet, this.index);
 	}
@@ -214,7 +216,7 @@ public void readAll(final File file, boolean isInput) {
 	}
 
 	/**
-	 * If the given path identifies an file with an allowable extension, then read it. 
+	 * If the given path identifies a file with an allowable extension, then read it. 
 	 * If the given path is for a directory, then recursively read all the allowable files in it, 
 	 * directly or indirectly.
 	 *