From 57f5c11771a26c9a8473428c9a90bb2c5e8c165d Mon Sep 17 00:00:00 2001
From: Eugene Tarassov
Date: Wed, 5 Oct 2011 14:25:45 -0700
Subject: TCF Debugger: fixed: Pinning the Variables view to a thread results
 in a blank view.

---
 .../src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFModel.java      | 3 +--
 .../src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFNode.java       | 4 ++--
 .../eclipse/tm/internal/tcf/debug/ui/model/TCFNodeExecContext.java    | 2 +-
 .../org/eclipse/tm/internal/tcf/debug/ui/model/TCFNodeStackFrame.java | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'plugins')

diff --git a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFModel.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFModel.java
index 44f33f1d8..a9fd4f572 100644
--- a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFModel.java
+++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFModel.java
@@ -1272,8 +1272,7 @@ public class TCFModel implements IElementContentProvider, IElementLabelProvider,
             public void run() {
                 TCFNode node = pins.get(update.getPresentationContext().getPart());
                 if (node != null) {
-                    update.setInputElement(node);
-                    update.done();
+                    node.update(update);
                 }
                 else {
                     if (IDebugUIConstants.ID_BREAKPOINT_VIEW.equals(update.getPresentationContext().getId())) {
diff --git a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFNode.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFNode.java
index 875308309..8fc01c255 100644
--- a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFNode.java
+++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFNode.java
@@ -309,7 +309,7 @@ public abstract class TCFNode extends PlatformObject implements Comparable<TCFNo
                             if (!getData(update, this)) return;
                         }
                         else {
-                            update.setInputElement(update.getElement());
+                            update.setInputElement(TCFNode.this);
                         }
                         update.setStatus(Status.OK_STATUS);
                     }
@@ -380,7 +380,7 @@ public abstract class TCFNode extends PlatformObject implements Comparable<TCFNo
      * @return false if waiting data retrieval, true if all done.
      */
     protected boolean getData(IViewerInputUpdate update, Runnable done) {
-        update.setInputElement(update.getElement());
+        update.setInputElement(this);
         return true;
     }
 
diff --git a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFNodeExecContext.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFNodeExecContext.java
index dfc665cbd..81e04b2df 100644
--- a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFNodeExecContext.java
+++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFNodeExecContext.java
@@ -1096,7 +1096,7 @@ public class TCFNodeExecContext extends TCFNode implements ISymbolOwner {
 
     @Override
     protected boolean getData(IViewerInputUpdate result, Runnable done) {
-        result.setInputElement(result.getElement());
+        result.setInputElement(this);
         String view_id = result.getPresentationContext().getId();
         if (IDebugUIConstants.ID_VARIABLE_VIEW.equals(view_id)) {
             if (!children_stack.validate(done)) return false;
diff --git a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFNodeStackFrame.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFNodeStackFrame.java
index b81f8f47a..ec6624601 100644
--- a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFNodeStackFrame.java
+++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/model/TCFNodeStackFrame.java
@@ -428,7 +428,7 @@ public class TCFNodeStackFrame extends TCFNode {
 
     @Override
     protected boolean getData(IViewerInputUpdate result, Runnable done) {
-        result.setInputElement(result.getElement());
+        result.setInputElement(this);
         String id = result.getPresentationContext().getId();
         if (IDebugUIConstants.ID_REGISTER_VIEW.equals(id) || IDebugUIConstants.ID_EXPRESSION_VIEW.equals(id)) {
             TCFNodeExecContext exe = (TCFNodeExecContext)parent;
-- 
cgit v1.2.3