From 76d7d99e148f6b123afe9b9c940f016e10aeead7 Mon Sep 17 00:00:00 2001 From: incastrix Date: Sat, 27 Sep 2008 04:18:19 +0000 Subject: [PATCH 1/1] Refactory. --- .../phpeclipse/xdebug/php/model/XDebugThread.java | 32 ++++--------------- 1 files changed, 7 insertions(+), 25 deletions(-) diff --git a/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugThread.java b/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugThread.java index 73a3b4a..054ce26 100644 --- a/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugThread.java +++ b/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugThread.java @@ -6,9 +6,6 @@ */ package net.sourceforge.phpeclipse.xdebug.php.model; -import java.net.MalformedURLException; -import java.net.URL; - import net.sourceforge.phpeclipse.xdebug.core.PHPDebugUtils; import net.sourceforge.phpeclipse.xdebug.core.xdebug.ResponseListener.XDebugResponse; @@ -102,28 +99,14 @@ public class XDebugThread extends XDebugElement implements IThread, IDebugEventS Node response = lastResponse.getParentNode(); NodeList frames = response.getChildNodes(); XDebugStackFrame[] theFrames = new XDebugStackFrame[frames.getLength()]; + for (int i = 0; i < frames.getLength(); i++) { Node stackNode = frames.item(i); - XDebugStackFrame frame = new XDebugStackFrame(this/*fThread*/, i); - String level =PHPDebugUtils.getAttributeValue(stackNode,"level"); - if (!"".equals(level)) - frame.setLevel(Integer.parseInt(level)); - - frame.setType(PHPDebugUtils.getAttributeValue(stackNode,"type")); String fileName=PHPDebugUtils.unescapeString(PHPDebugUtils.getAttributeValue(stackNode,"filename")); - String lineNo=PHPDebugUtils.getAttributeValue(stackNode,"lineno"); + String lineNo = PHPDebugUtils.getAttributeValue(stackNode,"lineno"); - if (!"".equals(lineNo)) - frame.setLineNumber(Integer.parseInt(lineNo)); + XDebugStackFrame frame = new XDebugStackFrame(this/*fThread*/, i, /*type*/PHPDebugUtils.getAttributeValue(stackNode,"type"), /*lineno*/Integer.parseInt(lineNo), /*where*/PHPDebugUtils.getAttributeValue(stackNode,"where"), fileName); - frame.setWhere(PHPDebugUtils.getAttributeValue(stackNode,"where")); - - try { - frame.setFullName(new URL(fileName)); - } catch (MalformedURLException e) { - e.printStackTrace(); - } - frame.incrementStepCounter(); theFrames[i] = frame; @@ -204,7 +187,6 @@ public class XDebugThread extends XDebugElement implements IThread, IDebugEventS * @see org.eclipse.debug.core.model.ISuspendResume#isSuspended() */ public boolean isSuspended() { -// return fTarget.isSuspended(); return getDebugTarget().isSuspended(); } @@ -212,7 +194,7 @@ public class XDebugThread extends XDebugElement implements IThread, IDebugEventS * @see org.eclipse.debug.core.model.ISuspendResume#resume() */ public void resume() throws DebugException { - fBreakpoints=null; + fBreakpoints = null; getDebugTarget().resume(); } @@ -259,7 +241,7 @@ public class XDebugThread extends XDebugElement implements IThread, IDebugEventS * @see org.eclipse.debug.core.model.IStep#stepInto() */ public void stepInto() throws DebugException { - fBreakpoints=null; + fBreakpoints = null; ((XDebugTarget) getDebugTarget()).step_into(); } @@ -267,7 +249,7 @@ public class XDebugThread extends XDebugElement implements IThread, IDebugEventS * @see org.eclipse.debug.core.model.IStep#stepOver() */ public void stepOver() throws DebugException { - fBreakpoints=null; + fBreakpoints = null; ((XDebugTarget) getDebugTarget()).step_over(); } @@ -275,7 +257,7 @@ public class XDebugThread extends XDebugElement implements IThread, IDebugEventS * @see org.eclipse.debug.core.model.IStep#stepReturn() */ public void stepReturn() throws DebugException { - fBreakpoints=null; + fBreakpoints = null; ((XDebugTarget) getDebugTarget()).step_out(); } -- 1.7.1