Fix deprecation warnings

Author: ctrueden

src/main/java/org/scijava/jupyter/commands/InstallScijavaKernel.java

@@ -34,6 +34,7 @@
 import org.scijava.jupyter.utils.JupyterUtil;
 import org.scijava.jupyter.utils.ProcessUtil;
 import org.scijava.jupyter.utils.SystemUtil;
+import org.scijava.log.LogLevel;
 import org.scijava.log.LogService;
 import org.scijava.plugin.Menu;
 import org.scijava.plugin.Parameter;
@@ -157,7 +158,7 @@ public static void main(String... args) {
         Context context = new Context();
 
         LogService log = context.service(LogService.class);
-        log.setLevel(LogService.INFO);
+        log.setLevel(LogLevel.INFO);
 
         JupyterService jupyter = context.service(JupyterService.class);
         jupyter.installKernel(args);

src/main/java/org/scijava/jupyter/kernel/ScijavaKernel.java

@@ -34,6 +34,7 @@
 import org.scijava.jupyter.kernel.evaluator.ScijavaEvaluator;
 import org.scijava.jupyter.kernel.handler.ScijavaKernelInfoHandler;
 import org.scijava.jupyter.service.JupyterService;
+import org.scijava.log.LogLevel;
 import org.scijava.log.LogService;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.PluginInfo;
@@ -84,19 +85,19 @@ public KernelHandler<Message> getKernelInfoHandler(Kernel kernel) {
     private void setLogLevel(String logLevel) {
 	switch (logLevel) {
 	    case "debug":
-		this.log.setLevel(LogService.DEBUG);
+		this.log.setLevel(LogLevel.DEBUG);
 		break;
 	    case "error":
-		this.log.setLevel(LogService.ERROR);
+		this.log.setLevel(LogLevel.ERROR);
 		break;
 	    case "info":
-		this.log.setLevel(LogService.INFO);
+		this.log.setLevel(LogLevel.INFO);
 		break;
 	    case "none":
-		this.log.setLevel(LogService.NONE);
+		this.log.setLevel(LogLevel.NONE);
 		break;
 	    default:
-		this.log.setLevel(LogService.INFO);
+		this.log.setLevel(LogLevel.INFO);
 		break;
 	}
     }

src/main/java/org/scijava/jupyter/kernel/evaluator/Worker.java

@@ -88,13 +88,13 @@ public void run() {
 
 	final Reader input = new StringReader(this.code);
 	final ScriptInfo info = new ScriptInfo(context, "dummy.py", input);
+	info.setLanguage(scriptLanguage);
 	this.seo.setOutputHandler();
 
 	try {
 	    // create the ScriptModule instance
 	    final ScriptModule module = info.createModule();
 	    context.inject(module);
-	    module.setLanguage(scriptLanguage);
 
 	    // HACK: Inject our cached script engine instance, rather
 	    // than letting the ScriptModule instance create its own.

src/main/java/org/scijava/notebook/converter/StringToPlainNotebookConverter.java

@@ -25,7 +25,7 @@
 import org.scijava.notebook.converter.output.PlainNotebookOutput;
 import org.scijava.plugin.Plugin;
 
-@Plugin(type = Converter.class, priority = Priority.VERY_HIGH_PRIORITY)
+@Plugin(type = Converter.class, priority = Priority.VERY_HIGH)
 public class StringToPlainNotebookConverter
         extends NotebookOutputConverter<String, PlainNotebookOutput> {
 

src/test/java/org/scijava/jupyter/sandbox/TestAnnotations.java

@@ -28,7 +28,6 @@
 import javax.script.ScriptException;
 
 import net.imagej.ImageJ;
-import net.imagej.Main;
 
 import org.scijava.module.ModuleItem;
 import org.scijava.module.process.ModulePreprocessor;
@@ -45,7 +44,8 @@
 public class TestAnnotations {
 
     public static void main(final String[] args) throws ScriptException {
-        ImageJ ij = Main.launch(args);
+        ImageJ ij = new ImageJ();
+        ij.launch(args);
 
         String code = "#@LogService log\n#@ImageJ ij\nprint('log')\nprint('jjjj')";
         final Reader input = new StringReader(code);
@@ -57,12 +57,12 @@ public static void main(final String[] args) throws ScriptException {
         List<? extends PostprocessorPlugin> post = ij.plugin().createInstancesOfType(PostprocessorPlugin.class);
 
         ScriptLanguage scriptLanguage = ij.script().getLanguageByName("jython");
+        info.setLanguage(scriptLanguage);
         ScriptEngine scriptEngine = scriptLanguage.getScriptEngine();
 
         ScriptModule module;
         module = new ScriptModule(info);
         ij.context().inject(module);
-        module.setLanguage(scriptLanguage);
 
         for (final ModulePreprocessor p : pre) {
             p.process(module);

src/test/java/org/scijava/jupyter/sandbox/TestGroovy.java

@@ -28,7 +28,6 @@
 import javax.script.ScriptException;
 
 import net.imagej.ImageJ;
-import net.imagej.Main;
 
 import org.scijava.module.ModuleItem;
 import org.scijava.module.process.PreprocessorPlugin;
@@ -43,7 +42,8 @@
 public class TestGroovy {
 
     public static void main(String[] args) throws ScriptException {
-        ImageJ ij = Main.launch(args);
+        ImageJ ij = new ImageJ();
+        ij.launch(args);
 
         String code = "";
         //code += "@Grab('org.springframework:spring-orm:3.2.5.RELEASE')\n";
@@ -57,12 +57,12 @@ public static void main(String[] args) throws ScriptException {
         List<? extends PreprocessorPlugin> pre = ij.plugin().createInstancesOfType(PreprocessorPlugin.class);
 
         ScriptLanguage scriptLanguage = ij.script().getLanguageByName("groovy");
+        info.setLanguage(scriptLanguage);
         ScriptEngine scriptEngine = scriptLanguage.getScriptEngine();
 
         ScriptModule module;
         module = new ScriptModule(info);
         ij.context().inject(module);
-        module.setLanguage(scriptLanguage);
 
         pre.forEach((p) -> {
             p.process(module);