Merge pull request #238 from scijava/script-attrs

Add support for arbitrary parameter attributes

Author: ctrueden

src/main/java/org/scijava/AbstractBasicDetails.java

@@ -53,7 +53,7 @@ public abstract class AbstractBasicDetails implements BasicDetails {
 	private String description;
 
 	/** Table of extra key/value pairs. */
-	private Map<String, String> values = new HashMap<String, String>();
+	private final Map<String, String> values = new HashMap<String, String>();
 
 	// -- Object methods --
 
@@ -102,7 +102,7 @@ public void setDescription(final String description) {
 	}
 
 	@Override
-	public void set(String key, String value) {
+	public void set(final String key, final String value) {
 		values.put(key, value);
 	}
 

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. */

src/test/java/org/scijava/script/ScriptInfoTest.java

@@ -142,7 +142,7 @@ public void testParameters() {
 			"% @LogService(required = false) log\n" + //
 			"% @int(label=\"Slider Value\", softMin=5, softMax=15, " + //
 			"stepSize=3, value=11, style=\"slider\") sliderValue\n" + //
-			"% @String(persist = false, " + //
+			"% @String(persist = false, family='Carnivora', " + //
 			"choices={'quick brown fox', 'lazy dog'}) animal\n" + //
 			"% @BOTH java.lang.StringBuilder buffer";
 
@@ -164,6 +164,7 @@ public void testParameters() {
 			Arrays.asList("quick brown fox", "lazy dog");
 		assertItem("animal", String.class, null, ItemIO.INPUT, true, false,
 			null, null, null, null, null, null, null, null, animalChoices, animal);
+		assertEquals(animal.get("family"), "Carnivora"); // test custom attribute
 
 		final ModuleItem<?> buffer = info.getOutput("buffer");
 		assertItem("buffer", StringBuilder.class, null, ItemIO.BOTH, true, true,