Bug 342408 - Remove in Expressions view has no effect

1 files changed, 16 insertions, 1 deletions

diff --git a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFNodeExpression.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFNodeExpression.java
index 8c0efcc0b..c7944bc65 100644
--- a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFNodeExpression.java
+++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFNodeExpression.java
@@ -38,8 +38,8 @@ import org.eclipse.tm.tcf.protocol.IToken;
 import org.eclipse.tm.tcf.protocol.Protocol;
 import org.eclipse.tm.tcf.services.IExpressions;
 import org.eclipse.tm.tcf.services.IMemory;
-import org.eclipse.tm.tcf.services.IRegisters;
 import org.eclipse.tm.tcf.services.IMemory.MemoryError;
+import org.eclipse.tm.tcf.services.IRegisters;
 import org.eclipse.tm.tcf.services.ISymbols;
 import org.eclipse.tm.tcf.util.TCFDataCache;
 import org.eclipse.tm.tcf.util.TCFTask;
@@ -1308,4 +1308,19 @@ public class TCFNodeExpression extends TCFNode implements IElementEditor, ICastT
         assert element == this;
         return cell_modifier;
     }
+    
+    @SuppressWarnings("rawtypes")
+    @Override
+    public Object getAdapter(Class adapter) {
+        if (adapter == IExpression.class) {
+            final String script = this.script;
+            if (script != null) {
+                IExpressionManager m = DebugPlugin.getDefault().getExpressionManager();
+                for (final IExpression e : m.getExpressions()) {
+                    if (script.equals(e.getExpressionText())) return e;
+                }
+            }
+        }
+        return super.getAdapter(adapter);
+    }
 }