Make Sholl plugins macro recordable.

This depends on imagej/imagej-legacy#313

Author: tferr

src/main/java/sc/fiji/snt/plugin/ShollAnalysisImgCmd.java

@@ -316,9 +316,16 @@ public void onEvent(final DataDeletedEvent evt) {
 
 	@Override
 	public void run() {
-		// the code here gets called once the prompt is displayed.
-		// There is no "OK" button in the prompt, so we don't need anything here
-		// All the code is run from callbacks
+		// There is no "OK" button in the prompt, so we don't need anything here. All functionality is run from callbacks
+		// The code here gets called once the prompt is displayed and when CommandService.run() is called, so we'll only
+		// run analysis if called from a (pre-recorded) macro
+		if (ij.IJ.isMacro()) {
+			try {
+				runAnalysis();
+			} catch (final InterruptedException e) {
+				throw new RuntimeException(e);
+			}
+		}
 	}
 
 	/*
@@ -361,14 +368,9 @@ private boolean ongoingAnalysis() {
 
 	protected void runAnalysis() throws InterruptedException {
 		if (Recorder.record) {
-			Recorder.recordString(
-					  "// N.B.: Currently,recorded instances of the Sholl Analysis prompt may not allow for \n" //
-					+ "// fully automated macros(see e.g., https://github.com/imagej/imagej-legacy/pull/239.)\n" //
-					+ "// Please have a look at the example scripts in Templates>Neuroanatomy>\n"//
-					+ "// for more robust ways to automate Sholl. E.g., the script\n"//
-					+ "// 'Sholl_Extract_Profile_From_Image_Demo.py' exemplifies how to parse\n"//
-					+ "// an image programmatically. Alternatively, the Legacy IJ1 command remains\n"//
-					+ "// available with historical support for recorded calls.\n");
+			Recorder.recordString("// Please have a look at the example scripts in Templates>Neuroanatomy> for more\n"//
+					+ "// robust ways to automate Sholl. E.g., Sholl_Extract_Profile_From_Image_Demo.py\n"//
+					+ "// exemplifies how to parse an image programmatically using API calls");
 		}
 		switch (scope) {
 		case SCOPE_IMP:

src/main/java/sc/fiji/snt/plugin/ShollAnalysisTreeCmd.java

@@ -27,6 +27,7 @@
 import java.util.*;
 import java.util.concurrent.Future;
 
+import ij.plugin.frame.Recorder;
 import net.imagej.ImageJ;
 import net.imagej.lut.LUTService;
 import net.imglib2.display.ColorTable;
@@ -249,7 +250,13 @@ public class ShollAnalysisTreeCmd extends DynamicCommand implements Interactive,
 
 	@Override
 	public void run() {
-		// Do nothing. Actually analysis is performed by runAnalysis();
+		if (ij.IJ.isMacro()) { // see ShollAnalyisImgCmd#run
+			try {
+				runAnalysis();
+			} catch (final InterruptedException e) {
+				throw new RuntimeException(e);
+			}
+		}
 	}
 
 	/*
@@ -268,6 +275,11 @@ public void cancel() {
 
 	@SuppressWarnings("unused")
 	private void runAnalysis() throws InterruptedException {
+		if (Recorder.record) {
+			Recorder.recordString("// Please have a look at the example scripts in Templates>Neuroanatomy> for more\n"//
+					+ "// robust ways to automate Sholl. E.g., Sholl_Extensive_Stats_Demo.groovy\n"//
+					+ "// exemplifies how to obtain and analyze profiles in a programmatic way");
+		}
 		if (analysisFuture != null && !analysisFuture.isDone()) {
 			threadService.queue(() -> {
 				final boolean killExisting = helper.getConfirmation("An analysis is already running. Abort it?",