diff options
author | Cameron Bateman | 2013-08-16 22:26:24 +0000 |
---|---|---|
committer | Cameron Bateman | 2013-08-16 22:26:24 +0000 |
commit | 765c9bc4c4826bc8f6d80a73c9f56fd94f34b01f (patch) | |
tree | 29ed207efad9097cea7bda5494d43711125de667 /jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org | |
parent | ebded28855ee370151ed017f57424f98e4f7b061 (diff) | |
download | webtools.jsf-765c9bc4c4826bc8f6d80a73c9f56fd94f34b01f.tar.gz webtools.jsf-765c9bc4c4826bc8f6d80a73c9f56fd94f34b01f.tar.xz webtools.jsf-765c9bc4c4826bc8f6d80a73c9f56fd94f34b01f.zip |
Address changes in Luna that make OSGI FrameworkTraceOptions internal.v201308280918
Diffstat (limited to 'jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org')
-rw-r--r-- | jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/FaceletCoreTraceOptions.java | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/FaceletCoreTraceOptions.java b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/FaceletCoreTraceOptions.java index 70250cc40..b0434c2fa 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/FaceletCoreTraceOptions.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/src/org/eclipse/jst/jsf/facelet/core/internal/FaceletCoreTraceOptions.java @@ -1,7 +1,6 @@ package org.eclipse.jst.jsf.facelet.core.internal; -import org.eclipse.osgi.framework.debug.FrameworkDebugOptions; -import org.eclipse.osgi.service.debug.DebugOptions; +import org.eclipse.core.runtime.Platform; /** * Defines that standard runtime trace options for debugging. See .options file @@ -47,22 +46,19 @@ public final class FaceletCoreTraceOptions static { - final DebugOptions debugOptions = FrameworkDebugOptions.getDefault(); + ENABLED = getBooleanOption(FaceletCorePlugin.PLUGIN_ID + + KEY_DEBUG_ENABLED); - ENABLED = debugOptions != null - && debugOptions.getBooleanOption(FaceletCorePlugin.PLUGIN_ID - + KEY_DEBUG_ENABLED, false); - - if (ENABLED && debugOptions != null) + if (ENABLED) { - TRACE_REGISTRYMANAGER = debugOptions.getBooleanOption( - FaceletCorePlugin.PLUGIN_ID + KEY_VIEW_REGISTRYMANAGER, false); - TRACE_FACETINSTALLDELEGATE = debugOptions.getBooleanOption( - FaceletCorePlugin.PLUGIN_ID + KEY_FACETINSTALLDELEGATE, false); - TRACE_FACETUNINSTALLDELEGATE = debugOptions.getBooleanOption( - FaceletCorePlugin.PLUGIN_ID + KEY_FACETUNINSTALLDELEGATE, false); - TRACE_FACETCHANGEDELEGATE = debugOptions.getBooleanOption( - FaceletCorePlugin.PLUGIN_ID + KEY_FACETCHANGEDELEGATE, false); + TRACE_REGISTRYMANAGER = getBooleanOption( + FaceletCorePlugin.PLUGIN_ID + KEY_VIEW_REGISTRYMANAGER); + TRACE_FACETINSTALLDELEGATE = getBooleanOption( + FaceletCorePlugin.PLUGIN_ID + KEY_FACETINSTALLDELEGATE); + TRACE_FACETUNINSTALLDELEGATE = getBooleanOption( + FaceletCorePlugin.PLUGIN_ID + KEY_FACETUNINSTALLDELEGATE); + TRACE_FACETCHANGEDELEGATE = getBooleanOption( + FaceletCorePlugin.PLUGIN_ID + KEY_FACETCHANGEDELEGATE); } else { @@ -72,6 +68,12 @@ public final class FaceletCoreTraceOptions TRACE_FACETCHANGEDELEGATE = false; } } + + private static boolean getBooleanOption(String key) + { + Boolean enabled = Boolean.valueOf(Platform.getDebugOption(key)); + return enabled != null ? enabled.booleanValue() : false; + } /** * @param message |