AdaptedScriptLanguage: really handle null info

ctrueden · ctrueden · commit 7538b25d145e · 2014-08-02T21:42:12.000-05:00
Commit b591ed4 was not good enough: if the PluginInfo is null, the base language name should be returned, _not_ null!
diff --git a/src/main/java/org/scijava/script/AdaptedScriptLanguage.java b/src/main/java/org/scijava/script/AdaptedScriptLanguage.java
@@ -103,8 +103,7 @@ public List<String> getNames() {
 	@Override
 	public String getLanguageName() {
 		final PluginInfo<?> info = getInfo();
-		if (info == null) return null;
-		final String name = info.getName();
+		final String name = info == null ? null : info.getName();
 		return name != null && !name.isEmpty() ? name : base.getLanguageName();
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -103,8 +103,7 @@ public List<String> getNames() {`
`103`	`103`	`@Override`
`104`	`104`	`public String getLanguageName() {`
`105`	`105`	`final PluginInfo<?> info = getInfo();`
`106`		`- if (info == null) return null;`
`107`		`- final String name = info.getName();`
	`106`	`+ final String name = info == null ? null : info.getName();`
`108`	`107`	`return name != null && !name.isEmpty() ? name : base.getLanguageName();`
`109`	`108`	`}`
`110`	`109`