[Pydev-cvs] org.python.pydev.debug/src/org/python/pydev/debug/model PyThread.java,1.5,1.6 PyVariable.java,1.2,1.3 PyDebugTarget.java,1.6,1.7 PyStackFrame.java,1.3,1.4

[Aleksandar T. <at...@us...>]

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

Modified Files:
	PyThread.java PyVariable.java PyDebugTarget.java 
	PyStackFrame.java 
Log Message:
3.0 port


Index: PyThread.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.debug/src/org/python/pydev/debug/model/PyThread.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PyThread.java	7 May 2004 21:50:59 -0000	1.5
--- PyThread.java	2 Jul 2004 02:26:00 -0000	1.6
***************
*** 195,199 ****
  		else if (adapter.equals(ITaskListResourceAdapter.class))
  			return null;
! 		else if (adapter.equals(IPropertySource.class) || adapter.equals(ITaskListResourceAdapter.class))
  			return  super.getAdapter(adapter);
  		else {
--- 195,203 ----
  		else if (adapter.equals(ITaskListResourceAdapter.class))
  			return null;
! 		else if (adapter.equals(IPropertySource.class) 
! 				|| adapter.equals(ITaskListResourceAdapter.class)
! 				|| adapter.equals(org.eclipse.debug.ui.actions.IToggleBreakpointsTarget.class)
! 				|| adapter.equals(org.eclipse.debug.ui.actions.IRunToLineTarget.class)
! 				)
  			return  super.getAdapter(adapter);
  		else {

Index: PyStackFrame.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.debug/src/org/python/pydev/debug/model/PyStackFrame.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PyStackFrame.java	5 May 2004 02:02:00 -0000	1.3
--- PyStackFrame.java	2 Jul 2004 02:26:00 -0000	1.4
***************
*** 202,207 ****
  		else if (adapter.equals(ITaskListResourceAdapter.class))
  			return null;
! 		else if (adapter.equals(IPropertySource.class) || 
! 			adapter.equals(ITaskListResourceAdapter.class))
  			return  super.getAdapter(adapter);
  		// ongoing, I do not fully understand all the interfaces they'd like me to support
--- 202,210 ----
  		else if (adapter.equals(ITaskListResourceAdapter.class))
  			return null;
! 		else if (adapter.equals(IPropertySource.class) 
! 			|| adapter.equals(ITaskListResourceAdapter.class)
! 			|| adapter.equals(org.eclipse.debug.ui.actions.IToggleBreakpointsTarget.class)
! 			|| adapter.equals(org.eclipse.debug.ui.actions.IRunToLineTarget.class)
! 			)
  			return  super.getAdapter(adapter);
  		// ongoing, I do not fully understand all the interfaces they'd like me to support

Index: PyVariable.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.debug/src/org/python/pydev/debug/model/PyVariable.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PyVariable.java	7 May 2004 21:50:59 -0000	1.2
--- PyVariable.java	2 Jul 2004 02:26:00 -0000	1.3
***************
*** 100,105 ****
  
  	public Object getAdapter(Class adapter) {
! 		if (adapter.equals(ILaunch.class) ||
! 			adapter.equals(IResource.class))
  			return target.getAdapter(adapter);
  		else if (adapter.equals(IPropertySource.class) ||
--- 100,104 ----
  
  	public Object getAdapter(Class adapter) {
! 		if (adapter.equals(ILaunch.class))
  			return target.getAdapter(adapter);
  		else if (adapter.equals(IPropertySource.class) ||
***************
*** 108,111 ****
--- 107,113 ----
  				adapter.equals(org.eclipse.ui.IActionFilter.class) ||
  				adapter.equals(org.eclipse.ui.model.IWorkbenchAdapter.class)
+ 				|| adapter.equals(org.eclipse.debug.ui.actions.IToggleBreakpointsTarget.class)
+ 				|| adapter.equals(org.eclipse.debug.ui.actions.IRunToLineTarget.class)
+ 				||	adapter.equals(IResource.class)
  				)
  			return  super.getAdapter(adapter);

Index: PyDebugTarget.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev.debug/src/org/python/pydev/debug/model/PyDebugTarget.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** PyDebugTarget.java	7 May 2004 21:50:59 -0000	1.6
--- PyDebugTarget.java	2 Jul 2004 02:26:00 -0000	1.7
***************
*** 282,286 ****
  		} else if (adapter.equals(IPropertySource.class))
  			return launch.getAdapter(adapter);
! 		else if (adapter.equals(ITaskListResourceAdapter.class))
  			return  super.getAdapter(adapter);
  		System.err.println("Need adapter " + adapter.toString());
--- 282,289 ----
  		} else if (adapter.equals(IPropertySource.class))
  			return launch.getAdapter(adapter);
! 		else if (adapter.equals(ITaskListResourceAdapter.class) 
! 				|| adapter.equals(org.eclipse.debug.ui.actions.IRunToLineTarget.class) 
! 				|| adapter.equals(org.eclipse.debug.ui.actions.IToggleBreakpointsTarget.class) 
! 				)
  			return  super.getAdapter(adapter);
  		System.err.println("Need adapter " + adapter.toString());