[Pydev-cvs] org.python.pydev.debug/src/org/python/pydev/debug/model PyStackFrame.java,1.5,1.6

[Fabio Z. <fa...@us...>]

Update of /cvsroot/pydev/org.python.pydev.debug/src/org/python/pydev/debug/model
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7493/src/org/python/pydev/debug/model

Modified Files:
	PyStackFrame.java 
Log Message:
not able to debug recursively bug fixed

Index: PyStackFrame.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.debug/src/org/python/pydev/debug/model/PyStackFrame.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PyStackFrame.java	21 Jul 2004 18:04:43 -0000	1.5
--- PyStackFrame.java	5 Aug 2005 11:48:09 -0000	1.6
***************
*** 8,12 ****
  import org.eclipse.core.resources.IResource;
  import org.eclipse.core.runtime.IPath;
- import org.eclipse.core.runtime.IStatus;
  import org.eclipse.core.runtime.PlatformObject;
  import org.eclipse.debug.core.DebugException;
--- 8,11 ----
***************
*** 19,23 ****
  import org.eclipse.ui.views.properties.IPropertySource;
  import org.eclipse.ui.views.tasklist.ITaskListResourceAdapter;
- import org.python.pydev.debug.core.PydevDebugPlugin;
  
  /**
--- 18,21 ----
***************
*** 214,242 ****
  
  	/**
! 	 * HACK
! 	 * Here to work around eclipse2 annotation marker removal code.
! 	 * This makes sure that old stack markers get removed.
! 	 * E3 remove me in Eclipse 3
  	 */
  	public int hashCode() {
! 		return 5;
  	}
  	/**
! 	 * HACK
! 	 * Here to work around eclipse2 annotation marker removal code
! 	 * E3 remove me in Eclipse 3
! 	 * LaunchView wants to know, 
  	 */
  	public boolean equals(Object obj) {
! 		if (obj instanceof PyStackFrame) 
! 			try {
! 				return path.equals(((PyStackFrame)obj).getPath()) && 
! 						(line == ((PyStackFrame)obj).getLineNumber());
! 			} catch (DebugException e) {
! 				PydevDebugPlugin.log(IStatus.ERROR, "PyStackFrame.equals", null);
! 				return false;
! 			}
! 		else
! 			return super.equals(obj);
  	}
  }
--- 212,232 ----
  
  	/**
! 	 * fixed - this was bug http://sourceforge.net/tracker/index.php?func=detail&aid=1174821&group_id=85796&atid=577329
! 	 * in the forum (unable to get stack correctly when recursing)
  	 */
  	public int hashCode() {
! 		return id.hashCode();
  	}
+     
  	/**
!      * fixed - this was bug http://sourceforge.net/tracker/index.php?func=detail&aid=1174821&group_id=85796&atid=577329
!      * in the forum (unable to get stack correctly when recursing)
  	 */
  	public boolean equals(Object obj) {
!         if (obj instanceof PyStackFrame) {
!             PyStackFrame sf = (PyStackFrame) obj;
!             return this.id.equals(sf.id);
!         }
!         return false;
  	}
  }