[Pydev-cvs] org.python.pydev/src/org/python/pydev/navigator/actions OpenPythonNodeAction.java, 1.1, 1.2 PyOpenPythonFileAction.java, 1.2, 1.3

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

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

Modified Files:
	OpenPythonNodeAction.java PyOpenPythonFileAction.java 
Log Message:


Index: PyOpenPythonFileAction.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/navigator/actions/PyOpenPythonFileAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PyOpenPythonFileAction.java	12 Feb 2007 10:50:20 -0000	1.2
--- PyOpenPythonFileAction.java	13 Feb 2007 14:58:45 -0000	1.3
***************
*** 18,21 ****
--- 18,22 ----
  import org.python.pydev.editor.actions.PyOpenAction;
  import org.python.pydev.editor.model.ItemPointer;
+ import org.python.pydev.navigator.PythonNode;
  
  public class PyOpenPythonFileAction extends Action {
***************
*** 46,49 ****
--- 47,53 ----
                  while(iterator.hasNext()){
                      Object element = iterator.next();
+                     if(element instanceof PythonNode){
+                     	return false;
+                     }
                      if(element instanceof IAdaptable){
                          IAdaptable adaptable = (IAdaptable) element;

Index: OpenPythonNodeAction.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/navigator/actions/OpenPythonNodeAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** OpenPythonNodeAction.java	9 Oct 2006 21:43:17 -0000	1.1
--- OpenPythonNodeAction.java	13 Feb 2007 14:58:45 -0000	1.2
***************
*** 14,17 ****
--- 14,18 ----
  import org.python.pydev.navigator.PythonNode;
  import org.python.pydev.outline.ParsedItem;
+ import org.python.pydev.parser.visitors.NodeUtils;
  
  public class OpenPythonNodeAction extends Action {
***************
*** 54,58 ****
          if (isEnabled()) {
              ParsedItem actualObject = data.getActualObject();
!             new PyOpenAction().run(new ItemPointer( data.getPythonFile().getActualObject(), actualObject.astThis.node));
          }
      }
--- 55,60 ----
          if (isEnabled()) {
              ParsedItem actualObject = data.getActualObject();
!             new PyOpenAction().run(new ItemPointer( data.getPythonFile().getActualObject(), 
!             		NodeUtils.getNameTokFromNode(actualObject.astThis.node)));
          }
      }