[Pydev-cvs] org.python.pydev/src/org/python/pydev/plugin/nature PythonNatureStore.java, 1.18, 1.19
Brought to you by:
fabioz
Menu
▾
▴
[Pydev-cvs] org.python.pydev/src/org/python/pydev/plugin/nature PythonNatureStore.java, 1.18, 1.19 PythonPathNature.java, 1.26, 1.27
|
From: Fabio Z. <fa...@us...> - 2008-06-14 22:15:19
|
Update of /cvsroot/pydev/org.python.pydev/src/org/python/pydev/plugin/nature In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27940/src/org/python/pydev/plugin/nature Modified Files: PythonNatureStore.java PythonPathNature.java Log Message: Using faster version of StringBuffer: FastStrintgBuffer / Better icons for auto-import. Index: PythonPathNature.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/plugin/nature/PythonPathNature.java,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** PythonPathNature.java 9 May 2008 00:42:32 -0000 1.26 --- PythonPathNature.java 14 Jun 2008 22:14:55 -0000 1.27 *************** *** 25,28 **** --- 25,29 ---- import org.python.pydev.core.IPythonPathNature; import org.python.pydev.core.REF; + import org.python.pydev.core.structure.FastStringBuffer; import org.python.pydev.plugin.PydevPlugin; import org.python.pydev.ui.filetypes.FileTypesPreferencesPage; *************** *** 116,120 **** //relative to the project location String[] strings = source.split("\\|"); ! StringBuffer buf = new StringBuffer(); for (int i = 0; i < strings.length; i++) { if(strings[i].trim().length()>0){ --- 117,121 ---- //relative to the project location String[] strings = source.split("\\|"); ! FastStringBuffer buf = new FastStringBuffer(); for (int i = 0; i < strings.length; i++) { if(strings[i].trim().length()>0){ *************** *** 157,161 **** external = ""; } ! return buf.toString()+"|"+external; } --- 158,162 ---- external = ""; } ! return buf.append("|").append(external).toString(); } Index: PythonNatureStore.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/plugin/nature/PythonNatureStore.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** PythonNatureStore.java 13 Aug 2007 01:16:30 -0000 1.18 --- PythonNatureStore.java 14 Jun 2008 22:14:55 -0000 1.19 *************** *** 38,41 **** --- 38,42 ---- import org.eclipse.core.runtime.jobs.Job; import org.python.pydev.core.docutils.StringUtils; + import org.python.pydev.core.structure.FastStringBuffer; import org.python.pydev.editor.codecompletion.revisited.ProjectModulesManager; import org.python.pydev.plugin.PydevPlugin; *************** *** 134,139 **** private volatile boolean inInit; ! private void traceFunc(String func){ if(TRACE_PYTHON_NATURE_STORE){ if(!func.startsWith("END ")){ System.out.println(indent+func); --- 135,145 ---- private volatile boolean inInit; ! private void traceFunc(String func, Object ... args){ if(TRACE_PYTHON_NATURE_STORE){ + FastStringBuffer buf = new FastStringBuffer(func, 128); + for(Object o:args){ + buf.appendObject(o); + } + func = buf.toString(); if(!func.startsWith("END ")){ System.out.println(indent+func); *************** *** 165,169 **** }else{ ! traceFunc("setProject - "+project.getName()); try{ this.project = project; --- 171,175 ---- }else{ ! traceFunc("setProject - ", project.getName()); try{ this.project = project; *************** *** 180,184 **** loaded = true; } ! traceFunc("END setProject - "+project.getName()); } } --- 186,190 ---- loaded = true; } ! traceFunc("END setProject - ", project.getName()); } } *************** *** 205,213 **** return ""; } ! traceFunc("getPathProperty - "+key); synchronized (this) { checkLoad("getPathProperty"); String ret = getPathStringFromArray(getPathPropertyFromXml(key)); ! traceFunc("END getPathProperty - "+ret); return ret; } --- 211,219 ---- return ""; } ! traceFunc("getPathProperty - ", key); synchronized (this) { checkLoad("getPathProperty"); String ret = getPathStringFromArray(getPathPropertyFromXml(key)); ! traceFunc("END getPathProperty - ", ret); return ret; } *************** *** 336,340 **** } ! traceFunc("END getRootNodeInXml -- "+ret); if(ret != null){ return ret; --- 342,346 ---- } ! traceFunc("END getRootNodeInXml -- ", ret); if(ret != null){ return ret; *************** *** 382,386 **** String name = attrs.getNamedItem(PYDEV_NATURE_PROPERTY_NAME).getNodeValue(); if (name != null && name.equals(keyString)) { ! traceFunc("END findPropertyNodeInXml - "+child); return child; } --- 388,392 ---- String name = attrs.getNamedItem(PYDEV_NATURE_PROPERTY_NAME).getNodeValue(); if (name != null && name.equals(keyString)) { ! traceFunc("END findPropertyNodeInXml - ", child); return child; } *************** *** 454,458 **** synchronized (this) { if (pathArray != null) { ! StringBuffer s = new StringBuffer(""); for (int i = 0; i < pathArray.length; i++) { if (i > 0) { --- 460,464 ---- synchronized (this) { if (pathArray != null) { ! FastStringBuffer s = new FastStringBuffer(); for (int i = 0; i < pathArray.length; i++) { if (i > 0) { *************** *** 495,499 **** } ! traceFunc("getPropertyFromXml - "+key); synchronized (this) { checkLoad("getPropertyFromXml"); --- 501,505 ---- } ! traceFunc("getPropertyFromXml - ", key); synchronized (this) { checkLoad("getPropertyFromXml"); *************** *** 503,507 **** if (propertyNode != null) { String ret = getTextContent(propertyNode); ! traceFunc("END getPropertyFromXml -- "+ret); return ret; } --- 509,513 ---- if (propertyNode != null) { String ret = getTextContent(propertyNode); ! traceFunc("END getPropertyFromXml -- ", ret); return ret; } *************** *** 582,586 **** traceFunc("getTextContent"); synchronized (this) { ! StringBuffer fBufferStr = new StringBuffer(); Node child = self.getFirstChild(); if (child != null) { --- 588,592 ---- traceFunc("getTextContent"); synchronized (this) { ! FastStringBuffer fBufferStr = new FastStringBuffer(); Node child = self.getFirstChild(); if (child != null) { *************** *** 590,594 **** String nodeValue = child.getNodeValue(); if(nodeValue != null){ ! traceFunc("END getTextContent - "+nodeValue); return nodeValue; } --- 596,600 ---- String nodeValue = child.getNodeValue(); if(nodeValue != null){ ! traceFunc("END getTextContent - ", nodeValue); return nodeValue; } *************** *** 597,608 **** return ""; } ! if (fBufferStr == null){ ! fBufferStr = new StringBuffer(); ! } ! else { ! fBufferStr.setLength(0); ! } getTextContent(fBufferStr, self); ! traceFunc("END getTextContent - "+fBufferStr); return fBufferStr.toString(); } --- 603,609 ---- return ""; } ! fBufferStr.clear(); getTextContent(fBufferStr, self); ! traceFunc("END getTextContent - ", fBufferStr); return fBufferStr.toString(); } *************** *** 614,618 **** // internal method taking a StringBuffer in parameter ! private synchronized void getTextContent(StringBuffer buf, Node self) throws DOMException { traceFunc("getTextContent"); synchronized (this) { --- 615,619 ---- // internal method taking a StringBuffer in parameter ! private synchronized void getTextContent(FastStringBuffer buf, Node self) throws DOMException { traceFunc("getTextContent"); synchronized (this) { *************** *** 634,638 **** boolean ret = child.getNodeType() != Node.COMMENT_NODE && child.getNodeType() != Node.PROCESSING_INSTRUCTION_NODE; ! traceFunc("END hasTextContent "+ret); return ret; } --- 635,639 ---- boolean ret = child.getNodeType() != Node.COMMENT_NODE && child.getNodeType() != Node.PROCESSING_INSTRUCTION_NODE; ! traceFunc("END hasTextContent ", ret); return ret; } *************** *** 758,762 **** return; } ! traceFunc("resourceChanged -- "+project.getName()); if(inInit){ traceFunc("END resourceChanged (inInit)"); --- 759,763 ---- return; } ! traceFunc("resourceChanged -- ", project.getName()); if(inInit){ traceFunc("END resourceChanged (inInit)"); *************** *** 808,812 **** } } ! traceFunc("END resourceChanged -- rebuilt:"+doRebuild); } --- 809,813 ---- } } ! traceFunc("END resourceChanged -- rebuilt:", doRebuild); } |