Skip to content

Commit d9abc07

Browse files
committed
Do not use empty plugin name as language name
When leaving off the 'name = "..."' attribute from the @plugin, the name is actually set to "", not null, so we need to test for that too.
1 parent b591ed4 commit d9abc07

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public String getEngineName() {
106106
@Override
107107
public String getLanguageName() {
108108
final String name = getInfo().getName();
109-
return name != null ? name : inferNameFromClassName();
109+
return name != null && !name.isEmpty() ? name : inferNameFromClassName();
110110
}
111111

112112
@Override

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public String getLanguageName() {
105105
final PluginInfo<?> info = getInfo();
106106
if (info == null) return null;
107107
final String name = info.getName();
108-
return name != null ? name : base.getLanguageName();
108+
return name != null && !name.isEmpty() ? name : base.getLanguageName();
109109
}
110110

111111
@Override

0 commit comments

Comments
 (0)