Fix NPE when noConsole mode is set

The ConsolePane may be null. Let's react gracefully.

Author: ctrueden

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

@@ -50,6 +50,7 @@
 import org.scijava.ui.awt.AWTDropTargetEventDispatcher;
 import org.scijava.ui.swing.AbstractSwingUI;
 import org.scijava.ui.swing.SwingApplicationFrame;
+import org.scijava.ui.swing.console.SwingConsolePane;
 import org.scijava.ui.swing.mdi.viewer.SwingMdiDisplayWindow;
 
 /**
@@ -119,13 +120,15 @@ protected void setupAppFrame() {
 
 	@Override
 	protected void setupConsole() {
+		final SwingConsolePane cPane = getConsolePane();
+		if (cPane == null) return;
 		final JInternalFrame frame = new JInternalFrame("Console");
 		desktopPane.add(frame);
 		frame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
-		frame.setContentPane(getConsolePane().getComponent());
+		frame.setContentPane(cPane.getComponent());
 		frame.setJMenuBar(createConsoleMenu());
 		frame.pack();
-		getConsolePane().setWindow(frame);
+		cPane.setWindow(frame);
 	}
 
 	// -- Helper methods --

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

@@ -49,6 +49,7 @@
 import org.scijava.ui.swing.AbstractSwingUI;
 import org.scijava.ui.swing.SwingApplicationFrame;
 import org.scijava.ui.swing.SwingUI;
+import org.scijava.ui.swing.console.SwingConsolePane;
 import org.scijava.ui.swing.viewer.SwingDisplayWindow;
 
 /**
@@ -111,12 +112,14 @@ protected void setupAppFrame() {
 
 	@Override
 	protected void setupConsole() {
+		final SwingConsolePane cPane = getConsolePane();
+		if (cPane == null) return;
 		final JFrame frame = new JFrame("Console");
 		frame.setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
-		frame.setContentPane(getConsolePane().getComponent());
+		frame.setContentPane(cPane.getComponent());
 		frame.setJMenuBar(createConsoleMenu());
 		frame.pack();
-		getConsolePane().setWindow(frame);
+		cPane.setWindow(frame);
 	}
 
 }