Skip to content

Commit b9ec17e

Browse files
committed
ScriptLanguage: use plugin name if present
The language name can be inferred from the name attribute of the @plugin annotation. This is nice because it lets us name the languages in a more succinct way, without needing to override a method.
1 parent b382e24 commit b9ec17e

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,8 @@ public String getEngineName() {
105105

106106
@Override
107107
public String getLanguageName() {
108-
return inferNameFromClassName();
108+
final String name = getInfo().getName();
109+
return name != null ? name : inferNameFromClassName();
109110
}
110111

111112
@Override

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,8 @@ public List<String> getNames() {
100100

101101
@Override
102102
public String getLanguageName() {
103-
return base.getLanguageName();
103+
final String name = getInfo().getName();
104+
return name != null ? name : base.getLanguageName();
104105
}
105106

106107
@Override

0 commit comments

Comments
 (0)