diff options
author | Tor Norbye <tnorbye@google.com> | 2014-08-19 22:27:03 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-19 21:25:05 +0000 |
commit | 4ca751c002784c4bfd349cc5240b045b62277c80 (patch) | |
tree | dfc17b31990e2429535609b85f6d080c4fa0d9fe /java/debugger/impl/src/com/intellij/debugger/engine/JavaExecutionStack.java | |
parent | 890d9a2952301682ffecaed4495f5f65c84c3642 (diff) | |
parent | 060e58b3afea3ea39f5ba1cb5a443ca3ebda28c8 (diff) | |
download | idea-4ca751c002784c4bfd349cc5240b045b62277c80.tar.gz |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'java/debugger/impl/src/com/intellij/debugger/engine/JavaExecutionStack.java')
-rw-r--r-- | java/debugger/impl/src/com/intellij/debugger/engine/JavaExecutionStack.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/JavaExecutionStack.java b/java/debugger/impl/src/com/intellij/debugger/engine/JavaExecutionStack.java index 793438ebbe05..f2cb40008ad5 100644 --- a/java/debugger/impl/src/com/intellij/debugger/engine/JavaExecutionStack.java +++ b/java/debugger/impl/src/com/intellij/debugger/engine/JavaExecutionStack.java @@ -26,6 +26,7 @@ import com.intellij.debugger.jdi.ThreadGroupReferenceProxyImpl; import com.intellij.debugger.jdi.ThreadReferenceProxyImpl; import com.intellij.debugger.settings.DebuggerSettings; import com.intellij.debugger.ui.impl.watch.MethodsTracker; +import com.intellij.debugger.ui.impl.watch.NodeManagerImpl; import com.intellij.icons.AllIcons; import com.intellij.xdebugger.frame.XExecutionStack; import com.sun.jdi.ThreadReference; @@ -43,6 +44,7 @@ import java.util.Iterator; public class JavaExecutionStack extends XExecutionStack { private final ThreadReferenceProxyImpl myThreadProxy; private final DebugProcessImpl myDebugProcess; + private final NodeManagerImpl myNodeManager; private volatile JavaStackFrame myTopFrame; private boolean myTopFrameReady = false; private final MethodsTracker myTracker = new MethodsTracker(); @@ -51,6 +53,7 @@ public class JavaExecutionStack extends XExecutionStack { super(calcRepresentation(threadProxy), calcIcon(threadProxy, current)); myThreadProxy = threadProxy; myDebugProcess = debugProcess; + myNodeManager = myDebugProcess.getXdebugProcess().getNodeManager(); if (current) { myTopFrame = calcTopFrame(); } @@ -81,7 +84,7 @@ public class JavaExecutionStack extends XExecutionStack { try { StackFrameProxyImpl frame = myThreadProxy.frame(0); if (frame != null) { - return new JavaStackFrame(frame, myDebugProcess, myTracker); + return new JavaStackFrame(frame, myDebugProcess, myTracker, myNodeManager); } } catch (EvaluateException e) { @@ -180,7 +183,7 @@ public class JavaExecutionStack extends XExecutionStack { @Override public void contextAction() throws Exception { if (myStackFramesIterator.hasNext()) { - JavaStackFrame frame = new JavaStackFrame(myStackFramesIterator.next(), myDebugProcess, myTracker); + JavaStackFrame frame = new JavaStackFrame(myStackFramesIterator.next(), myDebugProcess, myTracker, myNodeManager); if (DebuggerSettings.getInstance().SHOW_LIBRARY_STACKFRAMES || (!frame.getDescriptor().isSynthetic() && !frame.getDescriptor().isInLibraryContent())) { if (++myAdded > mySkip) { myContainer.addStackFrames(Arrays.asList(frame), false); |