ScriptInfo: support all attrs

ctrueden · ctrueden · commit be41b8e2913f · 2016-04-13T16:09:38.000-05:00
When an arbitrary key/value pair is given, we should set it as an attribute rather than throwing an exception. In Java, the way these are specified is rather verbose: @parameter(attrs = { @attr(name="foo", value="bar") }) private int value; But for scripts, it is now not only possible, but much more succinct: // @int value(foo="bar") Noticed by Gabriel Einsdorf.
diff --git a/src/main/java/org/scijava/script/ScriptInfo.java b/src/main/java/org/scijava/script/ScriptInfo.java
@@ -399,7 +399,7 @@ private void addReturnValue() throws ScriptException {
 	}
 
 	private <T> void addItem(final String name, final Class<T> type,
-		final Map<String, Object> attrs) throws ScriptException
+		final Map<String, Object> attrs)
 	{
 		final DefaultMutableModuleItem<T> item =
 			new DefaultMutableModuleItem<T>(this, name, type);
@@ -412,7 +412,7 @@ private <T> void addItem(final String name, final Class<T> type,
 	}
 
 	private <T> void assignAttribute(final DefaultMutableModuleItem<T> item,
-		final String k, final Object v) throws ScriptException
+		final String k, final Object v)
 	{
 		// CTR: There must be an easier way to do this.
 		// Just compile the thing using javac? Or parse via javascript, maybe?
@@ -435,7 +435,7 @@ private <T> void assignAttribute(final DefaultMutableModuleItem<T> item,
 		else if (is(k, "style")) item.setWidgetStyle(as(v, String.class));
 		else if (is(k, "visibility")) item.setVisibility(as(v, ItemVisibility.class));
 		else if (is(k, "value")) item.setDefaultValue(as(v, item.getType()));
-		else throw new ScriptException("Invalid attribute name: " + k);
+		else item.set(k, v.toString());
 	}
 
 	/** Super terse comparison helper method. */

Original file line number	Diff line number	Diff line change
`@@ -399,7 +399,7 @@ private void addReturnValue() throws ScriptException {`
`399`	`399`	`}`
`400`	`400`
`401`	`401`	`private <T> void addItem(final String name, final Class<T> type,`
`402`		`- final Map<String, Object> attrs) throws ScriptException`
	`402`	`+ final Map<String, Object> attrs)`
`403`	`403`	`{`
`404`	`404`	`final DefaultMutableModuleItem<T> item =`
`405`	`405`	`new DefaultMutableModuleItem<T>(this, name, type);`
`@@ -412,7 +412,7 @@ private <T> void addItem(final String name, final Class<T> type,`
`412`	`412`	`}`
`413`	`413`
`414`	`414`	`private <T> void assignAttribute(final DefaultMutableModuleItem<T> item,`
`415`		`- final String k, final Object v) throws ScriptException`
	`415`	`+ final String k, final Object v)`
`416`	`416`	`{`
`417`	`417`	`// CTR: There must be an easier way to do this.`
`418`	`418`	`// Just compile the thing using javac? Or parse via javascript, maybe?`
`@@ -435,7 +435,7 @@ private <T> void assignAttribute(final DefaultMutableModuleItem<T> item,`
`435`	`435`	`else if (is(k, "style")) item.setWidgetStyle(as(v, String.class));`
`436`	`436`	`else if (is(k, "visibility")) item.setVisibility(as(v, ItemVisibility.class));`
`437`	`437`	`else if (is(k, "value")) item.setDefaultValue(as(v, item.getType()));`
`438`		`- else throw new ScriptException("Invalid attribute name: " + k);`
	`438`	`+ else item.set(k, v.toString());`
`439`	`439`	`}`
`440`	`440`
`441`	`441`	`/** Super terse comparison helper method. */`