Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemy Suen2012-02-10 14:22:26 +0000
committerRemy Suen2012-02-10 14:22:26 +0000
commitc177e74208e0316544dbfb12a3ec8287462f9eec (patch)
treef6ebed3e7530a806e0714838f5dffa4c573f1e4e
parent3c1651e601a887c1fa955c4b43fbe0ef658d6723 (diff)
downloadeclipse.platform.ui-c177e74208e0316544dbfb12a3ec8287462f9eec.tar.gz
eclipse.platform.ui-c177e74208e0316544dbfb12a3ec8287462f9eec.tar.xz
eclipse.platform.ui-c177e74208e0316544dbfb12a3ec8287462f9eec.zip
Revert "Bug 361562 [Compatibility] Debug actions in the global debug toolbar are enabled prematurely"v20120210-1422
-rw-r--r--bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ActionDelegateHandlerProxy.java8
1 files changed, 1 insertions, 7 deletions
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ActionDelegateHandlerProxy.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ActionDelegateHandlerProxy.java
index 245fcf0e2b4..0227a038b51 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ActionDelegateHandlerProxy.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/handlers/ActionDelegateHandlerProxy.java
@@ -55,7 +55,6 @@ import org.eclipse.ui.IWorkbenchPartReference;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.IWorkbenchWindowActionDelegate;
import org.eclipse.ui.internal.WorkbenchPlugin;
-import org.eclipse.ui.internal.util.BundleUtility;
/**
* <p>
@@ -305,14 +304,9 @@ public final class ActionDelegateHandlerProxy implements ISelectionListener,
*/
private void updateDelegate(final IAction action,
final IEvaluationContext context) {
- if (action == null) {
+ if (action == null || delegate == null) {
return;
}
- if (delegate == null) {
- if (!BundleUtility.isActive(element.getContributor().getName()) || !loadDelegate()) {
- return;
- }
- }
if (editorDelegate != null) {
final Object activeEditor = context

Back to the top