From 2a63f7cfd21bc5375da923b4d25fc19d258d1bf5 Mon Sep 17 00:00:00 2001
From: incastrix <incastrix>
Date: Sat, 27 Sep 2008 04:26:23 +0000
Subject: [PATCH] More refactory.

---
 .../xdebug/php/model/XDebugStackFrame.java         |   61 ++++----------------
 1 files changed, 11 insertions(+), 50 deletions(-)

diff --git a/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugStackFrame.java b/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugStackFrame.java
index 4cacdd9..e7b1182 100644
--- a/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugStackFrame.java
+++ b/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugStackFrame.java
@@ -27,10 +27,7 @@ import org.w3c.dom.NodeList;
 public class XDebugStackFrame  extends XDebugElement implements IStackFrame {
 	private XDebugThread fThread;
 
-	private int fId;
-	
 	private URL fName;
-	
 	private int fLineNumber;
 	private int fLevel;
 	private String fType;
@@ -48,16 +45,14 @@ public class XDebugStackFrame  extends XDebugElement implements IStackFrame {
 	 * @param data frame data
 	 * @param id stack frame id (0 is the bottom of the stack)
 	 */
-	public XDebugStackFrame(XDebugThread thread, int id, String type, int lineNumber, String where, /*URL*/String filename) {
+	public XDebugStackFrame(XDebugThread thread, int level, String type, int lineNumber, String where, /*URL*/String filename) {
 		super(thread == null ? null : (XDebugTarget) thread.getDebugTarget());
 		
-		fId = id;
-		fLevel = id;
+		fLevel = level;
 		fThread = thread;
 		fType = type;
 		fLineNumber = lineNumber;
-		fWhere = where;
-		
+		fWhere = where;	
 		try {
 		fName = new URL(filename);
 		} catch (MalformedURLException e) {
@@ -288,15 +283,9 @@ public class XDebugStackFrame  extends XDebugElement implements IStackFrame {
 		
 		if (obj instanceof XDebugStackFrame) {
 			XDebugStackFrame sf = (XDebugStackFrame)obj;
-			//try {
-				isSameStackFrame = sf.getSourceName().equals(getSourceName()) &&
-					/*sf.getLineNumber() == getLineNumber() &&*/
-					/*sf.getLevel() == getLevel() &&*/
-					sf.getType().equals(getType()) &&
-					sf.getWhere().equals(getWhere()); //&&
-					/*sf.fId == fId;*/
-			/*} catch (DebugException e) {
-			}*/
+			isSameStackFrame = sf.getSourceName().equals(getSourceName()) &&
+				sf.getType().equals(getType()) &&
+				sf.getWhere().equals(getWhere()); //&&
 		}
 
 		return isSameStackFrame;
@@ -309,14 +298,11 @@ public class XDebugStackFrame  extends XDebugElement implements IStackFrame {
 		if (obj instanceof XDebugStackFrame) {
 			XDebugStackFrame sf = (XDebugStackFrame)obj;
 			try {
-				return sf.getSourceName().equals(getSourceName()) &&
-					sf.getLineNumber() == getLineNumber() &&
-					sf.getLevel() == getLevel() &&
-					sf.getType().equals(getType()) &&
-					sf.getWhere().equals(getWhere());
-/*					sf.getType() == getType() &&
-					sf.getWhere() == getWhere() &&*/
-					/*sf.fId == fId;*/
+				return sf.getSourceName().equals(fName) &&
+					sf.getLineNumber() == fLineNumber &&
+					sf.getLevel() == fLevel &&
+					sf.getType().equals(fType) &&
+					sf.getWhere().equals(fWhere);
 			} catch (DebugException e) {
 			}
 		}
@@ -325,41 +311,16 @@ public class XDebugStackFrame  extends XDebugElement implements IStackFrame {
 	}
 	
 	/* (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	public boolean equalsOld(Object obj) {
-		if (obj instanceof XDebugStackFrame) {
-			XDebugStackFrame sf = (XDebugStackFrame)obj;
-			try {
-				return sf.getSourceName().equals(getSourceName()) &&
-					sf.getLineNumber() == getLineNumber() &&
-					sf.fId == fId;
-			} catch (DebugException e) {
-			}
-		}
-		return false;
-	}
-	
-	/* (non-Javadoc)
 	 * @see java.lang.Object#hashCode()
 	 */
 	public int hashCode() {
 		return getSourceName().hashCode() + fLevel;
 	}
 	
-	/**
-	 * 
-	 * @return this stack frame's unique identifier within its thread
-	 */
-	/*protected int getIdentifier() {
-		return fId;
-	}*/
-
 	public URL getFullName() {
 		return fName;
 	}
 	
-
 	public int getLevel() {
 		return fLevel;
 	}
-- 
1.7.1