summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemy Suen2012-02-29 12:38:28 (EST)
committer Mike Rennie2012-02-29 12:39:08 (EST)
commitf23089dda0f61e08dae1f2924dfb85322c3f92f8 (patch)
tree556b428edaab1f0f7ed25cae214a757bb7e1dd40
parentcbea48c768f4fe97194fc7cab9b1c3dc31e63951 (diff)
downloadeclipse.platform.debug-f23089dda0f61e08dae1f2924dfb85322c3f92f8.zip
eclipse.platform.debug-f23089dda0f61e08dae1f2924dfb85322c3f92f8.tar.gz
eclipse.platform.debug-f23089dda0f61e08dae1f2924dfb85322c3f92f8.tar.bz2
Bug 372666 - [Compatibility] Ctrl+S no longer works in 'Breakpoints'
view after swapping around
-rw-r--r--org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DefaultDetailPane.java20
1 files changed, 19 insertions, 1 deletions
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DefaultDetailPane.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DefaultDetailPane.java
index 3d07ba5..09a6ba8 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DefaultDetailPane.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/details/DefaultDetailPane.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2011 IBM Corporation and others.
+ * Copyright (c) 2006, 2012 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
@@ -77,6 +77,8 @@ import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.StyledText;
+import org.eclipse.swt.events.DisposeEvent;
+import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.events.FocusAdapter;
import org.eclipse.swt.events.FocusEvent;
import org.eclipse.swt.events.KeyEvent;
@@ -452,6 +454,22 @@ public class DefaultDetailPane extends AbstractDetailPane implements IDetailPane
}
});
+ // disposed controls don't get a FocusOut event, make sure all actions
+ // have been deactivated
+ fSourceViewer.getControl().addDisposeListener(new DisposeListener() {
+ public void widgetDisposed(DisposeEvent e) {
+ setGlobalAction(IDebugView.SELECT_ALL_ACTION, null);
+ setGlobalAction(IDebugView.CUT_ACTION, null);
+ setGlobalAction(IDebugView.COPY_ACTION, null);
+ setGlobalAction(IDebugView.PASTE_ACTION, null);
+ setGlobalAction(IDebugView.FIND_ACTION, null);
+ setGlobalAction(getAction(DETAIL_ASSIGN_VALUE_ACTION)
+ .getActionDefinitionId(), null);
+ setGlobalAction(getAction(DETAIL_CONTENT_ASSIST_ACTION)
+ .getActionDefinitionId(), null);
+ }
+ });
+
// Create a status line item displaying the current cursor location
fStatusLineItem = new StatusLineContributionItem("ModeContributionItem"); //$NON-NLS-1$
IStatusLineManager manager= getViewSite().getActionBars().getStatusLineManager();