Skip to content

Commit b7b502e

Browse files
committed
Merge branch 'suppress-console'
2 parents 054ed75 + d88bf79 commit b7b502e

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.scijava</groupId>
77
<artifactId>pom-scijava</artifactId>
8-
<version>8.0.0</version>
8+
<version>8.4.0</version>
99
<relativePath />
1010
</parent>
1111

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
import org.scijava.ui.awt.AWTDropTargetEventDispatcher;
6060
import org.scijava.ui.awt.AWTInputEventDispatcher;
6161
import org.scijava.ui.awt.AWTWindowEventDispatcher;
62+
import org.scijava.ui.console.ConsolePane;
6263
import org.scijava.ui.swing.console.SwingConsolePane;
6364
import org.scijava.ui.swing.menu.SwingJMenuBarCreator;
6465
import org.scijava.ui.swing.menu.SwingJPopupMenuCreator;
@@ -178,7 +179,10 @@ protected void createUI() {
178179

179180
toolBar = new SwingToolBar(getContext());
180181
statusBar = new SwingStatusBar(getContext());
181-
consolePane = new SwingConsolePane(getContext());
182+
183+
if (!Boolean.getBoolean(ConsolePane.NO_CONSOLE_PROPERTY)) {
184+
consolePane = new SwingConsolePane(getContext());
185+
}
182186

183187
systemClipboard = new AWTClipboard();
184188

0 commit comments

Comments
 (0)