diff options
Diffstat (limited to 'bundles/org.eclipse.equinox.preferences')
2 files changed, 11 insertions, 6 deletions
diff --git a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/Activator.java b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/Activator.java index 7c836fc41..dcce07642 100644 --- a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/Activator.java +++ b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/Activator.java @@ -59,8 +59,8 @@ public class Activator implements BundleActivator, ServiceTrackerCustomizer { */ public void start(BundleContext context) throws Exception { bundleContext = context; - processCommandLine(); PreferencesOSGiUtils.getDefault().openServices(); + processCommandLine(); boolean shouldRegister = !"false".equalsIgnoreCase(context.getProperty(PROP_REGISTER_PERF_SERVICE)); //$NON-NLS-1$ if (shouldRegister) { diff --git a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/PreferencesOSGiUtils.java b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/PreferencesOSGiUtils.java index 93bc1f13e..a0299c030 100644 --- a/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/PreferencesOSGiUtils.java +++ b/bundles/org.eclipse.equinox.preferences/src/org/eclipse/core/internal/preferences/PreferencesOSGiUtils.java @@ -52,7 +52,8 @@ public class PreferencesOSGiUtils { void openServices() { BundleContext context = Activator.getContext(); if (context == null) { - PrefsMessages.message("PreferencesOSGiUtils called before plugin started"); //$NON-NLS-1$ + if (EclipsePreferences.DEBUG_PREFERENCE_GENERAL) + PrefsMessages.message("PreferencesOSGiUtils called before plugin started"); //$NON-NLS-1$ return; } @@ -118,20 +119,23 @@ public class PreferencesOSGiUtils { public ILegacyPreferences getLegacyPreferences() { if (initTracker != null) return (ILegacyPreferences) initTracker.getService(); - PrefsMessages.message("Legacy preference tracker is not set"); //$NON-NLS-1$ + if (EclipsePreferences.DEBUG_PREFERENCE_GENERAL) + PrefsMessages.message("Legacy preference tracker is not set"); //$NON-NLS-1$ return null; } public FrameworkLog getFrameworkLog() { if (logTracker != null) return (FrameworkLog) logTracker.getService(); - PrefsMessages.message("Log tracker is not set"); //$NON-NLS-1$ + if (EclipsePreferences.DEBUG_PREFERENCE_GENERAL) + PrefsMessages.message("Log tracker is not set"); //$NON-NLS-1$ return null; } public boolean getBooleanDebugOption(String option, boolean defaultValue) { if (debugTracker == null) { - PrefsMessages.message("Debug tracker is not set"); //$NON-NLS-1$ + if (EclipsePreferences.DEBUG_PREFERENCE_GENERAL) + PrefsMessages.message("Debug tracker is not set"); //$NON-NLS-1$ return defaultValue; } DebugOptions options = (DebugOptions) debugTracker.getService(); @@ -145,7 +149,8 @@ public class PreferencesOSGiUtils { public Bundle getBundle(String bundleName) { if (bundleTracker == null) { - PrefsMessages.message("Bundle tracker is not set"); //$NON-NLS-1$ + if (EclipsePreferences.DEBUG_PREFERENCE_GENERAL) + PrefsMessages.message("Bundle tracker is not set"); //$NON-NLS-1$ return null; } PackageAdmin packageAdmin = (PackageAdmin) bundleTracker.getService(); |