[Pydev-cvs] org.python.pydev/src/org/python/pydev/outline ParsedLabelProvider.java,1.3,1.4 ParsedItem.java,1.8,1.9

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

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

Modified Files:
	ParsedLabelProvider.java ParsedItem.java 
Log Message:


Index: ParsedItem.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/outline/ParsedItem.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ParsedItem.java	21 Mar 2005 16:42:37 -0000	1.8
--- ParsedItem.java	5 Sep 2005 22:57:56 -0000	1.9
***************
*** 10,13 ****
--- 10,14 ----
  
  import org.python.parser.ast.ImportFrom;
+ import org.python.parser.ast.NameTok;
  import org.python.parser.ast.aliasType;
  import org.python.pydev.editor.model.AbstractNode;
***************
*** 17,20 ****
--- 18,22 ----
  import org.python.pydev.editor.model.ImportNode;
  import org.python.pydev.editor.model.NameEqualsMainNode;
+ import org.python.pydev.parser.visitors.NodeUtils;
  
  /**
***************
*** 83,90 ****
  			return "null";
  		if (token instanceof ClassNode) {
! 			return ((ClassNode)token).astNode.name;
  		}
  		else if (token instanceof FunctionNode) {
! 			return ((FunctionNode)token).astNode.name;
  		}
  		else if (token instanceof ImportNode) {
--- 85,92 ----
  			return "null";
  		if (token instanceof ClassNode) {
! 			return NodeUtils.getNameFromNameTok((NameTok) ((ClassNode)token).astNode.name);
  		}
  		else if (token instanceof FunctionNode) {
! 			return NodeUtils.getNameFromNameTok((NameTok) ((FunctionNode)token).astNode.name);
  		}
  		else if (token instanceof ImportNode) {

Index: ParsedLabelProvider.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/outline/ParsedLabelProvider.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ParsedLabelProvider.java	21 Mar 2005 16:42:37 -0000	1.3
--- ParsedLabelProvider.java	5 Sep 2005 22:57:56 -0000	1.4
***************
*** 8,11 ****
--- 8,12 ----
  import org.eclipse.jface.viewers.LabelProvider;
  import org.eclipse.swt.graphics.Image;
+ import org.python.parser.ast.NameTok;
  import org.python.pydev.editor.model.AbstractNode;
  import org.python.pydev.editor.model.ClassNode;
***************
*** 14,17 ****
--- 15,19 ----
  import org.python.pydev.editor.model.ImportNode;
  import org.python.pydev.editor.model.NameEqualsMainNode;
+ import org.python.pydev.parser.visitors.NodeUtils;
  import org.python.pydev.ui.ImageCache;
  import org.python.pydev.ui.UIConstants;
***************
*** 40,44 ****
  		}
  		else if (token instanceof FunctionNode) {
! 			if (((FunctionNode)token).astNode.name.startsWith("_")) {
  				return imageCache.get(UIConstants.PRIVATE_METHOD_ICON);
  			}
--- 42,46 ----
  		}
  		else if (token instanceof FunctionNode) {
! 			if (NodeUtils.getNameFromNameTok((NameTok) ((FunctionNode)token).astNode.name).startsWith("_")) {
  				return imageCache.get(UIConstants.PRIVATE_METHOD_ICON);
  			}