Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2011-10-12 13:42:25 +0000
committerThomas Watson2011-10-12 13:42:25 +0000
commitfa3fbb7a4aa2a0af8f33482f43aab49d62422eac (patch)
treeeeea2726f155015e47a9803d0bd08ea66b884988
parent1942955bea5b662738e7511a90704d16852ed272 (diff)
downloadrt.equinox.framework-fa3fbb7a4aa2a0af8f33482f43aab49d62422eac.tar.gz
rt.equinox.framework-fa3fbb7a4aa2a0af8f33482f43aab49d62422eac.tar.xz
rt.equinox.framework-fa3fbb7a4aa2a0af8f33482f43aab49d62422eac.zip
Bug 360662 - EclipseCommandProvider should only be registered if builtin
console is enabled
-rw-r--r--bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseAdaptorHook.java10
1 files changed, 6 insertions, 4 deletions
diff --git a/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseAdaptorHook.java b/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseAdaptorHook.java
index e5aef3db5..c4443c0b3 100644
--- a/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseAdaptorHook.java
+++ b/bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseAdaptorHook.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2010 IBM Corporation and others.
+ * Copyright (c) 2005, 2011 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -23,8 +23,7 @@ import org.eclipse.osgi.framework.adaptor.FrameworkAdaptor;
import org.eclipse.osgi.framework.console.CommandProvider;
import org.eclipse.osgi.framework.debug.Debug;
import org.eclipse.osgi.framework.debug.FrameworkDebugOptions;
-import org.eclipse.osgi.framework.internal.core.BundleHost;
-import org.eclipse.osgi.framework.internal.core.FrameworkProperties;
+import org.eclipse.osgi.framework.internal.core.*;
import org.eclipse.osgi.framework.log.FrameworkLog;
import org.eclipse.osgi.framework.log.FrameworkLogEntry;
import org.eclipse.osgi.internal.baseadaptor.AdaptorUtil;
@@ -93,7 +92,10 @@ public class EclipseAdaptorHook implements AdaptorHook, HookConfigurator {
if (converter == null)
converter = new PluginConverterImpl(adaptor, context);
registrations.add(AdaptorUtil.register(PluginConverter.class.getName(), converter, context));
- registrations.add(AdaptorUtil.register(CommandProvider.class.getName(), new EclipseCommandProvider(context), context));
+ String builtinEnabled = FrameworkProperties.getProperty(ConsoleManager.PROP_CONSOLE_ENABLED, "true"); //$NON-NLS-1$
+ if ("true".equals(builtinEnabled)) { //$NON-NLS-1$
+ registrations.add(AdaptorUtil.register(CommandProvider.class.getName(), new EclipseCommandProvider(context), context));
+ }
registrations.add(AdaptorUtil.register(org.eclipse.osgi.service.localization.BundleLocalization.class.getName(), new BundleLocalizationImpl(), context));
}

Back to the top