[Pydev-cvs] org.python.pydev/src/org/python/pydev/editor PyWordRule.java, 1.3, 1.4 PyCodeScanner.java, 1.9, 1.10 PyEditConfiguration.java, 1.57, 1.58

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

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

Modified Files:
	PyWordRule.java PyCodeScanner.java PyEditConfiguration.java 
Log Message:
Using faster version of StringBuffer: FastStrintgBuffer / Better icons for auto-import.

Index: PyWordRule.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/PyWordRule.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PyWordRule.java	20 Oct 2007 19:30:36 -0000	1.3
--- PyWordRule.java	14 Jun 2008 22:14:55 -0000	1.4
***************
*** 13,16 ****
--- 13,17 ----
  import org.eclipse.jface.text.rules.IWordDetector;
  import org.eclipse.jface.text.rules.Token;
+ import org.python.pydev.core.structure.FastStringBuffer;
  
  
***************
*** 40,44 ****
      protected Map fWords= new HashMap();
      /** Buffer used for pattern detection */
!     private StringBuffer fBuffer= new StringBuffer();
  
      private IToken classNameToken;
--- 41,45 ----
      protected Map fWords= new HashMap();
      /** Buffer used for pattern detection */
!     private FastStringBuffer fBuffer= new FastStringBuffer();
  
      private IToken classNameToken;
***************
*** 104,108 ****
              if (fColumn == UNDEFINED || (fColumn == scanner.getColumn() - 1)) {
  
!                 fBuffer.setLength(0);
                  do {
                      fBuffer.append((char) c);
--- 105,109 ----
              if (fColumn == UNDEFINED || (fColumn == scanner.getColumn() - 1)) {
  
!                 fBuffer.clear();
                  do {
                      fBuffer.append((char) c);

Index: PyEditConfiguration.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/PyEditConfiguration.java,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** PyEditConfiguration.java	12 Apr 2008 13:04:08 -0000	1.57
--- PyEditConfiguration.java	14 Jun 2008 22:14:55 -0000	1.58
***************
*** 37,40 ****
--- 37,41 ----
  import org.eclipse.ui.texteditor.spelling.SpellingService;
  import org.python.pydev.core.IPythonPartitions;
+ import org.python.pydev.core.structure.FastStringBuffer;
  import org.python.pydev.editor.autoedit.DefaultIndentPrefs;
  import org.python.pydev.editor.autoedit.PyAutoIndentStrategy;
***************
*** 172,176 ****
          Preferences prefs = PydevPlugin.getDefault().getPluginPreferences();
          int tabWidth = DefaultIndentPrefs.getStaticTabWidth();
!         StringBuffer spaces = new StringBuffer(8);
  
          for (int i = 0; i < tabWidth; i++) {
--- 173,177 ----
          Preferences prefs = PydevPlugin.getDefault().getPluginPreferences();
          int tabWidth = DefaultIndentPrefs.getStaticTabWidth();
!         FastStringBuffer spaces = new FastStringBuffer(8);
  
          for (int i = 0; i < tabWidth; i++) {

Index: PyCodeScanner.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/PyCodeScanner.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** PyCodeScanner.java	14 Sep 2006 01:15:46 -0000	1.9
--- PyCodeScanner.java	14 Jun 2008 22:14:55 -0000	1.10
***************
*** 21,24 ****
--- 21,25 ----
  import org.eclipse.jface.text.rules.WhitespaceRule;
  import org.eclipse.jface.text.rules.WordRule;
+ import org.python.pydev.core.structure.FastStringBuffer;
  import org.python.pydev.plugin.PydevPlugin;
  import org.python.pydev.plugin.PydevPrefs;
***************
*** 106,110 ****
           * Used to keep the state of the token
           */
!         private StringBuffer buffer;
          
          /**
--- 107,111 ----
           * Used to keep the state of the token
           */
!         private FastStringBuffer buffer = new FastStringBuffer();
          
          /**
***************
*** 118,122 ****
          public boolean isWordStart(char c) {
              isInHexa = false;
!             buffer = new StringBuffer();
              buffer.append(c);
              return Character.isDigit(c);
--- 119,123 ----
          public boolean isWordStart(char c) {
              isInHexa = false;
!             buffer.clear();
              buffer.append(c);
              return Character.isDigit(c);