[Pydev-cvs] org.python.pydev/src/org/python/pydev/outline ParsedLabelProvider.java, 1.7, 1.8 ParsedItem.java, 1.14, 1.15

[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-serv24148/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.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ParsedItem.java	20 Jul 2006 01:27:05 -0000	1.14
--- ParsedItem.java	8 Oct 2006 15:31:58 -0000	1.15
***************
*** 7,13 ****
--- 7,20 ----
  import java.util.ArrayList;
  
+ import org.eclipse.swt.graphics.Image;
  import org.python.pydev.core.FullRepIterable;
+ import org.python.pydev.core.bundle.ImageCache;
+ import org.python.pydev.parser.jython.SimpleNode;
+ import org.python.pydev.parser.jython.ast.Attribute;
+ import org.python.pydev.parser.jython.ast.ClassDef;
+ import org.python.pydev.parser.jython.ast.FunctionDef;
  import org.python.pydev.parser.jython.ast.Import;
  import org.python.pydev.parser.jython.ast.ImportFrom;
+ import org.python.pydev.parser.jython.ast.Name;
  import org.python.pydev.parser.jython.ast.NameTok;
  import org.python.pydev.parser.jython.ast.aliasType;
***************
*** 15,18 ****
--- 22,27 ----
  import org.python.pydev.parser.visitors.NodeUtils;
  import org.python.pydev.parser.visitors.scope.ASTEntryWithChildren;
+ import org.python.pydev.plugin.PydevPlugin;
+ import org.python.pydev.ui.UIConstants;
  
  public class ParsedItem implements Comparable{
***************
*** 34,37 ****
--- 43,82 ----
      }
  
+ 
+     // returns images based upon element type
+     public Image getImage() {
+         ImageCache imageCache = PydevPlugin.getImageCache();
+         if(astThis == null){
+             return imageCache.get("ERROR");
+         }
+         
+         SimpleNode token = astThis.node;
+         if (token instanceof ClassDef) {
+             return imageCache.get(UIConstants.CLASS_ICON);
+         }
+         else if (token instanceof FunctionDef) {
+             if (NodeUtils.getNameFromNameTok((NameTok) ((FunctionDef)token).name).startsWith("_")) {
+                 return imageCache.get(UIConstants.PRIVATE_METHOD_ICON);
+             }
+             else
+                 return imageCache.get(UIConstants.PUBLIC_METHOD_ICON);
+         }
+         else if (token instanceof Import) {
+             return imageCache.get(UIConstants.IMPORT_ICON);
+         }
+         else if (token instanceof ImportFrom) {
+             return imageCache.get(UIConstants.IMPORT_ICON);
+         }
+         else if (token instanceof commentType) {
+             return imageCache.get(UIConstants.COMMENT);
+         }
+         else if (token instanceof Attribute || token instanceof Name || token instanceof NameTok) {
+             return imageCache.get(UIConstants.PUBLIC_ATTR_ICON);
+         }
+         else {
+             return imageCache.get("ERROR");
+         }
+     }
+     
      public ParsedItem[] getChildren() {
          if(children != null ){

Index: ParsedLabelProvider.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/outline/ParsedLabelProvider.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ParsedLabelProvider.java	10 Jun 2006 18:43:08 -0000	1.7
--- ParsedLabelProvider.java	8 Oct 2006 15:31:58 -0000	1.8
***************
*** 9,23 ****
  import org.eclipse.swt.graphics.Image;
  import org.python.pydev.core.bundle.ImageCache;
- import org.python.pydev.parser.jython.SimpleNode;
- import org.python.pydev.parser.jython.ast.Attribute;
- import org.python.pydev.parser.jython.ast.ClassDef;
- import org.python.pydev.parser.jython.ast.FunctionDef;
- import org.python.pydev.parser.jython.ast.Import;
- import org.python.pydev.parser.jython.ast.ImportFrom;
- import org.python.pydev.parser.jython.ast.Name;
- import org.python.pydev.parser.jython.ast.NameTok;
- import org.python.pydev.parser.jython.ast.commentType;
- import org.python.pydev.parser.visitors.NodeUtils;
- import org.python.pydev.ui.UIConstants;
  
  /**
--- 9,12 ----
***************
*** 39,68 ****
  	// returns images based upon element type
  	public Image getImage(Object element) {
! 		SimpleNode token = ((ParsedItem)element).astThis.node;
! 		if (token instanceof ClassDef) {
! 			return imageCache.get(UIConstants.CLASS_ICON);
! 		}
! 		else if (token instanceof FunctionDef) {
! 			if (NodeUtils.getNameFromNameTok((NameTok) ((FunctionDef)token).name).startsWith("_")) {
! 				return imageCache.get(UIConstants.PRIVATE_METHOD_ICON);
! 			}
! 			else
! 				return imageCache.get(UIConstants.PUBLIC_METHOD_ICON);
! 		}
! 		else if (token instanceof Import) {
! 			return imageCache.get(UIConstants.IMPORT_ICON);
! 		}
! 		else if (token instanceof ImportFrom) {
! 			return imageCache.get(UIConstants.IMPORT_ICON);
! 		}
! 		else if (token instanceof commentType) {
! 		    return imageCache.get(UIConstants.COMMENT);
! 		}
! 		else if (token instanceof Attribute || token instanceof Name || token instanceof NameTok) {
! 		    return imageCache.get(UIConstants.PUBLIC_ATTR_ICON);
! 		}
! 		else {
! 			return imageCache.get("ERROR");
! 		}
  	}
  }
--- 28,32 ----
  	// returns images based upon element type
  	public Image getImage(Object element) {
! 		return((ParsedItem)element).getImage();
  	}
  }