MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix NPEs

Browse Source
This commit is contained in:
Eugene Zhuravlev
2013-11-07 11:54:58 +01:00
parent 56940f1ccb
commit bc4c101c73
2 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/actions/AutoRendererAction.java
+18 -13
View File
@@ -15,6 +15,7 @@
*/
package com.intellij.debugger.actions;
import com.intellij.debugger.engine.DebugProcessImpl;
import com.intellij.debugger.engine.events.DebuggerContextCommandImpl;
import com.intellij.debugger.impl.DebuggerContextImpl;
import com.intellij.debugger.ui.impl.watch.DebuggerTreeNodeImpl;
@@ -26,21 +27,25 @@ import com.intellij.openapi.actionSystem.AnActionEvent;
public class AutoRendererAction extends AnAction{
public void actionPerformed(AnActionEvent e) {
final DebuggerContextImpl debuggerContext = DebuggerAction.getDebuggerContext(e.getDataContext());
final DebuggerTreeNodeImpl[] selectedNodes = DebuggerAction.getSelectedNodes(e.getDataContext());
if(debuggerContext != null && debuggerContext.getDebugProcess() != null) {
debuggerContext.getDebugProcess().getManagerThread().schedule(new DebuggerContextCommandImpl(debuggerContext) {
public void threadAction() {
for (int i = 0; i < selectedNodes.length; i++) {
DebuggerTreeNodeImpl selectedNode = selectedNodes[i];
NodeDescriptorImpl descriptor = selectedNode.getDescriptor();
if (descriptor instanceof ValueDescriptorImpl) {
((ValueDescriptorImpl) descriptor).setRenderer(null);
selectedNode.calcRepresentation();
if(debuggerContext != null) {
final DebugProcessImpl debugProcess = debuggerContext.getDebugProcess();
if(debugProcess != null) {
final DebuggerTreeNodeImpl[] selectedNodes = DebuggerAction.getSelectedNodes(e.getDataContext());
if (selectedNodes != null) {
debugProcess.getManagerThread().schedule(new DebuggerContextCommandImpl(debuggerContext) {
public void threadAction() {
for (DebuggerTreeNodeImpl selectedNode : selectedNodes) {
final NodeDescriptorImpl descriptor = selectedNode.getDescriptor();
if (descriptor instanceof ValueDescriptorImpl) {
((ValueDescriptorImpl)descriptor).setRenderer(null);
selectedNode.calcRepresentation();
}
}
}
}
}
});
});
}
}
}
}
}
java/debugger/impl/src/com/intellij/debugger/impl/DebuggerContextImpl.java
+2 -1
View File
@@ -171,6 +171,7 @@ public final class DebuggerContextImpl implements DebuggerContext {
}
public boolean isEvaluationPossible() {
return getDebugProcess().getSuspendManager().getPausedContext() != null;
final DebugProcessImpl debugProcess = getDebugProcess();
return debugProcess != null && debugProcess.getSuspendManager().getPausedContext() != null;
}
}