diff --git a/docs/FAQ/FAQ_How_do_I_use_the_platform_debug_tracing_facility.md b/docs/FAQ/FAQ_How_do_I_use_the_platform_debug_tracing_facility.md index d0f66d10241..bba1c84eb27 100644 --- a/docs/FAQ/FAQ_How_do_I_use_the_platform_debug_tracing_facility.md +++ b/docs/FAQ/FAQ_How_do_I_use_the_platform_debug_tracing_facility.md @@ -34,7 +34,7 @@ If you do not need dynamic trace enablement or if you are concerned about code c ```java - private static final boolean DEBUG_TWO = "true".equalsIgnoreCase(Platform.getDebugOption( + private static final boolean DEBUG_TWO = Platform.getDebugBoolean( "org.eclipse.faq.examples/debug/option2")); ... if (DEBUG_TWO) diff --git a/runtime/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/Expressions.java b/runtime/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/Expressions.java index 1e14ca02f97..76819cb6c21 100644 --- a/runtime/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/Expressions.java +++ b/runtime/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/Expressions.java @@ -56,7 +56,7 @@ public class Expressions { private static WeakHashMap> fgNotFoundClasses; /* debugging flag to enable tracing */ - public static final boolean TRACING= "true".equalsIgnoreCase(Platform.getDebugOption("org.eclipse.core.expressions/tracePropertyResolving")); //$NON-NLS-1$ //$NON-NLS-2$ + public static final boolean TRACING= Platform.getDebugBoolean("org.eclipse.core.expressions/tracePropertyResolving"); //$NON-NLS-1$ private Expressions() { diff --git a/runtime/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/TypeExtensionManager.java b/runtime/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/TypeExtensionManager.java index f8b01fa156f..11743aef5f5 100644 --- a/runtime/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/TypeExtensionManager.java +++ b/runtime/bundles/org.eclipse.core.expressions/src/org/eclipse/core/internal/expressions/TypeExtensionManager.java @@ -40,7 +40,7 @@ public class TypeExtensionManager implements IRegistryChangeListener { * * @since 3.5 */ - private static boolean DEBUG= "true".equalsIgnoreCase(Platform.getDebugOption("org.eclipse.core.expressions/debug/TypeExtensionManager")); //$NON-NLS-1$//$NON-NLS-2$ + private static boolean DEBUG = Platform.getDebugBoolean("org.eclipse.core.expressions/debug/TypeExtensionManager"); //$NON-NLS-1$ private static final String TYPE= "type"; //$NON-NLS-1$ diff --git a/terminal/bundles/org.eclipse.terminal.control/src/org/eclipse/terminal/connector/Logger.java b/terminal/bundles/org.eclipse.terminal.control/src/org/eclipse/terminal/connector/Logger.java index fc3ade82392..302db7d196b 100644 --- a/terminal/bundles/org.eclipse.terminal.control/src/org/eclipse/terminal/connector/Logger.java +++ b/terminal/bundles/org.eclipse.terminal.control/src/org/eclipse/terminal/connector/Logger.java @@ -59,10 +59,10 @@ public static void setUnderTest(boolean underTest) { static { // Any of the known debugging options turns on the creation of the log file - boolean createLogFile = TerminalPlugin.isOptionEnabled(TRACE_DEBUG_LOG) - || TerminalPlugin.isOptionEnabled(TRACE_DEBUG_LOG_CHAR) - || TerminalPlugin.isOptionEnabled(TRACE_DEBUG_LOG_VT100BACKEND) - || TerminalPlugin.isOptionEnabled(TRACE_DEBUG_LOG_HOVER); + boolean createLogFile = Platform.getDebugBoolean(TRACE_DEBUG_LOG) + || Platform.getDebugBoolean(TRACE_DEBUG_LOG_CHAR) + || Platform.getDebugBoolean(TRACE_DEBUG_LOG_VT100BACKEND) + || Platform.getDebugBoolean(TRACE_DEBUG_LOG_HOVER); // Log only if tracing is enabled if (createLogFile && TerminalPlugin.getDefault() != null) { diff --git a/terminal/bundles/org.eclipse.terminal.control/src/org/eclipse/terminal/internal/control/impl/TerminalPlugin.java b/terminal/bundles/org.eclipse.terminal.control/src/org/eclipse/terminal/internal/control/impl/TerminalPlugin.java index 370d3e55a05..5f786b1986e 100644 --- a/terminal/bundles/org.eclipse.terminal.control/src/org/eclipse/terminal/internal/control/impl/TerminalPlugin.java +++ b/terminal/bundles/org.eclipse.terminal.control/src/org/eclipse/terminal/internal/control/impl/TerminalPlugin.java @@ -20,7 +20,6 @@ *******************************************************************************/ package org.eclipse.terminal.internal.control.impl; -import org.eclipse.core.runtime.Platform; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; @@ -54,13 +53,4 @@ public void stop(BundleContext context) throws Exception { super.stop(context); } - public static boolean isOptionEnabled(String strOption) { - String strEnabled = Platform.getDebugOption(strOption); - if (strEnabled == null) { - return false; - } - - return Boolean.parseBoolean(strEnabled); - } - } diff --git a/terminal/bundles/org.eclipse.terminal.control/src/org/eclipse/terminal/internal/emulator/VT100Emulator.java b/terminal/bundles/org.eclipse.terminal.control/src/org/eclipse/terminal/internal/emulator/VT100Emulator.java index 9b2224bfcd5..659fd5cd4fd 100644 --- a/terminal/bundles/org.eclipse.terminal.control/src/org/eclipse/terminal/internal/emulator/VT100Emulator.java +++ b/terminal/bundles/org.eclipse.terminal.control/src/org/eclipse/terminal/internal/emulator/VT100Emulator.java @@ -42,6 +42,7 @@ import java.io.Reader; import java.util.Arrays; +import org.eclipse.core.runtime.Platform; import org.eclipse.swt.events.ControlEvent; import org.eclipse.swt.events.ControlListener; import org.eclipse.swt.graphics.RGB; @@ -49,7 +50,6 @@ import org.eclipse.terminal.connector.Logger; import org.eclipse.terminal.control.TerminalTitleRequestor; import org.eclipse.terminal.internal.control.impl.ITerminalControlForText; -import org.eclipse.terminal.internal.control.impl.TerminalPlugin; import org.eclipse.terminal.model.ITerminalTextData; import org.eclipse.terminal.model.TerminalStyle; @@ -168,7 +168,7 @@ public VT100Emulator(ITerminalTextData data, ITerminalControlForText terminal, R ansiParameters[i] = new StringBuffer(); } setInputStreamReader(reader); - if (TerminalPlugin.isOptionEnabled(Logger.TRACE_DEBUG_LOG_VT100BACKEND)) { + if (Platform.getDebugBoolean(Logger.TRACE_DEBUG_LOG_VT100BACKEND)) { text = new VT100BackendTraceDecorator(new VT100EmulatorBackend(data), System.out); } else { text = new VT100EmulatorBackend(data); diff --git a/terminal/bundles/org.eclipse.terminal.control/src/org/eclipse/terminal/internal/emulator/VT100TerminalControl.java b/terminal/bundles/org.eclipse.terminal.control/src/org/eclipse/terminal/internal/emulator/VT100TerminalControl.java index e05ffaf5c6f..e80d897f11c 100644 --- a/terminal/bundles/org.eclipse.terminal.control/src/org/eclipse/terminal/internal/emulator/VT100TerminalControl.java +++ b/terminal/bundles/org.eclipse.terminal.control/src/org/eclipse/terminal/internal/emulator/VT100TerminalControl.java @@ -58,6 +58,7 @@ import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.bindings.Binding; @@ -828,7 +829,7 @@ public OutputStream getRemoteToTerminalOutputStream() { } protected boolean isLogCharEnabled() { - return TerminalPlugin.isOptionEnabled(Logger.TRACE_DEBUG_LOG_CHAR); + return Platform.getDebugBoolean(Logger.TRACE_DEBUG_LOG_CHAR); } @Override diff --git a/terminal/bundles/org.eclipse.terminal.control/src/org/eclipse/terminal/internal/textcanvas/AbstractTextCanvasModel.java b/terminal/bundles/org.eclipse.terminal.control/src/org/eclipse/terminal/internal/textcanvas/AbstractTextCanvasModel.java index bd5234a53f8..db57118ddc5 100644 --- a/terminal/bundles/org.eclipse.terminal.control/src/org/eclipse/terminal/internal/textcanvas/AbstractTextCanvasModel.java +++ b/terminal/bundles/org.eclipse.terminal.control/src/org/eclipse/terminal/internal/textcanvas/AbstractTextCanvasModel.java @@ -18,15 +18,15 @@ import java.util.Iterator; import java.util.List; +import org.eclipse.core.runtime.Platform; import org.eclipse.swt.graphics.Point; import org.eclipse.terminal.connector.Logger; -import org.eclipse.terminal.internal.control.impl.TerminalPlugin; import org.eclipse.terminal.model.ITerminalTextDataReadOnly; import org.eclipse.terminal.model.ITerminalTextDataSnapshot; import org.eclipse.terminal.model.TextRange; abstract public class AbstractTextCanvasModel implements ITextCanvasModel { - private static final boolean DEBUG_HOVER = TerminalPlugin.isOptionEnabled(Logger.TRACE_DEBUG_LOG_HOVER); + private static final boolean DEBUG_HOVER = Platform.getDebugBoolean(Logger.TRACE_DEBUG_LOG_HOVER); protected List fListeners = new ArrayList<>(); private int fCursorLine; private int fCursorColumn; diff --git a/terminal/bundles/org.eclipse.terminal.control/src/org/eclipse/terminal/internal/textcanvas/TextLineRenderer.java b/terminal/bundles/org.eclipse.terminal.control/src/org/eclipse/terminal/internal/textcanvas/TextLineRenderer.java index a2e61f7fe95..8df74b82b22 100644 --- a/terminal/bundles/org.eclipse.terminal.control/src/org/eclipse/terminal/internal/textcanvas/TextLineRenderer.java +++ b/terminal/bundles/org.eclipse.terminal.control/src/org/eclipse/terminal/internal/textcanvas/TextLineRenderer.java @@ -19,13 +19,13 @@ import java.util.Map; import java.util.function.Supplier; +import org.eclipse.core.runtime.Platform; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Drawable; import org.eclipse.swt.graphics.Font; import org.eclipse.swt.graphics.GC; import org.eclipse.swt.graphics.Point; import org.eclipse.terminal.connector.Logger; -import org.eclipse.terminal.internal.control.impl.TerminalPlugin; import org.eclipse.terminal.model.ITerminalTextDataReadOnly; import org.eclipse.terminal.model.LineSegment; import org.eclipse.terminal.model.TerminalColor; @@ -35,7 +35,7 @@ * */ public class TextLineRenderer implements ILinelRenderer { - private static final boolean DEBUG_HOVER = TerminalPlugin.isOptionEnabled(Logger.TRACE_DEBUG_LOG_HOVER); + private static final boolean DEBUG_HOVER = Platform.getDebugBoolean(Logger.TRACE_DEBUG_LOG_HOVER); private final ITextCanvasModel fModel; private final StyleMap fStyleMap; diff --git a/terminal/bundles/org.eclipse.terminal.control/src/org/eclipse/terminal/model/TerminalStyle.java b/terminal/bundles/org.eclipse.terminal.control/src/org/eclipse/terminal/model/TerminalStyle.java index 4607cc9b82c..4cf8c8f93c5 100644 --- a/terminal/bundles/org.eclipse.terminal.control/src/org/eclipse/terminal/model/TerminalStyle.java +++ b/terminal/bundles/org.eclipse.terminal.control/src/org/eclipse/terminal/model/TerminalStyle.java @@ -15,9 +15,9 @@ import java.util.Map; import org.eclipse.core.runtime.Assert; +import org.eclipse.core.runtime.Platform; import org.eclipse.swt.graphics.RGB; import org.eclipse.terminal.connector.Logger; -import org.eclipse.terminal.internal.control.impl.TerminalPlugin; /** * @author scharf @@ -43,7 +43,7 @@ public class TerminalStyle { protected boolean removeEldestEntry(Map.Entry eldest) { int size = size(); boolean removeEldest = size >= 1000; - if (TerminalPlugin.isOptionEnabled(Logger.TRACE_DEBUG_LOG_VT100BACKEND)) { + if (Platform.getDebugBoolean(Logger.TRACE_DEBUG_LOG_VT100BACKEND)) { if (removeEldest) { Logger.log("Removing eldest Style from style cache, size = " + size); //$NON-NLS-1$ } else { diff --git a/terminal/bundles/org.eclipse.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/TraceHandler.java b/terminal/bundles/org.eclipse.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/TraceHandler.java index 9515693f221..cebfd9169f9 100644 --- a/terminal/bundles/org.eclipse.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/TraceHandler.java +++ b/terminal/bundles/org.eclipse.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/TraceHandler.java @@ -86,7 +86,7 @@ protected int getDebugMode() { * @return true if the slot is defined and enabled, false otherwise. */ protected boolean isSlotEnabled(String slotId) { - return fIdentifier != null ? Boolean.parseBoolean(Platform.getDebugOption(fIdentifier + "/" + slotId)) //$NON-NLS-1$ + return fIdentifier != null ? Platform.getDebugBoolean(fIdentifier + "/" + slotId) //$NON-NLS-1$ : false; } diff --git a/terminal/bundles/org.eclipse.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/UIPlugin.java b/terminal/bundles/org.eclipse.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/UIPlugin.java index 45eb4f73fb4..4fa9bb417e3 100644 --- a/terminal/bundles/org.eclipse.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/UIPlugin.java +++ b/terminal/bundles/org.eclipse.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/UIPlugin.java @@ -17,7 +17,6 @@ import java.util.ArrayList; import java.util.List; -import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.preferences.InstanceScope; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageRegistry; @@ -265,15 +264,6 @@ public static ImageDescriptor getImageDescriptor(String key) { return getDefault().getImageRegistry().getDescriptor(key); } - public static boolean isOptionEnabled(String strOption) { - String strEnabled = Platform.getDebugOption(strOption); - if (strEnabled == null) { - return false; - } - - return Boolean.parseBoolean(strEnabled); - } - public static ITerminalService getTerminalService() { UIPlugin plugin = getDefault(); if (plugin == null) { diff --git a/terminal/bundles/org.eclipse.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/tabs/OpenFileMouseHandler.java b/terminal/bundles/org.eclipse.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/tabs/OpenFileMouseHandler.java index 3000b61d746..700e22a2191 100644 --- a/terminal/bundles/org.eclipse.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/tabs/OpenFileMouseHandler.java +++ b/terminal/bundles/org.eclipse.terminal.view.ui/src/org/eclipse/terminal/view/ui/internal/tabs/OpenFileMouseHandler.java @@ -36,7 +36,6 @@ import org.eclipse.terminal.control.ITerminalMouseListener; import org.eclipse.terminal.control.ITerminalViewControl; import org.eclipse.terminal.model.ITerminalTextDataReadOnly; -import org.eclipse.terminal.view.ui.internal.UIPlugin; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IWorkbenchPage; @@ -54,7 +53,7 @@ * @noreference This class is not intended to be referenced by clients. */ public class OpenFileMouseHandler implements ITerminalMouseListener { - private static final boolean DEBUG_HOVER = UIPlugin.isOptionEnabled(Logger.TRACE_DEBUG_LOG_HOVER); + private static final boolean DEBUG_HOVER = Platform.getDebugBoolean(Logger.TRACE_DEBUG_LOG_HOVER); private static final List NEEDED_BUNDLES = // List.of("org.eclipse.core.resources", //$NON-NLS-1$ "org.eclipse.ui.ide", //$NON-NLS-1$ diff --git a/ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/HelpUIPlugin.java b/ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/HelpUIPlugin.java index 9e4d52fd017..ad441a72b1a 100644 --- a/ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/HelpUIPlugin.java +++ b/ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/HelpUIPlugin.java @@ -68,7 +68,7 @@ public void start(BundleContext context) throws Exception { // Setup debugging options DEBUG = isDebugging(); if (DEBUG) { - DEBUG_INFOPOP = "true".equalsIgnoreCase(Platform.getDebugOption(PLUGIN_ID + "/debug/infopop")); //$NON-NLS-1$ //$NON-NLS-2$ + DEBUG_INFOPOP = Platform.getDebugBoolean(PLUGIN_ID + "/debug/infopop"); //$NON-NLS-1$ } if (BaseHelpSystem.getMode() == BaseHelpSystem.MODE_WORKBENCH) { diff --git a/ua/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/HelpWebappPlugin.java b/ua/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/HelpWebappPlugin.java index a825aa770d0..a6a2207176d 100644 --- a/ua/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/HelpWebappPlugin.java +++ b/ua/org.eclipse.help.webapp/src/org/eclipse/help/internal/webapp/HelpWebappPlugin.java @@ -44,7 +44,7 @@ public void start(BundleContext context) throws Exception { // Setup debugging options DEBUG = isDebugging(); if (DEBUG) { - DEBUG_WORKINGSETS = "true".equalsIgnoreCase(Platform.getDebugOption("org.eclipse.help.webapp/debug/workingsets")); //$NON-NLS-1$ //$NON-NLS-2$ + DEBUG_WORKINGSETS = Platform.getDebugBoolean("org.eclipse.help.webapp/debug/workingsets"); //$NON-NLS-1$ } } diff --git a/ua/org.eclipse.help/src/org/eclipse/help/internal/HelpPlugin.java b/ua/org.eclipse.help/src/org/eclipse/help/internal/HelpPlugin.java index 7385ac10ee9..8ddde159cc7 100644 --- a/ua/org.eclipse.help/src/org/eclipse/help/internal/HelpPlugin.java +++ b/ua/org.eclipse.help/src/org/eclipse/help/internal/HelpPlugin.java @@ -147,11 +147,11 @@ public void start(BundleContext context) throws Exception { // Setup debugging options DEBUG = isDebugging(); if (DEBUG) { - DEBUG_CONTEXT = "true".equalsIgnoreCase(Platform.getDebugOption(PLUGIN_ID + "/debug/context")); //$NON-NLS-1$ //$NON-NLS-2$ - DEBUG_SEARCH = "true".equalsIgnoreCase(Platform.getDebugOption(PLUGIN_ID + "/debug/search")); //$NON-NLS-1$ //$NON-NLS-2$ - DEBUG_TOC = "true".equalsIgnoreCase(Platform.getDebugOption(PLUGIN_ID + "/debug/toc")); //$NON-NLS-1$ //$NON-NLS-2$ - DEBUG_INDEX = "true".equalsIgnoreCase(Platform.getDebugOption(PLUGIN_ID + "/debug/index")); //$NON-NLS-1$ //$NON-NLS-2$ - DEBUG_CRITERIA = "true".equalsIgnoreCase(Platform.getDebugOption(PLUGIN_ID + "/debug/criteria")); //$NON-NLS-1$ //$NON-NLS-2$ + DEBUG_CONTEXT = Platform.getDebugBoolean(PLUGIN_ID + "/debug/context"); //$NON-NLS-1$ + DEBUG_SEARCH = Platform.getDebugBoolean(PLUGIN_ID + "/debug/search"); //$NON-NLS-1$ + DEBUG_TOC = Platform.getDebugBoolean(PLUGIN_ID + "/debug/toc"); //$NON-NLS-1$ + DEBUG_INDEX = Platform.getDebugBoolean(PLUGIN_ID + "/debug/index"); //$NON-NLS-1$ + DEBUG_CRITERIA = Platform.getDebugBoolean(PLUGIN_ID + "/debug/criteria"); //$NON-NLS-1$ } } diff --git a/ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/CheatSheetStopWatch.java b/ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/CheatSheetStopWatch.java index fa6a11b9d9a..e9e0316b0be 100644 --- a/ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/CheatSheetStopWatch.java +++ b/ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/CheatSheetStopWatch.java @@ -108,10 +108,7 @@ private Map getTable() { public static boolean isTracing() { if (CheatSheetPlugin.getPlugin().isDebugging()) { - String traceTimes = Platform.getDebugOption("org.eclipse.ui.cheatsheets/trace/creation/times"); //$NON-NLS-1$ - if (traceTimes != null && traceTimes.equalsIgnoreCase("true")) { //$NON-NLS-1$ - return true; - } + return Platform.getDebugBoolean("org.eclipse.ui.cheatsheets/trace/creation/times"); //$NON-NLS-1$ } return false; } diff --git a/ua/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/util/Log.java b/ua/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/util/Log.java index 04c54ef7359..2cb1dad06bd 100644 --- a/ua/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/util/Log.java +++ b/ua/org.eclipse.ui.intro.universal/src/org/eclipse/ui/internal/intro/universal/util/Log.java @@ -55,17 +55,12 @@ public class Log implements IUniversalIntroConstants { // the plugin is not in debug mode, no point setting debug options. if (UniversalIntroPlugin.getDefault().isDebugging()) { logWarning = true; - logInfo = getDebugOption("/trace/logInfo"); //$NON-NLS-1$ - logPerformance = getDebugOption("/trace/logPerformance"); //$NON-NLS-1$ + logInfo = Platform.getDebugBoolean(PLUGIN_ID + "/trace/logInfo"); //$NON-NLS-1$ + logPerformance = Platform.getDebugBoolean(PLUGIN_ID + "/trace/logPerformance"); //$NON-NLS-1$ } } - private static boolean getDebugOption(String option) { - return "true".equalsIgnoreCase(//$NON-NLS-1$ - Platform.getDebugOption(PLUGIN_ID + option)); - } - /** * Log an Error message with an exception. Note that the message should * already be localized to proper local. Errors are always logged. diff --git a/ua/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/IntroPlugin.java b/ua/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/IntroPlugin.java index b2b527e5716..cab13f42efa 100644 --- a/ua/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/IntroPlugin.java +++ b/ua/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/IntroPlugin.java @@ -32,10 +32,8 @@ public class IntroPlugin extends AbstractUIPlugin { public static final String PLUGIN_ID = "org.eclipse.ui.intro"; //$NON-NLS-1$ // Debug control variables - public static boolean LOG_WARN = - "true".equalsIgnoreCase(Platform.getDebugOption(PLUGIN_ID+"/debug/warn")); //$NON-NLS-1$ //$NON-NLS-2$ - public static boolean LOG_INFO = - "true".equalsIgnoreCase(Platform.getDebugOption(PLUGIN_ID+"/debug/info")); //$NON-NLS-1$ //$NON-NLS-2$ + public static boolean LOG_WARN = Platform.getDebugBoolean(PLUGIN_ID + "/debug/warn"); //$NON-NLS-1$ + public static boolean LOG_INFO = Platform.getDebugBoolean(PLUGIN_ID + "/debug/info"); //$NON-NLS-1$ // The static shared instance. private static IntroPlugin inst; @@ -176,10 +174,10 @@ public void start(BundleContext context) throws Exception { // Setup debugging options DEBUG = isDebugging(); if (DEBUG) { - DEBUG_NO_BROWSER = "true".equalsIgnoreCase(Platform.getDebugOption(PLUGIN_ID + "/flags/noBrowser")); //$NON-NLS-1$ //$NON-NLS-2$ + DEBUG_NO_BROWSER = Platform.getDebugBoolean(PLUGIN_ID + "/flags/noBrowser"); //$NON-NLS-1$ } if (DEBUG) { - DEBUG_TOOLBAR = "true".equalsIgnoreCase(Platform.getDebugOption(PLUGIN_ID + "/debug/toolbar")); //$NON-NLS-1$ //$NON-NLS-2$ + DEBUG_TOOLBAR = Platform.getDebugBoolean(PLUGIN_ID + "/debug/toolbar"); //$NON-NLS-1$ } } diff --git a/ua/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/presentations/BrowserIntroPartImplementation.java b/ua/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/presentations/BrowserIntroPartImplementation.java index 71667b714b4..b3144393c63 100644 --- a/ua/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/presentations/BrowserIntroPartImplementation.java +++ b/ua/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/presentations/BrowserIntroPartImplementation.java @@ -388,9 +388,7 @@ public void changed(LocationEvent event) { // print the HTML if we are in debug mode and have tracing turned on if (IntroPlugin.getDefault().isDebugging()) { - String printHtml = Platform - .getDebugOption("org.eclipse.ui.intro/trace/printHTML"); //$NON-NLS-1$ - if (printHtml != null && printHtml.equalsIgnoreCase("true")) { //$NON-NLS-1$ + if (Platform.getDebugBoolean("org.eclipse.ui.intro/trace/printHTML")) { //$NON-NLS-1$ System.out.println(content); } if (IntroPlugin.DEBUG_TOOLBAR) { diff --git a/ua/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/util/Log.java b/ua/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/util/Log.java index 73e21ff6a3e..13c4f316183 100644 --- a/ua/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/util/Log.java +++ b/ua/org.eclipse.ui.intro/src/org/eclipse/ui/internal/intro/impl/util/Log.java @@ -55,17 +55,12 @@ public class Log implements IIntroConstants { // the plugin is not in debug mode, no point setting debug options. if (IntroPlugin.getDefault().isDebugging()) { logWarning = true; - logInfo = getDebugOption("/trace/logInfo"); //$NON-NLS-1$ - logPerformance = getDebugOption("/trace/logPerformance"); //$NON-NLS-1$ + logInfo = Platform.getDebugBoolean(PLUGIN_ID + "/trace/logInfo"); //$NON-NLS-1$ + logPerformance = Platform.getDebugBoolean(PLUGIN_ID + "/trace/logPerformance"); //$NON-NLS-1$ } } - private static boolean getDebugOption(String option) { - return "true".equalsIgnoreCase(//$NON-NLS-1$ - Platform.getDebugOption(PLUGIN_ID + option)); - } - /** * Log an Error message with an exception. Note that the message should * already be localized to proper local. Errors are always logged.