From 7783a4cec56b956a1a06ea3e69177f6251e77081 Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Tue, 9 Feb 2021 11:00:58 +0000 Subject: [PATCH 1/2] Add option to completely disable to BOY console; prints to log instead --- .../util/ConsoleServiceSSHelperImpl.java | 60 +++++++++++++++---- .../preferences/PreferencesHelper.java | 1 + 2 files changed, 49 insertions(+), 12 deletions(-) diff --git a/applications/opibuilder/opibuilder-plugins/org.csstudio.opibuilder.rcp/src/org/csstudio/opibuilder/util/ConsoleServiceSSHelperImpl.java b/applications/opibuilder/opibuilder-plugins/org.csstudio.opibuilder.rcp/src/org/csstudio/opibuilder/util/ConsoleServiceSSHelperImpl.java index 875bb3f1f47..c8a8a2b59e7 100644 --- a/applications/opibuilder/opibuilder-plugins/org.csstudio.opibuilder.rcp/src/org/csstudio/opibuilder/util/ConsoleServiceSSHelperImpl.java +++ b/applications/opibuilder/opibuilder-plugins/org.csstudio.opibuilder.rcp/src/org/csstudio/opibuilder/util/ConsoleServiceSSHelperImpl.java @@ -53,18 +53,18 @@ public class ConsoleServiceSSHelperImpl extends ConsoleServiceSSHelper { private IOConsoleOutputStream errorStream, warningStream, infoStream, generalStream; { - console = new IOConsole("BOY Console", null); - - generalStream = console.newOutputStream(); - - // Values are from https://bugs.eclipse.org/bugs/show_bug.cgi?id=46871#c5 - console.setWaterMarks(400000, 500000); - - ConsolePlugin consolePlugin = ConsolePlugin.getDefault(); - consolePlugin.getConsoleManager().addConsoles( - new IConsole[] { console }); - - + if (PreferencesHelper.getConsolePopupLevel() != PreferencesHelper.ConsolePopupLevel.NO_CONSOLE) { + console = new IOConsole("BOY Console", null); + + generalStream = console.newOutputStream(); + + // Values are from https://bugs.eclipse.org/bugs/show_bug.cgi?id=46871#c5 + console.setWaterMarks(400000, 500000); + + ConsolePlugin consolePlugin = ConsolePlugin.getDefault(); + consolePlugin.getConsoleManager().addConsoles( + new IConsole[] { console }); + } } /** @@ -117,6 +117,13 @@ private String getTimeString(){ */ @Override public void writeError(final String message){ + + if (PreferencesHelper.getConsolePopupLevel() == PreferencesHelper.ConsolePopupLevel.NO_CONSOLE) { + // If we are not writing to the console, send it to logger instead. + OPIBuilderPlugin.getLogger().log(Level.WARNING, message); + return; + } + switch (PreferencesHelper.getConsolePopupLevel()) { case ALL: popConsoleView(); @@ -147,6 +154,13 @@ public void run() { */ @Override public void writeWarning(String message){ + + if (PreferencesHelper.getConsolePopupLevel() == PreferencesHelper.ConsolePopupLevel.NO_CONSOLE) { + // If we are not writing to the console, send it to logger instead. + OPIBuilderPlugin.getLogger().log(Level.WARNING, message); + return; + } + final String output = getTimeString() + " WARNING: " + message+ ENTER; switch (PreferencesHelper.getConsolePopupLevel()) { case ALL: @@ -155,6 +169,7 @@ public void writeWarning(String message){ default: break; } + UIBundlingThread.getInstance().addRunnable(new Runnable() { @Override @@ -175,6 +190,13 @@ public void run() { */ @Override public void writeInfo(String message){ + + if (PreferencesHelper.getConsolePopupLevel() == PreferencesHelper.ConsolePopupLevel.NO_CONSOLE) { + // If we are not writing to the console, send it to logger instead. + OPIBuilderPlugin.getLogger().log(Level.INFO, message); + return; + } + final String output = getTimeString() + " INFO: " + message+ ENTER; switch (PreferencesHelper.getConsolePopupLevel()) { case ALL: @@ -184,6 +206,7 @@ public void writeInfo(String message){ default: break; } + UIBundlingThread.getInstance().addRunnable(new Runnable(){ @Override public void run() { @@ -200,6 +223,12 @@ public void run() { @Override public void writeString(final String s){ + if (PreferencesHelper.getConsolePopupLevel() == PreferencesHelper.ConsolePopupLevel.NO_CONSOLE) { + // If we are not writing to the console, send it to logger instead. + OPIBuilderPlugin.getLogger().log(Level.INFO, s); + return; + } + UIBundlingThread.getInstance().addRunnable(new Runnable(){ @Override public void run() { @@ -215,6 +244,13 @@ public void run() { @Override public void writeString(final String s, final RGB color){ + + if (PreferencesHelper.getConsolePopupLevel() == PreferencesHelper.ConsolePopupLevel.NO_CONSOLE) { + // If we are not writing to the console, send it to logger instead. + OPIBuilderPlugin.getLogger().log(Level.INFO, s); + return; + } + UIBundlingThread.getInstance().addRunnable(new Runnable() { @Override public void run() { diff --git a/applications/opibuilder/opibuilder-plugins/org.csstudio.opibuilder/src/org/csstudio/opibuilder/preferences/PreferencesHelper.java b/applications/opibuilder/opibuilder-plugins/org.csstudio.opibuilder/src/org/csstudio/opibuilder/preferences/PreferencesHelper.java index e2961b99d02..06fd3e18abc 100644 --- a/applications/opibuilder/opibuilder-plugins/org.csstudio.opibuilder/src/org/csstudio/opibuilder/preferences/PreferencesHelper.java +++ b/applications/opibuilder/opibuilder-plugins/org.csstudio.opibuilder/src/org/csstudio/opibuilder/preferences/PreferencesHelper.java @@ -33,6 +33,7 @@ public class PreferencesHelper { public enum ConsolePopupLevel { + NO_CONSOLE, NO_POP, ONLY_INFO, ALL; From 5480a4b8b639d2c6bd98f2638cb510c7ce54763a Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Wed, 10 Feb 2021 18:22:43 +0000 Subject: [PATCH 2/2] Use switch statements --- .../util/ConsoleServiceSSHelperImpl.java | 27 +++++++------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/applications/opibuilder/opibuilder-plugins/org.csstudio.opibuilder.rcp/src/org/csstudio/opibuilder/util/ConsoleServiceSSHelperImpl.java b/applications/opibuilder/opibuilder-plugins/org.csstudio.opibuilder.rcp/src/org/csstudio/opibuilder/util/ConsoleServiceSSHelperImpl.java index c8a8a2b59e7..8b31b7a5d82 100644 --- a/applications/opibuilder/opibuilder-plugins/org.csstudio.opibuilder.rcp/src/org/csstudio/opibuilder/util/ConsoleServiceSSHelperImpl.java +++ b/applications/opibuilder/opibuilder-plugins/org.csstudio.opibuilder.rcp/src/org/csstudio/opibuilder/util/ConsoleServiceSSHelperImpl.java @@ -118,16 +118,13 @@ private String getTimeString(){ @Override public void writeError(final String message){ - if (PreferencesHelper.getConsolePopupLevel() == PreferencesHelper.ConsolePopupLevel.NO_CONSOLE) { - // If we are not writing to the console, send it to logger instead. - OPIBuilderPlugin.getLogger().log(Level.WARNING, message); - return; - } - switch (PreferencesHelper.getConsolePopupLevel()) { case ALL: popConsoleView(); break; + case NO_CONSOLE: + OPIBuilderPlugin.getLogger().log(Level.WARNING, message); + return; default: break; } @@ -155,17 +152,14 @@ public void run() { @Override public void writeWarning(String message){ - if (PreferencesHelper.getConsolePopupLevel() == PreferencesHelper.ConsolePopupLevel.NO_CONSOLE) { - // If we are not writing to the console, send it to logger instead. - OPIBuilderPlugin.getLogger().log(Level.WARNING, message); - return; - } - final String output = getTimeString() + " WARNING: " + message+ ENTER; switch (PreferencesHelper.getConsolePopupLevel()) { case ALL: popConsoleView(); break; + case NO_CONSOLE: + OPIBuilderPlugin.getLogger().log(Level.WARNING, message); + return; default: break; } @@ -191,18 +185,15 @@ public void run() { @Override public void writeInfo(String message){ - if (PreferencesHelper.getConsolePopupLevel() == PreferencesHelper.ConsolePopupLevel.NO_CONSOLE) { - // If we are not writing to the console, send it to logger instead. - OPIBuilderPlugin.getLogger().log(Level.INFO, message); - return; - } - final String output = getTimeString() + " INFO: " + message+ ENTER; switch (PreferencesHelper.getConsolePopupLevel()) { case ALL: case ONLY_INFO: popConsoleView(); break; + case NO_CONSOLE: + OPIBuilderPlugin.getLogger().log(Level.INFO, message); + return; default: break; }