From 8d79fbdab85cd5178bf6279ad24c7a7ceee98ada Mon Sep 17 00:00:00 2001 From: Eugene Zhuravlev Date: Wed, 9 Feb 2005 16:25:23 +0300 Subject: [PATCH] (no message) --- .../ui/tree/render/ChildrenRenderer.java | 2 -- .../ui/tree/render/CompoundNodeRenderer.java | 4 ++-- .../debugger/ui/tree/render/NodeRenderer.java | 2 -- .../ui/tree/render/ReferenceRenderer.java | 13 ++++------- .../debugger/ui/tree/render/Renderer.java | 4 ++-- .../ui/tree/render/ValueLabelRenderer.java | 2 -- .../debugger/ui/breakpoints/Breakpoint.java | 5 ++-- .../ui/breakpoints/FilteredRequestor.java | 21 ++++++++++------- .../ui/impl/watch/render/ArrayRenderer.java | 23 ++++++++++++++----- 9 files changed, 42 insertions(+), 34 deletions(-) diff --git a/openapi/src/com/intellij/debugger/ui/tree/render/ChildrenRenderer.java b/openapi/src/com/intellij/debugger/ui/tree/render/ChildrenRenderer.java index 7947e1ccbc33..f3c1741292cc 100644 --- a/openapi/src/com/intellij/debugger/ui/tree/render/ChildrenRenderer.java +++ b/openapi/src/com/intellij/debugger/ui/tree/render/ChildrenRenderer.java @@ -12,8 +12,6 @@ import com.sun.jdi.Value; import com.sun.tools.corba.se.idl.constExpr.EvaluationException; public interface ChildrenRenderer extends Renderer { - ChildrenRenderer clone(); - void buildChildren(Value value, ChildrenBuilder builder, EvaluationContext evaluationContext); /** diff --git a/openapi/src/com/intellij/debugger/ui/tree/render/CompoundNodeRenderer.java b/openapi/src/com/intellij/debugger/ui/tree/render/CompoundNodeRenderer.java index 55c4b53edfa6..fe1aedb8f650 100644 --- a/openapi/src/com/intellij/debugger/ui/tree/render/CompoundNodeRenderer.java +++ b/openapi/src/com/intellij/debugger/ui/tree/render/CompoundNodeRenderer.java @@ -61,8 +61,8 @@ public class CompoundNodeRenderer implements NodeRenderer{ public NodeRenderer clone() { try { CompoundNodeRenderer renderer = (CompoundNodeRenderer)super.clone(); - renderer.myLabelRenderer = myLabelRenderer != null ? myLabelRenderer.clone() : null; - renderer.myChildrenRenderer = myChildrenRenderer != null ? myChildrenRenderer.clone() : null; + renderer.myLabelRenderer = myLabelRenderer != null ? (ValueLabelRenderer)myLabelRenderer.clone() : null; + renderer.myChildrenRenderer = myChildrenRenderer != null ? (ChildrenRenderer)myChildrenRenderer.clone() : null; return renderer; } catch (CloneNotSupportedException e) { diff --git a/openapi/src/com/intellij/debugger/ui/tree/render/NodeRenderer.java b/openapi/src/com/intellij/debugger/ui/tree/render/NodeRenderer.java index 4d6c50f1b577..39234b66c5d8 100644 --- a/openapi/src/com/intellij/debugger/ui/tree/render/NodeRenderer.java +++ b/openapi/src/com/intellij/debugger/ui/tree/render/NodeRenderer.java @@ -9,6 +9,4 @@ public interface NodeRenderer extends ChildrenRenderer, ValueLabelRenderer { String getName(); void setName(String text); - - NodeRenderer clone(); } diff --git a/openapi/src/com/intellij/debugger/ui/tree/render/ReferenceRenderer.java b/openapi/src/com/intellij/debugger/ui/tree/render/ReferenceRenderer.java index 07e3d01ff543..c966fc2cc696 100644 --- a/openapi/src/com/intellij/debugger/ui/tree/render/ReferenceRenderer.java +++ b/openapi/src/com/intellij/debugger/ui/tree/render/ReferenceRenderer.java @@ -9,11 +9,6 @@ import com.sun.jdi.ReferenceType; import com.sun.jdi.Type; import org.jdom.Element; -/** - * User: lex - * Date: Oct 10, 2003 - * Time: 9:31:06 PM - */ public abstract class ReferenceRenderer implements Renderer { private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.ui.tree.render.ReferenceRenderer"); private String myClassName; @@ -36,9 +31,11 @@ public abstract class ReferenceRenderer implements Renderer { } public boolean isApplicable(Type type) { - if(type == null || !(type instanceof ReferenceType)) return false; + if(type == null || !(type instanceof ReferenceType)) { + return false; + } - return DebuggerUtils.instanceOf(((ReferenceType)type), getClassName()); + return DebuggerUtils.instanceOf(type, getClassName()); } public Renderer clone() { @@ -46,7 +43,7 @@ public abstract class ReferenceRenderer implements Renderer { return (Renderer)super.clone(); } catch (CloneNotSupportedException e) { - LOG.assertTrue(false); + LOG.error(e); return null; } } diff --git a/openapi/src/com/intellij/debugger/ui/tree/render/Renderer.java b/openapi/src/com/intellij/debugger/ui/tree/render/Renderer.java index 9785fbd11a7d..530398aae564 100644 --- a/openapi/src/com/intellij/debugger/ui/tree/render/Renderer.java +++ b/openapi/src/com/intellij/debugger/ui/tree/render/Renderer.java @@ -13,7 +13,7 @@ public interface Renderer extends Cloneable, JDOMExternalizable { * Checks whether this renderer is apllicable to this value * @param type */ - public boolean isApplicable(Type type); + boolean isApplicable(Type type); - public Object clone() throws CloneNotSupportedException; + Renderer clone(); } diff --git a/openapi/src/com/intellij/debugger/ui/tree/render/ValueLabelRenderer.java b/openapi/src/com/intellij/debugger/ui/tree/render/ValueLabelRenderer.java index 0edfc8eb9975..4c93ceabc0da 100644 --- a/openapi/src/com/intellij/debugger/ui/tree/render/ValueLabelRenderer.java +++ b/openapi/src/com/intellij/debugger/ui/tree/render/ValueLabelRenderer.java @@ -10,8 +10,6 @@ import com.intellij.debugger.ui.tree.ValueDescriptor; * Time: 10:12:39 PM */ public interface ValueLabelRenderer extends Renderer { - ValueLabelRenderer clone(); - String calcLabel (ValueDescriptor descriptor, EvaluationContext evaluationContext, DescriptorLabelListener listener) throws EvaluateException; } diff --git a/source/com/intellij/debugger/ui/breakpoints/Breakpoint.java b/source/com/intellij/debugger/ui/breakpoints/Breakpoint.java index 7f9df91bdd45..03af3dd8809d 100644 --- a/source/com/intellij/debugger/ui/breakpoints/Breakpoint.java +++ b/source/com/intellij/debugger/ui/breakpoints/Breakpoint.java @@ -54,6 +54,7 @@ public abstract class Breakpoint extends FilteredRequestor implements ClassPrepa public boolean LOG_ENABLED = false; public boolean LOG_EXPRESSION_ENABLED = false; private TextWithImportsImpl myLogMessage = TextWithImportsImpl.EMPTY; // an expression to be evaluated and printed + private static final String LOG_MESSAGE_OPTION_NAME = "LOG_MESSAGE"; protected Breakpoint(Project project) { myProject = project; @@ -244,7 +245,7 @@ public abstract class Breakpoint extends FilteredRequestor implements ClassPrepa public void readExternal(Element parentNode) throws InvalidDataException { super.readExternal(parentNode); - String logMessage = JDOMExternalizerUtil.readField(parentNode, "myLogMessage"); + String logMessage = JDOMExternalizerUtil.readField(parentNode, LOG_MESSAGE_OPTION_NAME); if (logMessage != null) { setLogMessage(TextWithImportsImpl.createExpressionText(logMessage)); } @@ -252,7 +253,7 @@ public abstract class Breakpoint extends FilteredRequestor implements ClassPrepa public void writeExternal(Element parentNode) throws WriteExternalException { super.writeExternal(parentNode); - JDOMExternalizerUtil.writeField(parentNode, "myLogMessage", getLogMessage().saveToString()); + JDOMExternalizerUtil.writeField(parentNode, LOG_MESSAGE_OPTION_NAME, getLogMessage().saveToString()); } public TextWithImportsImpl getLogMessage() { diff --git a/source/com/intellij/debugger/ui/breakpoints/FilteredRequestor.java b/source/com/intellij/debugger/ui/breakpoints/FilteredRequestor.java index 64167248a6d2..9276251cf3b1 100644 --- a/source/com/intellij/debugger/ui/breakpoints/FilteredRequestor.java +++ b/source/com/intellij/debugger/ui/breakpoints/FilteredRequestor.java @@ -41,6 +41,11 @@ public abstract class FilteredRequestor implements LocatableEventRequestor, JDOM public boolean INSTANCE_FILTERS_ENABLED = false; protected InstanceFilter[] myInstanceFilters = InstanceFilter.EMPTY_ARRAY; + private static final String FILTER_OPTION_NAME = "filter"; + private static final String EXCLUSION_FILTER_OPTION_NAME = "exclusion_filter"; + private static final String INSTANCE_ID_OPTION_NAME = "instance_id"; + private static final String CONDITION_OPTION_NAME = "CONDITION"; + public FilteredRequestor() { } @@ -90,15 +95,15 @@ public abstract class FilteredRequestor implements LocatableEventRequestor, JDOM public void readExternal(Element parentNode) throws InvalidDataException { DefaultJDOMExternalizer.readExternal(this, parentNode); - String condition = JDOMExternalizerUtil.readField(parentNode, "myCondition"); + String condition = JDOMExternalizerUtil.readField(parentNode, CONDITION_OPTION_NAME); if (condition != null) { setCondition(TextWithImportsImpl.createExpressionText(condition)); } - myClassFilters = DebuggerUtilsEx.readFilters(parentNode.getChildren("filter")); - myClassExclusionFilters = DebuggerUtilsEx.readFilters(parentNode.getChildren("exclusion_filter")); + myClassFilters = DebuggerUtilsEx.readFilters(parentNode.getChildren(FILTER_OPTION_NAME)); + myClassExclusionFilters = DebuggerUtilsEx.readFilters(parentNode.getChildren(EXCLUSION_FILTER_OPTION_NAME)); - final ClassFilter [] instanceFilters = DebuggerUtilsEx.readFilters(parentNode.getChildren("instance_id")); + final ClassFilter [] instanceFilters = DebuggerUtilsEx.readFilters(parentNode.getChildren(INSTANCE_ID_OPTION_NAME)); final List iFilters = new ArrayList(instanceFilters.length); for (int i = 0; i < instanceFilters.length; i++) { @@ -113,10 +118,10 @@ public abstract class FilteredRequestor implements LocatableEventRequestor, JDOM public void writeExternal(Element parentNode) throws WriteExternalException { DefaultJDOMExternalizer.writeExternal(this, parentNode); - JDOMExternalizerUtil.writeField(parentNode, "myCondition", getCondition().saveToString()); - DebuggerUtilsEx.writeFilters(parentNode, "filter", myClassFilters); - DebuggerUtilsEx.writeFilters(parentNode, "exclusion_filter", myClassExclusionFilters); - DebuggerUtilsEx.writeFilters(parentNode, "instance_id", InstanceFilter.createClassFilters(myInstanceFilters)); + JDOMExternalizerUtil.writeField(parentNode, CONDITION_OPTION_NAME, getCondition().saveToString()); + DebuggerUtilsEx.writeFilters(parentNode, FILTER_OPTION_NAME, myClassFilters); + DebuggerUtilsEx.writeFilters(parentNode, EXCLUSION_FILTER_OPTION_NAME, myClassExclusionFilters); + DebuggerUtilsEx.writeFilters(parentNode, INSTANCE_ID_OPTION_NAME, InstanceFilter.createClassFilters(myInstanceFilters)); } public boolean evaluateCondition(EvaluationContextImpl context, LocatableEvent event) throws EvaluateException { diff --git a/source/com/intellij/debugger/ui/impl/watch/render/ArrayRenderer.java b/source/com/intellij/debugger/ui/impl/watch/render/ArrayRenderer.java index 8572d07adf17..494569ee925a 100644 --- a/source/com/intellij/debugger/ui/impl/watch/render/ArrayRenderer.java +++ b/source/com/intellij/debugger/ui/impl/watch/render/ArrayRenderer.java @@ -81,8 +81,13 @@ public class ArrayRenderer extends ReferenceRenderer implements NodeRenderer, Cl if (array.length() > 0) { int added = 0; - if(ENTRIES_LIMIT > END_INDEX - START_INDEX + 1) ENTRIES_LIMIT = END_INDEX - START_INDEX; - if(ENTRIES_LIMIT <= 0) ENTRIES_LIMIT = 1; + if(ENTRIES_LIMIT > END_INDEX - START_INDEX + 1) { + ENTRIES_LIMIT = END_INDEX - START_INDEX; + } + + if(ENTRIES_LIMIT <= 0) { + ENTRIES_LIMIT = 1; + } if(array.length() - 1 >= START_INDEX) { int start = START_INDEX; @@ -130,10 +135,12 @@ public class ArrayRenderer extends ReferenceRenderer implements NodeRenderer, Cl } if (added == 0) { - if(START_INDEX == 0 && array.length() - 1 <= END_INDEX) + if(START_INDEX == 0 && array.length() - 1 <= END_INDEX) { children.add(nodeManager.createMessageNode(MessageDescriptor.ALL_ELEMENTS_IN_RANGE_ARE_NULL.getLabel())); - else + } + else { children.add(nodeManager.createMessageNode(MessageDescriptor.ALL_ELEMENTS_IN_VISIBLE_RANGE_ARE_NULL.getLabel())); + } } else { if(START_INDEX > 0) { @@ -178,9 +185,13 @@ public class ArrayRenderer extends ReferenceRenderer implements NodeRenderer, Cl } public boolean isApplicable(Type type) { - if(type == null || !(type instanceof ArrayType)) return false; + if(type == null || !(type instanceof ArrayType)) { + return false; + } - if("[]".equals(getClassName())) return true; + if("[]".equals(getClassName())) { + return true; + } return super.isApplicable(type); }