[Pydev-cvs] org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited ProjectModulesMana
Brought to you by:
fabioz
From: Fabio Z. <fa...@us...> - 2005-06-22 16:34:48
|
Update of /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11532/src/org/python/pydev/editor/codecompletion/revisited Modified Files: ProjectModulesManager.java Log Message: Index: ProjectModulesManager.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/codecompletion/revisited/ProjectModulesManager.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ProjectModulesManager.java 3 Jun 2005 18:49:36 -0000 1.6 --- ProjectModulesManager.java 22 Jun 2005 16:34:39 -0000 1.7 *************** *** 7,11 **** import java.util.ArrayList; - import java.util.Arrays; import java.util.HashSet; import java.util.List; --- 7,10 ---- *************** *** 37,50 **** public Set keySet() { Set s = new HashSet(); - for (int i = 0; i < this.getManagersInvolved().length; i++) { - s.addAll(this.getManagersInvolved()[i].getModules().keySet()); - } s.addAll(getModules().keySet()); return s; } public AbstractModule getModule(String name, PythonNature nature) { ! for (int i = 0; i < this.getManagersInvolved().length; i++) { ! AbstractModule module = this.getManagersInvolved()[i].getModule(name, nature); if(module != null){ return module; --- 36,52 ---- public Set keySet() { Set s = new HashSet(); s.addAll(getModules().keySet()); + + ModulesManager[] managersInvolved = this.getManagersInvolved(); + for (int i = 0; i < managersInvolved.length; i++) { + s.addAll(managersInvolved[i].getModules().keySet()); + } return s; } public AbstractModule getModule(String name, PythonNature nature) { ! ModulesManager[] managersInvolved = this.getManagersInvolved(); ! for (int i = 0; i < managersInvolved.length; i++) { ! AbstractModule module = managersInvolved[i].getModule(name, nature); if(module != null){ return module; *************** *** 59,64 **** */ public String resolveModule(String full) { ! for (int i = 0; i < this.getManagersInvolved().length; i++) { ! String mod = this.getManagersInvolved()[i].resolveModule(full); if(mod != null){ return mod; --- 61,67 ---- */ public String resolveModule(String full) { ! ModulesManager[] managersInvolved = this.getManagersInvolved(); ! for (int i = 0; i < managersInvolved.length; i++) { ! String mod = managersInvolved[i].resolveModule(full); if(mod != null){ return mod; *************** *** 84,90 **** */ public int getSize() { ! int size = super.getSize(); ! for (int i = 0; i < this.getManagersInvolved().length; i++) { ! size += this.getManagersInvolved()[i].getSize(); } return size; --- 87,94 ---- */ public int getSize() { ! int size = getModules().size(); ! ModulesManager[] managersInvolved = this.getManagersInvolved(); ! for (int i = 0; i < managersInvolved.length; i++) { ! size += managersInvolved[i].getModules().size(); } return size; *************** *** 97,106 **** */ public String[] getBuiltins() { ! HashSet set = new HashSet(); ! for (int i = 0; i < this.getManagersInvolved().length; i++) { ! String[] builtins = this.getManagersInvolved()[i].getBuiltins(); ! set.addAll(Arrays.asList(builtins)); } ! return (String[]) set.toArray(new String[0]); } --- 101,109 ---- */ public String[] getBuiltins() { ! String[] builtins = null; ! if(systemModulesManager != null){ ! builtins = systemModulesManager.getBuiltins(); } ! return builtins; } |