From c08fc59d55c08358027bc346fb34e3f5dbb6a68a Mon Sep 17 00:00:00 2001
From: frauzufall <mail@frauzufall.de>
Date: Mon, 16 Mar 2020 12:56:28 +0100
Subject: [PATCH 1/2] MacroRecorder: Improve handling of
 org.scijava.widget.Button

* button in scijava command will be recorded as buttonName=0
* macro call with buttonName=0 will not display widget with button
---
 .../convert/StringToButtonConverter.java      | 31 +++++++++++++++++++
 .../plugin/MacroRecorderPostprocessor.java    |  6 ++++
 2 files changed, 37 insertions(+)
 create mode 100644 src/main/java/net/imagej/legacy/convert/StringToButtonConverter.java

diff --git a/src/main/java/net/imagej/legacy/convert/StringToButtonConverter.java b/src/main/java/net/imagej/legacy/convert/StringToButtonConverter.java
new file mode 100644
index 000000000..9de0cc520
--- /dev/null
+++ b/src/main/java/net/imagej/legacy/convert/StringToButtonConverter.java
@@ -0,0 +1,31 @@
+package net.imagej.legacy.convert;
+
+import org.scijava.Priority;
+import org.scijava.convert.AbstractConverter;
+import org.scijava.convert.ConversionRequest;
+import org.scijava.convert.Converter;
+import org.scijava.plugin.Plugin;
+import org.scijava.widget.Button;
+
+@Plugin(type = Converter.class, priority = Priority.LOW)
+public class StringToButtonConverter extends AbstractConverter<String, Button> {
+	@Override
+	public <T> T convert(Object src, Class<T> dest) {
+		return null;
+	}
+
+	@Override
+	public Class<Button> getOutputType() {
+		return Button.class;
+	}
+
+	@Override
+	public Class<String> getInputType() {
+		return String.class;
+	}
+
+	@Override
+	public boolean supports(ConversionRequest request) {
+		return super.supports(request);
+	}
+}
diff --git a/src/main/java/net/imagej/legacy/plugin/MacroRecorderPostprocessor.java b/src/main/java/net/imagej/legacy/plugin/MacroRecorderPostprocessor.java
index f25205bbf..5a4fee1eb 100644
--- a/src/main/java/net/imagej/legacy/plugin/MacroRecorderPostprocessor.java
+++ b/src/main/java/net/imagej/legacy/plugin/MacroRecorderPostprocessor.java
@@ -42,6 +42,7 @@
 import org.scijava.module.process.PostprocessorPlugin;
 import org.scijava.plugin.Parameter;
 import org.scijava.plugin.Plugin;
+import org.scijava.widget.Button;
 import org.scijava.widget.TextWidget;
 
 /**
@@ -73,6 +74,7 @@ public void process(final Module module) {
 			final String name = input.getName();
 			if (excludedInputs != null && excludedInputs.contains(name)) continue;
 			if (excludedFromRecording(input)) continue;
+			if (isButton(input)) ij1Helper.recordOption(name, "0");
 			final Object value = module.getInput(name);
 			if (value != null) ij1Helper.recordOption(name, toString(value));
 		}
@@ -80,6 +82,10 @@ public void process(final Module module) {
 		ij1Helper.finishRecording();
 	}
 
+	private boolean isButton(ModuleItem<?> input) {
+		return input.getType().equals(Button.class);
+	}
+
 	// -- Helper methods --
 
 	private boolean excludedFromRecording(final ModuleItem<?> input) {

From bb5730148e293513f1678e06e29bf9447c84e29f Mon Sep 17 00:00:00 2001
From: Christian Tischer <christian.tischer@embl.de>
Date: Mon, 16 Mar 2020 13:44:10 +0100
Subject: [PATCH 2/2] WIP: Add Command recording test

---
 .../legacy/ExploreCommandRecording.java       | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 src/test/java/net/imagej/legacy/ExploreCommandRecording.java

diff --git a/src/test/java/net/imagej/legacy/ExploreCommandRecording.java b/src/test/java/net/imagej/legacy/ExploreCommandRecording.java
new file mode 100644
index 000000000..d0f9a5372
--- /dev/null
+++ b/src/test/java/net/imagej/legacy/ExploreCommandRecording.java
@@ -0,0 +1,37 @@
+package net.imagej.legacy;
+
+import ij.plugin.frame.Recorder;
+import org.scijava.command.Command;
+import org.scijava.command.DefaultCommandService;
+import org.scijava.plugin.Parameter;
+import org.scijava.widget.Button;
+
+public class ExploreCommandRecording implements Command
+{
+	@Parameter
+	String string = "Hello";
+
+	@Parameter( callback = "callback" )
+	Button button;
+
+	@Override
+	public void run()
+	{
+
+	}
+
+	public void callback()
+	{
+		System.out.println("Button pressed.");
+	}
+
+	public static void main( String[] args )
+	{
+		// turn on recorder
+		new Recorder();
+
+		// execute above command (does not work)
+		final DefaultCommandService cs = new DefaultCommandService();
+		cs.run( ExploreCommandRecording.class, true );
+	}
+}