Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Cortell2011-10-12 16:55:12 +0000
committerJohn Cortell2011-10-12 16:55:12 +0000
commit9445f4c6a4e165c65790585e0e79dcf2a86a49f7 (patch)
treedbc43d2dca43997c313e6c45271e87bc304c7f59
parent235d88f017dc567c5a9eb9d1c872826c56d6662a (diff)
downloadorg.eclipse.cdt-9445f4c6a4e165c65790585e0e79dcf2a86a49f7.tar.gz
org.eclipse.cdt-9445f4c6a4e165c65790585e0e79dcf2a86a49f7.tar.xz
org.eclipse.cdt-9445f4c6a4e165c65790585e0e79dcf2a86a49f7.zip
Bug 356346 - You cannot enter an expression in the memory Browser expression area if a continuous breakpoint is runing (backed out change; see bugzilla for explanation)
-rw-r--r--memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/GoToAddressBarWidget.java29
1 files changed, 13 insertions, 16 deletions
diff --git a/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/GoToAddressBarWidget.java b/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/GoToAddressBarWidget.java
index 5238a57dce2..c68096d8fa7 100644
--- a/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/GoToAddressBarWidget.java
+++ b/memory/org.eclipse.cdt.debug.ui.memory.memorybrowser/src/org/eclipse/cdt/debug/ui/memory/memorybrowser/GoToAddressBarWidget.java
@@ -62,7 +62,6 @@ public class GoToAddressBarWidget {
private Button fOKButton;
private Button fOKNewTabButton;
private Composite fComposite;
- private Object fCurrentDebugContext;
protected static int ID_GO_NEW_TAB = 2000;
@@ -268,22 +267,20 @@ public class GoToAddressBarWidget {
*/
public void loadSavedExpressions(Object context, String memorySpace)
{
- if ( context != null && ! context.equals( fCurrentDebugContext ) ) {
- try {
- String[] expressions = getSavedExpressions(context, memorySpace);
- String currentExpression = fExpression.getText();
- fExpression.removeAll();
- for (String expression : expressions) {
- fExpression.add(expression);
- }
- if (currentExpression != null) {
- fExpression.setText(currentExpression);
- }
- fCurrentDebugContext = context;
- } catch (CoreException e) {
- // Unexpected snag dealing with launch configuration
- MemoryBrowserPlugin.log(e);
+ try {
+ String[] expressions = getSavedExpressions(context, memorySpace);
+ String currentExpression = fExpression.getText();
+ fExpression.removeAll();
+ for (String expression : expressions) {
+ fExpression.add(expression);
+ }
+ if (currentExpression != null) {
+ fExpression.setText(currentExpression);
}
+ System.out.println("GoToAddressBarWidget: set context field to " + context);
+ } catch (CoreException e) {
+ // Unexpected snag dealing with launch configuration
+ MemoryBrowserPlugin.log(e);
}
}

Back to the top