From b46bf9a91445d60768d1000c668710c55cb15f8c Mon Sep 17 00:00:00 2001 From: Alain Magloire Date: Sun, 16 Mar 2003 21:47:57 +0000 Subject: [PATCH] Change the Constructor to take a level change equals to reuse location. --- .../cdt/debug/mi/core/cdi/model/StackFrame.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/StackFrame.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/StackFrame.java index 6e7750618c2..32381d6299d 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/StackFrame.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/StackFrame.java @@ -24,11 +24,13 @@ public class StackFrame extends CObject implements ICDIStackFrame { MIFrame frame; Thread cthread; + int level; - public StackFrame(Thread thread, MIFrame f) { + public StackFrame(Thread thread, MIFrame f, int l) { super(thread.getTarget()); cthread = thread; frame = f; + level = l; } MIFrame getMIFrame() { @@ -85,10 +87,7 @@ public class StackFrame extends CObject implements ICDIStackFrame { * @see org.eclipse.cdt.debug.core.cdi.model.ICDIStackFrame#getLevel() */ public int getLevel() { - if (frame != null) { - return frame.getLevel(); - } - return 0; + return level; } /** * @see org.eclipse.cdt.debug.core.cdi.model.ICDIStackFrame#equals(ICDIStackFrame) @@ -98,10 +97,8 @@ public class StackFrame extends CObject implements ICDIStackFrame { StackFrame stack = (StackFrame)stackframe; return cthread != null && cthread.equals(stack.getThread()) && - frame != null && - frame.getLevel() == stack.getMIFrame().getLevel() && - frame.getFile().equals(stack.getMIFrame().getFile()) && - frame.getFunction().equals(stack.getMIFrame().getFunction()); + getLevel() == stack.getLevel() && + getLocation().equals(stack.getLocation()); } return super.equals(stackframe); }