[Pydev-cvs] org.python.pydev/src_completions/org/python/pydev/editor/codecompletion/revisited Comp
Brought to you by:
fabioz
Menu
▾
▴
[Pydev-cvs] org.python.pydev/src_completions/org/python/pydev/editor/codecompletion/revisited CompletionStateWrapper.java, 1.7, 1.8 PythonPathHelper.java, 1.10, 1.11 AbstractToken.java, 1.4, 1.5 ModulesFoundStructure.java, 1.3, 1.4 SystemModulesManager.java, 1.9, 1.10 ModulesManager.java, 1.22, 1.23
|
From: Fabio Z. <fa...@us...> - 2008-06-14 22:14:50
|
Update of /cvsroot/pydev/org.python.pydev/src_completions/org/python/pydev/editor/codecompletion/revisited In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27940/src_completions/org/python/pydev/editor/codecompletion/revisited Modified Files: CompletionStateWrapper.java PythonPathHelper.java AbstractToken.java ModulesFoundStructure.java SystemModulesManager.java ModulesManager.java Log Message: Using faster version of StringBuffer: FastStrintgBuffer / Better icons for auto-import. Index: SystemModulesManager.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src_completions/org/python/pydev/editor/codecompletion/revisited/SystemModulesManager.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** SystemModulesManager.java 5 May 2008 01:31:22 -0000 1.9 --- SystemModulesManager.java 14 Jun 2008 22:14:55 -0000 1.10 *************** *** 20,23 **** --- 20,24 ---- import org.python.pydev.core.Tuple; import org.python.pydev.core.cache.LRUCache; + import org.python.pydev.core.structure.FastStringBuffer; import org.python.pydev.editor.codecompletion.revisited.modules.AbstractModule; import org.python.pydev.editor.codecompletion.revisited.modules.CompiledModule; *************** *** 170,173 **** --- 171,176 ---- boolean foundStartingWithBuiltin = false; + FastStringBuffer buffer = null; + for (int i = 0; i < builtins.length; i++) { String forcedBuiltin = builtins[i]; *************** *** 180,184 **** if(n == null && dontSearchInit == false){ ! keyForCacheAccess.name = new StringBuffer(name).append(".__init__").toString(); n = cache.getObj(keyForCacheAccess, this); } --- 183,192 ---- if(n == null && dontSearchInit == false){ ! if(buffer == null){ ! buffer = new FastStringBuffer(); ! }else{ ! buffer.clear(); ! } ! keyForCacheAccess.name = buffer.append(name).append(".__init__").toString(); n = cache.getObj(keyForCacheAccess, this); } Index: ModulesFoundStructure.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src_completions/org/python/pydev/editor/codecompletion/revisited/ModulesFoundStructure.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ModulesFoundStructure.java 30 Sep 2007 01:30:51 -0000 1.3 --- ModulesFoundStructure.java 14 Jun 2008 22:14:55 -0000 1.4 *************** *** 13,16 **** --- 13,17 ---- import org.eclipse.core.runtime.IProgressMonitor; import org.python.pydev.core.docutils.StringUtils; + import org.python.pydev.core.structure.FastStringBuffer; /** *************** *** 85,88 **** --- 86,90 ---- public void consolidatePythonpathInfo(IProgressMonitor monitor) { int i=0; + FastStringBuffer buffer = new FastStringBuffer(); for (Map.Entry<String, String> entry : pyFilesLowerToRegular.entrySet()) { if(i % 15==0){ *************** *** 95,99 **** } ! StringBuffer buffer = new StringBuffer(StringUtils.stripFromLastSlash(entry.getKey())); boolean add = true; if(zipContentsType == ZIP_CONTENTS_TYPE_PY_ZIP){ --- 97,102 ---- } ! buffer.clear(); ! buffer.append(StringUtils.stripFromLastSlash(entry.getKey())); boolean add = true; if(zipContentsType == ZIP_CONTENTS_TYPE_PY_ZIP){ Index: ModulesManager.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src_completions/org/python/pydev/editor/codecompletion/revisited/ModulesManager.java,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** ModulesManager.java 5 May 2008 01:31:21 -0000 1.22 --- ModulesManager.java 14 Jun 2008 22:14:55 -0000 1.23 *************** *** 32,35 **** --- 32,36 ---- import org.python.pydev.core.REF; import org.python.pydev.core.docutils.StringUtils; + import org.python.pydev.core.structure.FastStringBuffer; import org.python.pydev.editor.codecompletion.revisited.ModulesFoundStructure.ZipContents; import org.python.pydev.editor.codecompletion.revisited.ModulesKeyTreeMap.Entry; *************** *** 228,231 **** --- 229,233 ---- int j = 0; + FastStringBuffer buffer = new FastStringBuffer(); //now, create in memory modules for all the loaded files (empty modules). for (Iterator<Map.Entry<File, String>> iterator = modulesFound.regularModules.entrySet().iterator(); iterator.hasNext() *************** *** 237,241 **** if (j % 15 == 0) { //no need to report all the time (that's pretty fast now) ! monitor.setTaskName(new StringBuffer("Module resolved: ").append(m).toString()); monitor.worked(1); } --- 239,244 ---- if (j % 15 == 0) { //no need to report all the time (that's pretty fast now) ! buffer.clear(); ! monitor.setTaskName(buffer.append("Module resolved: ").append(m).toString()); monitor.worked(1); } Index: CompletionStateWrapper.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src_completions/org/python/pydev/editor/codecompletion/revisited/CompletionStateWrapper.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** CompletionStateWrapper.java 4 May 2008 16:48:46 -0000 1.7 --- CompletionStateWrapper.java 14 Jun 2008 22:14:55 -0000 1.8 *************** *** 9,12 **** --- 9,13 ---- import org.python.pydev.core.IToken; import org.python.pydev.core.structure.CompletionRecursionException; + import org.python.pydev.core.structure.FastStringBuffer; public class CompletionStateWrapper implements ICompletionState { *************** *** 167,171 **** @Override public String toString() { ! StringBuffer buf = new StringBuffer(); buf.append("CompletionStateWrapper[ "); buf.append(this.activationToken); --- 168,172 ---- @Override public String toString() { ! FastStringBuffer buf = new FastStringBuffer(); buf.append("CompletionStateWrapper[ "); buf.append(this.activationToken); Index: PythonPathHelper.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src_completions/org/python/pydev/editor/codecompletion/revisited/PythonPathHelper.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** PythonPathHelper.java 18 May 2008 20:02:16 -0000 1.10 --- PythonPathHelper.java 14 Jun 2008 22:14:55 -0000 1.11 *************** *** 22,25 **** --- 22,26 ---- import org.python.pydev.core.REF; import org.python.pydev.core.docutils.StringUtils; + import org.python.pydev.core.structure.FastStringBuffer; import org.python.pydev.editor.codecompletion.revisited.ModulesFoundStructure.ZipContents; import org.python.pydev.plugin.PydevPlugin; *************** *** 112,115 **** --- 113,117 ---- int i=0; + FastStringBuffer buffer = new FastStringBuffer(); //ok, now that we have the zip entries, let's map them to modules while (entries.hasMoreElements()) { *************** *** 128,132 **** return null; } ! monitor.setTaskName(new StringBuffer("Found in ").append(zipFileName).append(" module ").append(name).toString()); monitor.worked(1); } --- 130,135 ---- return null; } ! buffer.clear(); ! monitor.setTaskName(buffer.append("Found in ").append(zipFileName).append(" module ").append(name).toString()); monitor.worked(1); } Index: AbstractToken.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src_completions/org/python/pydev/editor/codecompletion/revisited/AbstractToken.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** AbstractToken.java 21 Oct 2007 18:34:44 -0000 1.4 --- AbstractToken.java 14 Jun 2008 22:14:55 -0000 1.5 *************** *** 9,12 **** --- 9,13 ---- import org.python.pydev.core.FullRepIterable; import org.python.pydev.core.IToken; + import org.python.pydev.core.structure.FastStringBuffer; import org.python.pydev.editor.codecompletion.PyCodeCompletionImages; import org.python.pydev.editor.codecompletion.revisited.modules.SourceToken; *************** *** 187,191 **** if(getParentPackage() != null && getParentPackage().length() > 0){ ! return new StringBuffer(getRepresentation()).append(" - ").append(getParentPackage()).toString(); }else{ return getRepresentation(); --- 188,192 ---- if(getParentPackage() != null && getParentPackage().length() > 0){ ! return new FastStringBuffer(getRepresentation(), 64).append(" - ").append(getParentPackage()).toString(); }else{ return getRepresentation(); |