[Pydev-cvs] org.python.pydev/src/org/python/pydev/editor PyEdit.java, 1.133, 1.134

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

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

Modified Files:
	PyEdit.java 
Log Message:
Minor changes for console / possible race condition on linking with outline page.

Index: PyEdit.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/PyEdit.java,v
retrieving revision 1.133
retrieving revision 1.134
diff -C2 -d -r1.133 -r1.134
*** PyEdit.java	13 Aug 2008 21:12:15 -0000	1.133
--- PyEdit.java	21 Aug 2008 20:56:28 -0000	1.134
***************
*** 92,96 ****
  import org.python.pydev.parser.jython.TokenMgrError;
  import org.python.pydev.parser.visitors.NodeUtils;
- import org.python.pydev.parser.visitors.scope.ASTEntry;
  import org.python.pydev.plugin.PydevPlugin;
  import org.python.pydev.plugin.PydevPrefs;
--- 92,95 ----
***************
*** 894,897 ****
--- 893,900 ----
      }
  
+     
+     /**
+      * Selects more than one node, making a selection from the 1st node to the last node passed.
+      */
      public void revealModelNodes(SimpleNode[] nodes) {
          if (nodes == null){
***************
*** 928,931 ****
--- 931,939 ----
      }
  
+     
+     /**
+      * Shows some node in the editor.
+      * @param node the node to be shown.
+      */
      public void revealModelNode(SimpleNode node) {
          if (node == null){
***************
*** 953,982 ****
          
      }
!     /**
!      * Selects & reveals the model node
!      */
!     public void revealModelNode(ASTEntry entry) {
!         if (entry == null){
!             return; // nothing to see here
!         }
!         
!         IDocument document = getDocumentProvider().getDocument(getEditorInput());
!         if(document == null){
!         	return;
!         }
!         
!         int offset, length, endOffset;
! 
!         try {
!             PySelection selection = new PySelection(this);
!             offset = selection.getLineOffset(entry.node.beginLine-1) + entry.node.beginColumn-1;
!             
!             endOffset = selection.getLineOffset(entry.endLine-1) + entry.endCol-1;
!             length = endOffset - offset;
!             setSelection(offset, length);
!         } catch (Exception e) {
!             PydevPlugin.log(e);
!         }
!     }
  
      /**
--- 961,965 ----
          
      }
!     
  
      /**