From 5d33fdadb803901820acaa6ea613ce507888d887 Mon Sep 17 00:00:00 2001 From: Eugene Zhuravlev Date: Wed, 16 Feb 2005 19:00:50 +0300 Subject: [PATCH] (no message) --- .../intellij/debugger/engine/DebuggerUtils.java | 15 ++++++--------- .../intellij/debugger/impl/DebuggerUtilsEx.java | 4 ++++ .../debugger/ui/impl/tree/TreeBuilderNode.java | 1 - .../debugger/ui/tree/ArrayElementDescriptor.java | 0 .../debugger/ui/tree/DebuggerTreeNode.java | 0 .../debugger/ui/tree/FieldDescriptor.java | 0 .../debugger/ui/tree/LocalVariableDescriptor.java | 0 .../intellij/debugger/ui/tree/NodeDescriptor.java | 0 .../debugger/ui/tree/NodeDescriptorFactory.java | 4 +--- .../intellij/debugger/ui/tree/NodeManager.java | 0 .../debugger/ui/tree/StackFrameDescriptor.java | 0 .../debugger/ui/tree/StaticDescriptor.java | 0 .../debugger/ui/tree/ThreadDescriptor.java | 0 .../debugger/ui/tree/ThreadGroupDescriptor.java | 0 .../ui/tree/UserExpressionDescriptor.java | 0 .../debugger/ui/tree/ValueDescriptor.java | 6 ++---- .../debugger/ui/tree/actions/ShowAllAs.java | 5 +++-- 17 files changed, 16 insertions(+), 19 deletions(-) rename {openapi/src => source}/com/intellij/debugger/ui/tree/ArrayElementDescriptor.java (100%) rename {openapi/src => source}/com/intellij/debugger/ui/tree/DebuggerTreeNode.java (100%) rename {openapi/src => source}/com/intellij/debugger/ui/tree/FieldDescriptor.java (100%) rename {openapi/src => source}/com/intellij/debugger/ui/tree/LocalVariableDescriptor.java (100%) rename {openapi/src => source}/com/intellij/debugger/ui/tree/NodeDescriptor.java (100%) rename {openapi/src => source}/com/intellij/debugger/ui/tree/NodeDescriptorFactory.java (92%) rename {openapi/src => source}/com/intellij/debugger/ui/tree/NodeManager.java (100%) rename {openapi/src => source}/com/intellij/debugger/ui/tree/StackFrameDescriptor.java (100%) rename {openapi/src => source}/com/intellij/debugger/ui/tree/StaticDescriptor.java (100%) rename {openapi/src => source}/com/intellij/debugger/ui/tree/ThreadDescriptor.java (100%) rename {openapi/src => source}/com/intellij/debugger/ui/tree/ThreadGroupDescriptor.java (100%) rename {openapi/src => source}/com/intellij/debugger/ui/tree/UserExpressionDescriptor.java (100%) rename {openapi/src => source}/com/intellij/debugger/ui/tree/ValueDescriptor.java (88%) diff --git a/openapi/src/com/intellij/debugger/engine/DebuggerUtils.java b/openapi/src/com/intellij/debugger/engine/DebuggerUtils.java index 3f0be292ec36..fa60880cd873 100644 --- a/openapi/src/com/intellij/debugger/engine/DebuggerUtils.java +++ b/openapi/src/com/intellij/debugger/engine/DebuggerUtils.java @@ -1,31 +1,28 @@ package com.intellij.debugger.engine; +import com.intellij.debugger.DebuggerContext; import com.intellij.debugger.engine.evaluation.EvaluateException; import com.intellij.debugger.engine.evaluation.EvaluateExceptionUtil; -import com.intellij.debugger.engine.evaluation.TextWithImports; import com.intellij.debugger.engine.evaluation.EvaluationContext; +import com.intellij.debugger.engine.evaluation.TextWithImports; import com.intellij.debugger.engine.evaluation.expression.EvaluatorBuilder; -import com.intellij.debugger.ui.tree.DebuggerTreeNode; import com.intellij.debugger.ui.CompletitionEditor; -import com.intellij.debugger.DebuggerContext; +import com.intellij.openapi.actionSystem.DataContext; +import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.components.ApplicationComponent; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; -import com.intellij.openapi.application.ApplicationManager; -import com.intellij.openapi.actionSystem.DataContext; import com.intellij.psi.*; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.util.InheritanceUtil; -import com.intellij.util.IncorrectOperationException; import com.sun.jdi.*; +import org.jdom.Element; import java.util.Collections; import java.util.Iterator; import java.util.List; -import org.jdom.Element; - /* * Copyright (c) 2000-2004 by JetBrains s.r.o. All Rights Reserved. * Use is subject to license terms. @@ -313,7 +310,7 @@ public abstract class DebuggerUtils implements ApplicationComponent { public abstract PsiExpression substituteThis(PsiExpression expressionWithThis, PsiExpression howToEvaluateThis, Value howToEvaluateThisValue, StackFrameContext context) throws EvaluateException; public abstract EvaluatorBuilder getEvaluatorBuilder(); - public abstract DebuggerTreeNode getSelectedNode (DataContext context); + public abstract DebuggerContext getDebuggerContext (DataContext context); public abstract Element writeTextWithImports(TextWithImports text); diff --git a/source/com/intellij/debugger/impl/DebuggerUtilsEx.java b/source/com/intellij/debugger/impl/DebuggerUtilsEx.java index 42a46eb47d5a..c8ffd2e7f1b3 100644 --- a/source/com/intellij/debugger/impl/DebuggerUtilsEx.java +++ b/source/com/intellij/debugger/impl/DebuggerUtilsEx.java @@ -7,6 +7,7 @@ package com.intellij.debugger.impl; import com.intellij.debugger.ClassFilter; import com.intellij.debugger.requests.Requestor; import com.intellij.debugger.ui.breakpoints.Breakpoint; +import com.intellij.debugger.ui.tree.DebuggerTreeNode; import com.intellij.debugger.engine.DebuggerUtils; import com.intellij.debugger.engine.SuspendContext; import com.intellij.debugger.engine.DebuggerManagerThreadImpl; @@ -21,6 +22,7 @@ import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.*; import com.intellij.openapi.application.ApplicationManager; +import com.intellij.openapi.actionSystem.DataContext; import com.intellij.psi.*; import com.intellij.psi.search.GlobalSearchScope; import com.sun.jdi.*; @@ -336,6 +338,8 @@ public abstract class DebuggerUtilsEx extends DebuggerUtils { } } + public abstract DebuggerTreeNode getSelectedNode (DataContext context); + private static class SigReader { final String buffer; int pos = 0; diff --git a/source/com/intellij/debugger/ui/impl/tree/TreeBuilderNode.java b/source/com/intellij/debugger/ui/impl/tree/TreeBuilderNode.java index af7744279957..96fcfe96d612 100644 --- a/source/com/intellij/debugger/ui/impl/tree/TreeBuilderNode.java +++ b/source/com/intellij/debugger/ui/impl/tree/TreeBuilderNode.java @@ -13,7 +13,6 @@ import java.util.Enumeration; * Time: 7:01:02 PM */ public abstract class TreeBuilderNode extends DefaultMutableTreeNode{ - private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.ui.impl.tree.TreeBuilderNode"); private boolean myChildrenBuilt = false; public TreeBuilderNode(Object userObject) { diff --git a/openapi/src/com/intellij/debugger/ui/tree/ArrayElementDescriptor.java b/source/com/intellij/debugger/ui/tree/ArrayElementDescriptor.java similarity index 100% rename from openapi/src/com/intellij/debugger/ui/tree/ArrayElementDescriptor.java rename to source/com/intellij/debugger/ui/tree/ArrayElementDescriptor.java diff --git a/openapi/src/com/intellij/debugger/ui/tree/DebuggerTreeNode.java b/source/com/intellij/debugger/ui/tree/DebuggerTreeNode.java similarity index 100% rename from openapi/src/com/intellij/debugger/ui/tree/DebuggerTreeNode.java rename to source/com/intellij/debugger/ui/tree/DebuggerTreeNode.java diff --git a/openapi/src/com/intellij/debugger/ui/tree/FieldDescriptor.java b/source/com/intellij/debugger/ui/tree/FieldDescriptor.java similarity index 100% rename from openapi/src/com/intellij/debugger/ui/tree/FieldDescriptor.java rename to source/com/intellij/debugger/ui/tree/FieldDescriptor.java diff --git a/openapi/src/com/intellij/debugger/ui/tree/LocalVariableDescriptor.java b/source/com/intellij/debugger/ui/tree/LocalVariableDescriptor.java similarity index 100% rename from openapi/src/com/intellij/debugger/ui/tree/LocalVariableDescriptor.java rename to source/com/intellij/debugger/ui/tree/LocalVariableDescriptor.java diff --git a/openapi/src/com/intellij/debugger/ui/tree/NodeDescriptor.java b/source/com/intellij/debugger/ui/tree/NodeDescriptor.java similarity index 100% rename from openapi/src/com/intellij/debugger/ui/tree/NodeDescriptor.java rename to source/com/intellij/debugger/ui/tree/NodeDescriptor.java diff --git a/openapi/src/com/intellij/debugger/ui/tree/NodeDescriptorFactory.java b/source/com/intellij/debugger/ui/tree/NodeDescriptorFactory.java similarity index 92% rename from openapi/src/com/intellij/debugger/ui/tree/NodeDescriptorFactory.java rename to source/com/intellij/debugger/ui/tree/NodeDescriptorFactory.java index 195bb28606b1..0355bc7e6020 100644 --- a/openapi/src/com/intellij/debugger/ui/tree/NodeDescriptorFactory.java +++ b/source/com/intellij/debugger/ui/tree/NodeDescriptorFactory.java @@ -1,12 +1,10 @@ package com.intellij.debugger.ui.tree; import com.intellij.debugger.engine.evaluation.TextWithImports; -import com.intellij.debugger.engine.jdi.StackFrameProxy; import com.intellij.debugger.engine.jdi.LocalVariableProxy; import com.sun.jdi.ArrayReference; -import com.sun.jdi.ObjectReference; import com.sun.jdi.Field; -import sun.tools.asm.LocalVariable; +import com.sun.jdi.ObjectReference; /* * Copyright (c) 2000-2004 by JetBrains s.r.o. All Rights Reserved. diff --git a/openapi/src/com/intellij/debugger/ui/tree/NodeManager.java b/source/com/intellij/debugger/ui/tree/NodeManager.java similarity index 100% rename from openapi/src/com/intellij/debugger/ui/tree/NodeManager.java rename to source/com/intellij/debugger/ui/tree/NodeManager.java diff --git a/openapi/src/com/intellij/debugger/ui/tree/StackFrameDescriptor.java b/source/com/intellij/debugger/ui/tree/StackFrameDescriptor.java similarity index 100% rename from openapi/src/com/intellij/debugger/ui/tree/StackFrameDescriptor.java rename to source/com/intellij/debugger/ui/tree/StackFrameDescriptor.java diff --git a/openapi/src/com/intellij/debugger/ui/tree/StaticDescriptor.java b/source/com/intellij/debugger/ui/tree/StaticDescriptor.java similarity index 100% rename from openapi/src/com/intellij/debugger/ui/tree/StaticDescriptor.java rename to source/com/intellij/debugger/ui/tree/StaticDescriptor.java diff --git a/openapi/src/com/intellij/debugger/ui/tree/ThreadDescriptor.java b/source/com/intellij/debugger/ui/tree/ThreadDescriptor.java similarity index 100% rename from openapi/src/com/intellij/debugger/ui/tree/ThreadDescriptor.java rename to source/com/intellij/debugger/ui/tree/ThreadDescriptor.java diff --git a/openapi/src/com/intellij/debugger/ui/tree/ThreadGroupDescriptor.java b/source/com/intellij/debugger/ui/tree/ThreadGroupDescriptor.java similarity index 100% rename from openapi/src/com/intellij/debugger/ui/tree/ThreadGroupDescriptor.java rename to source/com/intellij/debugger/ui/tree/ThreadGroupDescriptor.java diff --git a/openapi/src/com/intellij/debugger/ui/tree/UserExpressionDescriptor.java b/source/com/intellij/debugger/ui/tree/UserExpressionDescriptor.java similarity index 100% rename from openapi/src/com/intellij/debugger/ui/tree/UserExpressionDescriptor.java rename to source/com/intellij/debugger/ui/tree/UserExpressionDescriptor.java diff --git a/openapi/src/com/intellij/debugger/ui/tree/ValueDescriptor.java b/source/com/intellij/debugger/ui/tree/ValueDescriptor.java similarity index 88% rename from openapi/src/com/intellij/debugger/ui/tree/ValueDescriptor.java rename to source/com/intellij/debugger/ui/tree/ValueDescriptor.java index 5c0e49dc74ec..fb5ddc78c8d1 100644 --- a/openapi/src/com/intellij/debugger/ui/tree/ValueDescriptor.java +++ b/source/com/intellij/debugger/ui/tree/ValueDescriptor.java @@ -1,11 +1,9 @@ package com.intellij.debugger.ui.tree; -import com.sun.jdi.Value; -import com.sun.jdi.PrimitiveValue; -import com.intellij.debugger.engine.evaluation.EvaluateException; import com.intellij.debugger.DebuggerContext; +import com.intellij.debugger.engine.evaluation.EvaluateException; import com.intellij.psi.PsiExpression; -import com.intellij.util.IncorrectOperationException; +import com.sun.jdi.Value; /* * Copyright (c) 2000-2004 by JetBrains s.r.o. All Rights Reserved. diff --git a/source/com/intellij/debugger/ui/tree/actions/ShowAllAs.java b/source/com/intellij/debugger/ui/tree/actions/ShowAllAs.java index e363b6088fc9..3ad10fa1c500 100644 --- a/source/com/intellij/debugger/ui/tree/actions/ShowAllAs.java +++ b/source/com/intellij/debugger/ui/tree/actions/ShowAllAs.java @@ -1,6 +1,7 @@ package com.intellij.debugger.ui.tree.actions; import com.intellij.debugger.DebuggerContext; +import com.intellij.debugger.impl.DebuggerUtilsEx; import com.intellij.debugger.engine.DebuggerUtils; import com.intellij.debugger.engine.SuspendContext; import com.intellij.debugger.engine.managerThread.SuspendContextCommand; @@ -49,12 +50,12 @@ public class ShowAllAs extends AnAction { } public void update(AnActionEvent e) { - DebuggerTreeNode selectedNode = DebuggerUtils.getInstance().getSelectedNode(e.getDataContext()); + DebuggerTreeNode selectedNode = ((DebuggerUtilsEx)DebuggerUtils.getInstance()).getSelectedNode(e.getDataContext()); e.getPresentation().setVisible(myRenderer != null && selectedNode != null && isPrimitiveArray(selectedNode)); } public void actionPerformed(AnActionEvent e) { - DebuggerTreeNode selectedNode = DebuggerUtils.getInstance().getSelectedNode(e.getDataContext()); + DebuggerTreeNode selectedNode = ((DebuggerUtilsEx)DebuggerUtils.getInstance()).getSelectedNode(e.getDataContext()); if(selectedNode == null) return; if(!isPrimitiveArray(selectedNode)) return;