Skip to content

Commit 0abf0ec

Browse files
committed
ScriptInfo: fix ConvertService var name
1 parent 7df5e31 commit 0abf0ec

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

src/main/java/org/scijava/script/ScriptInfo.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public class ScriptInfo extends AbstractModuleInfo implements Contextual {
8585
private ScriptService scriptService;
8686

8787
@Parameter
88-
private ConvertService conversionService;
88+
private ConvertService convertService;
8989

9090
/**
9191
* Creates a script metadata object which describes the given script file.
@@ -370,7 +370,7 @@ private HashMap<String, String> parseAttrs(final String attrs)
370370
}
371371

372372
private boolean isIOType(final String token) {
373-
return conversionService.convert(token, ItemIO.class) != null;
373+
return convertService.convert(token, ItemIO.class) != null;
374374
}
375375

376376
private void checkValid(final boolean valid, final String param)
@@ -412,7 +412,7 @@ else if ("choices".equalsIgnoreCase(key)) {
412412
// item.setChoices(choices);
413413
}
414414
else if ("columns".equalsIgnoreCase(key)) {
415-
item.setColumnCount(conversionService.convert(value, int.class));
415+
item.setColumnCount(convertService.convert(value, int.class));
416416
}
417417
else if ("description".equalsIgnoreCase(key)) {
418418
item.setDescription(value);
@@ -421,44 +421,44 @@ else if ("initializer".equalsIgnoreCase(key)) {
421421
item.setInitializer(value);
422422
}
423423
else if ("type".equalsIgnoreCase(key)) {
424-
item.setIOType(conversionService.convert(value, ItemIO.class));
424+
item.setIOType(convertService.convert(value, ItemIO.class));
425425
}
426426
else if ("label".equalsIgnoreCase(key)) {
427427
item.setLabel(value);
428428
}
429429
else if ("max".equalsIgnoreCase(key)) {
430-
item.setMaximumValue(conversionService.convert(value, item.getType()));
430+
item.setMaximumValue(convertService.convert(value, item.getType()));
431431
}
432432
else if ("min".equalsIgnoreCase(key)) {
433-
item.setMinimumValue(conversionService.convert(value, item.getType()));
433+
item.setMinimumValue(convertService.convert(value, item.getType()));
434434
}
435435
else if ("name".equalsIgnoreCase(key)) {
436436
item.setName(value);
437437
}
438438
else if ("persist".equalsIgnoreCase(key)) {
439-
item.setPersisted(conversionService.convert(value, boolean.class));
439+
item.setPersisted(convertService.convert(value, boolean.class));
440440
}
441441
else if ("persistKey".equalsIgnoreCase(key)) {
442442
item.setPersistKey(value);
443443
}
444444
else if ("required".equalsIgnoreCase(key)) {
445-
item.setRequired(conversionService.convert(value, boolean.class));
445+
item.setRequired(convertService.convert(value, boolean.class));
446446
}
447447
else if ("softMax".equalsIgnoreCase(key)) {
448-
item.setSoftMaximum(conversionService.convert(value, item.getType()));
448+
item.setSoftMaximum(convertService.convert(value, item.getType()));
449449
}
450450
else if ("softMin".equalsIgnoreCase(key)) {
451-
item.setSoftMinimum(conversionService.convert(value, item.getType()));
451+
item.setSoftMinimum(convertService.convert(value, item.getType()));
452452
}
453453
else if ("stepSize".equalsIgnoreCase(key)) {
454454
// FIXME
455-
item.setStepSize(conversionService.convert(value, Number.class));
455+
item.setStepSize(convertService.convert(value, Number.class));
456456
}
457457
else if ("style".equalsIgnoreCase(key)) {
458458
item.setWidgetStyle(value);
459459
}
460460
else if ("visibility".equalsIgnoreCase(key)) {
461-
item.setVisibility(conversionService.convert(value, ItemVisibility.class));
461+
item.setVisibility(convertService.convert(value, ItemVisibility.class));
462462
}
463463
else if ("value".equalsIgnoreCase(key)) {
464464
item.setWidgetStyle(value);

0 commit comments

Comments
 (0)