Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings
This repository was archived by the owner on Feb 4, 2022. It is now read-only.

Commit69984f0

Browse files
committed
Fix deprecation warnings
1 parentdec9888 commit69984f0

File tree

6 files changed

+16
-14
lines changed

6 files changed

+16
-14
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
importorg.scijava.jupyter.utils.JupyterUtil;
3535
importorg.scijava.jupyter.utils.ProcessUtil;
3636
importorg.scijava.jupyter.utils.SystemUtil;
37+
importorg.scijava.log.LogLevel;
3738
importorg.scijava.log.LogService;
3839
importorg.scijava.plugin.Menu;
3940
importorg.scijava.plugin.Parameter;
@@ -157,7 +158,7 @@ public static void main(String... args) {
157158
Contextcontext =newContext();
158159

159160
LogServicelog =context.service(LogService.class);
160-
log.setLevel(LogService.INFO);
161+
log.setLevel(LogLevel.INFO);
161162

162163
JupyterServicejupyter =context.service(JupyterService.class);
163164
jupyter.installKernel(args);

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
importorg.scijava.jupyter.kernel.evaluator.ScijavaEvaluator;
3535
importorg.scijava.jupyter.kernel.handler.ScijavaKernelInfoHandler;
3636
importorg.scijava.jupyter.service.JupyterService;
37+
importorg.scijava.log.LogLevel;
3738
importorg.scijava.log.LogService;
3839
importorg.scijava.plugin.Parameter;
3940
importorg.scijava.plugin.PluginInfo;
@@ -84,19 +85,19 @@ public KernelHandler<Message> getKernelInfoHandler(Kernel kernel) {
8485
privatevoidsetLogLevel(StringlogLevel) {
8586
switch (logLevel) {
8687
case"debug":
87-
this.log.setLevel(LogService.DEBUG);
88+
this.log.setLevel(LogLevel.DEBUG);
8889
break;
8990
case"error":
90-
this.log.setLevel(LogService.ERROR);
91+
this.log.setLevel(LogLevel.ERROR);
9192
break;
9293
case"info":
93-
this.log.setLevel(LogService.INFO);
94+
this.log.setLevel(LogLevel.INFO);
9495
break;
9596
case"none":
96-
this.log.setLevel(LogService.NONE);
97+
this.log.setLevel(LogLevel.NONE);
9798
break;
9899
default:
99-
this.log.setLevel(LogService.INFO);
100+
this.log.setLevel(LogLevel.INFO);
100101
break;
101102
}
102103
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,13 @@ public void run() {
8888

8989
finalReaderinput =newStringReader(this.code);
9090
finalScriptInfoinfo =newScriptInfo(context,"dummy.py",input);
91+
info.setLanguage(scriptLanguage);
9192
this.seo.setOutputHandler();
9293

9394
try {
9495
// create the ScriptModule instance
9596
finalScriptModulemodule =info.createModule();
9697
context.inject(module);
97-
module.setLanguage(scriptLanguage);
9898

9999
// HACK: Inject our cached script engine instance, rather
100100
// than letting the ScriptModule instance create its own.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
importorg.scijava.notebook.converter.output.PlainNotebookOutput;
2626
importorg.scijava.plugin.Plugin;
2727

28-
@Plugin(type =Converter.class,priority =Priority.VERY_HIGH_PRIORITY)
28+
@Plugin(type =Converter.class,priority =Priority.VERY_HIGH)
2929
publicclassStringToPlainNotebookConverter
3030
extendsNotebookOutputConverter<String,PlainNotebookOutput> {
3131

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
importjavax.script.ScriptException;
2929

3030
importnet.imagej.ImageJ;
31-
importnet.imagej.Main;
3231

3332
importorg.scijava.module.ModuleItem;
3433
importorg.scijava.module.process.ModulePreprocessor;
@@ -45,7 +44,8 @@
4544
publicclassTestAnnotations {
4645

4746
publicstaticvoidmain(finalString[]args)throwsScriptException {
48-
ImageJij =Main.launch(args);
47+
ImageJij =newImageJ();
48+
ij.launch(args);
4949

5050
Stringcode ="#@LogService log\n#@ImageJ ij\nprint('log')\nprint('jjjj')";
5151
finalReaderinput =newStringReader(code);
@@ -57,12 +57,12 @@ public static void main(final String[] args) throws ScriptException {
5757
List<?extendsPostprocessorPlugin>post =ij.plugin().createInstancesOfType(PostprocessorPlugin.class);
5858

5959
ScriptLanguagescriptLanguage =ij.script().getLanguageByName("jython");
60+
info.setLanguage(scriptLanguage);
6061
ScriptEnginescriptEngine =scriptLanguage.getScriptEngine();
6162

6263
ScriptModulemodule;
6364
module =newScriptModule(info);
6465
ij.context().inject(module);
65-
module.setLanguage(scriptLanguage);
6666

6767
for (finalModulePreprocessorp :pre) {
6868
p.process(module);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
importjavax.script.ScriptException;
2929

3030
importnet.imagej.ImageJ;
31-
importnet.imagej.Main;
3231

3332
importorg.scijava.module.ModuleItem;
3433
importorg.scijava.module.process.PreprocessorPlugin;
@@ -43,7 +42,8 @@
4342
publicclassTestGroovy {
4443

4544
publicstaticvoidmain(String[]args)throwsScriptException {
46-
ImageJij =Main.launch(args);
45+
ImageJij =newImageJ();
46+
ij.launch(args);
4747

4848
Stringcode ="";
4949
//code += "@Grab('org.springframework:spring-orm:3.2.5.RELEASE')\n";
@@ -57,12 +57,12 @@ public static void main(String[] args) throws ScriptException {
5757
List<?extendsPreprocessorPlugin>pre =ij.plugin().createInstancesOfType(PreprocessorPlugin.class);
5858

5959
ScriptLanguagescriptLanguage =ij.script().getLanguageByName("groovy");
60+
info.setLanguage(scriptLanguage);
6061
ScriptEnginescriptEngine =scriptLanguage.getScriptEngine();
6162

6263
ScriptModulemodule;
6364
module =newScriptModule(info);
6465
ij.context().inject(module);
65-
module.setLanguage(scriptLanguage);
6666

6767
pre.forEach((p) -> {
6868
p.process(module);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp