[Pydev-cvs] org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/visitors AbstractVisitor.java,1.21,1.22

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

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

Modified Files:
	AbstractVisitor.java 
Log Message:


Index: AbstractVisitor.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/visitors/AbstractVisitor.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** AbstractVisitor.java	26 Sep 2005 01:25:23 -0000	1.21
--- AbstractVisitor.java	29 Sep 2005 19:55:23 -0000	1.22
***************
*** 102,105 ****
--- 102,120 ----
      }
  
+     public static List<IToken> makeImportToken(SimpleNode node, List<IToken> tokens, String moduleName, boolean allowForMultiple) {
+     	if(node instanceof Import){
+     		return makeImportToken((Import)node, tokens, moduleName, allowForMultiple);
+     	}
+     	if(node instanceof ImportFrom){
+     		ImportFrom i = (ImportFrom) node;
+     		if(isWildImport(i)){
+     			tokens.add(makeWildImportToken(i, tokens, moduleName));
+     			return tokens;
+     		}
+     		return makeImportToken((ImportFrom)node, tokens, moduleName, allowForMultiple);
+     	}
+     	
+     	throw new RuntimeException("Unable to create token for the passed import.");
+     }
  
      /**