Thread: [Pydev-cvs] org.python.pydev/src/org/python/pydev/runners SimpleJythonRunner.java, 1.26, 1.27 Threa
Brought to you by:
fabioz
From: Fabio Z. <fa...@us...> - 2008-06-14 22:14:49
|
Update of /cvsroot/pydev/org.python.pydev/src/org/python/pydev/runners In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27940/src/org/python/pydev/runners Modified Files: SimpleJythonRunner.java ThreadStreamReader.java SimpleRunner.java ThreadStreamReaderPrinter.java Log Message: Using faster version of StringBuffer: FastStrintgBuffer / Better icons for auto-import. Index: ThreadStreamReader.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/runners/ThreadStreamReader.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** ThreadStreamReader.java 30 Mar 2008 21:45:12 -0000 1.8 --- ThreadStreamReader.java 14 Jun 2008 22:14:55 -0000 1.9 *************** *** 7,18 **** import java.io.InputStreamReader; public class ThreadStreamReader extends Thread { InputStream is; ! public StringBuffer contents; public ThreadStreamReader(InputStream is) { this.setName("ThreadStreamReader"); this.setDaemon(true); ! contents = new StringBuffer(); this.is = is; } --- 7,20 ---- import java.io.InputStreamReader; + import org.python.pydev.core.structure.FastStringBuffer; + public class ThreadStreamReader extends Thread { InputStream is; ! public FastStringBuffer contents; public ThreadStreamReader(InputStream is) { this.setName("ThreadStreamReader"); this.setDaemon(true); ! contents = new FastStringBuffer(); this.is = is; } *************** *** 36,41 **** */ public String getAndClearContents() { ! StringBuffer oldContents = contents; ! contents = new StringBuffer(); return oldContents.toString(); } --- 38,43 ---- */ public String getAndClearContents() { ! FastStringBuffer oldContents = contents; ! contents = new FastStringBuffer(); return oldContents.toString(); } Index: SimpleRunner.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/runners/SimpleRunner.java,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** SimpleRunner.java 21 May 2008 01:38:08 -0000 1.25 --- SimpleRunner.java 14 Jun 2008 22:14:55 -0000 1.26 *************** *** 28,31 **** --- 28,32 ---- import org.python.pydev.core.docutils.StringUtils; import org.python.pydev.core.log.Log; + import org.python.pydev.core.structure.FastStringBuffer; import org.python.pydev.plugin.PydevPlugin; import org.python.pydev.plugin.nature.PythonNature; *************** *** 153,157 **** if (commandLine.length < 1) return ""; //$NON-NLS-1$ ! StringBuffer buf= new StringBuffer(); for (int i= 0; i < commandLine.length; i++) { if(commandLine[i] == null){ --- 154,159 ---- if (commandLine.length < 1) return ""; //$NON-NLS-1$ ! FastStringBuffer buf= new FastStringBuffer(); ! FastStringBuffer command= new FastStringBuffer(); for (int i= 0; i < commandLine.length; i++) { if(commandLine[i] == null){ *************** *** 161,165 **** buf.append(' '); char[] characters= commandLine[i].toCharArray(); ! StringBuffer command= new StringBuffer(); boolean containsSpace= false; for (int j = 0; j < characters.length; j++) { --- 163,167 ---- buf.append(' '); char[] characters= commandLine[i].toCharArray(); ! command.clear(); boolean containsSpace= false; for (int j = 0; j < characters.length; j++) { Index: ThreadStreamReaderPrinter.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/runners/ThreadStreamReaderPrinter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ThreadStreamReaderPrinter.java 7 Jun 2006 21:54:33 -0000 1.2 --- ThreadStreamReaderPrinter.java 14 Jun 2008 22:14:55 -0000 1.3 *************** *** 9,20 **** import java.io.InputStreamReader; public class ThreadStreamReaderPrinter extends Thread { private static final boolean DEBUG = false; InputStream is; ! StringBuffer contents; public ThreadStreamReaderPrinter(InputStream is) { ! contents = new StringBuffer(); setName("ThreadStreamReaderPrinter"); this.is = is; --- 9,22 ---- import java.io.InputStreamReader; + import org.python.pydev.core.structure.FastStringBuffer; + public class ThreadStreamReaderPrinter extends Thread { private static final boolean DEBUG = false; InputStream is; ! FastStringBuffer contents; public ThreadStreamReaderPrinter(InputStream is) { ! contents = new FastStringBuffer(); setName("ThreadStreamReaderPrinter"); this.is = is; *************** *** 33,37 **** if(DEBUG){ System.out.print(contents); ! contents = new StringBuffer(); } } catch (IOException ioe) { --- 35,39 ---- if(DEBUG){ System.out.print(contents); ! contents = new FastStringBuffer(); } } catch (IOException ioe) { Index: SimpleJythonRunner.java =================================================================== RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/runners/SimpleJythonRunner.java,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** SimpleJythonRunner.java 21 May 2008 01:38:08 -0000 1.26 --- SimpleJythonRunner.java 14 Jun 2008 22:14:55 -0000 1.27 *************** *** 18,21 **** --- 18,22 ---- import org.python.pydev.core.Tuple; import org.python.pydev.core.docutils.StringUtils; + import org.python.pydev.core.structure.FastStringBuffer; import org.python.pydev.plugin.PydevPlugin; import org.python.pydev.ui.pythonpathconf.InterpreterInfo; *************** *** 101,105 **** //pythonpath is: base path + libs path. String libs = SimpleRunner.makePythonPathEnvFromPaths(info.libs); ! StringBuffer jythonPath = new StringBuffer(basePythonPath); String pathSeparator = SimpleRunner.getPythonPathSeparator(); if(jythonPath.length() != 0){ --- 102,106 ---- //pythonpath is: base path + libs path. String libs = SimpleRunner.makePythonPathEnvFromPaths(info.libs); ! FastStringBuffer jythonPath = new FastStringBuffer(basePythonPath, 128); String pathSeparator = SimpleRunner.getPythonPathSeparator(); if(jythonPath.length() != 0){ |