[Pydev-cvs] org.python.pydev/src/org/python/pydev/editor/actions/navigation PyPreviousMethod.java,1.1,1.2 PyNextMethod.java,1.1,1.2 PyMethodNavigation.java,1.1,1.2

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

Update of /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/actions/navigation
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11341/src/org/python/pydev/editor/actions/navigation

Modified Files:
	PyPreviousMethod.java PyNextMethod.java 
	PyMethodNavigation.java 
Log Message:
Refactoring of the fabioz changes

Index: PyPreviousMethod.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/actions/navigation/PyPreviousMethod.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PyPreviousMethod.java	5 Mar 2004 14:43:05 -0000	1.1
--- PyPreviousMethod.java	5 Mar 2004 22:04:44 -0000	1.2
***************
*** 8,12 ****
  
  import org.python.pydev.outline.ParsedItem;
! import org.python.pydev.outline.IOutlineModel.SelectThis;
  
  /**
--- 8,12 ----
  
  import org.python.pydev.outline.ParsedItem;
! import org.python.pydev.outline.SelectionPosition;
  
  /**
***************
*** 15,19 ****
  public class PyPreviousMethod extends PyMethodNavigation{
  
! 	public SelectThis getSelect(Visitor v) {
  		if (v.prevNode != null){
  			return ParsedItem.getPosition(v.prevNode);
--- 15,19 ----
  public class PyPreviousMethod extends PyMethodNavigation{
  
! 	public SelectionPosition getSelect(Visitor v) {
  		if (v.prevNode != null){
  			return ParsedItem.getPosition(v.prevNode);

Index: PyNextMethod.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/actions/navigation/PyNextMethod.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PyNextMethod.java	5 Mar 2004 14:43:05 -0000	1.1
--- PyNextMethod.java	5 Mar 2004 22:04:44 -0000	1.2
***************
*** 8,12 ****
  
  import org.python.pydev.outline.ParsedItem;
! import org.python.pydev.outline.IOutlineModel.SelectThis;
  
  /**
--- 8,12 ----
  
  import org.python.pydev.outline.ParsedItem;
! import org.python.pydev.outline.SelectionPosition;
  
  /**
***************
*** 15,19 ****
  public class PyNextMethod extends PyMethodNavigation{
  
! 	public SelectThis getSelect(Visitor v) {
  		if (v.nextNode != null){
  			return ParsedItem.getPosition(v.nextNode);
--- 15,19 ----
  public class PyNextMethod extends PyMethodNavigation{
  
! 	public SelectionPosition getSelect(Visitor v) {
  		if (v.nextNode != null){
  			return ParsedItem.getPosition(v.nextNode);

Index: PyMethodNavigation.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/actions/navigation/PyMethodNavigation.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PyMethodNavigation.java	5 Mar 2004 14:43:05 -0000	1.1
--- PyMethodNavigation.java	5 Mar 2004 22:04:44 -0000	1.2
***************
*** 10,14 ****
  import org.eclipse.jface.text.IDocument;
  import org.eclipse.jface.text.ITextSelection;
- import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
  import org.python.parser.SimpleNode;
  import org.python.parser.ast.ClassDef;
--- 10,13 ----
***************
*** 17,23 ****
  import org.python.pydev.editor.PyEdit;
  import org.python.pydev.editor.actions.PyAction;
- import org.python.pydev.outline.IOutlineModel;
  import org.python.pydev.outline.ParsedItem;
! import org.python.pydev.outline.PyOutlinePage;
  
  /**
--- 16,22 ----
  import org.python.pydev.editor.PyEdit;
  import org.python.pydev.editor.actions.PyAction;
  import org.python.pydev.outline.ParsedItem;
! import org.python.pydev.outline.ParsedModel;
! import org.python.pydev.outline.SelectionPosition;
  
  /**
***************
*** 115,133 ****
  		ITextSelection selection =
  			(ITextSelection) pyEdit.getSelectionProvider().getSelection();
! 
! 		PyOutlinePage out =
! 			(PyOutlinePage) pyEdit.getAdapter(IContentOutlinePage.class);
! 		ParsedItem item = (ParsedItem) out.getParsedModel().getRoot();
  		SimpleNode node = item.getToken();
  
  		int startLine = selection.getStartLine();
  		Visitor v = whereAmI(startLine, node);
  		
  //		print (v.nextNode);
! 		IOutlineModel.SelectThis select = getSelect(v);
  //		print("select = " + select);
  		if (select != null) {
! 			PyOutlinePage.selectSelectionInEditor(select,pyEdit);
  		}
  	}
  
--- 114,135 ----
  		ITextSelection selection =
  			(ITextSelection) pyEdit.getSelectionProvider().getSelection();
! 		
! 		ParsedModel model = new ParsedModel(null, pyEdit.getParser());
! 		ParsedItem item = (ParsedItem)model.getRoot();
  		SimpleNode node = item.getToken();
  
+ 		if (node == null)
+ 			return;
+ 
  		int startLine = selection.getStartLine();
  		Visitor v = whereAmI(startLine, node);
  		
  //		print (v.nextNode);
! 		SelectionPosition select = getSelect(v);
  //		print("select = " + select);
  		if (select != null) {
! 			pyEdit.selectSelectionInEditor(select);
  		}
+ 		model.dispose();
  	}
  
***************
*** 159,163 ****
  	 * @return
  	 */
! 	public abstract IOutlineModel.SelectThis getSelect(Visitor v);
  
  }
--- 161,165 ----
  	 * @return
  	 */
! 	public abstract SelectionPosition getSelect(Visitor v);
  
  }