Merge branch 'console-fixes'

Author: ctrueden

src/main/java/org/scijava/ui/swing/AbstractSwingUI.java

@@ -32,12 +32,16 @@
 
 import java.awt.BorderLayout;
 import java.awt.Component;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.io.File;
 
 import javax.swing.JFileChooser;
+import javax.swing.JMenu;
 import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
 import javax.swing.JPopupMenu;
 import javax.swing.WindowConstants;
 
@@ -238,6 +242,22 @@ protected JMenuBar createMenus() {
 		return menuBar;
 	}
 
+	protected JMenuBar createConsoleMenu() {
+		final JMenuBar menuBar = new JMenuBar();
+		final JMenu edit = new JMenu("Edit");
+		menuBar.add(edit);
+		final JMenuItem editClear = new JMenuItem("Clear");
+		editClear.addActionListener(new ActionListener() {
+
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				getConsolePane().clear();
+			}
+		});
+		edit.add(editClear);
+		return menuBar;
+	}
+
 	/**
 	 * Configures the application frame for subclass-specific settings (e.g., SDI
 	 * or MDI).

src/main/java/org/scijava/ui/swing/console/SwingConsolePane.java

@@ -35,6 +35,7 @@
 import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.Font;
+import java.awt.FontMetrics;
 
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
@@ -102,6 +103,11 @@ public JScrollPane getScrollPane() {
 		return scrollPane;
 	}
 
+	public void clear() {
+		if (consolePanel == null) initConsolePanel();
+		textPane.setText("");
+	}
+
 	// -- ConsolePane methods --
 
 	@Override
@@ -179,6 +185,14 @@ private synchronized void initConsolePanel() {
 
 		scrollPane = new JScrollPane(textPanel);
 		scrollPane.setPreferredSize(new Dimension(600, 600));
+
+		// Make the scroll bars move at a reasonable pace.
+		final FontMetrics fm = scrollPane.getFontMetrics(scrollPane.getFont());
+		final int charWidth = fm.charWidth('a');
+		final int lineHeight = fm.getHeight();
+		scrollPane.getHorizontalScrollBar().setUnitIncrement(charWidth);
+		scrollPane.getVerticalScrollBar().setUnitIncrement(2 * lineHeight);
+
 		panel.add(scrollPane);
 
 		consolePanel = panel;

src/main/java/org/scijava/ui/swing/mdi/SwingMdiUI.java

@@ -124,6 +124,7 @@ protected void setupConsole() {
 		desktopPane.add(frame);
 		frame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
 		frame.setContentPane(getConsolePane().getComponent());
+		frame.setJMenuBar(createConsoleMenu());
 		frame.pack();
 		getConsolePane().setWindow(frame);
 	}

src/main/java/org/scijava/ui/swing/sdi/SwingSDIUI.java

@@ -115,6 +115,7 @@ protected void setupConsole() {
 		final JFrame frame = new JFrame("Console");
 		frame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
 		frame.setContentPane(getConsolePane().getComponent());
+		frame.setJMenuBar(createConsoleMenu());
 		frame.pack();
 		getConsolePane().setWindow(frame);
 	}