Index: contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/Hyphen.java
===================================================================
--- contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/Hyphen.java	(revision 820798)
+++ contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/Hyphen.java	(working copy)
@@ -56,7 +56,7 @@
         && preBreak.equals("-")) {
       return "-";
     }
-    StringBuffer res = new StringBuffer("{");
+    StringBuilder res = new StringBuilder("{");
     res.append(preBreak);
     res.append("}{");
     res.append(postBreak);
Index: contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/HyphenationTree.java
===================================================================
--- contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/HyphenationTree.java	(revision 820798)
+++ contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/HyphenationTree.java	(working copy)
@@ -91,7 +91,7 @@
   }
 
   protected String unpackValues(int k) {
-    StringBuffer buf = new StringBuffer();
+    StringBuilder buf = new StringBuilder();
     byte v = vspace.get(k++);
     while (v != 0) {
       char c = (char) ((v >>> 4) - 1 + '0');
@@ -169,7 +169,7 @@
   }
 
   protected byte[] getValues(int k) {
-    StringBuffer buf = new StringBuffer();
+    StringBuilder buf = new StringBuilder();
     byte v = vspace.get(k++);
     while (v != 0) {
       char c = (char) ((v >>> 4) - 1);
Index: contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/PatternParser.java
===================================================================
--- contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/PatternParser.java	(revision 820798)
+++ contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/PatternParser.java	(working copy)
@@ -51,7 +51,7 @@
 
   PatternConsumer consumer;
 
-  StringBuffer token;
+  StringBuilder token;
 
   ArrayList exception;
 
@@ -68,7 +68,7 @@
   static final int ELEM_HYPHEN = 4;
 
   public PatternParser() throws HyphenationException {
-    token = new StringBuffer();
+    token = new StringBuilder();
     parser = createParser();
     parser.setContentHandler(this);
     parser.setErrorHandler(this);
@@ -145,7 +145,7 @@
     }
   }
 
-  protected String readToken(StringBuffer chars) {
+  protected String readToken(StringBuilder chars) {
     String word;
     boolean space = false;
     int i;
@@ -191,7 +191,7 @@
   }
 
   protected static String getPattern(String word) {
-    StringBuffer pat = new StringBuffer();
+    StringBuilder pat = new StringBuilder();
     int len = word.length();
     for (int i = 0; i < len; i++) {
       if (!Character.isDigit(word.charAt(i))) {
@@ -207,7 +207,7 @@
       Object item = ex.get(i);
       if (item instanceof String) {
         String str = (String) item;
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         for (int j = 0; j < str.length(); j++) {
           char c = str.charAt(j);
           if (c != hyphenChar) {
@@ -233,7 +233,7 @@
   }
 
   protected String getExceptionWord(ArrayList ex) {
-    StringBuffer res = new StringBuffer();
+    StringBuilder res = new StringBuilder();
     for (int i = 0; i < ex.size(); i++) {
       Object item = ex.get(i);
       if (item instanceof String) {
@@ -248,7 +248,7 @@
   }
 
   protected static String getInterletterValues(String pat) {
-    StringBuffer il = new StringBuffer();
+    StringBuilder il = new StringBuilder();
     String word = pat + "a"; // add dummy letter to serve as sentinel
     int len = word.length();
     for (int i = 0; i < len; i++) {
@@ -344,7 +344,7 @@
    * @see org.xml.sax.ContentHandler#characters(char[], int, int)
    */
   public void characters(char ch[], int start, int length) {
-    StringBuffer chars = new StringBuffer(length);
+    StringBuilder chars = new StringBuilder(length);
     chars.append(ch, start, length);
     String word = readToken(chars);
     while (word != null) {
@@ -399,7 +399,7 @@
    * Returns a string of the location.
    */
   private String getLocationString(SAXParseException ex) {
-    StringBuffer str = new StringBuffer();
+    StringBuilder str = new StringBuilder();
 
     String systemId = ex.getSystemId();
     if (systemId != null) {
Index: contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/TernaryTree.java
===================================================================
--- contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/TernaryTree.java	(revision 820798)
+++ contrib/analyzers/common/src/java/org/apache/lucene/analysis/compound/hyphenation/TernaryTree.java	(working copy)
@@ -495,14 +495,14 @@
     Stack ns;
 
     /**
-     * key stack implemented with a StringBuffer
+     * key stack implemented with a StringBuilder
      */
-    StringBuffer ks;
+    StringBuilder ks;
 
     public Iterator() {
       cur = -1;
       ns = new Stack();
-      ks = new StringBuffer();
+      ks = new StringBuilder();
       rewind();
     }
 
@@ -619,7 +619,7 @@
       }
       // The current node should be a data node and
       // the key should be in the key stack (at least partially)
-      StringBuffer buf = new StringBuffer(ks.toString());
+      StringBuilder buf = new StringBuilder(ks.toString());
       if (sc[cur] == 0xFFFF) {
         int p = lo[cur];
         while (kv.get(p) != 0) {
Index: contrib/analyzers/common/src/java/org/apache/lucene/analysis/de/GermanStemmer.java
===================================================================
--- contrib/analyzers/common/src/java/org/apache/lucene/analysis/de/GermanStemmer.java	(revision 820798)
+++ contrib/analyzers/common/src/java/org/apache/lucene/analysis/de/GermanStemmer.java	(working copy)
@@ -33,7 +33,7 @@
     /**
      * Buffer for the terms while stemming them.
      */
-    private StringBuffer sb = new StringBuffer();
+    private StringBuilder sb = new StringBuilder();
 
     /**
      * Amount of characters that are removed with <tt>substitute()</tt> while stemming.
@@ -52,7 +52,7 @@
       term = term.toLowerCase();
       if ( !isStemmable( term ) )
         return term;
-      // Reset the StringBuffer.
+      // Reset the StringBuilder.
       sb.delete( 0, sb.length() );
       sb.insert( 0, term );
       // Stemming starts here...
@@ -86,7 +86,7 @@
      * discriminators in the most of those cases.
      * The algorithm is context free, except of the length restrictions.
      */
-    private void strip( StringBuffer buffer )
+    private void strip( StringBuilder buffer )
     {
       boolean doMore = true;
       while ( doMore && buffer.length() > 3 ) {
@@ -126,7 +126,7 @@
      * Does some optimizations on the term. This optimisations are
      * contextual.
      */
-    private void optimize( StringBuffer buffer )
+    private void optimize( StringBuilder buffer )
     {
       // Additional step for female plurals of professions and inhabitants.
       if ( buffer.length() > 5 && buffer.substring( buffer.length() - 5, buffer.length() ).equals( "erin*" ) ) {
@@ -142,7 +142,7 @@
     /**
      * Removes a particle denotion ("ge") from a term.
      */
-    private void removeParticleDenotion( StringBuffer buffer )
+    private void removeParticleDenotion( StringBuilder buffer )
     {
       if ( buffer.length() > 4 ) {
         for ( int c = 0; c < buffer.length() - 3; c++ ) {
@@ -164,7 +164,7 @@
      * - Substitute some common character combinations with a token:
      *   sch/ch/ei/ie/ig/st -> $/§/%/&/#/!
      */
-    private void substitute( StringBuffer buffer )
+    private void substitute( StringBuilder buffer )
     {
       substCount = 0;
       for ( int c = 0; c < buffer.length(); c++ ) {
@@ -232,7 +232,7 @@
      * character combinations. Umlauts will remain as their corresponding vowel,
      * as "ß" remains as "ss".
      */
-    private void resubstitute( StringBuffer buffer )
+    private void resubstitute( StringBuilder buffer )
     {
       for ( int c = 0; c < buffer.length(); c++ ) {
         if ( buffer.charAt( c ) == '*' ) {
Index: contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/FrenchStemmer.java
===================================================================
--- contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/FrenchStemmer.java	(revision 820798)
+++ contrib/analyzers/common/src/java/org/apache/lucene/analysis/fr/FrenchStemmer.java	(working copy)
@@ -32,12 +32,12 @@
     /**
      * Buffer for the terms while stemming them.
      */
-    private StringBuffer sb = new StringBuffer();
+    private StringBuilder sb = new StringBuilder();
 
     /**
      * A temporary buffer, used to reconstruct R2
      */
-     private StringBuffer tb = new StringBuffer();
+     private StringBuilder tb = new StringBuilder();
 
 	/**
 	 * Region R0 is equal to the whole buffer
@@ -92,7 +92,7 @@
 		// Use lowercase for medium stemming.
 		term = term.toLowerCase();
 
-		// Reset the StringBuffer.
+		// Reset the StringBuilder.
 		sb.delete( 0, sb.length() );
 		sb.insert( 0, term );
 
@@ -207,7 +207,7 @@
 	 * or changed were done in the amment, emment, ments or ment suffixes<br>
 	 * refer to http://snowball.sourceforge.net/french/stemmer.html for an explanation
 	 *
-	 * @return boolean - true if something changed in the StringBuffer
+	 * @return boolean - true if something changed in the StringBuilder
 	 */
 	private boolean step2a() {
 		String[] search = { "îmes", "îtes", "iraIent", "irait", "irais", "irai", "iras", "ira",
@@ -553,10 +553,10 @@
 	 * Retrieve the "R zone" (1 or 2 depending on the buffer) and return the corresponding string<br>
 	 * "R is the region after the first non-vowel following a vowel
 	 * or is the null region at the end of the word if there is no such non-vowel"<br>
-	 * @param buffer java.lang.StringBuffer - the in buffer
+	 * @param buffer java.lang.StringBuilder - the in buffer
 	 * @return java.lang.String - the resulting string
 	 */
-	private String retrieveR( StringBuffer buffer ) {
+	private String retrieveR( StringBuilder buffer ) {
 		int len = buffer.length();
 		int pos = -1;
 		for (int c = 0; c < len; c++) {
@@ -590,10 +590,10 @@
 	 * "If the word begins with two vowels, RV is the region after the third letter,
 	 * otherwise the region after the first vowel not at the beginning of the word,
 	 * or the end of the word if these positions cannot be found."<br>
-	 * @param buffer java.lang.StringBuffer - the in buffer
+	 * @param buffer java.lang.StringBuilder - the in buffer
 	 * @return java.lang.String - the resulting string
 	 */
-	private String retrieveRV( StringBuffer buffer ) {
+	private String retrieveRV( StringBuilder buffer ) {
 		int len = buffer.length();
 		if ( buffer.length() > 3)
 		{
@@ -627,10 +627,10 @@
 	 * Turns y preceded OR followed by a vowel to UpperCase<br>
 	 * Turns u preceded by q to UpperCase<br>
      *
-     * @param buffer java.util.StringBuffer - the buffer to treat
-     * @return java.util.StringBuffer - the treated buffer
+     * @param buffer java.util.StringBuilder - the buffer to treat
+     * @return java.util.StringBuilder - the treated buffer
      */
-    private StringBuffer treatVowels( StringBuffer buffer ) {
+    private StringBuilder treatVowels( StringBuilder buffer ) {
 		for ( int c = 0; c < buffer.length(); c++ ) {
 			char ch = buffer.charAt( c );
 
Index: contrib/analyzers/common/src/java/org/apache/lucene/analysis/nl/DutchStemmer.java
===================================================================
--- contrib/analyzers/common/src/java/org/apache/lucene/analysis/nl/DutchStemmer.java	(revision 820798)
+++ contrib/analyzers/common/src/java/org/apache/lucene/analysis/nl/DutchStemmer.java	(working copy)
@@ -32,7 +32,7 @@
   /**
    * Buffer for the terms while stemming them.
    */
-  private StringBuffer sb = new StringBuffer();
+  private StringBuilder sb = new StringBuilder();
   private boolean _removedE;
   private Map _stemDict;
 
@@ -56,7 +56,7 @@
       else
         return null;
 
-    // Reset the StringBuffer.
+    // Reset the StringBuilder.
     sb.delete(0, sb.length());
     sb.insert(0, term);
     // Stemming starts here...
@@ -74,7 +74,7 @@
     return sb.toString();
   }
 
-  private boolean enEnding(StringBuffer sb) {
+  private boolean enEnding(StringBuilder sb) {
     String[] enend = new String[]{"ene", "en"};
     for (int i = 0; i < enend.length; i++) {
       String end = enend[i];
@@ -93,7 +93,7 @@
   }
 
 
-  private void step1(StringBuffer sb) {
+  private void step1(StringBuilder sb) {
     if (_R1 >= sb.length())
       return;
 
@@ -129,7 +129,7 @@
    *
    * @param sb String being stemmed
    */
-  private void step2(StringBuffer sb) {
+  private void step2(StringBuilder sb) {
     _removedE = false;
     if (_R1 >= sb.length())
       return;
@@ -149,7 +149,7 @@
    *
    * @param sb String being stemmed
    */
-  private void step3a(StringBuffer sb) {
+  private void step3a(StringBuilder sb) {
     if (_R2 >= sb.length())
       return;
     String s = sb.toString();
@@ -174,7 +174,7 @@
    *
    * @param sb String being stemmed
    */
-  private void step3b(StringBuffer sb) {
+  private void step3b(StringBuilder sb) {
     if (_R2 >= sb.length())
       return;
     String s = sb.toString();
@@ -229,7 +229,7 @@
    *
    * @param sb String being stemmed
    */
-  private void step4(StringBuffer sb) {
+  private void step4(StringBuilder sb) {
     if (sb.length() < 4)
       return;
     String end = sb.substring(sb.length() - 4, sb.length());
@@ -262,7 +262,7 @@
   /**
    * Substitute ä, ë, ï, ö, ü, á , é, í, ó, ú
    */
-  private void substitute(StringBuffer buffer) {
+  private void substitute(StringBuilder buffer) {
     for (int i = 0; i < buffer.length(); i++) {
       switch (buffer.charAt(i)) {
         case 'ä':
@@ -299,22 +299,22 @@
     }
   }
 
-  /*private boolean isValidSEnding(StringBuffer sb) {
+  /*private boolean isValidSEnding(StringBuilder sb) {
     return isValidSEnding(sb, sb.length() - 1);
   }*/
 
-  private boolean isValidSEnding(StringBuffer sb, int index) {
+  private boolean isValidSEnding(StringBuilder sb, int index) {
     char c = sb.charAt(index);
     if (isVowel(c) || c == 'j')
       return false;
     return true;
   }
 
-  /*private boolean isValidEnEnding(StringBuffer sb) {
+  /*private boolean isValidEnEnding(StringBuilder sb) {
     return isValidEnEnding(sb, sb.length() - 1);
   }*/
 
-  private boolean isValidEnEnding(StringBuffer sb, int index) {
+  private boolean isValidEnEnding(StringBuilder sb, int index) {
     char c = sb.charAt(index);
     if (isVowel(c))
       return false;
@@ -326,18 +326,18 @@
     return true;
   }
 
-  private void unDouble(StringBuffer sb) {
+  private void unDouble(StringBuilder sb) {
     unDouble(sb, sb.length());
   }
 
-  private void unDouble(StringBuffer sb, int endIndex) {
+  private void unDouble(StringBuilder sb, int endIndex) {
     String s = sb.substring(0, endIndex);
     if (s.endsWith("kk") || s.endsWith("tt") || s.endsWith("dd") || s.endsWith("nn") || s.endsWith("mm") || s.endsWith("ff")) {
       sb.delete(endIndex - 1, endIndex);
     }
   }
 
-  private int getRIndex(StringBuffer sb, int start) {
+  private int getRIndex(StringBuilder sb, int start) {
     if (start == 0)
       start = 1;
     int i = start;
@@ -350,7 +350,7 @@
     return i + 1;
   }
 
-  private void storeYandI(StringBuffer sb) {
+  private void storeYandI(StringBuilder sb) {
     if (sb.charAt(0) == 'y')
       sb.setCharAt(0, 'Y');
 
@@ -378,7 +378,7 @@
       sb.setCharAt(last, 'Y');
   }
 
-  private void reStoreYandI(StringBuffer sb) {
+  private void reStoreYandI(StringBuilder sb) {
     String tmp = sb.toString();
     sb.delete(0, sb.length());
     sb.insert(0, tmp.replaceAll("I", "i").replaceAll("Y", "y"));
Index: contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianStemmer.java
===================================================================
--- contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianStemmer.java	(revision 820798)
+++ contrib/analyzers/common/src/java/org/apache/lucene/analysis/ru/RussianStemmer.java	(working copy)
@@ -255,9 +255,9 @@
      * Adjectival ending is an adjective ending,
      * optionally preceded by participle ending.
      * Creation date: (17/03/2002 12:14:58 AM)
-     * @param stemmingZone java.lang.StringBuffer
+     * @param stemmingZone java.lang.StringBuilder
      */
-    private boolean adjectival(StringBuffer stemmingZone)
+    private boolean adjectival(StringBuilder stemmingZone)
     {
         // look for adjective ending in a stemming zone
         if (!findAndRemoveEnding(stemmingZone, adjectiveEndings))
@@ -275,9 +275,9 @@
     /**
      * Derivational endings
      * Creation date: (17/03/2002 12:14:58 AM)
-     * @param stemmingZone java.lang.StringBuffer
+     * @param stemmingZone java.lang.StringBuilder
      */
-    private boolean derivational(StringBuffer stemmingZone)
+    private boolean derivational(StringBuilder stemmingZone)
     {
         int endingLength = findEnding(stemmingZone, derivationalEndings);
         if (endingLength == 0)
@@ -302,7 +302,7 @@
      * Finds ending among given ending class and returns the length of ending found(0, if not found).
      * Creation date: (17/03/2002 8:18:34 PM)
      */
-    private int findEnding(StringBuffer stemmingZone, int startIndex, char[][] theEndingClass)
+    private int findEnding(StringBuilder stemmingZone, int startIndex, char[][] theEndingClass)
     {
         boolean match = false;
         for (int i = theEndingClass.length - 1; i >= 0; i--)
@@ -333,7 +333,7 @@
         return 0;
     }
 
-    private int findEnding(StringBuffer stemmingZone, char[][] theEndingClass)
+    private int findEnding(StringBuilder stemmingZone, char[][] theEndingClass)
     {
         return findEnding(stemmingZone, stemmingZone.length() - 1, theEndingClass);
     }
@@ -342,7 +342,7 @@
      * Finds the ending among the given class of endings and removes it from stemming zone.
      * Creation date: (17/03/2002 8:18:34 PM)
      */
-    private boolean findAndRemoveEnding(StringBuffer stemmingZone, char[][] theEndingClass)
+    private boolean findAndRemoveEnding(StringBuilder stemmingZone, char[][] theEndingClass)
     {
         int endingLength = findEnding(stemmingZone, theEndingClass);
         if (endingLength == 0)
@@ -360,7 +360,7 @@
      * preceded by any of given predecessors, and if so, removes it from stemming zone.
      * Creation date: (17/03/2002 8:18:34 PM)
      */
-    private boolean findAndRemoveEnding(StringBuffer stemmingZone,
+    private boolean findAndRemoveEnding(StringBuilder stemmingZone,
         char[][] theEndingClass, char[][] thePredessors)
     {
         int endingLength = findEnding(stemmingZone, theEndingClass);
@@ -445,9 +445,9 @@
     /**
      * Noun endings.
      * Creation date: (17/03/2002 12:14:58 AM)
-     * @param stemmingZone java.lang.StringBuffer
+     * @param stemmingZone java.lang.StringBuilder
      */
-    private boolean noun(StringBuffer stemmingZone)
+    private boolean noun(StringBuilder stemmingZone)
     {
         return findAndRemoveEnding(stemmingZone, nounEndings);
     }
@@ -455,9 +455,9 @@
     /**
      * Perfective gerund endings.
      * Creation date: (17/03/2002 12:14:58 AM)
-     * @param stemmingZone java.lang.StringBuffer
+     * @param stemmingZone java.lang.StringBuilder
      */
-    private boolean perfectiveGerund(StringBuffer stemmingZone)
+    private boolean perfectiveGerund(StringBuilder stemmingZone)
     {
         return findAndRemoveEnding(
             stemmingZone,
@@ -469,9 +469,9 @@
     /**
      * Reflexive endings.
      * Creation date: (17/03/2002 12:14:58 AM)
-     * @param stemmingZone java.lang.StringBuffer
+     * @param stemmingZone java.lang.StringBuilder
      */
-    private boolean reflexive(StringBuffer stemmingZone)
+    private boolean reflexive(StringBuilder stemmingZone)
     {
         return findAndRemoveEnding(stemmingZone, reflexiveEndings);
     }
@@ -479,9 +479,9 @@
     /**
      * Insert the method's description here.
      * Creation date: (17/03/2002 12:14:58 AM)
-     * @param stemmingZone java.lang.StringBuffer
+     * @param stemmingZone java.lang.StringBuilder
      */
-    private boolean removeI(StringBuffer stemmingZone)
+    private boolean removeI(StringBuilder stemmingZone)
     {
         if (stemmingZone.length() > 0
             && stemmingZone.charAt(stemmingZone.length() - 1) == I)
@@ -498,9 +498,9 @@
     /**
      * Insert the method's description here.
      * Creation date: (17/03/2002 12:14:58 AM)
-     * @param stemmingZone java.lang.StringBuffer
+     * @param stemmingZone java.lang.StringBuilder
      */
-    private boolean removeSoft(StringBuffer stemmingZone)
+    private boolean removeSoft(StringBuilder stemmingZone)
     {
         if (stemmingZone.length() > 0
             && stemmingZone.charAt(stemmingZone.length() - 1) == SOFT)
@@ -525,7 +525,7 @@
         markPositions(input);
         if (RV == 0)
             return input; //RV wasn't detected, nothing to stem
-        StringBuffer stemmingZone = new StringBuffer(input.substring(RV));
+        StringBuilder stemmingZone = new StringBuilder(input.substring(RV));
         // stemming goes on in RV
         // Step 1
 
@@ -555,9 +555,9 @@
     /**
      * Superlative endings.
      * Creation date: (17/03/2002 12:14:58 AM)
-     * @param stemmingZone java.lang.StringBuffer
+     * @param stemmingZone java.lang.StringBuilder
      */
-    private boolean superlative(StringBuffer stemmingZone)
+    private boolean superlative(StringBuilder stemmingZone)
     {
         return findAndRemoveEnding(stemmingZone, superlativeEndings);
     }
@@ -565,9 +565,9 @@
     /**
      * Undoubles N.
      * Creation date: (17/03/2002 12:14:58 AM)
-     * @param stemmingZone java.lang.StringBuffer
+     * @param stemmingZone java.lang.StringBuilder
      */
-    private boolean undoubleN(StringBuffer stemmingZone)
+    private boolean undoubleN(StringBuilder stemmingZone)
     {
         char[][] doubleN = {
             { N, N }
@@ -586,9 +586,9 @@
     /**
      * Verb endings.
      * Creation date: (17/03/2002 12:14:58 AM)
-     * @param stemmingZone java.lang.StringBuffer
+     * @param stemmingZone java.lang.StringBuilder
      */
-    private boolean verb(StringBuffer stemmingZone)
+    private boolean verb(StringBuilder stemmingZone)
     {
         return findAndRemoveEnding(
             stemmingZone,
Index: contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilter.java
===================================================================
--- contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilter.java	(revision 820798)
+++ contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle/ShingleFilter.java	(working copy)
@@ -44,7 +44,7 @@
 public class ShingleFilter extends TokenFilter {
 
   private LinkedList shingleBuf = new LinkedList();
-  private StringBuffer[] shingles;
+  private StringBuilder[] shingles;
   private String tokenType = "shingle";
 
   /**
@@ -140,15 +140,15 @@
     if (maxShingleSize < 2) {
       throw new IllegalArgumentException("Max shingle size must be >= 2");
     }
-    shingles = new StringBuffer[maxShingleSize];
+    shingles = new StringBuilder[maxShingleSize];
     for (int i = 0; i < shingles.length; i++) {
-      shingles[i] = new StringBuffer();
+      shingles[i] = new StringBuilder();
     }
     this.maxShingleSize = maxShingleSize;
   }
 
   /**
-   * Clear the StringBuffers that are used for storing the output shingles.
+   * Clear the StringBuilders that are used for storing the output shingles.
    */
   private void clearShingles() {
     for (int i = 0; i < shingles.length; i++) {
@@ -188,7 +188,7 @@
         restoreState(nextToken);
         typeAtt.setType(tokenType);
         offsetAtt.setOffset(offsetAtt.startOffset(), endOffsets[shingleBufferPosition]);
-        StringBuffer buf = shingles[shingleBufferPosition];
+        StringBuilder buf = shingles[shingleBufferPosition];
         int termLength = buf.length();
         char[] termBuffer = termAtt.termBuffer();
         if (termBuffer.length < termLength)
Index: contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle/ShingleMatrixFilter.java
===================================================================
--- contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle/ShingleMatrixFilter.java	(revision 820798)
+++ contrib/analyzers/common/src/java/org/apache/lucene/analysis/shingle/ShingleMatrixFilter.java	(working copy)
@@ -451,7 +451,7 @@
         }
 
         // shingle token factory
-        StringBuffer sb = new StringBuffer(termLength + 10); // paranormal ability to foresee the future.
+        StringBuilder sb = new StringBuilder(termLength + 10); // paranormal ability to foresee the future.
         for (Iterator iterator = shingle.iterator(); iterator.hasNext();) {
           Token shingleToken = (Token) iterator.next();
           if (spacerCharacter != null && sb.length() > 0) {
Index: contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/BiSegGraph.java
===================================================================
--- contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/BiSegGraph.java	(revision 820798)
+++ contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/BiSegGraph.java	(working copy)
@@ -225,7 +225,7 @@
   }
 
   public String toString() {
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     Collection values = tokenPairListTable.values();
     for (Iterator iter1 = values.iterator(); iter1.hasNext();) {
       List segList = (List) iter1.next();
Index: contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/HHMMSegmenter.java
===================================================================
--- contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/HHMMSegmenter.java	(revision 820798)
+++ contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/HHMMSegmenter.java	(working copy)
@@ -47,7 +47,7 @@
     int length = sentence.length();
     int foundIndex;
     int[] charTypeArray = getCharTypes(sentence);
-    StringBuffer wordBuf = new StringBuffer();
+    StringBuilder wordBuf = new StringBuilder();
     SegToken token;
     int frequency = 0; // word的出现次数
     boolean hasFullWidth;
Index: contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegGraph.java
===================================================================
--- contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegGraph.java	(revision 820798)
+++ contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/hhmm/SegGraph.java	(working copy)
@@ -141,7 +141,7 @@
 
   public String toString() {
     List tokenList = this.toTokenList();
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     for (Iterator iter = tokenList.iterator(); iter.hasNext();) {
       SegToken t = (SegToken) iter.next();
       sb.append(t + "\n");
Index: contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SentenceTokenizer.java
===================================================================
--- contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SentenceTokenizer.java	(revision 820798)
+++ contrib/analyzers/smartcn/src/java/org/apache/lucene/analysis/cn/smart/SentenceTokenizer.java	(working copy)
@@ -44,7 +44,7 @@
    */
   private final static String PUNCTION = "。，！？；,!?;";
 
-  private final StringBuffer buffer = new StringBuffer();
+  private final StringBuilder buffer = new StringBuilder();
 
   private int tokenStart = 0, tokenEnd = 0;
   
Index: contrib/ant/src/java/org/apache/lucene/ant/HtmlDocument.java
===================================================================
--- contrib/ant/src/java/org/apache/lucene/ant/HtmlDocument.java	(revision 820798)
+++ contrib/ant/src/java/org/apache/lucene/ant/HtmlDocument.java	(working copy)
@@ -275,7 +275,7 @@
      */
     private String getBodyText(Node node) {
         NodeList nl = node.getChildNodes();
-        StringBuffer buffer = new StringBuffer();
+        StringBuilder buffer = new StringBuilder();
         for (int i = 0; i < nl.getLength(); i++) {
             Node child = nl.item(i);
             switch (child.getNodeType()) {
Index: contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/AbstractQueryMaker.java
===================================================================
--- contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/AbstractQueryMaker.java	(revision 820798)
+++ contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/AbstractQueryMaker.java	(working copy)
@@ -42,7 +42,7 @@
 
   public String printQueries() {
     String newline = System.getProperty("line.separator");
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     if (queries != null) {
       for (int i = 0; i < queries.length; i++) {
         sb.append(i+". "+ Format.simpleName(queries[i].getClass())+" - "+queries[i].toString());
Index: contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DemoHTMLParser.java
===================================================================
--- contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DemoHTMLParser.java	(revision 820798)
+++ contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DemoHTMLParser.java	(working copy)
@@ -40,7 +40,7 @@
     // body
     Reader r = p.getReader();
     char c[] = new char[1024];
-    StringBuffer bodyBuf = new StringBuffer();
+    StringBuilder bodyBuf = new StringBuilder();
     int n;
     while ((n = r.read(c)) >= 0) {
       if (n>0) {
@@ -69,9 +69,9 @@
 
   /*
    *  (non-Javadoc)
-   * @see org.apache.lucene.benchmark.byTask.feeds.HTMLParser#parse(java.lang.String, java.util.Date, java.lang.StringBuffer, java.text.DateFormat)
+   * @see org.apache.lucene.benchmark.byTask.feeds.HTMLParser#parse(java.lang.String, java.util.Date, java.lang.StringBuilder, java.text.DateFormat)
    */
-  public DocData parse(DocData docData, String name, Date date, StringBuffer inputText, DateFormat dateFormat) throws IOException, InterruptedException {
+  public DocData parse(DocData docData, String name, Date date, StringBuilder inputText, DateFormat dateFormat) throws IOException, InterruptedException {
     return parse(docData, name, date, new StringReader(inputText.toString()), dateFormat);
   }
 
Index: contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DirContentSource.java
===================================================================
--- contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DirContentSource.java	(revision 820798)
+++ contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DirContentSource.java	(working copy)
@@ -203,7 +203,7 @@
     reader.readLine();//skip an empty line
     String title = reader.readLine();
     reader.readLine();//skip an empty line
-    StringBuffer bodyBuf = new StringBuffer(1024);
+    StringBuilder bodyBuf = new StringBuilder(1024);
     while ((line = reader.readLine()) != null) {
       bodyBuf.append(line).append(' ');
     }
Index: contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java
===================================================================
--- contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java	(revision 820798)
+++ contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java	(working copy)
@@ -330,7 +330,7 @@
   public void printDocStatistics() {
     boolean print = false;
     String col = "                  ";
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     String newline = System.getProperty("line.separator");
     sb.append("------------> ").append(Format.simpleName(getClass())).append(" statistics (").append(printNum).append("): ").append(newline);
     int nut = source.getTotalDocsCount();
Index: contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiContentSource.java
===================================================================
--- contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiContentSource.java	(revision 820798)
+++ contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/EnwikiContentSource.java	(working copy)
@@ -47,7 +47,7 @@
     private boolean threadDone;
     private String[] tuple;
     private NoMoreDataException nmde;
-    private StringBuffer contents = new StringBuffer();
+    private StringBuilder contents = new StringBuilder();
     private String title;
     private String body;
     private String time;
@@ -89,7 +89,7 @@
     }
     
     String time(String original) {
-      StringBuffer buffer = new StringBuffer();
+      StringBuilder buffer = new StringBuilder();
 
       buffer.append(original.substring(8, 10));
       buffer.append('-');
Index: contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/HTMLParser.java
===================================================================
--- contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/HTMLParser.java	(revision 820798)
+++ contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/HTMLParser.java	(working copy)
@@ -46,6 +46,6 @@
    * @param inputText the html text to parse.
    * @see #parse(DocData, String, Date, Reader, DateFormat)
    */
-  public DocData parse(DocData docData, String name, Date date, StringBuffer inputText, DateFormat dateFormat) throws IOException, InterruptedException;
+  public DocData parse(DocData docData, String name, Date date, StringBuilder inputText, DateFormat dateFormat) throws IOException, InterruptedException;
 
 }
Index: contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersContentSource.java
===================================================================
--- contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersContentSource.java	(revision 820798)
+++ contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ReutersContentSource.java	(working copy)
@@ -116,7 +116,7 @@
       reader.readLine();// skip an empty line
       String title = reader.readLine();
       reader.readLine();// skip an empty line
-      StringBuffer bodyBuf = new StringBuffer(1024);
+      StringBuilder bodyBuf = new StringBuilder(1024);
       String line = null;
       while ((line = reader.readLine()) != null) {
         bodyBuf.append(line).append(' ');
Index: contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/TaskStats.java
===================================================================
--- contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/TaskStats.java	(revision 820798)
+++ contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/TaskStats.java	(working copy)
@@ -103,7 +103,7 @@
    * @see java.lang.Object#toString()
    */
   public String toString() {
-    StringBuffer res = new StringBuffer(task.getName());
+    StringBuilder res = new StringBuilder(task.getName());
     res.append(" ");
     res.append(count);
     res.append(" ");
Index: contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/PerfTask.java
===================================================================
--- contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/PerfTask.java	(revision 820798)
+++ contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/PerfTask.java	(working copy)
@@ -167,7 +167,7 @@
     if (params==null) {
       return name;
     } 
-    return new StringBuffer(name).append('(').append(params).append(')').toString();
+    return new StringBuilder(name).append('(').append(params).append(')').toString();
   }
 
   /**
@@ -210,7 +210,7 @@
    */
   public String toString() {
     String padd = getPadding();
-    StringBuffer sb = new StringBuffer(padd);
+    StringBuilder sb = new StringBuilder(padd);
     if (disableCounting) {
       sb.append('-');
     }
Index: contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepAllTask.java
===================================================================
--- contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepAllTask.java	(revision 820798)
+++ contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepAllTask.java	(working copy)
@@ -51,7 +51,7 @@
   protected Report reportAll(List taskStats) {
     String longestOp = longestOp(taskStats.iterator());
     boolean first = true;
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     sb.append(tableTitle(longestOp));
     sb.append(newline);
     int reported = 0;
Index: contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReportTask.java
===================================================================
--- contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReportTask.java	(revision 820798)
+++ contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReportTask.java	(working copy)
@@ -81,7 +81,7 @@
    * @return the table title line.
    */
   protected String tableTitle (String longestOp) {
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     sb.append(Format.format(OP,longestOp));
     sb.append(ROUND);
     sb.append(getRunData().getConfig().getColsNamesForValsByRound());
@@ -118,7 +118,7 @@
    */
   protected String taskReportLine(String longestOp, TaskStats stat) {
     PerfTask task = stat.getTask();
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     sb.append(Format.format(task.getName(), longestOp));
     String round = (stat.getRound()>=0 ? ""+stat.getRound() : "-");
     sb.append(Format.formatPaddLeft(round, ROUND));
@@ -136,7 +136,7 @@
   protected Report genPartialReport(int reported, LinkedHashMap partOfTasks, int totalSize) {
     String longetOp = longestOp(partOfTasks.values().iterator());
     boolean first = true;
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     sb.append(tableTitle(longetOp));
     sb.append(newline);
     int lineNum = 0;
Index: contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSelectByPrefTask.java
===================================================================
--- contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSelectByPrefTask.java	(revision 820798)
+++ contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSelectByPrefTask.java	(working copy)
@@ -49,7 +49,7 @@
   protected Report reportSelectByPrefix(List taskStats) {
     String longestOp = longestOp(taskStats.iterator());
     boolean first = true;
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     sb.append(tableTitle(longestOp));
     sb.append(newline);
     int reported = 0;
Index: contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/TaskSequence.java
===================================================================
--- contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/TaskSequence.java	(revision 820798)
+++ contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/TaskSequence.java	(working copy)
@@ -276,7 +276,7 @@
    */
   public String toString() {
     String padd = getPadding();
-    StringBuffer sb = new StringBuffer(super.toString());
+    StringBuilder sb = new StringBuilder(super.toString());
     sb.append(parallel ? " [" : " {");
     sb.append(NEW_LINE);
     for (Iterator it = tasks.iterator(); it.hasNext();) {
Index: contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Algorithm.java
===================================================================
--- contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Algorithm.java	(revision 820798)
+++ contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Algorithm.java	(working copy)
@@ -84,7 +84,7 @@
             stok.pushBack();
           } else {
             // get params, for tasks that supports them, - anything until next ')'
-            StringBuffer params = new StringBuffer();
+            StringBuilder params = new StringBuilder();
             stok.nextToken();
             while (stok.ttype!=')') { 
               switch (stok.ttype) {
@@ -232,7 +232,7 @@
    */
   public String toString() {
     String newline = System.getProperty("line.separator");
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     sb.append(sequence.toString());
     sb.append(newline);
     return sb.toString();
Index: contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Config.java
===================================================================
--- contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Config.java	(revision 820798)
+++ contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/utils/Config.java	(working copy)
@@ -71,7 +71,7 @@
     }
     r.close();
     // copy props lines to string
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     for (int i=0; i<lastConfigLine; i++) {
       sb.append(lines.get(i));
       sb.append(NEW_LINE);
@@ -90,7 +90,7 @@
     }
     
     // copy algorithm lines
-    sb = new StringBuffer();
+    sb = new StringBuilder();
     for (int i=lastConfigLine; i<lines.size(); i++) {
       sb.append(lines.get(i));
       sb.append(NEW_LINE);
@@ -242,7 +242,7 @@
   public int newRound () {
     roundNumber++;
     
-    StringBuffer sb = new StringBuffer("--> Round ").append(roundNumber-1).append("-->").append(roundNumber);
+    StringBuilder sb = new StringBuilder("--> Round ").append(roundNumber-1).append("-->").append(roundNumber);
 
     // log changes in values
     if (valByRound.size()>0) {
@@ -341,7 +341,7 @@
     if (colForValByRound.size()==0) {
       return "";
     }
-    StringBuffer sb = new StringBuffer(); 
+    StringBuilder sb = new StringBuilder(); 
     for (Iterator it = colForValByRound.keySet().iterator(); it.hasNext();) {
       String name = (String) it.next();
       String colName = (String) colForValByRound.get(name);
@@ -357,7 +357,7 @@
     if (colForValByRound.size()==0) {
       return "";
     }
-    StringBuffer sb = new StringBuffer(); 
+    StringBuilder sb = new StringBuilder(); 
     for (Iterator it = colForValByRound.keySet().iterator(); it.hasNext();) {
       String name = (String) it.next();
       String colName = (String) colForValByRound.get(name);
Index: contrib/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/TrecTopicsReader.java
===================================================================
--- contrib/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/TrecTopicsReader.java	(revision 820798)
+++ contrib/benchmark/src/java/org/apache/lucene/benchmark/quality/trec/TrecTopicsReader.java	(working copy)
@@ -63,7 +63,7 @@
    */
   public QualityQuery[] readQueries(BufferedReader reader) throws IOException {
     ArrayList res = new ArrayList();
-    StringBuffer sb;
+    StringBuilder sb;
     try {
       while (null!=(sb=read(reader,"<top>",null,false,false))) {
         HashMap fields = new HashMap();
@@ -97,8 +97,8 @@
   }
 
   // read until finding a line that starts with the specified prefix
-  private StringBuffer read (BufferedReader reader, String prefix, StringBuffer sb, boolean collectMatchLine, boolean collectAll) throws IOException {
-    sb = (sb==null ? new StringBuffer() : sb);
+  private StringBuilder read (BufferedReader reader, String prefix, StringBuilder sb, boolean collectMatchLine, boolean collectAll) throws IOException {
+    sb = (sb==null ? new StringBuilder() : sb);
     String sep = "";
     while (true) {
       String line = reader.readLine();
Index: contrib/benchmark/src/java/org/apache/lucene/benchmark/stats/MemUsage.java
===================================================================
--- contrib/benchmark/src/java/org/apache/lucene/benchmark/stats/MemUsage.java	(revision 820798)
+++ contrib/benchmark/src/java/org/apache/lucene/benchmark/stats/MemUsage.java	(working copy)
@@ -30,7 +30,7 @@
 
   /** Scale down the values by divisor, append the unit string. */
   public String toScaledString(int div, String unit) {
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
       sb.append("free=").append(minFree / div);
       sb.append("/").append(avgFree / div);
       sb.append("/").append(maxFree / div).append(" ").append(unit);
Index: contrib/benchmark/src/java/org/apache/lucene/benchmark/stats/TestData.java
===================================================================
--- contrib/benchmark/src/java/org/apache/lucene/benchmark/stats/TestData.java	(revision 820798)
+++ contrib/benchmark/src/java/org/apache/lucene/benchmark/stats/TestData.java	(working copy)
@@ -133,7 +133,7 @@
             return "# [NO RUN DATA]";
         }
         HashMap resByTask = new HashMap(); 
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         String lineSep = System.getProperty("line.separator");
         sb.append("warm = Warm Index Reader").append(lineSep).append("srch = Search Index").append(lineSep).append("trav = Traverse Hits list, optionally retrieving document").append(lineSep).append(lineSep);
         for (int i = 0; i < COLS.length; i++) {
@@ -447,7 +447,7 @@
 
     public String toString()
     {
-        StringBuffer res = new StringBuffer();
+        StringBuilder res = new StringBuilder();
         res.append("#-- ID: ").append(id).append(", ").append(new Date()).append(", heap=").append(heap).append(" --\n");
         res.append("# source=").append(source).append(", directory=").append(directory).append("\n");
         res.append("# maxBufferedDocs=").append(maxBufferedDocs).append(", mergeFactor=").append(mergeFactor);
Index: contrib/benchmark/src/java/org/apache/lucene/benchmark/stats/TestRunData.java
===================================================================
--- contrib/benchmark/src/java/org/apache/lucene/benchmark/stats/TestRunData.java	(revision 820798)
+++ contrib/benchmark/src/java/org/apache/lucene/benchmark/stats/TestRunData.java	(working copy)
@@ -161,7 +161,7 @@
 
   /** Return a string representation. */
   public String toString() {
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     Collection labels = getLabels();
     Iterator it = labels.iterator();
     while (it.hasNext()) {
Index: contrib/benchmark/src/java/org/apache/lucene/benchmark/stats/TimeData.java
===================================================================
--- contrib/benchmark/src/java/org/apache/lucene/benchmark/stats/TimeData.java	(revision 820798)
+++ contrib/benchmark/src/java/org/apache/lucene/benchmark/stats/TimeData.java	(working copy)
@@ -93,7 +93,7 @@
    * @return The String
    */
   public String toString(boolean withMem) {
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     sb.append(count + "\t" + elapsed + "\t" + getRate());
     if (withMem) sb.append("\t" + freeMem + "\t" + totalMem);
     return sb.toString();
Index: contrib/benchmark/src/java/org/apache/lucene/benchmark/utils/ExtractReuters.java
===================================================================
--- contrib/benchmark/src/java/org/apache/lucene/benchmark/utils/ExtractReuters.java	(revision 820798)
+++ contrib/benchmark/src/java/org/apache/lucene/benchmark/utils/ExtractReuters.java	(working copy)
@@ -90,8 +90,8 @@
         {
             BufferedReader reader = new BufferedReader(new FileReader(sgmFile));
 
-            StringBuffer buffer = new StringBuffer(1024);
-            StringBuffer outBuffer = new StringBuffer(1024);
+            StringBuilder buffer = new StringBuilder(1024);
+            StringBuilder outBuffer = new StringBuilder(1024);
 
             String line = null;
             int index = -1;
Index: contrib/benchmark/src/java/org/apache/lucene/benchmark/utils/ExtractWikipedia.java
===================================================================
--- contrib/benchmark/src/java/org/apache/lucene/benchmark/utils/ExtractWikipedia.java	(revision 820798)
+++ contrib/benchmark/src/java/org/apache/lucene/benchmark/utils/ExtractWikipedia.java	(working copy)
@@ -72,7 +72,7 @@
     d.mkdirs();
     File f = new File(d, id + ".txt");
 
-    StringBuffer contents = new StringBuffer();
+    StringBuilder contents = new StringBuilder();
 
     contents.append(time);
     contents.append("\n\n");
Index: contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/LineDocSourceTest.java
===================================================================
--- contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/LineDocSourceTest.java	(revision 820798)
+++ contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/LineDocSourceTest.java	(working copy)
@@ -48,7 +48,7 @@
     OutputStream out = new FileOutputStream(file);
     out = csFactory.createCompressorOutputStream("bzip2", out);
     BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(out, "utf-8"));
-    StringBuffer doc = new StringBuffer();
+    StringBuilder doc = new StringBuilder();
     doc.append("title").append(WriteLineDocTask.SEP).append("date").append(WriteLineDocTask.SEP).append("body");
     writer.write(doc.toString());
     writer.newLine();
@@ -58,7 +58,7 @@
   private void createRegularLineFile(File file) throws Exception {
     OutputStream out = new FileOutputStream(file);
     BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(out, "utf-8"));
-    StringBuffer doc = new StringBuffer();
+    StringBuilder doc = new StringBuilder();
     doc.append("title").append(WriteLineDocTask.SEP).append("date").append(WriteLineDocTask.SEP).append("body");
     writer.write(doc.toString());
     writer.newLine();
Index: contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java
===================================================================
--- contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java	(revision 820798)
+++ contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java	(working copy)
@@ -460,7 +460,7 @@
   // catenate alg lines to make the alg text
   private static String algLinesToText(String[] algLines) {
     String indent = "  ";
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     for (int i = 0; i < propLines.length; i++) {
       sb.append(indent).append(propLines[i]).append(NEW_LINE);
     }
Index: contrib/collation/src/test/org/apache/lucene/collation/CollationTestBase.java
===================================================================
--- contrib/collation/src/test/org/apache/lucene/collation/CollationTestBase.java	(revision 820798)
+++ contrib/collation/src/test/org/apache/lucene/collation/CollationTestBase.java	(working copy)
@@ -292,7 +292,7 @@
   private void assertMatches(Searcher searcher, Query query, Sort sort, 
                              String expectedResult) throws IOException {
     ScoreDoc[] result = searcher.search(query, null, 1000, sort).scoreDocs;
-    StringBuffer buff = new StringBuffer(10);
+    StringBuilder buff = new StringBuilder(10);
     int n = result.length;
     for (int i = 0 ; i < n ; ++i) {
       Document doc = searcher.doc(result[i].doc);
Index: contrib/highlighter/src/java/org/apache/lucene/search/highlight/GradientFormatter.java
===================================================================
--- contrib/highlighter/src/java/org/apache/lucene/search/highlight/GradientFormatter.java	(revision 820798)
+++ contrib/highlighter/src/java/org/apache/lucene/search/highlight/GradientFormatter.java	(working copy)
@@ -123,7 +123,7 @@
         {
             return originalText;
         }
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         sb.append("<font ");
         if (highlightForeground)
         {
@@ -148,7 +148,7 @@
         int rVal = getColorVal(fgRMin, fgRMax, score);
         int gVal = getColorVal(fgGMin, fgGMax, score);
         int bVal = getColorVal(fgBMin, fgBMax, score);
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         sb.append("#");
         sb.append(intToHex(rVal));
         sb.append(intToHex(gVal));
@@ -161,7 +161,7 @@
         int rVal = getColorVal(bgRMin, bgRMax, score);
         int gVal = getColorVal(bgGMin, bgGMax, score);
         int bVal = getColorVal(bgBMin, bgBMax, score);
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         sb.append("#");
         sb.append(intToHex(rVal));
         sb.append(intToHex(gVal));
Index: contrib/highlighter/src/java/org/apache/lucene/search/highlight/Highlighter.java
===================================================================
--- contrib/highlighter/src/java/org/apache/lucene/search/highlight/Highlighter.java	(revision 820798)
+++ contrib/highlighter/src/java/org/apache/lucene/search/highlight/Highlighter.java	(working copy)
@@ -215,7 +215,7 @@
 		throws IOException, InvalidTokenOffsetsException
 	{
 		ArrayList docFrags = new ArrayList();
-		StringBuffer newText=new StringBuffer();
+		StringBuilder newText=new StringBuilder();
 		
 	    TermAttribute termAtt = tokenStream.addAttribute(TermAttribute.class);
 	    OffsetAttribute offsetAtt = tokenStream.addAttribute(OffsetAttribute.class);
@@ -486,7 +486,7 @@
 		throws IOException, InvalidTokenOffsetsException
 	{
 		String sections[] =	getBestFragments(tokenStream,text, maxNumFragments);
-		StringBuffer result = new StringBuffer();
+		StringBuilder result = new StringBuilder();
 		for (int i = 0; i < sections.length; i++)
 		{
 			if (i > 0)
Index: contrib/highlighter/src/java/org/apache/lucene/search/highlight/SimpleHTMLEncoder.java
===================================================================
--- contrib/highlighter/src/java/org/apache/lucene/search/highlight/SimpleHTMLEncoder.java	(revision 820798)
+++ contrib/highlighter/src/java/org/apache/lucene/search/highlight/SimpleHTMLEncoder.java	(working copy)
@@ -40,7 +40,7 @@
 			return "";
 		}
 
-		StringBuffer result = new StringBuffer(plainText.length());
+		StringBuilder result = new StringBuilder(plainText.length());
 
 		for (int index=0; index<plainText.length(); index++) 
 		{
Index: contrib/highlighter/src/java/org/apache/lucene/search/highlight/SimpleHTMLFormatter.java
===================================================================
--- contrib/highlighter/src/java/org/apache/lucene/search/highlight/SimpleHTMLFormatter.java	(revision 820798)
+++ contrib/highlighter/src/java/org/apache/lucene/search/highlight/SimpleHTMLFormatter.java	(working copy)
@@ -47,9 +47,9 @@
 	    return originalText;
 	  }
 	  
-	  // Allocate StringBuffer with the right number of characters from the
+	  // Allocate StringBuilder with the right number of characters from the
     // beginning, to avoid char[] allocations in the middle of appends.
-	  StringBuffer returnBuffer = new StringBuffer(preTag.length() + originalText.length() + postTag.length());
+	  StringBuilder returnBuffer = new StringBuilder(preTag.length() + originalText.length() + postTag.length());
 	  returnBuffer.append(preTag);
 	  returnBuffer.append(originalText);
 	  returnBuffer.append(postTag);
Index: contrib/highlighter/src/java/org/apache/lucene/search/highlight/SpanGradientFormatter.java
===================================================================
--- contrib/highlighter/src/java/org/apache/lucene/search/highlight/SpanGradientFormatter.java	(revision 820798)
+++ contrib/highlighter/src/java/org/apache/lucene/search/highlight/SpanGradientFormatter.java	(working copy)
@@ -50,7 +50,7 @@
         }
 
 		// try to size sb correctly
-        StringBuffer sb = new StringBuffer( originalText.length() + EXTRA);
+        StringBuilder sb = new StringBuilder( originalText.length() + EXTRA);
 		
 		sb.append("<span style=\""); 
 		if (highlightForeground) 
@@ -71,7 +71,7 @@
         return sb.toString();
     }
 
-	// guess how much extra text we'll add to the text we're highlighting to try to avoid a  StringBuffer resize
+	// guess how much extra text we'll add to the text we're highlighting to try to avoid a  StringBuilder resize
 	private static final String TEMPLATE = "<span style=\"background: #EEEEEE; color: #000000;\">...</span>";
 	private static final int EXTRA = TEMPLATE.length();	
 }
Index: contrib/highlighter/src/java/org/apache/lucene/search/highlight/TextFragment.java
===================================================================
--- contrib/highlighter/src/java/org/apache/lucene/search/highlight/TextFragment.java	(revision 820798)
+++ contrib/highlighter/src/java/org/apache/lucene/search/highlight/TextFragment.java	(working copy)
@@ -25,13 +25,13 @@
  */
 public class TextFragment
 {
-	StringBuffer markedUpText;
+	StringBuilder markedUpText;
 	int fragNum;
 	int textStartPos;
 	int textEndPos;
 	float score;
 
-	public TextFragment(StringBuffer markedUpText,int textStartPos, int fragNum)
+	public TextFragment(StringBuilder markedUpText,int textStartPos, int fragNum)
 	{
 		this.markedUpText=markedUpText;
 		this.textStartPos = textStartPos;
Index: contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java
===================================================================
--- contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java	(revision 820798)
+++ contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java	(working copy)
@@ -1034,7 +1034,7 @@
         TermQuery query = new TermQuery(new Term("data", goodWord));
 
         String match = null;
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         sb.append(goodWord);
         for (int i = 0; i < 10000; i++) {
           sb.append(" ");
Index: contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedTermFreqVector.java
===================================================================
--- contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedTermFreqVector.java	(revision 820798)
+++ contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedTermFreqVector.java	(working copy)
@@ -58,7 +58,7 @@
   }
 
   public String toString() {
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     sb.append('{');
     sb.append(field).append(": ");
     if (terms != null) {
Index: contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
===================================================================
--- contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java	(revision 820798)
+++ contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java	(working copy)
@@ -507,7 +507,7 @@
    * @return the string representation
    */
   public String toString() {
-    StringBuffer result = new StringBuffer(256);    
+    StringBuilder result = new StringBuilder(256);    
     sortFields();   
     int sumChars = 0;
     int sumPositions = 0;
@@ -688,7 +688,7 @@
     public String toString(int stride) {
       int s = size() / stride;
       int len = Math.min(10, s); // avoid printing huge lists
-      StringBuffer buf = new StringBuffer(4*len);
+      StringBuilder buf = new StringBuilder(4*len);
       buf.append("[");
       for (int i = 0; i < len; i++) {
         buf.append(get(i*stride));
Index: contrib/memory/src/java/org/apache/lucene/index/memory/SynonymMap.java
===================================================================
--- contrib/memory/src/java/org/apache/lucene/index/memory/SynonymMap.java	(revision 820798)
+++ contrib/memory/src/java/org/apache/lucene/index/memory/SynonymMap.java	(working copy)
@@ -122,7 +122,7 @@
    * @return a String representation
    */
   public String toString() {
-    StringBuffer buf = new StringBuffer();
+    StringBuilder buf = new StringBuilder();
     Iterator iter = new TreeMap(table).keySet().iterator();
     int count = 0;
     int f0 = 0;
@@ -327,7 +327,7 @@
     }
     
     // assemble large string containing all words
-    StringBuffer buf = new StringBuffer(len);
+    StringBuilder buf = new StringBuilder(len);
     for (int j=0; j < size; j++) buf.append(words[j]);
     String allWords = new String(buf.toString()); // ensure compact string across JDK versions
     buf = null;
Index: contrib/misc/src/java/org/apache/lucene/misc/ChainedFilter.java
===================================================================
--- contrib/misc/src/java/org/apache/lucene/misc/ChainedFilter.java	(revision 820798)
+++ contrib/misc/src/java/org/apache/lucene/misc/ChainedFilter.java	(working copy)
@@ -201,7 +201,7 @@
 
     public String toString()
     {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         sb.append("ChainedFilter: [");
         for (int i = 0; i < chain.length; i++)
         {
Index: contrib/misc/src/java/org/apache/lucene/queryParser/analyzing/AnalyzingQueryParser.java
===================================================================
--- contrib/misc/src/java/org/apache/lucene/queryParser/analyzing/AnalyzingQueryParser.java	(revision 820798)
+++ contrib/misc/src/java/org/apache/lucene/queryParser/analyzing/AnalyzingQueryParser.java	(working copy)
@@ -80,7 +80,7 @@
     /* somewhat a hack: find/store wildcard chars
      * in order to put them back after analyzing */
     boolean isWithinToken = (!termStr.startsWith("?") && !termStr.startsWith("*"));
-    StringBuffer tmpBuffer = new StringBuffer();
+    StringBuilder tmpBuffer = new StringBuilder();
     char[] chars = termStr.toCharArray();
     for (int i = 0; i < termStr.length(); i++) {
       if (chars[i] == '?' || chars[i] == '*') {
@@ -154,7 +154,7 @@
     } else {
       /* the term was tokenized, let's rebuild to one token
        * with wildcards put back in postion */
-      StringBuffer sb = new StringBuffer();
+      StringBuilder sb = new StringBuilder();
       for (int i = 0; i < tlist.size(); i++) {
         sb.append((String) tlist.get(i));
         if (wlist != null && wlist.size() > i) {
Index: contrib/queries/src/java/org/apache/lucene/search/BooleanFilter.java
===================================================================
--- contrib/queries/src/java/org/apache/lucene/search/BooleanFilter.java	(revision 820798)
+++ contrib/queries/src/java/org/apache/lucene/search/BooleanFilter.java	(working copy)
@@ -182,7 +182,7 @@
   /** Prints a user-readable version of this query. */
   public String toString()
   {
-    StringBuffer buffer = new StringBuffer();
+    StringBuilder buffer = new StringBuilder();
     buffer.append("BooleanFilter(");
     appendFilters(shouldFilters, "", buffer);
     appendFilters(mustFilters, "+", buffer);
@@ -191,7 +191,7 @@
     return buffer.toString();
   }
   
-  private void appendFilters(ArrayList filters, String occurString, StringBuffer buffer)
+  private void appendFilters(ArrayList filters, String occurString, StringBuilder buffer)
   {
     if (filters != null) {
       for (int i = 0; i < filters.size(); i++) {
Index: contrib/queries/src/java/org/apache/lucene/search/similar/MoreLikeThis.java
===================================================================
--- contrib/queries/src/java/org/apache/lucene/search/similar/MoreLikeThis.java	(revision 820798)
+++ contrib/queries/src/java/org/apache/lucene/search/similar/MoreLikeThis.java	(working copy)
@@ -681,7 +681,7 @@
      * Describe the parameters that control how the "more like this" query is formed.
      */
     public String describeParams() {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         sb.append("\t" + "maxQueryTerms  : " + maxQueryTerms + "\n");
         sb.append("\t" + "minWordLen     : " + minWordLen + "\n");
         sb.append("\t" + "maxWordLen     : " + maxWordLen + "\n");
Index: contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/PathQueryNode.java
===================================================================
--- contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/PathQueryNode.java	(revision 820798)
+++ contrib/queryparser/src/java/org/apache/lucene/queryParser/core/nodes/PathQueryNode.java	(working copy)
@@ -171,7 +171,7 @@
   }
 
   private CharSequence getPathString() {
-    StringBuffer path = new StringBuffer();
+    StringBuilder path = new StringBuilder();
 
     for (QueryText pathelement : values) {
       path.append("/").append(pathelement.value);
@@ -180,7 +180,7 @@
   }
 
   public CharSequence toQueryString(EscapeQuerySyntax escaper) {
-    StringBuffer path = new StringBuffer();
+    StringBuilder path = new StringBuilder();
     path.append("/").append(getFirstPathElement());
 
     for (QueryText pathelement : getPathElements(1)) {
Index: contrib/queryparser/src/java/org/apache/lucene/queryParser/core/util/UnescapedCharSequence.java
===================================================================
--- contrib/queryparser/src/java/org/apache/lucene/queryParser/core/util/UnescapedCharSequence.java	(revision 820798)
+++ contrib/queryparser/src/java/org/apache/lucene/queryParser/core/util/UnescapedCharSequence.java	(working copy)
@@ -96,7 +96,7 @@
    */
   public String toStringEscaped() {
     // non efficient implementation
-    StringBuffer result = new StringBuffer();
+    StringBuilder result = new StringBuilder();
     for (int i = 0; i >= this.length(); i++) {
       if (this.chars[i] == '\\') {
         result.append('\\');
@@ -117,7 +117,7 @@
    */
   public String toStringEscaped(char[] enabledChars) {
     // TODO: non efficient implementation, refactor this code
-    StringBuffer result = new StringBuffer();
+    StringBuilder result = new StringBuilder();
     for (int i = 0; i < this.length(); i++) {
       if (this.chars[i] == '\\') {
         result.append('\\');
Index: contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/QueryParserUtil.java
===================================================================
--- contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/QueryParserUtil.java	(revision 820798)
+++ contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/QueryParserUtil.java	(working copy)
@@ -188,7 +188,7 @@
    * escaped are escaped by a preceding <code>\</code>.
    */
   public static String escape(String s) {
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     for (int i = 0; i < s.length(); i++) {
       char c = s.charAt(i);
       // These characters are part of the query syntax and must be escaped
Index: contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/QueryParserWrapper.java
===================================================================
--- contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/QueryParserWrapper.java	(revision 820798)
+++ contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/QueryParserWrapper.java	(working copy)
@@ -95,7 +95,7 @@
    * escaped are escaped by a preceding <code>\</code>.
    */
   public static String escape(String s) {
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     for (int i = 0; i < s.length(); i++) {
       char c = s.charAt(i);
       // These characters are part of the query syntax and must be escaped
Index: contrib/regex/src/java/org/apache/lucene/search/regex/SpanRegexQuery.java
===================================================================
--- contrib/regex/src/java/org/apache/lucene/search/regex/SpanRegexQuery.java	(revision 820798)
+++ contrib/regex/src/java/org/apache/lucene/search/regex/SpanRegexQuery.java	(working copy)
@@ -107,7 +107,7 @@
   }
 
   public String toString(String field) {
-    StringBuffer buffer = new StringBuffer();
+    StringBuilder buffer = new StringBuilder();
     buffer.append("spanRegexQuery(");
     buffer.append(term);
     buffer.append(")");
Index: contrib/remote/src/test/org/apache/lucene/search/TestRemoteSort.java
===================================================================
--- contrib/remote/src/test/org/apache/lucene/search/TestRemoteSort.java	(revision 820798)
+++ contrib/remote/src/test/org/apache/lucene/search/TestRemoteSort.java	(working copy)
@@ -146,7 +146,7 @@
   }
   
   public String getRandomNumberString(int num, int low, int high) {
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     for (int i = 0; i < num; i++) {
       sb.append(getRandomNumber(low, high));
     }
@@ -158,7 +158,7 @@
   }
   
   public String getRandomCharString(int num, int start, int end) {
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     for (int i = 0; i < num; i++) {
       sb.append(new Character((char) getRandomNumber(start, end)));
     }
@@ -394,7 +394,7 @@
     TopDocs hits = searcher.search (query, null, expectedResult.length(), sort);
     ScoreDoc[] result = hits.scoreDocs;
     assertEquals(hits.totalHits, expectedResult.length());
-    StringBuffer buff = new StringBuffer(10);
+    StringBuilder buff = new StringBuilder(10);
     int n = result.length;
     for (int i=0; i<n; ++i) {
       Document doc = searcher.doc(result[i].doc);
Index: contrib/snowball/src/java/org/tartarus/snowball/ext/DanishStemmer.java
===================================================================
--- contrib/snowball/src/java/org/tartarus/snowball/ext/DanishStemmer.java	(revision 820798)
+++ contrib/snowball/src/java/org/tartarus/snowball/ext/DanishStemmer.java	(working copy)
@@ -65,7 +65,7 @@
 
         private int I_x;
         private int I_p1;
-        private StringBuffer S_ch = new StringBuffer();
+        private StringBuilder S_ch = new StringBuilder();
 
         private void copy_from(DanishStemmer other) {
             I_x = other.I_x;
Index: contrib/snowball/src/java/org/tartarus/snowball/ext/FinnishStemmer.java
===================================================================
--- contrib/snowball/src/java/org/tartarus/snowball/ext/FinnishStemmer.java	(revision 820798)
+++ contrib/snowball/src/java/org/tartarus/snowball/ext/FinnishStemmer.java	(working copy)
@@ -136,7 +136,7 @@
         private static final char g_particle_end[] = {17, 97, 24, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 32 };
 
         private boolean B_ending_removed;
-        private StringBuffer S_x = new StringBuffer();
+        private StringBuilder S_x = new StringBuilder();
         private int I_p2;
         private int I_p1;
 
Index: contrib/snowball/src/java/org/tartarus/snowball/ext/KpStemmer.java
===================================================================
--- contrib/snowball/src/java/org/tartarus/snowball/ext/KpStemmer.java	(revision 820798)
+++ contrib/snowball/src/java/org/tartarus/snowball/ext/KpStemmer.java	(working copy)
@@ -125,7 +125,7 @@
         private int I_p2;
         private int I_p1;
         private int I_x;
-        private StringBuffer S_ch = new StringBuffer();
+        private StringBuilder S_ch = new StringBuilder();
 
         private void copy_from(KpStemmer other) {
             B_GE_removed = other.B_GE_removed;
Index: contrib/snowball/src/java/org/tartarus/snowball/SnowballProgram.java
===================================================================
--- contrib/snowball/src/java/org/tartarus/snowball/SnowballProgram.java	(revision 820798)
+++ contrib/snowball/src/java/org/tartarus/snowball/SnowballProgram.java	(working copy)
@@ -28,7 +28,7 @@
 public abstract class SnowballProgram {
     protected SnowballProgram()
     {
-	current = new StringBuffer();
+	current = new StringBuilder();
 	setCurrent("");
     }
 
@@ -53,18 +53,18 @@
     public String getCurrent()
     {
         String result = current.toString();
-        // Make a new StringBuffer.  If we reuse the old one, and a user of
+        // Make a new StringBuilder.  If we reuse the old one, and a user of
         // the library keeps a reference to the buffer returned (for example,
         // by converting it to a String in a way which doesn't force a copy),
         // the buffer size will not decrease, and we will risk wasting a large
         // amount of memory.
         // Thanks to Wolfram Esser for spotting this problem.
-        current = new StringBuffer();
+        current = new StringBuilder();
         return result;
     }
 
     // current string
-    protected StringBuffer current;
+    protected StringBuilder current;
 
     protected int cursor;
     protected int limit;
@@ -194,12 +194,12 @@
 	return true;
     }
 
-    protected boolean eq_v(StringBuffer s)
+    protected boolean eq_v(StringBuilder s)
     {
 	return eq_s(s.length(), s.toString());
     }
 
-    protected boolean eq_v_b(StringBuffer s)
+    protected boolean eq_v_b(StringBuilder s)
     {   return eq_s_b(s.length(), s.toString());
     }
 
@@ -380,7 +380,7 @@
 	replace_s(bra, ket, s);
     }
 
-    protected void slice_from(StringBuffer s)
+    protected void slice_from(StringBuilder s)
     {
         slice_from(s.toString());
     }
@@ -397,13 +397,13 @@
 	if (c_bra <= ket) ket += adjustment;
     }
 
-    protected void insert(int c_bra, int c_ket, StringBuffer s)
+    protected void insert(int c_bra, int c_ket, StringBuilder s)
     {
 	insert(c_bra, c_ket, s.toString());
     }
 
-    /* Copy the slice into the supplied StringBuffer */
-    protected StringBuffer slice_to(StringBuffer s)
+    /* Copy the slice into the supplied StringBuilder */
+    protected StringBuilder slice_to(StringBuilder s)
     {
 	slice_check();
 	int len = ket - bra;
@@ -411,7 +411,7 @@
 	return s;
     }
 
-    protected StringBuffer assign_to(StringBuffer s)
+    protected StringBuilder assign_to(StringBuilder s)
     {
 	s.replace(0, s.length(), current.substring(0, limit));
 	return s;
Index: contrib/snowball/src/java/org/tartarus/snowball/TestApp.java
===================================================================
--- contrib/snowball/src/java/org/tartarus/snowball/TestApp.java	(revision 820798)
+++ contrib/snowball/src/java/org/tartarus/snowball/TestApp.java	(working copy)
@@ -49,7 +49,7 @@
 	reader = new InputStreamReader(new FileInputStream(args[1]));
 	reader = new BufferedReader(reader);
 
-	StringBuffer input = new StringBuffer();
+	StringBuilder input = new StringBuilder();
 
         OutputStream outstream;
 
Index: contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/ComposedQuery.java
===================================================================
--- contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/ComposedQuery.java	(revision 820798)
+++ contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/ComposedQuery.java	(working copy)
@@ -57,7 +57,7 @@
   }
 
   public String toString() {
-    StringBuffer r = new StringBuffer();
+    StringBuilder r = new StringBuilder();
     if (isOperatorInfix()) {
       infixToString(r);
     } else {
@@ -72,7 +72,7 @@
   protected String getBracketOpen() { return "(";}
   protected String getBracketClose() { return ")";}
   
-  protected void infixToString(StringBuffer r) {
+  protected void infixToString(StringBuilder r) {
     /* Brackets are possibly redundant in the result. */
     Iterator sqi = getSubQueriesIterator();
     r.append(getBracketOpen());
@@ -88,7 +88,7 @@
     r.append(getBracketClose());
   }
 
-  protected void prefixToString(StringBuffer r) {
+  protected void prefixToString(StringBuilder r) {
     Iterator sqi = getSubQueriesIterator();
     r.append(getOperatorName()); /* prefix operator */
     r.append(getBracketOpen());
Index: contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/FieldsQuery.java
===================================================================
--- contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/FieldsQuery.java	(revision 820798)
+++ contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/FieldsQuery.java	(working copy)
@@ -75,7 +75,7 @@
   public char getFieldOperator() { return fieldOp;}
   
   public String toString() {
-    StringBuffer r = new StringBuffer();
+    StringBuilder r = new StringBuilder();
     r.append("(");
     fieldNamesToString(r);
     r.append(q.toString());
@@ -83,7 +83,7 @@
     return r.toString();
   }
   
-  protected void fieldNamesToString(StringBuffer r) {
+  protected void fieldNamesToString(StringBuilder r) {
     Iterator fni = getFieldNames().listIterator();
     while (fni.hasNext()) {
       r.append((String) fni.next());
Index: contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/SimpleTerm.java
===================================================================
--- contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/SimpleTerm.java	(revision 820798)
+++ contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/SimpleTerm.java	(working copy)
@@ -45,10 +45,10 @@
     return this.toStringUnquoted().compareTo( ost.toStringUnquoted());
   }
   
-  protected void suffixToString(StringBuffer r) {;} /* override for prefix query */
+  protected void suffixToString(StringBuilder r) {;} /* override for prefix query */
   
   public String toString() {
-    StringBuffer r = new StringBuffer();
+    StringBuilder r = new StringBuilder();
     if (isQuoted()) {
       r.append(getQuote());
     }
Index: contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/SrndPrefixQuery.java
===================================================================
--- contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/SrndPrefixQuery.java	(revision 820798)
+++ contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/SrndPrefixQuery.java	(working copy)
@@ -42,7 +42,7 @@
   
   public String toStringUnquoted() {return getPrefix();}
   
-  protected void suffixToString(StringBuffer r) {r.append(getSuffixOperator());}
+  protected void suffixToString(StringBuilder r) {r.append(getSuffixOperator());}
   
   public void visitMatchingTerms(
     IndexReader reader,
Index: contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/SrndQuery.java
===================================================================
--- contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/SrndQuery.java	(revision 820798)
+++ contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/SrndQuery.java	(working copy)
@@ -36,7 +36,7 @@
 
   public String getWeightOperator() {return "^";}
 
-  protected void weightToString(StringBuffer r) { /* append the weight part of a query */
+  protected void weightToString(StringBuilder r) { /* append the weight part of a query */
     if (isWeighted()) {
       r.append(getWeightOperator());
       r.append(getWeightString());
Index: contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/SrndTruncQuery.java
===================================================================
--- contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/SrndTruncQuery.java	(revision 820798)
+++ contrib/surround/src/java/org/apache/lucene/queryParser/surround/query/SrndTruncQuery.java	(working copy)
@@ -52,7 +52,7 @@
     return (c != unlimited) && (c != mask);
   }
 
-  protected void appendRegExpForChar(char c, StringBuffer re) {
+  protected void appendRegExpForChar(char c, StringBuilder re) {
     if (c == unlimited)
       re.append(".*");
     else if (c == mask)
@@ -68,7 +68,7 @@
     }
     prefix = truncated.substring(0, i);
     
-    StringBuffer re = new StringBuffer();
+    StringBuilder re = new StringBuilder();
     while (i < truncated.length()) {
       appendRegExpForChar(truncated.charAt(i), re);
       i++;
Index: contrib/surround/src/test/org/apache/lucene/queryParser/surround/query/ExceptionQueryTst.java
===================================================================
--- contrib/surround/src/test/org/apache/lucene/queryParser/surround/query/ExceptionQueryTst.java	(revision 820798)
+++ contrib/surround/src/test/org/apache/lucene/queryParser/surround/query/ExceptionQueryTst.java	(working copy)
@@ -30,7 +30,7 @@
     this.verbose = verbose;
   }
 
-  public void doTest(StringBuffer failQueries) {
+  public void doTest(StringBuilder failQueries) {
     boolean pass = false;
     SrndQuery lq = null;
     try {
@@ -55,7 +55,7 @@
   }
   
   public static String getFailQueries(String[] exceptionQueries, boolean verbose) {
-    StringBuffer failQueries = new StringBuffer();
+    StringBuilder failQueries = new StringBuilder();
     for (int i = 0; i < exceptionQueries.length; i++ ) {
       new ExceptionQueryTst( exceptionQueries[i], verbose).doTest(failQueries);
     }
Index: contrib/wikipedia/src/java/org/apache/lucene/wikipedia/analysis/WikipediaTokenizer.java
===================================================================
--- contrib/wikipedia/src/java/org/apache/lucene/wikipedia/analysis/WikipediaTokenizer.java	(revision 820798)
+++ contrib/wikipedia/src/java/org/apache/lucene/wikipedia/analysis/WikipediaTokenizer.java	(working copy)
@@ -236,7 +236,7 @@
 
   private void collapseAndSaveTokens(int tokenType, String type) throws IOException {
     //collapse
-    StringBuffer buffer = new StringBuffer(32);
+    StringBuilder buffer = new StringBuilder(32);
     int numAdded = scanner.setText(buffer);
     //TODO: how to know how much whitespace to add
     int theStart = scanner.yychar();
@@ -279,7 +279,7 @@
 
   private void collapseTokens(int tokenType) throws IOException {
     //collapse
-    StringBuffer buffer = new StringBuffer(32);
+    StringBuilder buffer = new StringBuilder(32);
     int numAdded = scanner.setText(buffer);
     //TODO: how to know how much whitespace to add
     int theStart = scanner.yychar();
Index: contrib/wikipedia/src/java/org/apache/lucene/wikipedia/analysis/WikipediaTokenizerImpl.java
===================================================================
--- contrib/wikipedia/src/java/org/apache/lucene/wikipedia/analysis/WikipediaTokenizerImpl.java	(revision 820798)
+++ contrib/wikipedia/src/java/org/apache/lucene/wikipedia/analysis/WikipediaTokenizerImpl.java	(working copy)
@@ -480,7 +480,7 @@
   t.setTermBuffer(zzBuffer, zzStartRead, zzMarkedPos-zzStartRead);
 }
 
-final int setText(StringBuffer buffer){
+final int setText(StringBuilder buffer){
   int length = zzMarkedPos - zzStartRead;
   buffer.append(zzBuffer, zzStartRead, length);
   return length;
Index: contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/DOMUtils.java
===================================================================
--- contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/DOMUtils.java	(revision 820798)
+++ contrib/xml-query-parser/src/java/org/apache/lucene/xmlparser/DOMUtils.java	(working copy)
@@ -197,7 +197,7 @@
 	//MH changed to Node from Element 25/11/2005
 	public static String getText(Node e)
 	{
-		StringBuffer sb=new StringBuffer();
+		StringBuilder sb=new StringBuilder();
 		getTextBuffer(e, sb);
 		return sb.toString();
 	}
@@ -215,7 +215,7 @@
 		return null;
 	}	
 
-	private static void getTextBuffer(Node e, StringBuffer sb)
+	private static void getTextBuffer(Node e, StringBuilder sb)
 	{
 	    for (Node kid = e.getFirstChild(); kid != null; kid = kid.getNextSibling())
 		{
Index: src/java/org/apache/lucene/analysis/BaseCharFilter.java
===================================================================
--- src/java/org/apache/lucene/analysis/BaseCharFilter.java	(revision 820798)
+++ src/java/org/apache/lucene/analysis/BaseCharFilter.java	(working copy)
@@ -80,7 +80,7 @@
     }
 
     public String toString() {
-      StringBuffer sb = new StringBuffer();
+      StringBuilder sb = new StringBuilder();
       sb.append('(');
       sb.append(off);
       sb.append(',');
Index: src/java/org/apache/lucene/analysis/NumericTokenStream.java
===================================================================
--- src/java/org/apache/lucene/analysis/NumericTokenStream.java	(revision 820798)
+++ src/java/org/apache/lucene/analysis/NumericTokenStream.java	(working copy)
@@ -235,7 +235,7 @@
   
   @Override
   public String toString() {
-    final StringBuffer sb = new StringBuffer("(numeric,valSize=").append(valSize);
+    final StringBuilder sb = new StringBuilder("(numeric,valSize=").append(valSize);
     sb.append(",precisionStep=").append(precisionStep).append(')');
     return sb.toString();
   }
Index: src/java/org/apache/lucene/analysis/Token.java
===================================================================
--- src/java/org/apache/lucene/analysis/Token.java	(revision 820798)
+++ src/java/org/apache/lucene/analysis/Token.java	(working copy)
@@ -607,7 +607,7 @@
   }
   
   public String toString() {
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     sb.append('(');
     initTermBuffer();
     if (termBuffer == null)
Index: src/java/org/apache/lucene/document/AbstractField.java
===================================================================
--- src/java/org/apache/lucene/document/AbstractField.java	(revision 820798)
+++ src/java/org/apache/lucene/document/AbstractField.java	(working copy)
@@ -305,7 +305,7 @@
 
   /** Prints a Field for human consumption. */
   public final String toString() {
-    StringBuffer result = new StringBuffer();
+    StringBuilder result = new StringBuilder();
     if (isStored) {
       result.append("stored");
       if (isCompressed)
Index: src/java/org/apache/lucene/document/DateField.java
===================================================================
--- src/java/org/apache/lucene/document/DateField.java	(revision 820798)
+++ src/java/org/apache/lucene/document/DateField.java	(working copy)
@@ -102,7 +102,7 @@
 
     // Pad with leading zeros
     if (s.length() < DATE_LEN) {
-      StringBuffer sb = new StringBuffer(s);
+      StringBuilder sb = new StringBuilder(s);
       while (sb.length() < DATE_LEN)
         sb.insert(0, 0);
       s = sb.toString();
Index: src/java/org/apache/lucene/document/Document.java
===================================================================
--- src/java/org/apache/lucene/document/Document.java	(revision 820798)
+++ src/java/org/apache/lucene/document/Document.java	(working copy)
@@ -317,7 +317,7 @@
   
   /** Prints the fields of a document for human consumption. */
   public final String toString() {
-    StringBuffer buffer = new StringBuffer();
+    StringBuilder buffer = new StringBuilder();
     buffer.append("Document<");
     for (int i = 0; i < fields.size(); i++) {
       Fieldable field = (Fieldable)fields.get(i);
Index: src/java/org/apache/lucene/document/NumberTools.java
===================================================================
--- src/java/org/apache/lucene/document/NumberTools.java	(revision 820798)
+++ src/java/org/apache/lucene/document/NumberTools.java	(working copy)
@@ -81,7 +81,7 @@
             return MIN_STRING_VALUE;
         }
 
-        StringBuffer buf = new StringBuffer(STR_SIZE);
+        StringBuilder buf = new StringBuilder(STR_SIZE);
 
         if (l < 0) {
             buf.append(NEGATIVE_PREFIX);
Index: src/java/org/apache/lucene/index/IndexWriter.java
===================================================================
--- src/java/org/apache/lucene/index/IndexWriter.java	(revision 820798)
+++ src/java/org/apache/lucene/index/IndexWriter.java	(working copy)
@@ -5220,7 +5220,7 @@
   }
 
   private synchronized String segString(SegmentInfos infos) {
-    StringBuffer buffer = new StringBuffer();
+    StringBuilder buffer = new StringBuilder();
     final int count = infos.size();
     for(int i = 0; i < count; i++) {
       if (i > 0) {
Index: src/java/org/apache/lucene/index/MergePolicy.java
===================================================================
--- src/java/org/apache/lucene/index/MergePolicy.java	(revision 820798)
+++ src/java/org/apache/lucene/index/MergePolicy.java	(working copy)
@@ -123,7 +123,7 @@
     }
 
     String segString(Directory dir) {
-      StringBuffer b = new StringBuffer();
+      StringBuilder b = new StringBuilder();
       final int numSegments = segments.size();
       for(int i=0;i<numSegments;i++) {
         if (i > 0) b.append(' ');
@@ -159,7 +159,7 @@
     }
 
     public String segString(Directory dir) {
-      StringBuffer b = new StringBuffer();
+      StringBuilder b = new StringBuilder();
       b.append("MergeSpec:\n");
       final int count = merges.size();
       for(int i=0;i<count;i++)
Index: src/java/org/apache/lucene/index/SegmentInfos.java
===================================================================
--- src/java/org/apache/lucene/index/SegmentInfos.java	(revision 820798)
+++ src/java/org/apache/lucene/index/SegmentInfos.java	(working copy)
@@ -895,7 +895,7 @@
   }
 
   public synchronized String segString(Directory directory) {
-    StringBuffer buffer = new StringBuffer();
+    StringBuilder buffer = new StringBuilder();
     final int count = size();
     for(int i = 0; i < count; i++) {
       if (i > 0) {
Index: src/java/org/apache/lucene/index/SegmentTermVector.java
===================================================================
--- src/java/org/apache/lucene/index/SegmentTermVector.java	(revision 820798)
+++ src/java/org/apache/lucene/index/SegmentTermVector.java	(working copy)
@@ -40,7 +40,7 @@
   }
 
   public String toString() {
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     sb.append('{');
     sb.append(field).append(": ");
     if(terms != null){
Index: src/java/org/apache/lucene/queryParser/QueryParser.java
===================================================================
--- src/java/org/apache/lucene/queryParser/QueryParser.java	(revision 820798)
+++ src/java/org/apache/lucene/queryParser/QueryParser.java	(working copy)
@@ -1131,7 +1131,7 @@
    * expects to be escaped are escaped by a preceding <code>\</code>.
    */
   public static String escape(String s) {
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     for (int i = 0; i < s.length(); i++) {
       char c = s.charAt(i);
       // These characters are part of the query syntax and must be escaped
Index: src/java/org/apache/lucene/queryParser/QueryParser.jj
===================================================================
--- src/java/org/apache/lucene/queryParser/QueryParser.jj	(revision 820798)
+++ src/java/org/apache/lucene/queryParser/QueryParser.jj	(working copy)
@@ -1155,7 +1155,7 @@
    * expects to be escaped are escaped by a preceding <code>\</code>.
    */
   public static String escape(String s) {
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     for (int i = 0; i < s.length(); i++) {
       char c = s.charAt(i);
       // These characters are part of the query syntax and must be escaped
Index: src/java/org/apache/lucene/search/BooleanQuery.java
===================================================================
--- src/java/org/apache/lucene/search/BooleanQuery.java	(revision 820798)
+++ src/java/org/apache/lucene/search/BooleanQuery.java	(working copy)
@@ -464,7 +464,7 @@
 
   /** Prints a user-readable version of this query. */
   public String toString(String field) {
-    StringBuffer buffer = new StringBuffer();
+    StringBuilder buffer = new StringBuilder();
     boolean needParens=(getBoost() != 1.0) || (getMinimumNumberShouldMatch()>0) ;
     if (needParens) {
       buffer.append("(");
Index: src/java/org/apache/lucene/search/BooleanScorer.java
===================================================================
--- src/java/org/apache/lucene/search/BooleanScorer.java	(revision 820798)
+++ src/java/org/apache/lucene/search/BooleanScorer.java	(working copy)
@@ -357,7 +357,7 @@
   }
 
   public String toString() {
-    StringBuffer buffer = new StringBuffer();
+    StringBuilder buffer = new StringBuilder();
     buffer.append("boolean(");
     for (SubScorer sub = scorers; sub != null; sub = sub.next) {
       buffer.append(sub.scorer.toString());
Index: src/java/org/apache/lucene/search/DisjunctionMaxQuery.java
===================================================================
--- src/java/org/apache/lucene/search/DisjunctionMaxQuery.java	(revision 820798)
+++ src/java/org/apache/lucene/search/DisjunctionMaxQuery.java	(working copy)
@@ -224,7 +224,7 @@
    * @return a string that shows what we do, of the form "(disjunct1 | disjunct2 | ... | disjunctn)^boost"
    */
   public String toString(String field) {
-    StringBuffer buffer = new StringBuffer();
+    StringBuilder buffer = new StringBuilder();
     buffer.append("(");
     int numDisjunctions = disjuncts.size();
     for (int i = 0 ; i < numDisjunctions; i++) {
Index: src/java/org/apache/lucene/search/Explanation.java
===================================================================
--- src/java/org/apache/lucene/search/Explanation.java	(revision 820798)
+++ src/java/org/apache/lucene/search/Explanation.java	(working copy)
@@ -86,7 +86,7 @@
     return toString(0);
   }
   protected String toString(int depth) {
-    StringBuffer buffer = new StringBuffer();
+    StringBuilder buffer = new StringBuilder();
     for (int i = 0; i < depth; i++) {
       buffer.append("  ");
     }
@@ -106,7 +106,7 @@
 
   /** Render an explanation as HTML. */
   public String toHtml() {
-    StringBuffer buffer = new StringBuffer();
+    StringBuilder buffer = new StringBuilder();
     buffer.append("<ul>\n");
 
     buffer.append("<li>");
Index: src/java/org/apache/lucene/search/FieldCache.java
===================================================================
--- src/java/org/apache/lucene/search/FieldCache.java	(revision 820798)
+++ src/java/org/apache/lucene/search/FieldCache.java	(working copy)
@@ -563,7 +563,7 @@
     
     
     public String toString() {
-      StringBuffer b = new StringBuffer();
+      StringBuilder b = new StringBuilder();
       b.append("'").append(getReaderKey()).append("'=>");
       b.append("'").append(getFieldName()).append("',");
       b.append(getCacheType()).append(",").append(getCustom());
Index: src/java/org/apache/lucene/search/FieldCacheRangeFilter.java
===================================================================
--- src/java/org/apache/lucene/search/FieldCacheRangeFilter.java	(revision 820798)
+++ src/java/org/apache/lucene/search/FieldCacheRangeFilter.java	(working copy)
@@ -431,7 +431,7 @@
   }
   
   public final String toString() {
-    final StringBuffer sb = new StringBuffer(field).append(":");
+    final StringBuilder sb = new StringBuilder(field).append(":");
     return sb.append(includeLower ? '[' : '{')
       .append((lowerVal == null) ? "*" : lowerVal.toString())
       .append(" TO ")
Index: src/java/org/apache/lucene/search/FieldDoc.java
===================================================================
--- src/java/org/apache/lucene/search/FieldDoc.java	(revision 820798)
+++ src/java/org/apache/lucene/search/FieldDoc.java	(working copy)
@@ -63,7 +63,7 @@
 	public String toString() {
 	  // super.toString returns the doc and score information, so just add the
           // fields information
-	  StringBuffer sb = new StringBuffer(super.toString());
+	  StringBuilder sb = new StringBuilder(super.toString());
 	  sb.append("[");
 	  for (int i = 0; i < fields.length; i++) {
             sb.append(fields[i]).append(", ");
Index: src/java/org/apache/lucene/search/FilteredQuery.java
===================================================================
--- src/java/org/apache/lucene/search/FilteredQuery.java	(revision 820798)
+++ src/java/org/apache/lucene/search/FilteredQuery.java	(working copy)
@@ -206,7 +206,7 @@
 
   /** Prints a user-readable version of this query. */
   public String toString (String s) {
-    StringBuffer buffer = new StringBuffer();
+    StringBuilder buffer = new StringBuilder();
     buffer.append("filtered(");
     buffer.append(query.toString(s));
     buffer.append(")->");
Index: src/java/org/apache/lucene/search/function/CustomScoreQuery.java
===================================================================
--- src/java/org/apache/lucene/search/function/CustomScoreQuery.java	(revision 820798)
+++ src/java/org/apache/lucene/search/function/CustomScoreQuery.java	(working copy)
@@ -118,7 +118,7 @@
 
   /* (non-Javadoc) @see org.apache.lucene.search.Query#toString(java.lang.String) */
   public String toString(String field) {
-    StringBuffer sb = new StringBuffer(name()).append("(");
+    StringBuilder sb = new StringBuilder(name()).append("(");
     sb.append(subQuery.toString(field));
     for(int i = 0; i < valSrcQueries.length; i++) {
       sb.append(", ").append(valSrcQueries[i].toString(field));
Index: src/java/org/apache/lucene/search/FuzzyQuery.java
===================================================================
--- src/java/org/apache/lucene/search/FuzzyQuery.java	(revision 820798)
+++ src/java/org/apache/lucene/search/FuzzyQuery.java	(working copy)
@@ -173,7 +173,7 @@
   }
     
   public String toString(String field) {
-    StringBuffer buffer = new StringBuffer();
+    StringBuilder buffer = new StringBuilder();
     if (!term.field().equals(field)) {
         buffer.append(term.field());
         buffer.append(":");
Index: src/java/org/apache/lucene/search/Hit.java
===================================================================
--- src/java/org/apache/lucene/search/Hit.java	(revision 820798)
+++ src/java/org/apache/lucene/search/Hit.java	(working copy)
@@ -113,7 +113,7 @@
    * Prints the parameters to be used to discover the promised result.
    */
   public String toString() {
-    StringBuffer buffer = new StringBuffer();
+    StringBuilder buffer = new StringBuilder();
     buffer.append("Hit<");
     buffer.append(hits.toString());
     buffer.append(" [");
Index: src/java/org/apache/lucene/search/MatchAllDocsQuery.java
===================================================================
--- src/java/org/apache/lucene/search/MatchAllDocsQuery.java	(revision 820798)
+++ src/java/org/apache/lucene/search/MatchAllDocsQuery.java	(working copy)
@@ -150,7 +150,7 @@
   }
 
   public String toString(String field) {
-    StringBuffer buffer = new StringBuffer();
+    StringBuilder buffer = new StringBuilder();
     buffer.append("*:*");
     buffer.append(ToStringUtils.boost(getBoost()));
     return buffer.toString();
Index: src/java/org/apache/lucene/search/MultiPhraseQuery.java
===================================================================
--- src/java/org/apache/lucene/search/MultiPhraseQuery.java	(revision 820798)
+++ src/java/org/apache/lucene/search/MultiPhraseQuery.java	(working copy)
@@ -271,7 +271,7 @@
 
   /** Prints a user-readable version of this query. */
   public final String toString(String f) {
-    StringBuffer buffer = new StringBuffer();
+    StringBuilder buffer = new StringBuilder();
     if (!field.equals(f)) {
       buffer.append(field);
       buffer.append(":");
Index: src/java/org/apache/lucene/search/MultiTermQuery.java
===================================================================
--- src/java/org/apache/lucene/search/MultiTermQuery.java	(revision 820798)
+++ src/java/org/apache/lucene/search/MultiTermQuery.java	(working copy)
@@ -393,7 +393,7 @@
    */
   @Override
   public String toString(String field) {
-    StringBuffer buffer = new StringBuffer();
+    StringBuilder buffer = new StringBuilder();
     if (term != null) {
       if (!term.field().equals(field)) {
         buffer.append(term.field());
Index: src/java/org/apache/lucene/search/NumericRangeQuery.java
===================================================================
--- src/java/org/apache/lucene/search/NumericRangeQuery.java	(revision 820798)
+++ src/java/org/apache/lucene/search/NumericRangeQuery.java	(working copy)
@@ -317,7 +317,7 @@
   
   @Override
   public String toString(final String field) {
-    final StringBuffer sb = new StringBuffer();
+    final StringBuilder sb = new StringBuilder();
     if (!this.field.equals(field)) sb.append(this.field).append(':');
     return sb.append(minInclusive ? '[' : '{')
       .append((min == null) ? "*" : min.toString())
Index: src/java/org/apache/lucene/search/payloads/PayloadNearQuery.java
===================================================================
--- src/java/org/apache/lucene/search/payloads/PayloadNearQuery.java	(revision 820798)
+++ src/java/org/apache/lucene/search/payloads/PayloadNearQuery.java	(working copy)
@@ -85,7 +85,7 @@
   }
 
   public String toString(String field) {
-    StringBuffer buffer = new StringBuffer();
+    StringBuilder buffer = new StringBuilder();
     buffer.append("payloadNear([");
     Iterator i = clauses.iterator();
     while (i.hasNext()) {
Index: src/java/org/apache/lucene/search/PhraseQuery.java
===================================================================
--- src/java/org/apache/lucene/search/PhraseQuery.java	(revision 820798)
+++ src/java/org/apache/lucene/search/PhraseQuery.java	(working copy)
@@ -167,8 +167,8 @@
       Explanation result = new Explanation();
       result.setDescription("weight("+getQuery()+" in "+doc+"), product of:");
 
-      StringBuffer docFreqs = new StringBuffer();
-      StringBuffer query = new StringBuffer();
+      StringBuilder docFreqs = new StringBuilder();
+      StringBuilder query = new StringBuilder();
       query.append('\"');
       docFreqs.append(idfExp.explain());
       for (int i = 0; i < terms.size(); i++) {
@@ -259,7 +259,7 @@
 
   /** Prints a user-readable version of this query. */
   public String toString(String f) {
-    StringBuffer buffer = new StringBuffer();
+    StringBuilder buffer = new StringBuilder();
     if (field != null && !field.equals(f)) {
       buffer.append(field);
       buffer.append(":");
Index: src/java/org/apache/lucene/search/PrefixFilter.java
===================================================================
--- src/java/org/apache/lucene/search/PrefixFilter.java	(revision 820798)
+++ src/java/org/apache/lucene/search/PrefixFilter.java	(working copy)
@@ -33,7 +33,7 @@
 
   /** Prints a user-readable version of this query. */
   public String toString () {
-    StringBuffer buffer = new StringBuffer();
+    StringBuilder buffer = new StringBuilder();
     buffer.append("PrefixFilter(");
     buffer.append(getPrefix().toString());
     buffer.append(")");
Index: src/java/org/apache/lucene/search/PrefixQuery.java
===================================================================
--- src/java/org/apache/lucene/search/PrefixQuery.java	(revision 820798)
+++ src/java/org/apache/lucene/search/PrefixQuery.java	(working copy)
@@ -47,7 +47,7 @@
 
   /** Prints a user-readable version of this query. */
   public String toString(String field) {
-    StringBuffer buffer = new StringBuffer();
+    StringBuilder buffer = new StringBuilder();
     if (!prefix.field().equals(field)) {
       buffer.append(prefix.field());
       buffer.append(":");
Index: src/java/org/apache/lucene/search/QueryTermVector.java
===================================================================
--- src/java/org/apache/lucene/search/QueryTermVector.java	(revision 820798)
+++ src/java/org/apache/lucene/search/QueryTermVector.java	(working copy)
@@ -108,7 +108,7 @@
   }
   
   public final String toString() {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         sb.append('{');
         for (int i=0; i<terms.length; i++) {
             if (i>0) sb.append(", ");
Index: src/java/org/apache/lucene/search/Similarity.java
===================================================================
--- src/java/org/apache/lucene/search/Similarity.java	(revision 820798)
+++ src/java/org/apache/lucene/search/Similarity.java	(working copy)
@@ -826,7 +826,7 @@
     }
     final int max = searcher.maxDoc();
     float idf = 0.0f;
-    final StringBuffer exp = new StringBuffer();
+    final StringBuilder exp = new StringBuilder();
     Iterator i = terms.iterator();
     while (i.hasNext()) {
       Term term = (Term)i.next();
Index: src/java/org/apache/lucene/search/Sort.java
===================================================================
--- src/java/org/apache/lucene/search/Sort.java	(revision 820798)
+++ src/java/org/apache/lucene/search/Sort.java	(working copy)
@@ -229,7 +229,7 @@
   }
 
   public String toString() {
-    StringBuffer buffer = new StringBuffer();
+    StringBuilder buffer = new StringBuilder();
 
     for (int i = 0; i < fields.length; i++) {
       buffer.append(fields[i].toString());
Index: src/java/org/apache/lucene/search/SortField.java
===================================================================
--- src/java/org/apache/lucene/search/SortField.java	(revision 820798)
+++ src/java/org/apache/lucene/search/SortField.java	(working copy)
@@ -347,7 +347,7 @@
   }
 
   public String toString() {
-    StringBuffer buffer = new StringBuffer();
+    StringBuilder buffer = new StringBuilder();
     switch (type) {
       case SCORE:
         buffer.append("<score>");
Index: src/java/org/apache/lucene/search/spans/FieldMaskingSpanQuery.java
===================================================================
--- src/java/org/apache/lucene/search/spans/FieldMaskingSpanQuery.java	(revision 820798)
+++ src/java/org/apache/lucene/search/spans/FieldMaskingSpanQuery.java	(working copy)
@@ -128,7 +128,7 @@
   }
 
   public String toString(String field) {
-    StringBuffer buffer = new StringBuffer();
+    StringBuilder buffer = new StringBuilder();
     buffer.append("mask(");
     buffer.append(maskedQuery.toString(field));
     buffer.append(")");
Index: src/java/org/apache/lucene/search/spans/SpanFirstQuery.java
===================================================================
--- src/java/org/apache/lucene/search/spans/SpanFirstQuery.java	(revision 820798)
+++ src/java/org/apache/lucene/search/spans/SpanFirstQuery.java	(working copy)
@@ -54,7 +54,7 @@
   public Collection getTerms() { return match.getTerms(); }
 
   public String toString(String field) {
-    StringBuffer buffer = new StringBuffer();
+    StringBuilder buffer = new StringBuilder();
     buffer.append("spanFirst(");
     buffer.append(match.toString(field));
     buffer.append(", ");
Index: src/java/org/apache/lucene/search/spans/SpanNearQuery.java
===================================================================
--- src/java/org/apache/lucene/search/spans/SpanNearQuery.java	(revision 820798)
+++ src/java/org/apache/lucene/search/spans/SpanNearQuery.java	(working copy)
@@ -104,7 +104,7 @@
   
 
   public String toString(String field) {
-    StringBuffer buffer = new StringBuffer();
+    StringBuilder buffer = new StringBuilder();
     buffer.append("spanNear([");
     Iterator i = clauses.iterator();
     while (i.hasNext()) {
Index: src/java/org/apache/lucene/search/spans/SpanNotQuery.java
===================================================================
--- src/java/org/apache/lucene/search/spans/SpanNotQuery.java	(revision 820798)
+++ src/java/org/apache/lucene/search/spans/SpanNotQuery.java	(working copy)
@@ -58,7 +58,7 @@
   public void extractTerms(Set terms) { include.extractTerms(terms); }
 
   public String toString(String field) {
-    StringBuffer buffer = new StringBuffer();
+    StringBuilder buffer = new StringBuilder();
     buffer.append("spanNot(");
     buffer.append(include.toString(field));
     buffer.append(", ");
Index: src/java/org/apache/lucene/search/spans/SpanOrQuery.java
===================================================================
--- src/java/org/apache/lucene/search/spans/SpanOrQuery.java	(revision 820798)
+++ src/java/org/apache/lucene/search/spans/SpanOrQuery.java	(working copy)
@@ -112,7 +112,7 @@
   }
 
   public String toString(String field) {
-    StringBuffer buffer = new StringBuffer();
+    StringBuilder buffer = new StringBuilder();
     buffer.append("spanOr([");
     Iterator i = clauses.iterator();
     while (i.hasNext()) {
Index: src/java/org/apache/lucene/search/spans/SpanTermQuery.java
===================================================================
--- src/java/org/apache/lucene/search/spans/SpanTermQuery.java	(revision 820798)
+++ src/java/org/apache/lucene/search/spans/SpanTermQuery.java	(working copy)
@@ -52,7 +52,7 @@
   }
 
   public String toString(String field) {
-    StringBuffer buffer = new StringBuffer();
+    StringBuilder buffer = new StringBuilder();
     if (term.field().equals(field))
       buffer.append(term.text());
     else
Index: src/java/org/apache/lucene/search/TermQuery.java
===================================================================
--- src/java/org/apache/lucene/search/TermQuery.java	(revision 820798)
+++ src/java/org/apache/lucene/search/TermQuery.java	(working copy)
@@ -152,7 +152,7 @@
 
   /** Prints a user-readable version of this query. */
   public String toString(String field) {
-    StringBuffer buffer = new StringBuffer();
+    StringBuilder buffer = new StringBuilder();
     if (!term.field().equals(field)) {
       buffer.append(term.field());
       buffer.append(":");
Index: src/java/org/apache/lucene/search/TermRangeQuery.java
===================================================================
--- src/java/org/apache/lucene/search/TermRangeQuery.java	(revision 820798)
+++ src/java/org/apache/lucene/search/TermRangeQuery.java	(working copy)
@@ -137,7 +137,7 @@
 
   /** Prints a user-readable version of this query. */
   public String toString(String field) {
-      StringBuffer buffer = new StringBuffer();
+      StringBuilder buffer = new StringBuilder();
       if (!getField().equals(field)) {
           buffer.append(getField());
           buffer.append(":");
Index: src/java/org/apache/lucene/search/WildcardQuery.java
===================================================================
--- src/java/org/apache/lucene/search/WildcardQuery.java	(revision 820798)
+++ src/java/org/apache/lucene/search/WildcardQuery.java	(working copy)
@@ -65,7 +65,7 @@
   
   /** Prints a user-readable version of this query. */
   public String toString(String field) {
-    StringBuffer buffer = new StringBuffer();
+    StringBuilder buffer = new StringBuilder();
     if (!term.field().equals(field)) {
       buffer.append(term.field());
       buffer.append(":");
Index: src/java/org/apache/lucene/store/FSDirectory.java
===================================================================
--- src/java/org/apache/lucene/store/FSDirectory.java	(revision 820798)
+++ src/java/org/apache/lucene/store/FSDirectory.java	(working copy)
@@ -718,7 +718,7 @@
     synchronized (DIGESTER) {
       digest = DIGESTER.digest(dirName.getBytes());
     }
-    StringBuffer buf = new StringBuffer();
+    StringBuilder buf = new StringBuilder();
     buf.append("lucene-");
     for (int i = 0; i < digest.length; i++) {
       int b = digest[i];
Index: src/java/org/apache/lucene/util/FieldCacheSanityChecker.java
===================================================================
--- src/java/org/apache/lucene/util/FieldCacheSanityChecker.java	(revision 820798)
+++ src/java/org/apache/lucene/util/FieldCacheSanityChecker.java	(working copy)
@@ -366,7 +366,7 @@
      * own line prefaced by a tab character
      */
     public String toString() {
-      StringBuffer buf = new StringBuffer();
+      StringBuilder buf = new StringBuilder();
       buf.append(getType()).append(": ");
 
       String m = getMsg();
Index: src/test/org/apache/lucene/analysis/TestASCIIFoldingFilter.java
===================================================================
--- src/test/org/apache/lucene/analysis/TestASCIIFoldingFilter.java	(revision 820798)
+++ src/test/org/apache/lucene/analysis/TestASCIIFoldingFilter.java	(working copy)
@@ -1872,7 +1872,7 @@
 
     // Construct input text and expected output tokens
     List expectedOutputTokens = new ArrayList();
-    StringBuffer inputText = new StringBuffer();
+    StringBuilder inputText = new StringBuilder();
     for (int n = 0 ; n < foldings.length ; n += 2) {
       if (n > 0) {
         inputText.append(' ');  // Space between tokens
@@ -1881,7 +1881,7 @@
 
       // Construct the expected output token: the ASCII string to fold to,
       // duplicated as many times as the number of characters in the input text.
-      StringBuffer expected = new StringBuffer();
+      StringBuilder expected = new StringBuilder();
       int numChars = foldings[n].length();
       for (int m = 0 ; m < numChars; ++m) {
         expected.append(foldings[n + 1]);
Index: src/test/org/apache/lucene/analysis/TestCharArraySet.java
===================================================================
--- src/test/org/apache/lucene/analysis/TestCharArraySet.java	(revision 820798)
+++ src/test/org/apache/lucene/analysis/TestCharArraySet.java	(working copy)
@@ -108,7 +108,7 @@
     }
     
     try{
-      set.add(new StringBuffer(NOT_IN_SET));  
+      set.add(new StringBuilder(NOT_IN_SET));  
       fail("Modified unmodifiable set");
     }catch (UnsupportedOperationException e) {
       // expected
Index: src/test/org/apache/lucene/analysis/TestStopFilter.java
===================================================================
--- src/test/org/apache/lucene/analysis/TestStopFilter.java	(revision 820798)
+++ src/test/org/apache/lucene/analysis/TestStopFilter.java	(working copy)
@@ -71,7 +71,7 @@
    * Test Position increments applied by StopFilter with and without enabling this option.
    */
   public void testStopPositons() throws IOException {
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     ArrayList a = new ArrayList();
     for (int i=0; i<20; i++) {
       String w = English.intToEnglish(i).trim();
Index: src/test/org/apache/lucene/analysis/TestTeeSinkTokenFilter.java
===================================================================
--- src/test/org/apache/lucene/analysis/TestTeeSinkTokenFilter.java	(revision 820798)
+++ src/test/org/apache/lucene/analysis/TestTeeSinkTokenFilter.java	(working copy)
@@ -32,8 +32,8 @@
  * tests for the TestTeeSinkTokenFilter
  */
 public class TestTeeSinkTokenFilter extends BaseTokenStreamTestCase {
-  protected StringBuffer buffer1;
-  protected StringBuffer buffer2;
+  protected StringBuilder buffer1;
+  protected StringBuilder buffer2;
   protected String[] tokens1;
   protected String[] tokens2;
 
@@ -46,12 +46,12 @@
     super.setUp();
     tokens1 = new String[]{"The", "quick", "Burgundy", "Fox", "jumped", "over", "the", "lazy", "Red", "Dogs"};
     tokens2 = new String[]{"The", "Lazy", "Dogs", "should", "stay", "on", "the", "porch"};
-    buffer1 = new StringBuffer();
+    buffer1 = new StringBuilder();
 
     for (int i = 0; i < tokens1.length; i++) {
       buffer1.append(tokens1[i]).append(' ');
     }
-    buffer2 = new StringBuffer();
+    buffer2 = new StringBuilder();
     for (int i = 0; i < tokens2.length; i++) {
       buffer2.append(tokens2[i]).append(' ');
     }
@@ -161,7 +161,7 @@
     int[] tokCount = {100, 500, 1000, 2000, 5000, 10000};
     int[] modCounts = {1, 2, 5, 10, 20, 50, 100, 200, 500};
     for (int k = 0; k < tokCount.length; k++) {
-      StringBuffer buffer = new StringBuffer();
+      StringBuilder buffer = new StringBuilder();
       System.out.println("-----Tokens: " + tokCount[k] + "-----");
       for (int i = 0; i < tokCount[k]; i++) {
         buffer.append(English.intToEnglish(i).toUpperCase()).append(' ');
Index: src/test/org/apache/lucene/analysis/TestTeeTokenFilter.java
===================================================================
--- src/test/org/apache/lucene/analysis/TestTeeTokenFilter.java	(revision 820798)
+++ src/test/org/apache/lucene/analysis/TestTeeTokenFilter.java	(working copy)
@@ -30,8 +30,8 @@
  * tests for the TeeTokenFilter and SinkTokenizer
  */
 public class TestTeeTokenFilter extends LuceneTestCase {
-  protected StringBuffer buffer1;
-  protected StringBuffer buffer2;
+  protected StringBuilder buffer1;
+  protected StringBuilder buffer2;
   protected String[] tokens1;
   protected String[] tokens2;
 
@@ -44,12 +44,12 @@
     super.setUp();
     tokens1 = new String[]{"The", "quick", "Burgundy", "Fox", "jumped", "over", "the", "lazy", "Red", "Dogs"};
     tokens2 = new String[]{"The", "Lazy", "Dogs", "should", "stay", "on", "the", "porch"};
-    buffer1 = new StringBuffer();
+    buffer1 = new StringBuilder();
 
     for (int i = 0; i < tokens1.length; i++) {
       buffer1.append(tokens1[i]).append(' ');
     }
-    buffer2 = new StringBuffer();
+    buffer2 = new StringBuilder();
     for (int i = 0; i < tokens2.length; i++) {
       buffer2.append(tokens2[i]).append(' ');
 
@@ -147,7 +147,7 @@
     int[] tokCount = {100, 500, 1000, 2000, 5000, 10000};
     int[] modCounts = {1, 2, 5, 10, 20, 50, 100, 200, 500};
     for (int k = 0; k < tokCount.length; k++) {
-      StringBuffer buffer = new StringBuffer();
+      StringBuilder buffer = new StringBuilder();
       System.out.println("-----Tokens: " + tokCount[k] + "-----");
       for (int i = 0; i < tokCount[k]; i++) {
         buffer.append(English.intToEnglish(i).toUpperCase()).append(' ');
Index: src/test/org/apache/lucene/analysis/TestToken.java
===================================================================
--- src/test/org/apache/lucene/analysis/TestToken.java	(revision 820798)
+++ src/test/org/apache/lucene/analysis/TestToken.java	(working copy)
@@ -71,7 +71,7 @@
 
   public void testGrow() {
     Token t = new Token();
-    StringBuffer buf = new StringBuffer("ab");
+    StringBuilder buf = new StringBuilder("ab");
     for (int i = 0; i < 20; i++)
     {
       char[] content = buf.toString().toCharArray();
@@ -85,7 +85,7 @@
 
     // now as a string, first variant
     t = new Token();
-    buf = new StringBuffer("ab");
+    buf = new StringBuilder("ab");
     for (int i = 0; i < 20; i++)
     {
       String content = buf.toString();
@@ -99,7 +99,7 @@
 
     // now as a string, second variant
     t = new Token();
-    buf = new StringBuffer("ab");
+    buf = new StringBuilder("ab");
     for (int i = 0; i < 20; i++)
     {
       String content = buf.toString();
@@ -113,7 +113,7 @@
 
     // Test for slow growth to a long term
     t = new Token();
-    buf = new StringBuffer("a");
+    buf = new StringBuilder("a");
     for (int i = 0; i < 20000; i++)
     {
       String content = buf.toString();
@@ -127,7 +127,7 @@
 
     // Test for slow growth to a long term
     t = new Token();
-    buf = new StringBuffer("a");
+    buf = new StringBuilder("a");
     for (int i = 0; i < 20000; i++)
     {
       String content = buf.toString();
Index: src/test/org/apache/lucene/analysis/tokenattributes/TestTermAttributeImpl.java
===================================================================
--- src/test/org/apache/lucene/analysis/tokenattributes/TestTermAttributeImpl.java	(revision 820798)
+++ src/test/org/apache/lucene/analysis/tokenattributes/TestTermAttributeImpl.java	(working copy)
@@ -39,7 +39,7 @@
 
   public void testGrow() {
     TermAttributeImpl t = new TermAttributeImpl();
-    StringBuffer buf = new StringBuffer("ab");
+    StringBuilder buf = new StringBuilder("ab");
     for (int i = 0; i < 20; i++)
     {
       char[] content = buf.toString().toCharArray();
@@ -53,7 +53,7 @@
 
     // now as a string, first variant
     t = new TermAttributeImpl();
-    buf = new StringBuffer("ab");
+    buf = new StringBuilder("ab");
     for (int i = 0; i < 20; i++)
     {
       String content = buf.toString();
@@ -67,7 +67,7 @@
 
     // now as a string, second variant
     t = new TermAttributeImpl();
-    buf = new StringBuffer("ab");
+    buf = new StringBuilder("ab");
     for (int i = 0; i < 20; i++)
     {
       String content = buf.toString();
@@ -81,7 +81,7 @@
 
     // Test for slow growth to a long term
     t = new TermAttributeImpl();
-    buf = new StringBuffer("a");
+    buf = new StringBuilder("a");
     for (int i = 0; i < 20000; i++)
     {
       String content = buf.toString();
@@ -95,7 +95,7 @@
 
     // Test for slow growth to a long term
     t = new TermAttributeImpl();
-    buf = new StringBuffer("a");
+    buf = new StringBuilder("a");
     for (int i = 0; i < 20000; i++)
     {
       String content = buf.toString();
Index: src/test/org/apache/lucene/index/DocHelper.java
===================================================================
--- src/test/org/apache/lucene/index/DocHelper.java	(revision 820798)
+++ src/test/org/apache/lucene/index/DocHelper.java	(working copy)
@@ -152,7 +152,7 @@
 
   static {
     //Initialize the large Lazy Field
-    StringBuffer buffer = new StringBuffer();
+    StringBuilder buffer = new StringBuilder();
     for (int i = 0; i < 10000; i++)
     {
       buffer.append("Lazily loading lengths of language in lieu of laughing ");
Index: src/test/org/apache/lucene/index/TestIndexReaderReopen.java
===================================================================
--- src/test/org/apache/lucene/index/TestIndexReaderReopen.java	(revision 820798)
+++ src/test/org/apache/lucene/index/TestIndexReaderReopen.java	(working copy)
@@ -955,7 +955,7 @@
   }
 
   public static Document createDocument(int n, int numFields) {
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     Document doc = new Document();
     sb.append("a");
     sb.append(n);
Index: src/test/org/apache/lucene/index/TestIndexWriter.java
===================================================================
--- src/test/org/apache/lucene/index/TestIndexWriter.java	(revision 820798)
+++ src/test/org/apache/lucene/index/TestIndexWriter.java	(working copy)
@@ -1440,7 +1440,7 @@
         // occurs but the terms are very long (heavy on
         // char[] arrays)
         for(int j=0;j<100;j++) {
-          StringBuffer b = new StringBuffer();
+          StringBuilder b = new StringBuilder();
           String x = Integer.toString(j) + ".";
           for(int k=0;k<1000;k++)
             b.append(x);
@@ -1513,7 +1513,7 @@
       IndexWriter writer  = new IndexWriter(dir, new WhitespaceAnalyzer(), true, new IndexWriter.MaxFieldLength(100000000));
       writer.setRAMBufferSizeMB(0.01);
       // Massive doc that has 128 K a's
-      StringBuffer b = new StringBuffer(1024*1024);
+      StringBuilder b = new StringBuilder(1024*1024);
       for(int i=0;i<4096;i++) {
         b.append(" a a a a a a a a");
         b.append(" a a a a a a a a");
@@ -2677,7 +2677,7 @@
     IndexWriter writer = new IndexWriter(dir, new WhitespaceAnalyzer(), IndexWriter.MaxFieldLength.UNLIMITED);
 
     Document doc = new Document();
-    StringBuffer b = new StringBuffer();
+    StringBuilder b = new StringBuilder();
     for(int i=0;i<10000;i++)
       b.append(" a");
     b.append(" x");
@@ -2957,7 +2957,7 @@
     IndexWriter writer = new IndexWriter(dir, new WhitespaceAnalyzer(), new IndexWriter.MaxFieldLength(100000));
 
     Document doc = new Document();
-    StringBuffer b = new StringBuffer();
+    StringBuilder b = new StringBuilder();
     for(int i=0;i<10000;i++)
       b.append(" a");
     b.append(" x");
Index: src/test/org/apache/lucene/index/TestIndexWriterReader.java
===================================================================
--- src/test/org/apache/lucene/index/TestIndexWriterReader.java	(revision 820798)
+++ src/test/org/apache/lucene/index/TestIndexWriterReader.java	(working copy)
@@ -509,7 +509,7 @@
 
   
   public static Document createDocument(int n, String indexName, int numFields) {
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     Document doc = new Document();
     doc.add(new Field("id", Integer.toString(n), Store.YES, Index.NOT_ANALYZED, TermVector.WITH_POSITIONS_OFFSETS));
     doc.add(new Field("indexname", indexName, Store.YES, Index.NOT_ANALYZED, TermVector.WITH_POSITIONS_OFFSETS));
Index: src/test/org/apache/lucene/index/TestOmitTf.java
===================================================================
--- src/test/org/apache/lucene/index/TestOmitTf.java	(revision 820798)
+++ src/test/org/apache/lucene/index/TestOmitTf.java	(working copy)
@@ -242,7 +242,7 @@
     writer.setSimilarity(new SimpleSimilarity());
         
         
-    StringBuffer sb = new StringBuffer(265);
+    StringBuilder sb = new StringBuilder(265);
     String term = "term";
     for(int i = 0; i<30; i++){
       Document d = new Document();
Index: src/test/org/apache/lucene/index/TestPayloads.java
===================================================================
--- src/test/org/apache/lucene/index/TestPayloads.java	(revision 820798)
+++ src/test/org/apache/lucene/index/TestPayloads.java	(working copy)
@@ -179,7 +179,7 @@
         int numDocs = skipInterval + 1; 
         // create content for the test documents with just a few terms
         Term[] terms = generateTerms(fieldName, numTerms);
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         for (int i = 0; i < terms.length; i++) {
             sb.append(terms[i].text);
             sb.append(" ");
@@ -350,7 +350,7 @@
     private Term[] generateTerms(String fieldName, int n) {
         int maxDigits = (int) (Math.log(n) / Math.log(10));
         Term[] terms = new Term[n];
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
         for (int i = 0; i < n; i++) {
             sb.setLength(0);
             sb.append("t");
Index: src/test/org/apache/lucene/search/BaseTestRangeFilter.java
===================================================================
--- src/test/org/apache/lucene/search/BaseTestRangeFilter.java	(revision 820798)
+++ src/test/org/apache/lucene/search/BaseTestRangeFilter.java	(working copy)
@@ -65,7 +65,7 @@
      * a simple padding function that should work with any int
      */
     public static String pad(int n) {
-        StringBuffer b = new StringBuffer(40);
+        StringBuilder b = new StringBuilder(40);
         String p = "0";
         if (n < 0) {
             p = "-";
Index: src/test/org/apache/lucene/search/CheckHits.java
===================================================================
--- src/test/org/apache/lucene/search/CheckHits.java	(revision 820798)
+++ src/test/org/apache/lucene/search/CheckHits.java	(working copy)
@@ -223,7 +223,7 @@
   }
 
   public static String hits2str(ScoreDoc[] hits1, ScoreDoc[] hits2, int start, int end) throws IOException {
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     int len1=hits1==null ? 0 : hits1.length;
     int len2=hits2==null ? 0 : hits2.length;
     if (end<=0) {
@@ -251,7 +251,7 @@
 
 
   public static String topdocsString(TopDocs docs, int start, int end) {
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
       sb.append("TopDocs totalHits=").append(docs.totalHits).append(" top=").append(docs.scoreDocs.length).append('\n');
     if (end<=0) end=docs.scoreDocs.length;
     else end=Math.min(end,docs.scoreDocs.length);
Index: src/test/org/apache/lucene/search/QueryUtils.java
===================================================================
--- src/test/org/apache/lucene/search/QueryUtils.java	(revision 820798)
+++ src/test/org/apache/lucene/search/QueryUtils.java	(working copy)
@@ -312,7 +312,7 @@
               float scorerDiff = Math.abs(scorerScore2 - scorerScore);
               if (!more || doc != sdoc[0] || scoreDiff > maxDiff
                   || scorerDiff > maxDiff) {
-                StringBuffer sbord = new StringBuffer();
+                StringBuilder sbord = new StringBuilder();
                 for (int i = 0; i < order.length; i++)
                   sbord.append(order[i] == skip_op ? " skip()" : " next()");
                 throw new RuntimeException("ERROR matching docs:" + "\n\t"
Index: src/test/org/apache/lucene/search/TestCustomSearcherSort.java
===================================================================
--- src/test/org/apache/lucene/search/TestCustomSearcherSort.java	(revision 820798)
+++ src/test/org/apache/lucene/search/TestCustomSearcherSort.java	(working copy)
@@ -195,7 +195,7 @@
 
                 luceneId = new Integer(hits[docnum].doc);
                 if(idMap.containsKey(luceneId)) {
-                    StringBuffer message = new StringBuffer(prefix);
+                    StringBuilder message = new StringBuilder(prefix);
                     message.append("Duplicate key for hit index = ");
                     message.append(docnum);
                     message.append(", previous index = ");
Index: src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java
===================================================================
--- src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java	(revision 820798)
+++ src/test/org/apache/lucene/search/TestMultiThreadTermVectors.java	(working copy)
@@ -177,7 +177,7 @@
   }
   
   private void verifyVectors(TermFreqVector[] vectors, int num) {
-    StringBuffer temp = new StringBuffer();
+    StringBuilder temp = new StringBuilder();
     String[] terms = null;
     for (int i = 0; i < vectors.length; i++) {
       terms = vectors[i].getTerms();
Index: src/test/org/apache/lucene/search/TestSort.java
===================================================================
--- src/test/org/apache/lucene/search/TestSort.java	(revision 820798)
+++ src/test/org/apache/lucene/search/TestSort.java	(working copy)
@@ -164,7 +164,7 @@
   }
   
   public String getRandomNumberString(int num, int low, int high) {
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     for (int i = 0; i < num; i++) {
       sb.append(getRandomNumber(low, high));
     }
@@ -176,7 +176,7 @@
   }
   
   public String getRandomCharString(int num, int start, int end) {
-    StringBuffer sb = new StringBuffer();
+    StringBuilder sb = new StringBuilder();
     for (int i = 0; i < num; i++) {
       sb.append(new Character((char) getRandomNumber(start, end)));
     }
@@ -277,7 +277,7 @@
 
     result = searcher.search(new MatchAllDocsQuery(), null, 500, sort).scoreDocs;
 
-    StringBuffer buff = new StringBuffer();
+    StringBuilder buff = new StringBuilder();
     int n = result.length;
     String last = null;
     String lastSub = null;
@@ -998,7 +998,7 @@
     TopDocs hits = searcher.search (query, null, expectedResult.length(), sort);
     ScoreDoc[] result = hits.scoreDocs;
     assertEquals(hits.totalHits, expectedResult.length());
-    StringBuffer buff = new StringBuffer(10);
+    StringBuilder buff = new StringBuilder(10);
     int n = result.length;
     for (int i=0; i<n; ++i) {
       Document doc = searcher.doc(result[i].doc);
Index: src/test/org/apache/lucene/search/TestThreadSafe.java
===================================================================
--- src/test/org/apache/lucene/search/TestThreadSafe.java	(revision 820798)
+++ src/test/org/apache/lucene/search/TestThreadSafe.java	(working copy)
@@ -116,7 +116,7 @@
       int nFields = r.nextInt(maxFields);
       for (int i=0; i<nFields; i++) {
         int flen = r.nextInt(maxFieldLen);
-        StringBuffer sb = new StringBuffer("^ ");
+        StringBuilder sb = new StringBuilder("^ ");
         while (sb.length() < flen) sb.append(' ').append(words[r.nextInt(words.length)]);
         sb.append(" $");
         Field.Store store = Field.Store.YES;  // make random later
Index: src/test/org/apache/lucene/store/TestWindowsMMap.java
===================================================================
--- src/test/org/apache/lucene/store/TestWindowsMMap.java	(revision 820798)
+++ src/test/org/apache/lucene/store/TestWindowsMMap.java	(working copy)
@@ -41,7 +41,7 @@
 	
 	private String randomToken() {
 		int tl = 1 + random.nextInt(7);
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 		for(int cx = 0; cx < tl; cx ++) {
 			int c = random.nextInt(25);
 			sb.append(alphabet.substring(c, c+1));
@@ -51,7 +51,7 @@
 	
 	private String randomField() {
 		int fl = 1 + random.nextInt(3);
-		StringBuffer fb = new StringBuffer();
+		StringBuilder fb = new StringBuilder();
 		for(int fx = 0; fx < fl; fx ++) {
 			fb.append(randomToken());
 			fb.append(" ");
Index: src/test/org/apache/lucene/util/_TestUtil.java
===================================================================
--- src/test/org/apache/lucene/util/_TestUtil.java	(revision 820798)
+++ src/test/org/apache/lucene/util/_TestUtil.java	(working copy)
@@ -85,7 +85,7 @@
    *  @deprecated -- in 3.0 we can use Arrays.toString
    *  instead */
   public static String arrayToString(int[] array) {
-    StringBuffer buf = new StringBuffer();
+    StringBuilder buf = new StringBuilder();
     buf.append("[");
     for(int i=0;i<array.length;i++) {
       if (i > 0) {
@@ -101,7 +101,7 @@
    *  @deprecated -- in 3.0 we can use Arrays.toString
    *  instead */
   public static String arrayToString(Object[] array) {
-    StringBuffer buf = new StringBuffer();
+    StringBuilder buf = new StringBuilder();
     buf.append("[");
     for(int i=0;i<array.length;i++) {
       if (i > 0) {
Index: src/test/org/apache/lucene/util/English.java
===================================================================
--- src/test/org/apache/lucene/util/English.java	(revision 820798)
+++ src/test/org/apache/lucene/util/English.java	(working copy)
@@ -21,12 +21,12 @@
 public class English {
 
   public static String intToEnglish(int i) {
-    StringBuffer result = new StringBuffer();
+    StringBuilder result = new StringBuilder();
     intToEnglish(i, result);
     return result.toString();
   }
 
-  public static void intToEnglish(int i, StringBuffer result) {
+  public static void intToEnglish(int i, StringBuilder result) {
     if (i == 0) {
       result.append("zero");
       return;
Index: src/test/org/apache/lucene/util/TestIndexableBinaryStringTools.java
===================================================================
--- src/test/org/apache/lucene/util/TestIndexableBinaryStringTools.java	(revision 820798)
+++ src/test/org/apache/lucene/util/TestIndexableBinaryStringTools.java	(working copy)
@@ -152,7 +152,7 @@
   }
   
   public String binaryDump(ByteBuffer binaryBuf) {
-    StringBuffer buf = new StringBuffer();
+    StringBuilder buf = new StringBuilder();
     int numBytes = binaryBuf.limit() - binaryBuf.arrayOffset();
     byte[] binary = binaryBuf.array();
     for (int byteNum = 0 ; byteNum < numBytes ; ++byteNum) {
@@ -169,7 +169,7 @@
   }
 
   public String charArrayDump(CharBuffer charBuf) {
-    StringBuffer buf = new StringBuffer();
+    StringBuilder buf = new StringBuilder();
     int numBytes = charBuf.limit() - charBuf.arrayOffset();
     char[] charArray = charBuf.array();
     for (int charNum = 0 ; charNum < numBytes ; ++charNum) {