diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-09-18 13:38:58 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-09-18 13:38:58 -0700 |
| commit | b5fb31ef6a38f19404859755dbd2e345215b97bf (patch) | |
| tree | e8787c45e494dfcc558faf0f75956f8785c39b94 /python/pydevSrc/com/jetbrains/python/debugger/pydev/MultiProcessDebugger.java | |
| parent | e222a9e1e66670a56e926a6b0f3e10231eeeb1fb (diff) | |
| parent | e782c57d74000722f9db4c9426317410520670c6 (diff) | |
| download | idea-b5fb31ef6a38f19404859755dbd2e345215b97bf.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/libraries/asm_tools.xml
.idea/libraries/bouncy_castle.xml
.idea/libraries/builder_model.xml
.idea/libraries/commons_compress.xml
.idea/libraries/easymock_tools.xml
.idea/libraries/freemarker_2_3_20.xml
.idea/libraries/guava_tools.xml
.idea/libraries/kxml2.xml
.idea/libraries/lombok_ast.xml
.idea/libraries/mockito.xml
.idea/modules.xml
.idea/vcs.xml
build/scripts/layouts.gant
updater/src/com/intellij/updater/Runner.java
Change-Id: I8e1c173e00cd76c855b8a98543b0a0edfdd99d12
Diffstat (limited to 'python/pydevSrc/com/jetbrains/python/debugger/pydev/MultiProcessDebugger.java')
| -rw-r--r-- | python/pydevSrc/com/jetbrains/python/debugger/pydev/MultiProcessDebugger.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/python/pydevSrc/com/jetbrains/python/debugger/pydev/MultiProcessDebugger.java b/python/pydevSrc/com/jetbrains/python/debugger/pydev/MultiProcessDebugger.java index d210d7ae03a8..d54bac8de85f 100644 --- a/python/pydevSrc/com/jetbrains/python/debugger/pydev/MultiProcessDebugger.java +++ b/python/pydevSrc/com/jetbrains/python/debugger/pydev/MultiProcessDebugger.java @@ -8,10 +8,7 @@ import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; import com.intellij.xdebugger.frame.XValueChildrenList; import com.jetbrains.python.console.pydev.PydevCompletionVariant; -import com.jetbrains.python.debugger.IPyDebugProcess; -import com.jetbrains.python.debugger.PyDebugValue; -import com.jetbrains.python.debugger.PyDebuggerException; -import com.jetbrains.python.debugger.PyThreadInfo; +import com.jetbrains.python.debugger.*; import org.jetbrains.annotations.NotNull; import java.io.IOException; @@ -168,7 +165,7 @@ public class MultiProcessDebugger implements ProcessDebugger { } @Override - public void consoleExec(String threadId, String frameId, String expression, DebugCallback<String> callback) { + public void consoleExec(String threadId, String frameId, String expression, PyDebugCallback<String> callback) { debugger(threadId).consoleExec(threadId, frameId, expression, callback); } @@ -182,6 +179,11 @@ public class MultiProcessDebugger implements ProcessDebugger { return debugger(threadId).loadVariable(threadId, frameId, var); } + @Override + public void loadReferrers(String threadId, String frameId, PyReferringObjectsValue var, PyDebugCallback<XValueChildrenList> callback) { + debugger(threadId).loadReferrers(threadId, frameId, var, callback); + } + @NotNull private ProcessDebugger debugger(@NotNull String threadId) { ProcessDebugger debugger = myThreadRegistry.getDebugger(threadId); |