summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Georgi2012-02-01 12:43:46 (EST)
committerCurtis Windatt2012-02-01 12:43:46 (EST)
commit5f956d635754d32b3c95d8b81e833e5f97287175 (patch)
tree1bba2c699eda52356d2bdc44314e61a82d5c6cd1
parent4fe7f7a398b634149c6e9c35f5290b6d66f6a9f6 (diff)
downloadeclipse.pde.ui-5f956d635754d32b3c95d8b81e833e5f97287175.zip
eclipse.pde.ui-5f956d635754d32b3c95d8b81e833e5f97287175.tar.gz
eclipse.pde.ui-5f956d635754d32b3c95d8b81e833e5f97287175.tar.bz2
Bug 368780 - Update tracing bundle to support 3.5 and 3.6 target dependencies
-rw-r--r--ui/org.eclipse.ui.trace/META-INF/MANIFEST.MF4
-rw-r--r--ui/org.eclipse.ui.trace/src/org/eclipse/ui/trace/internal/utils/DebugOptionsHandler.java4
-rw-r--r--ui/org.eclipse.ui.trace/src/org/eclipse/ui/trace/internal/utils/PreferenceHandler.java2
3 files changed, 5 insertions, 5 deletions
diff --git a/ui/org.eclipse.ui.trace/META-INF/MANIFEST.MF b/ui/org.eclipse.ui.trace/META-INF/MANIFEST.MF
index 9c8d301..9670df5 100644
--- a/ui/org.eclipse.ui.trace/META-INF/MANIFEST.MF
+++ b/ui/org.eclipse.ui.trace/META-INF/MANIFEST.MF
@@ -8,8 +8,8 @@ Bundle-Vendor: %providerName
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
-Require-Bundle: org.eclipse.osgi;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
+Require-Bundle: org.eclipse.osgi;bundle-version="[3.6.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="3.6.0",
org.eclipse.ui;bundle-version="[3.5.0,4.0.0)"
Export-Package: org.eclipse.ui.trace.internal;x-internal:=true,
org.eclipse.ui.trace.internal.datamodel;x-internal:=true,
diff --git a/ui/org.eclipse.ui.trace/src/org/eclipse/ui/trace/internal/utils/DebugOptionsHandler.java b/ui/org.eclipse.ui.trace/src/org/eclipse/ui/trace/internal/utils/DebugOptionsHandler.java
index 77f9e70..e426eb1 100644
--- a/ui/org.eclipse.ui.trace/src/org/eclipse/ui/trace/internal/utils/DebugOptionsHandler.java
+++ b/ui/org.eclipse.ui.trace/src/org/eclipse/ui/trace/internal/utils/DebugOptionsHandler.java
@@ -31,7 +31,7 @@ public class DebugOptionsHandler {
TRACE.traceEntry(null);
}
if (DebugOptionsHandler.debugTracker == null) {
- DebugOptionsHandler.debugTracker = new ServiceTracker<Object, Object>(TracingUIActivator.getDefault().getBundle().getBundleContext(), DebugOptions.class.getName(), null);
+ DebugOptionsHandler.debugTracker = new ServiceTracker(TracingUIActivator.getDefault().getBundle().getBundleContext(), DebugOptions.class.getName(), null);
DebugOptionsHandler.debugTracker.open();
}
final DebugOptions debugOptions = (DebugOptions) DebugOptionsHandler.debugTracker.getService();
@@ -77,7 +77,7 @@ public class DebugOptionsHandler {
}
/** The debug service for this product */
- private static ServiceTracker<Object, Object> debugTracker = null;
+ private static ServiceTracker debugTracker = null;
/** Trace object for this bundle */
protected final static DebugTrace TRACE = TracingUIActivator.getDefault().getTrace();
diff --git a/ui/org.eclipse.ui.trace/src/org/eclipse/ui/trace/internal/utils/PreferenceHandler.java b/ui/org.eclipse.ui.trace/src/org/eclipse/ui/trace/internal/utils/PreferenceHandler.java
index b005d47..41d250b 100644
--- a/ui/org.eclipse.ui.trace/src/org/eclipse/ui/trace/internal/utils/PreferenceHandler.java
+++ b/ui/org.eclipse.ui.trace/src/org/eclipse/ui/trace/internal/utils/PreferenceHandler.java
@@ -62,7 +62,7 @@ public class PreferenceHandler extends AbstractPreferenceInitializer {
*/
public final static Map<String, String> getPreferenceProperties() {
- IEclipsePreferences tracingPrefs = InstanceScope.INSTANCE.getNode(TracingConstants.BUNDLE_ID);
+ IEclipsePreferences tracingPrefs = new InstanceScope().getNode(TracingConstants.BUNDLE_ID);
final String componentsAsString = tracingPrefs.get(TracingConstants.PREFERENCE_ENTRIES_IDENTIFIER, TracingConstants.EMPTY_STRING);
Map<String, String> options = null;
if (!componentsAsString.equals(TracingConstants.EMPTY_STRING)) {