Make the interpreter use the new SJC REPL

This gives it access to the REPL's meta-commands (:langs, :vars, etc.).
It also eliminates the ugly tabs in favor of one simpler unified pane.

Author: ctrueden

src/main/java/org/scijava/ui/swing/script/InterpreterPane.java

@@ -40,70 +40,62 @@
 import javax.script.ScriptContext;
 import javax.script.ScriptException;
 import javax.swing.JButton;
+import javax.swing.JComponent;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JSplitPane;
 
 import net.miginfocom.swing.MigLayout;
 
+import org.scijava.Context;
 import org.scijava.log.LogService;
-import org.scijava.prefs.PrefService;
-import org.scijava.script.DefaultScriptInterpreter;
-import org.scijava.script.ScriptInterpreter;
-import org.scijava.script.ScriptLanguage;
-import org.scijava.script.ScriptService;
+import org.scijava.plugin.Parameter;
+import org.scijava.script.ScriptREPL;
+import org.scijava.widget.UIComponent;
 
 /**
- * A Swing UI pane for a language-specific script interpreter.
+ * A Swing UI pane for the SciJava scripting REPL.
  *
  * @author Curtis Rueden
  * @author Johannes Schindelin
  */
-public class InterpreterPane {
+public class InterpreterPane implements UIComponent<JComponent> {
 
-	private final ScriptInterpreter interpreter;
+	private final ScriptREPL repl;
 
 	private final JSplitPane splitPane;
 	private final OutputPane output;
 	private final PromptPane prompt;
 
-	/**
-	 * Constructs an interpreter UI pane for a specific scripting language.
-	 *
-	 * @param prefs service to use for persisting the history
-	 * @param scriptService service to use for scripting
-	 * @param language scripting language for which to construct a UI pane
-	 * @param log service to use for logging
-	 */
-	public InterpreterPane(final PrefService prefs,
-		final ScriptService scriptService, final ScriptLanguage language,
-		final LogService log)
-	{
-		this(createInterpreter(prefs, scriptService, language), log);
-	}
+	@Parameter(required = false)
+	private LogService log;
 
 	/**
-	 * Constructs an interpreter UI pane for a specific script interpreter.
+	 * Constructs an interpreter UI pane for a SciJava scripting REPL.
 	 *
-	 * @param interpreter script interpreter to use for script execution
-	 * @param log service to use for logging
+	 * @param context The SciJava application context to use
 	 */
-	public InterpreterPane(final ScriptInterpreter interpreter,
-		final LogService log)
-	{
-		this.interpreter = interpreter;
-
+	public InterpreterPane(final Context context) {
+		context.inject(this);
 		output = new OutputPane(log);
 		final JScrollPane outputScroll = new JScrollPane(output);
 		outputScroll.setPreferredSize(new Dimension(440, 400));
 
+		repl = new ScriptREPL(context, output.getOutputStream());
+		repl.initialize();
+
 		final Writer writer = output.getOutputWriter();
-		final ScriptContext context = interpreter.getEngine().getContext();
-		context.setErrorWriter(writer);
-		context.setWriter(writer);
+		final ScriptContext ctx = repl.getInterpreter().getEngine().getContext();
+		ctx.setErrorWriter(writer);
+		ctx.setWriter(writer);
 
-		prompt = new PromptPane(interpreter, output);
-		final JScrollPane promptScroll = new JScrollPane(prompt);
+		prompt = new PromptPane(repl, output) {
+			@Override
+			public void quit() {
+				dispose();
+			}
+		};
+		final JScrollPane promptScroll = new JScrollPane(prompt.getComponent());
 
 		final JButton clearButton = new JButton("Clear");
 		clearButton.setToolTipText("Clears the text in the output pane.");
@@ -121,9 +113,8 @@ public void actionPerformed(final ActionEvent e) {
 		bottomPane.add(promptScroll, "spany 2");
 		bottomPane.add(clearButton, "w pref!, h pref!, wrap");
 
-		final Object importGenerator =
-			DefaultAutoImporters.getImportGenerator(log.getContext(), interpreter
-				.getLanguage());
+		final Object importGenerator = DefaultAutoImporters.getImportGenerator(
+			log.getContext(), repl.getInterpreter().getLanguage());
 		if (importGenerator != null) {
 			final JButton autoImportButton = new JButton("Auto-Import");
 			autoImportButton.setToolTipText("Auto-imports common classes.");
@@ -132,13 +123,13 @@ public void actionPerformed(final ActionEvent e) {
 				@Override
 				public void actionPerformed(final ActionEvent e) {
 					try {
-						interpreter.getEngine().eval(importGenerator.toString());
+						repl.getInterpreter().getEngine().eval(importGenerator.toString());
 					}
 					catch (final ScriptException e1) {
 						e1.printStackTrace(new PrintWriter(output.getOutputWriter()));
 					}
 					autoImportButton.setEnabled(false);
-					prompt.requestFocus();
+					prompt.getComponent().requestFocus();
 				}
 			});
 			bottomPane.add(autoImportButton, "w pref!, h pref!, wrap");
@@ -149,23 +140,14 @@ public void actionPerformed(final ActionEvent e) {
 		splitPane.setResizeWeight(1);
 	}
 
-	public void dispose() throws IOException {
-		output.close();
-	}
-
 	// -- InterpreterPane methods --
 
-	/** Gets the associated script interpreter. */
-	public ScriptInterpreter getInterpreter() {
-		return interpreter;
+	/** Gets the associated script REPL. */
+	public ScriptREPL getREPL() {
+		return repl;
 	}
 
-	/** Gets the pane's Swing UI component. */
-	public JSplitPane getComponent() {
-		return splitPane;
-	}
-
-	/** Print a message to the output panel */
+	/** Prints a message to the output panel. */
 	public void print(final String string) {
 		final Writer writer = output.getOutputWriter();
 		try {
@@ -176,12 +158,20 @@ public void print(final String string) {
 		}
 	}
 
-	// -- Utility methods --
+	public void dispose() {
+		output.close();
+	}
+
+	// -- UIComponent methods --
+
+	@Override
+	public JComponent getComponent() {
+		return splitPane;
+	}
 
-	public static ScriptInterpreter createInterpreter(final PrefService prefs,
-		final ScriptService scriptService, final ScriptLanguage language)
-	{
-		return new DefaultScriptInterpreter(prefs, scriptService, language);
+	@Override
+	public Class<JComponent> getComponentType() {
+		return JComponent.class;
 	}
 
 }

src/main/java/org/scijava/ui/swing/script/InterpreterWindow.java

@@ -30,24 +30,13 @@
 
 package org.scijava.ui.swing.script;
 
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-
 import javax.swing.JFrame;
-import javax.swing.JSplitPane;
-import javax.swing.JTabbedPane;
 import javax.swing.WindowConstants;
 
 import org.scijava.Context;
 import org.scijava.log.LogService;
 import org.scijava.plugin.Parameter;
 import org.scijava.prefs.PrefService;
-import org.scijava.script.ScriptLanguage;
 import org.scijava.script.ScriptService;
 
 /**
@@ -58,6 +47,8 @@
  */
 public class InterpreterWindow extends JFrame {
 
+	private final InterpreterPane pane;
+
 	@Parameter
 	private PrefService prefs;
 
@@ -67,29 +58,19 @@ public class InterpreterWindow extends JFrame {
 	@Parameter
 	private LogService log;
 
-	private final List<InterpreterPane> tabs = new ArrayList<InterpreterPane>();
-	private final JTabbedPane tabbedPane;
-
 	/** Constructs the scripting interpreter window. */
 	public InterpreterWindow(final Context context) {
 		super("Script Interpreter");
 		context.inject(this);
 
-		tabbedPane = new JTabbedPane();
-		setContentPane(tabbedPane);
-
-		for (final ScriptLanguage language : languages()) {
-			final String name = language.getLanguageName();
-			final InterpreterPane tab =
-				new InterpreterPane(prefs, scriptService, language, log);
-			tabs.add(tab);
-			tabbedPane.add(name, tab.getComponent());
-		}
-
-		syncTabs();
-
-		// read in interpreter histories, etc.
-		readState();
+		pane = new InterpreterPane(context) {
+			@Override
+			public void dispose() {
+				super.dispose();
+				InterpreterWindow.super.dispose();
+			}
+		};
+		setContentPane(pane.getComponent());
 
 		pack();
 
@@ -99,115 +80,14 @@ public InterpreterWindow(final Context context) {
 	@Override
 	public void dispose() {
 		// write out interpreter histories, etc., when frame goes away
-		writeState();
-		for (final InterpreterPane tab : tabs)
-			try {
-				tab.dispose();
-			}
-			catch (final Exception e) {
-				e.printStackTrace();
-			}
+		pane.dispose();
 		super.dispose();
 	}
 
 	// -- Helper methods --
 
-	/** Gets the list of available scripting languages, sorted by name. */
-	private List<ScriptLanguage> languages() {
-		final List<ScriptLanguage> languages =
-			new ArrayList<ScriptLanguage>(scriptService.getLanguages());
-
-		// skip compiled languages (makes no sense to interpret them)
-		for (final Iterator<ScriptLanguage> iter = languages.iterator(); iter
-			.hasNext();)
-		{
-			if (iter.next().isCompiledLanguage()) iter.remove();
-		}
-
-		Collections.sort(languages, new Comparator<ScriptLanguage>() {
-
-			@Override
-			public int compare(final ScriptLanguage l1, final ScriptLanguage l2) {
-				return l1.getLanguageName().compareTo(l2.getLanguageName());
-			}
-
-		});
-		return languages;
-	}
-
-	/** Ensures that each tab's split pane stays sized the same. */
-	private void syncTabs() {
-		final PropertyChangeListener l = new PropertyChangeListener() {
-
-			@Override
-			public void propertyChange(final PropertyChangeEvent evt) {
-				final String prop = evt.getPropertyName();
-				if (!prop.equals(JSplitPane.DIVIDER_LOCATION_PROPERTY)) return;
-				final JSplitPane splitPane = (JSplitPane) evt.getSource();
-				final int dividerLocation = splitPane.getDividerLocation();
-				for (final InterpreterPane tab : tabs) {
-					final JSplitPane c = tab.getComponent();
-					if (c == splitPane) continue;
-					c.setDividerLocation(dividerLocation);
-				}
-			}
-		};
-		for (final InterpreterPane tab : tabs) {
-			tab.getComponent().addPropertyChangeListener(l);
-		}
-	}
-
-	/**
-	 * Reads in persisted state, including the last active tab, as well as the
-	 * history of each interpreter.
-	 */
-	private void readState() {
-		setActiveLanguage(prefs.get(InterpreterWindow.class, "language"));
-		for (final InterpreterPane tab : tabs) {
-			tab.getInterpreter().readHistory();
-		}
-	}
-
-	/**
-	 * Writes out persisted state, including the currently active tab, as well as
-	 * the history of each interpreter.
-	 */
-	private void writeState() {
-		final String active = getActiveLanguage();
-		if (active != null) prefs.put(InterpreterWindow.class, "language", active);
-		for (final InterpreterPane tab : tabs) {
-			tab.getInterpreter().writeHistory();
-		}
-	}
-
-	/** Gets the name of the active language tab. */
-	private String getActiveLanguage() {
-		final int selected = tabbedPane.getSelectedIndex();
-		if (selected < 0) return null;
-		final InterpreterPane tab = tabs.get(selected);
-		return tab.getInterpreter().getLanguage().getLanguageName();
-	}
-
-	/** Sets the active language tab by name. */
-	private void setActiveLanguage(final String languageName) {
-		for (int i = 0; i < tabs.size(); i++) {
-			final InterpreterPane tab = tabs.get(i);
-			final String name = tab.getInterpreter().getLanguage().getLanguageName();
-			if (name.equals(languageName)) {
-				tabbedPane.setSelectedIndex(i);
-				break;
-			}
-		}
-	}
-
 	/** Print a message to the current language's output panel */
 	public void print(final String string) {
-		final int selected = tabbedPane.getSelectedIndex();
-		if (selected < 0) {
-			System.out.println(string);
-			return;
-		}
-		final InterpreterPane tab = tabs.get(selected);
-		tab.print(string);
+		pane.print(string);
 	}
 }