[jsword-svn] r2046 - in trunk: bibledesktop/etc/eclipse bibledesktop/src/main/java/org/crosswire/bibledesktop/book bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop biblemapper/src/main/java/org/crosswire/biblemapper/model biblemapper/src/main/java/org/crosswire/biblemapper/swing common-swing/src/main/java/org/crosswire/common/config/swing common-swing/src/main/java/org/crosswire/common/progress/swing common-swing/src/main/java/org/crosswire/common/swing javatar/src/main/java/com/ice/tar jsword/src/main/java/org/crosswire/common/config jsword/src/main/java/org/crosswire/common/diff jsword/src/main/java/org/crosswire/common/util jsword/src/main/java/org/crosswire/common/xml jsword/src/main/java/org/crosswire/jsword/book jsword/src/main/java/org/crosswire/jsword/book/filter/gbf jsword/src/main/java/org/crosswire/jsword/book/filter/thml jsword/src/main/java/org/crosswire/jsword/book/install jsword/src/main/java/org/crosswire/jsword/book/install/sword jsword/src/main/java/org/crosswire/jsword/book/study jsword/src/main/java/org/crosswire/jsword/book/sword jsword/src/main/java/org/crosswire/jsword/bridge jsword/src/main/java/org/crosswire/jsword/examples jsword/src/main/java/org/crosswire/jsword/index/lucene jsword/src/main/java/org/crosswire/jsword/passage jsword-limbo/src/historic/java/org/crosswire/jsword/view/cli jsword-limbo/src/main/java/org/crosswire/bibledesktop/desktop jsword-limbo/src/main/java/org/crosswire/common/net jsword-limbo/src/main/java/org/crosswire/common/swing jsword-limbo/src/main/java/org/crosswire/common/util jsword-limbo/src/main/java/org/crosswire/common/xml jsword-limbo/src/main/java/org/crosswire/jsword/book/jdbc jsword-limbo/src/main/java/org/crosswire/jsword/book/raw jsword-limbo/src/main/java/org/crosswire/jsword/book/remote jsword-limbo/src/main/java/org/crosswire/jsword/book/search/parse jsword-limbo/src/main/java/org/crosswire/jsword/book/stub jsword-support/tools/checkstyle/checkstyle-5.3/contrib jsword-sword/src/main/java/org/crosswire/sword/frontend/im

dmsmith at crosswire.org dmsmith at crosswire.org
Mon Dec 6 14:42:24 MST 2010


Author: dmsmith
Date: 2010-12-06 14:42:24 -0700 (Mon, 06 Dec 2010)
New Revision: 2046

Modified:
   trunk/bibledesktop/etc/eclipse/BD-junit-JS.launch
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane.java
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/BookFont.java
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/ViewSourcePane.java
   trunk/biblemapper/src/main/java/org/crosswire/biblemapper/model/LinkArray.java
   trunk/biblemapper/src/main/java/org/crosswire/biblemapper/model/Map.java
   trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/ExtensionFileFilter.java
   trunk/common-swing/src/main/java/org/crosswire/common/config/swing/AdvancedConfigEditor.java
   trunk/common-swing/src/main/java/org/crosswire/common/config/swing/TreeConfigEditor.java
   trunk/common-swing/src/main/java/org/crosswire/common/progress/swing/JobsProgressBar.java
   trunk/common-swing/src/main/java/org/crosswire/common/swing/ActionFactory.java
   trunk/common-swing/src/main/java/org/crosswire/common/swing/CWAction.java
   trunk/common-swing/src/main/java/org/crosswire/common/swing/CWLabel.java
   trunk/common-swing/src/main/java/org/crosswire/common/swing/ExceptionPane.java
   trunk/common-swing/src/main/java/org/crosswire/common/swing/FontStore.java
   trunk/common-swing/src/main/java/org/crosswire/common/swing/NumericDocument.java
   trunk/javatar/src/main/java/com/ice/tar/FastTarStream.java
   trunk/javatar/src/main/java/com/ice/tar/TarEntry.java
   trunk/javatar/src/main/java/com/ice/tar/TarHeader.java
   trunk/javatar/src/main/java/com/ice/tar/TarOutputStream.java
   trunk/jsword-limbo/src/historic/java/org/crosswire/jsword/view/cli/Model.java
   trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/desktop/DebugPane.java
   trunk/jsword-limbo/src/main/java/org/crosswire/common/net/WebBrowser.java
   trunk/jsword-limbo/src/main/java/org/crosswire/common/swing/MoneyDocument.java
   trunk/jsword-limbo/src/main/java/org/crosswire/common/util/OldStringUtil.java
   trunk/jsword-limbo/src/main/java/org/crosswire/common/util/Validator.java
   trunk/jsword-limbo/src/main/java/org/crosswire/common/xml/DOMDefaultHandler.java
   trunk/jsword-limbo/src/main/java/org/crosswire/common/xml/OldXMLUtil.java
   trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/jdbc/JDBCBibleUtil.java
   trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/CaseInstsMem.java
   trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/InstsDisk.java
   trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/InstsMem.java
   trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/ItemsMem.java
   trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/Mem.java
   trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/ParaInstsMem.java
   trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/PuncInstsDisk.java
   trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/PuncInstsMem.java
   trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/PuncItemsMem.java
   trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/RawBook.java
   trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/WordInstsDisk.java
   trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/remote/HttpRemoter.java
   trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/remote/RemoteBook.java
   trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/search/parse/CustomTokenizer.java
   trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/search/parse/PassageLeftParamWord.java
   trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/search/parse/PhraseParamWord.java
   trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/stub/StubDictionary.java
   trunk/jsword-support/tools/checkstyle/checkstyle-5.3/contrib/JavadocCheckDefault.java
   trunk/jsword-sword/src/main/java/org/crosswire/sword/frontend/im/HebrewMCIM.java
   trunk/jsword/src/main/java/org/crosswire/common/config/AbstractReflectedChoice.java
   trunk/jsword/src/main/java/org/crosswire/common/diff/CommonMiddle.java
   trunk/jsword/src/main/java/org/crosswire/common/diff/Diff.java
   trunk/jsword/src/main/java/org/crosswire/common/diff/DiffCleanup.java
   trunk/jsword/src/main/java/org/crosswire/common/diff/LineMap.java
   trunk/jsword/src/main/java/org/crosswire/common/diff/Patch.java
   trunk/jsword/src/main/java/org/crosswire/common/diff/PatchEntry.java
   trunk/jsword/src/main/java/org/crosswire/common/util/ClassUtil.java
   trunk/jsword/src/main/java/org/crosswire/common/util/Convert.java
   trunk/jsword/src/main/java/org/crosswire/common/util/EventListenerList.java
   trunk/jsword/src/main/java/org/crosswire/common/util/Histogram.java
   trunk/jsword/src/main/java/org/crosswire/common/util/NetUtil.java
   trunk/jsword/src/main/java/org/crosswire/common/util/StringUtil.java
   trunk/jsword/src/main/java/org/crosswire/common/util/Translations.java
   trunk/jsword/src/main/java/org/crosswire/common/xml/HTMLSerializingContentHandler.java
   trunk/jsword/src/main/java/org/crosswire/common/xml/SerializingContentHandler.java
   trunk/jsword/src/main/java/org/crosswire/common/xml/XMLFeatureSet.java
   trunk/jsword/src/main/java/org/crosswire/common/xml/XMLUtil.java
   trunk/jsword/src/main/java/org/crosswire/jsword/book/BookData.java
   trunk/jsword/src/main/java/org/crosswire/jsword/book/DataPolice.java
   trunk/jsword/src/main/java/org/crosswire/jsword/book/OSISUtil.java
   trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/gbf/GBFTags.java
   trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/thml/FontTag.java
   trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/thml/SyncTag.java
   trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/thml/THMLFilter.java
   trunk/jsword/src/main/java/org/crosswire/jsword/book/install/InstallManager.java
   trunk/jsword/src/main/java/org/crosswire/jsword/book/install/sword/AbstractSwordInstaller.java
   trunk/jsword/src/main/java/org/crosswire/jsword/book/study/StrongsNumber.java
   trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/ConfigEntry.java
   trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/ConfigEntryTable.java
   trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/RawFileBackend.java
   trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/RawLDBackend.java
   trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/SwordBookMetaData.java
   trunk/jsword/src/main/java/org/crosswire/jsword/bridge/BookExporter.java
   trunk/jsword/src/main/java/org/crosswire/jsword/bridge/BookLookup.java
   trunk/jsword/src/main/java/org/crosswire/jsword/examples/StrongsAnalysis.java
   trunk/jsword/src/main/java/org/crosswire/jsword/index/lucene/LuceneIndex.java
   trunk/jsword/src/main/java/org/crosswire/jsword/index/lucene/LuceneQueryDecorator.java
   trunk/jsword/src/main/java/org/crosswire/jsword/passage/AbstractKeyList.java
   trunk/jsword/src/main/java/org/crosswire/jsword/passage/AbstractPassage.java
   trunk/jsword/src/main/java/org/crosswire/jsword/passage/AccuracyType.java
   trunk/jsword/src/main/java/org/crosswire/jsword/passage/PassageKeyFactory.java
   trunk/jsword/src/main/java/org/crosswire/jsword/passage/PassageTally.java
   trunk/jsword/src/main/java/org/crosswire/jsword/passage/VerseRange.java
Log:
JS-136: Require Java 5
Use StringBuilder as a replacement for StringBuffer where possible as it is not synchronized.

Modified: trunk/bibledesktop/etc/eclipse/BD-junit-JS.launch
===================================================================
--- trunk/bibledesktop/etc/eclipse/BD-junit-JS.launch	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/bibledesktop/etc/eclipse/BD-junit-JS.launch	2010-12-06 21:42:24 UTC (rev 2046)
@@ -1,17 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="JSwordAllTests"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jsword"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx128m -ea"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/jsword/src/test/java/JSwordAllTests.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
 <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
 <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
 </listAttribute>
 <stringAttribute key="org.eclipse.debug.ui.target_debug_perspective" value="perspective_default"/>
+<stringAttribute key="org.eclipse.debug.ui.target_run_perspective" value="perspective_none"/>
 <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>
-<stringAttribute key="org.eclipse.debug.ui.target_run_perspective" value="perspective_none"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="JSwordAllTests"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jsword"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx128m -ea"/>
 </launchConfiguration>

Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/AdvancedSearchPane.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -524,7 +524,7 @@
      * Regenerate the search string from the input boxes
      */
     private void updateSearchString() {
-        StringBuffer search = new StringBuffer();
+        StringBuilder search = new StringBuilder();
 
         String restrict = txtRestrict.getText();
         if (restrict != null && restrict.trim().length() > 0) {

Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/BookFont.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/BookFont.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/BookFont.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -105,7 +105,7 @@
             return getFontMap().getProperty(book.getInitials()) != null;
         }
         if (lang != null) {
-            return getFontMap().getProperty(new StringBuffer(LANG_KEY_PREFIX).append(lang.getCode()).toString()) != null;
+            return getFontMap().getProperty(new StringBuilder(LANG_KEY_PREFIX).append(lang.getCode()).toString()) != null;
         }
         return false;
     }
@@ -119,7 +119,7 @@
             resetFont(book.getInitials());
         }
         if (lang != null) {
-            resetFont(new StringBuffer(LANG_KEY_PREFIX).append(lang.getCode()).toString());
+            resetFont(new StringBuilder(LANG_KEY_PREFIX).append(lang.getCode()).toString());
         }
     }
 

Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/ViewSourcePane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/ViewSourcePane.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/ViewSourcePane.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -77,7 +77,7 @@
 public class ViewSourcePane extends JPanel {
     public ViewSourcePane(Book[] books, Key key) {
         try {
-            StringBuffer buf = new StringBuffer();
+            StringBuilder buf = new StringBuilder();
 
             Iterator iter = key.iterator();
             while (iter.hasNext()) {

Modified: trunk/biblemapper/src/main/java/org/crosswire/biblemapper/model/LinkArray.java
===================================================================
--- trunk/biblemapper/src/main/java/org/crosswire/biblemapper/model/LinkArray.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/biblemapper/src/main/java/org/crosswire/biblemapper/model/LinkArray.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -288,7 +288,7 @@
      * Debug for an array of Links
      */
     public static String debug(Link[] set) {
-        StringBuffer buff = new StringBuffer();
+        StringBuilder buff = new StringBuilder();
 
         for (int i = 0; i < set.length; i++) {
             if (i != 0) {

Modified: trunk/biblemapper/src/main/java/org/crosswire/biblemapper/model/Map.java
===================================================================
--- trunk/biblemapper/src/main/java/org/crosswire/biblemapper/model/Map.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/biblemapper/src/main/java/org/crosswire/biblemapper/model/Map.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -221,8 +221,8 @@
                          * if (log.isDebugEnabled()) {
                          * log.debug("Rule: "+j+" ("+
                          * rules[j].getClass().getName(
-                         * )+") scale="+rules[j].getScale()); StringBuffer out =
-                         * new StringBuffer(" "); for (int i=0; i<dar[j].length;
+                         * )+") scale="+rules[j].getScale()); StringBuilder out =
+                         * new StringBuilder(" "); for (int i=0; i<dar[j].length;
                          * i++) {
                          * out.append(" ("+i+"="+dar[j][i].pos[0]+","+dar[
                          * j][i].pos[1]+")"); } log.debug(out); }

Modified: trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/ExtensionFileFilter.java
===================================================================
--- trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/ExtensionFileFilter.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/ExtensionFileFilter.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -88,7 +88,7 @@
             return desc;
         }
 
-        StringBuffer buff = new StringBuffer("(");
+        StringBuilder buff = new StringBuilder("(");
         for (int i = 0; i < extensions.length; i++) {
             if (i != 0) {
                 buff.append(", ");

Modified: trunk/common-swing/src/main/java/org/crosswire/common/config/swing/AdvancedConfigEditor.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/config/swing/AdvancedConfigEditor.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/common-swing/src/main/java/org/crosswire/common/config/swing/AdvancedConfigEditor.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -148,7 +148,7 @@
 
         // Get the name of the current deck
         Object[] list = tree.getSelectionPath().getPath();
-        StringBuffer path = new StringBuffer();
+        StringBuilder path = new StringBuilder();
 
         for (int i = 1; i < list.length; i++) {
             if (i > 1) {

Modified: trunk/common-swing/src/main/java/org/crosswire/common/config/swing/TreeConfigEditor.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/config/swing/TreeConfigEditor.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/common-swing/src/main/java/org/crosswire/common/config/swing/TreeConfigEditor.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -194,7 +194,7 @@
 
         // Get the name of the current deck
         Object[] list = tree.getSelectionPath().getPath();
-        StringBuffer path = new StringBuffer();
+        StringBuilder path = new StringBuilder();
 
         for (int i = 1; i < list.length; i++) {
             if (i > 1) {

Modified: trunk/common-swing/src/main/java/org/crosswire/common/progress/swing/JobsProgressBar.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/progress/swing/JobsProgressBar.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/common-swing/src/main/java/org/crosswire/common/progress/swing/JobsProgressBar.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -185,7 +185,7 @@
 
         // At 99% the progress bar animates nicely.
         int percent = 99;
-        StringBuffer buf = new StringBuffer(job.getSectionName());
+        StringBuilder buf = new StringBuilder(job.getSectionName());
         if (job.getProgressMode() != ProgressMode.UNKNOWN) {
             percent = job.getWork();
             buf.append(": ");

Modified: trunk/common-swing/src/main/java/org/crosswire/common/swing/ActionFactory.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/swing/ActionFactory.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/ActionFactory.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -423,7 +423,7 @@
      */
     private void buildActionMap(Class basis) {
         try {
-            StringBuffer basisName = new StringBuffer(basis.getName());
+            StringBuilder basisName = new StringBuilder(basis.getName());
             ResourceBundle resources = ResourceBundle.getBundle(basisName.toString(), Locale.getDefault(), CWClassLoader.instance(basis));
             ResourceBundle controls = null;
             try {

Modified: trunk/common-swing/src/main/java/org/crosswire/common/swing/CWAction.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/swing/CWAction.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/CWAction.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -120,7 +120,7 @@
      */
     /* @Override */
     public String toString() {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
 
         sb.append("Name:");
         sb.append((String) getValue(Action.NAME));

Modified: trunk/common-swing/src/main/java/org/crosswire/common/swing/CWLabel.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/swing/CWLabel.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/CWLabel.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -61,7 +61,7 @@
             label = label.substring(0, len - 1);
         } else if (pos >= 0 && pos < len - 1) {
             // Remove the _
-            StringBuffer buffer = new StringBuffer(label.length() - 1);
+            StringBuilder buffer = new StringBuilder(label.length() - 1);
             if (pos > 0) {
                 buffer.append(label.substring(0, pos));
             }

Modified: trunk/common-swing/src/main/java/org/crosswire/common/swing/ExceptionPane.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/swing/ExceptionPane.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/ExceptionPane.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -304,7 +304,7 @@
      * Gets a short HTML description of an Exception for display in a window
      */
     public static String getHTMLDescription(Throwable ex) {
-        StringBuffer retcode = new StringBuffer();
+        StringBuilder retcode = new StringBuilder();
 
         // The message in the exception
         String msg = ex.getMessage();
@@ -459,7 +459,7 @@
                 File file = new File(srcs[i], name);
                 if (file.isFile() && file.canRead()) {
                     // Found the file, load it into the window
-                    StringBuffer data = new StringBuffer();
+                    StringBuilder data = new StringBuilder();
 
                     // Attempt to note the line to highlight
                     int selection_start = 0;
@@ -515,7 +515,7 @@
             // TRANSLATOR: When an error dialog is presented to the user, this indicates that the Java source could not be found.
             // {1} is a placeholder for the line number on which the error occurred.
             // {0} is a placeholder for the Java file.
-            StringBuffer error = new StringBuffer(UserMsg.gettext("Cannot open source for: {0}, line: {1}\n", new Object[] {
+            StringBuilder error = new StringBuilder(UserMsg.gettext("Cannot open source for: {0}, line: {1}\n", new Object[] {
                     st.getClassName(level), errorLine
             }));
             for (int i = 0; i < srcs.length; i++) {

Modified: trunk/common-swing/src/main/java/org/crosswire/common/swing/FontStore.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/swing/FontStore.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/FontStore.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -133,7 +133,7 @@
             return;
         }
         load();
-        fontMap.setProperty(new StringBuffer(LANG_KEY_PREFIX).append(lang.getCode()).toString(), GuiConvert.font2String(font));
+        fontMap.setProperty(new StringBuilder(LANG_KEY_PREFIX).append(lang.getCode()).toString(), GuiConvert.font2String(font));
         store();
     }
 
@@ -181,7 +181,7 @@
         }
 
         if (lang != null) {
-            fontSpec = fontMap.getProperty(new StringBuffer(LANG_KEY_PREFIX).append(lang.getCode()).toString());
+            fontSpec = fontMap.getProperty(new StringBuilder(LANG_KEY_PREFIX).append(lang.getCode()).toString());
         }
 
         if (fontSpec != null) {

Modified: trunk/common-swing/src/main/java/org/crosswire/common/swing/NumericDocument.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/swing/NumericDocument.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/NumericDocument.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -48,7 +48,7 @@
         }
 
         char[] upper = str.toCharArray();
-        StringBuffer clear = new StringBuffer();
+        StringBuilder clear = new StringBuilder();
 
         for (int i = 0; i < upper.length; i++) {
             if (Character.isDigit(upper[i])) {

Modified: trunk/javatar/src/main/java/com/ice/tar/FastTarStream.java
===================================================================
--- trunk/javatar/src/main/java/com/ice/tar/FastTarStream.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/javatar/src/main/java/com/ice/tar/FastTarStream.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -193,7 +193,7 @@
             int nameWidth = 56;
             int sizeWidth = 9;
             int userWidth = 8;
-            StringBuffer padBuf = new StringBuffer(128);
+            StringBuilder padBuf = new StringBuilder(128);
             for (;;)
             {
                 TarEntry entry = fts.getNextEntry();

Modified: trunk/javatar/src/main/java/com/ice/tar/TarEntry.java
===================================================================
--- trunk/javatar/src/main/java/com/ice/tar/TarEntry.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/javatar/src/main/java/com/ice/tar/TarEntry.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -343,7 +343,7 @@
      */
     public void setName(String name)
     {
-        this.header.name = new StringBuffer(name);
+        this.header.name = new StringBuilder(name);
     }
 
     /**
@@ -403,7 +403,7 @@
      */
     public void setUserName(String userName)
     {
-        this.header.userName = new StringBuffer(userName);
+        this.header.userName = new StringBuilder(userName);
     }
 
     /**
@@ -423,7 +423,7 @@
      */
     public void setGroupName(String groupName)
     {
-        this.header.groupName = new StringBuffer(groupName);
+        this.header.groupName = new StringBuilder(groupName);
     }
 
     /**
@@ -580,9 +580,9 @@
         for (; name.startsWith("/");)
             name = name.substring(1);
 
-        hdr.linkName = new StringBuffer("");
+        hdr.linkName = new StringBuilder("");
 
-        hdr.name = new StringBuffer(name);
+        hdr.name = new StringBuilder(name);
 
         if (newFile.isDirectory())
         {
@@ -752,7 +752,7 @@
         }
         else
         {
-            StringBuffer buf = new StringBuffer(128);
+            StringBuilder buf = new StringBuilder(128);
 
             buf.append("header magic is not 'ustar' or unix-style zeros, it is '");
             buf.append(headerBuf[257]);
@@ -838,9 +838,9 @@
         {
             hdr.devMajor = 0;
             hdr.devMinor = 0;
-            hdr.magic = new StringBuffer("");
-            hdr.userName = new StringBuffer("");
-            hdr.groupName = new StringBuffer("");
+            hdr.magic = new StringBuilder("");
+            hdr.userName = new StringBuilder("");
+            hdr.groupName = new StringBuilder("");
         }
     }
 
@@ -862,7 +862,7 @@
         hdr.devMajor = 0;
         hdr.devMinor = 0;
 
-        hdr.name = new StringBuffer(name);
+        hdr.name = new StringBuilder(name);
         hdr.mode = isDir ? 040755 : 0100644;
         hdr.userId = 0;
         hdr.groupId = 0;
@@ -873,9 +873,9 @@
 
         hdr.linkFlag = isDir ? TarHeader.LF_DIR : TarHeader.LF_NORMAL;
 
-        hdr.linkName = new StringBuffer("");
-        hdr.userName = new StringBuffer("");
-        hdr.groupName = new StringBuffer("");
+        hdr.linkName = new StringBuilder("");
+        hdr.userName = new StringBuilder("");
+        hdr.groupName = new StringBuilder("");
 
         hdr.devMajor = 0;
         hdr.devMinor = 0;
@@ -884,7 +884,7 @@
     /* @Override */
     public String toString()
     {
-        StringBuffer result = new StringBuffer(128);
+        StringBuilder result = new StringBuilder(128);
         return result.append("[TarEntry name=").append(this.getName()).append(", isDir=").append(this.isDirectory()).append(", size=").append(this.getSize())
                         .append(", userId=").append(this.getUserId()).append(", user=").append(this.getUserName()).append(", groupId=").append(
                                         this.getGroupId()).append(", group=").append(this.getGroupName()).append("]").toString();

Modified: trunk/javatar/src/main/java/com/ice/tar/TarHeader.java
===================================================================
--- trunk/javatar/src/main/java/com/ice/tar/TarHeader.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/javatar/src/main/java/com/ice/tar/TarHeader.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -132,7 +132,7 @@
     /**
      * The entry's name.
      */
-    public StringBuffer name;
+    public StringBuilder name;
     /**
      * The entry's permission mode.
      */
@@ -164,19 +164,19 @@
     /**
      * The entry's link name.
      */
-    public StringBuffer linkName;
+    public StringBuilder linkName;
     /**
      * The entry's magic tag.
      */
-    public StringBuffer magic;
+    public StringBuilder magic;
     /**
      * The entry's user name.
      */
-    public StringBuffer userName;
+    public StringBuilder userName;
     /**
      * The entry's group name.
      */
-    public StringBuffer groupName;
+    public StringBuilder groupName;
     /**
      * The entry's major device number.
      */
@@ -188,10 +188,10 @@
 
     public TarHeader()
     {
-        this.magic = new StringBuffer(TarHeader.TMAGIC);
+        this.magic = new StringBuilder(TarHeader.TMAGIC);
 
-        this.name = new StringBuffer();
-        this.linkName = new StringBuffer();
+        this.name = new StringBuilder();
+        this.linkName = new StringBuilder();
 
         String user = System.getProperty("user.name", "");
 
@@ -200,8 +200,8 @@
 
         this.userId = 0;
         this.groupId = 0;
-        this.userName = new StringBuffer(user);
-        this.groupName = new StringBuffer("");
+        this.userName = new StringBuilder(user);
+        this.groupName = new StringBuilder("");
     }
 
     /**
@@ -216,7 +216,7 @@
         {
             hdr = (TarHeader) super.clone();
 
-            hdr.name = (this.name == null) ? null : new StringBuffer(this.name.toString());
+            hdr.name = (this.name == null) ? null : new StringBuilder(this.name.toString());
             hdr.mode = this.mode;
             hdr.userId = this.userId;
             hdr.groupId = this.groupId;
@@ -224,10 +224,10 @@
             hdr.modTime = this.modTime;
             hdr.checkSum = this.checkSum;
             hdr.linkFlag = this.linkFlag;
-            hdr.linkName = (this.linkName == null) ? null : new StringBuffer(this.linkName.toString());
-            hdr.magic = (this.magic == null) ? null : new StringBuffer(this.magic.toString());
-            hdr.userName = (this.userName == null) ? null : new StringBuffer(this.userName.toString());
-            hdr.groupName = (this.groupName == null) ? null : new StringBuffer(this.groupName.toString());
+            hdr.linkName = (this.linkName == null) ? null : new StringBuilder(this.linkName.toString());
+            hdr.magic = (this.magic == null) ? null : new StringBuilder(this.magic.toString());
+            hdr.userName = (this.userName == null) ? null : new StringBuilder(this.userName.toString());
+            hdr.groupName = (this.groupName == null) ? null : new StringBuilder(this.groupName.toString());
             hdr.devMajor = this.devMajor;
             hdr.devMinor = this.devMinor;
         }
@@ -296,9 +296,9 @@
      * @param header The header buffer from which to parse.
      * @return The header's entry name.
      */
-    public static StringBuffer parseFileName(byte[] header)
+    public static StringBuilder parseFileName(byte[] header)
     {
-        StringBuffer result = new StringBuffer(256);
+        StringBuilder result = new StringBuilder(256);
 
         // If header[345] is not equal to zero, then it is the "prefix"
         // that 'ustar' defines. It must be prepended to the "normal"
@@ -330,9 +330,9 @@
      * @param length The number of header bytes to parse.
      * @return The header's entry name.
      */
-    public static StringBuffer parseName(byte[] header, int offset, int length)
+    public static StringBuilder parseName(byte[] header, int offset, int length)
     {
-        StringBuffer result = new StringBuffer(length);
+        StringBuilder result = new StringBuilder(length);
 
         int end = offset + length;
         for (int i = offset; i < end; ++i)
@@ -376,13 +376,13 @@
             if (prefix.length() > TarHeader.PREFIXLEN)
                 throw new InvalidHeaderException("file prefix is greater than 155 characters");
 
-            TarHeader.getNameBytes(new StringBuffer(name), outbuf, TarHeader.NAMEOFFSET, TarHeader.NAMELEN);
+            TarHeader.getNameBytes(new StringBuilder(name), outbuf, TarHeader.NAMEOFFSET, TarHeader.NAMELEN);
 
-            TarHeader.getNameBytes(new StringBuffer(prefix), outbuf, TarHeader.PREFIXOFFSET, TarHeader.PREFIXLEN);
+            TarHeader.getNameBytes(new StringBuilder(prefix), outbuf, TarHeader.PREFIXOFFSET, TarHeader.PREFIXLEN);
         }
         else
         {
-            TarHeader.getNameBytes(new StringBuffer(newName), outbuf, TarHeader.NAMEOFFSET, TarHeader.NAMELEN);
+            TarHeader.getNameBytes(new StringBuilder(newName), outbuf, TarHeader.NAMEOFFSET, TarHeader.NAMELEN);
         }
 
         // The offset, regardless of the format, is now the end of the
@@ -392,13 +392,13 @@
     }
 
     /**
-     * Move the bytes from the name StringBuffer into the header's buffer.
+     * Move the bytes from the name StringBuilder into the header's buffer.
      * @param buf The header buffer into which to copy the name.
      * @param offset The offset into the buffer at which to store.
      * @param length The number of header bytes to store.
      * @return The new offset (offset + length).
      */
-    public static int getNameBytes(StringBuffer name, byte[] buf, int offset, int length)
+    public static int getNameBytes(StringBuilder name, byte[] buf, int offset, int length)
     {
         int i;
 

Modified: trunk/javatar/src/main/java/com/ice/tar/TarOutputStream.java
===================================================================
--- trunk/javatar/src/main/java/com/ice/tar/TarOutputStream.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/javatar/src/main/java/com/ice/tar/TarOutputStream.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -134,7 +134,7 @@
      */
     public void putNextEntry(TarEntry entry) throws IOException
     {
-        StringBuffer name = entry.getHeader().name;
+        StringBuilder name = entry.getHeader().name;
 
         // NOTE
         // This check is not adequate, because the maximum file length that

Modified: trunk/jsword/src/main/java/org/crosswire/common/config/AbstractReflectedChoice.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/common/config/AbstractReflectedChoice.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword/src/main/java/org/crosswire/common/config/AbstractReflectedChoice.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -78,8 +78,8 @@
 
         // OPTIMIZE(dms): This is poorly done (by me!)
         String[] pathParts = StringUtil.split(key, '.');
-        StringBuffer parentKey = new StringBuffer();
-        StringBuffer path = new StringBuffer();
+        StringBuilder parentKey = new StringBuilder();
+        StringBuilder path = new StringBuilder();
         for (int i = 0; i < pathParts.length; i++) {
             if (i > 0) {
                 parentKey.append('.');

Modified: trunk/jsword/src/main/java/org/crosswire/common/diff/CommonMiddle.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/common/diff/CommonMiddle.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword/src/main/java/org/crosswire/common/diff/CommonMiddle.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -94,7 +94,7 @@
      * @see java.lang.Object#toString()
      */
     public String toString() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         buf.append(sourcePrefix);
         buf.append(',');
         buf.append(sourceSuffix);

Modified: trunk/jsword/src/main/java/org/crosswire/common/diff/Diff.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/common/diff/Diff.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword/src/main/java/org/crosswire/common/diff/Diff.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -195,8 +195,8 @@
             diffs.add(new Difference(EditType.EQUAL, ""));
             int countDeletes = 0;
             int countInserts = 0;
-            StringBuffer textDelete = new StringBuffer();
-            StringBuffer textInsert = new StringBuffer();
+            StringBuilder textDelete = new StringBuilder();
+            StringBuilder textInsert = new StringBuilder();
             ListIterator pointer = diffs.listIterator();
             Difference curDiff = (Difference) pointer.next();
             while (curDiff != null) {
@@ -292,7 +292,7 @@
      * @return HTML representation
      */
     public String prettyHtml(List diffs) {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         for (int x = 0; x < diffs.size(); x++) {
             Difference diff = (Difference) diffs.get(x);
             EditType editType = diff.getEditType(); // Mode (delete, equal,

Modified: trunk/jsword/src/main/java/org/crosswire/common/diff/DiffCleanup.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/common/diff/DiffCleanup.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword/src/main/java/org/crosswire/common/diff/DiffCleanup.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -257,8 +257,8 @@
 
         int countDelete = 0;
         int countInsert = 0;
-        StringBuffer textDelete = new StringBuffer();
-        StringBuffer textInsert = new StringBuffer();
+        StringBuilder textDelete = new StringBuilder();
+        StringBuilder textInsert = new StringBuilder();
 
         int commonLength = 0;
 

Modified: trunk/jsword/src/main/java/org/crosswire/common/diff/LineMap.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/common/diff/LineMap.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword/src/main/java/org/crosswire/common/diff/LineMap.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -68,7 +68,7 @@
      *            List of Difference objects
      */
     public void restore(final List diffs) {
-        StringBuffer text = new StringBuffer();
+        StringBuilder text = new StringBuilder();
         for (int x = 0; x < diffs.size(); x++) {
             Difference diff = (Difference) diffs.get(x);
             String chars = diff.getText();
@@ -116,7 +116,7 @@
      * @return Encoded string
      */
     private String linesToCharsMunge(final String text, List linearray, Map linehash) {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         String work = text;
         // text.split('\n') would work fine, but would temporarily double our
         // memory footprint for minimal speed improvement.

Modified: trunk/jsword/src/main/java/org/crosswire/common/diff/Patch.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/common/diff/Patch.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword/src/main/java/org/crosswire/common/diff/Patch.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -366,7 +366,7 @@
      * @return Text representation of patches.
      */
     public String toText() {
-        StringBuffer text = new StringBuffer();
+        StringBuilder text = new StringBuilder();
         Iterator iter = patches.iterator();
         while (iter.hasNext()) {
             text.append(iter.next());

Modified: trunk/jsword/src/main/java/org/crosswire/common/diff/PatchEntry.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/common/diff/PatchEntry.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword/src/main/java/org/crosswire/common/diff/PatchEntry.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -153,7 +153,7 @@
     // Header: @@ -382,8 +481,9 @@
     // Indices are printed as 1-based, not 0-based.
     public String toString() {
-        StringBuffer txt = new StringBuffer();
+        StringBuilder txt = new StringBuilder();
         txt.append("@@ -");
         txt.append(getCoordinates(sourceStart, sourceLength));
         txt.append(" +");
@@ -234,7 +234,7 @@
 
     // Compute and return the source text (all equalities and deletions).
     public String getSourceText() {
-        StringBuffer txt = new StringBuffer();
+        StringBuilder txt = new StringBuilder();
         Iterator iter = diffs.iterator();
         while (iter.hasNext()) {
             Difference diff = (Difference) iter.next();
@@ -247,7 +247,7 @@
 
     // Compute and return the destination text (all equalities and insertions).
     public String getTargetText() {
-        StringBuffer txt = new StringBuffer();
+        StringBuilder txt = new StringBuilder();
         Iterator iter = diffs.iterator();
         while (iter.hasNext()) {
             Difference diff = (Difference) iter.next();
@@ -356,7 +356,7 @@
     }
 
     private String getCoordinates(int start, int length) {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
 
         if (length == 0) {
             buf.append(start);
@@ -383,7 +383,7 @@
      */
     private String encode(String str) {
         int strlen = str.length();
-        StringBuffer buf = new StringBuffer(2 * strlen);
+        StringBuilder buf = new StringBuilder(2 * strlen);
         for (int i = 0; i < strlen; i++) {
             char c = str.charAt(i);
             switch (c) {
@@ -409,7 +409,7 @@
      */
     private String decode(String str) {
         int strlen = str.length();
-        StringBuffer buf = new StringBuffer(2 * strlen);
+        StringBuilder buf = new StringBuilder(2 * strlen);
         int i = 0;
         for (i = 0; i < strlen; i++) {
             char c = str.charAt(i);

Modified: trunk/jsword/src/main/java/org/crosswire/common/util/ClassUtil.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/common/util/ClassUtil.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword/src/main/java/org/crosswire/common/util/ClassUtil.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -81,7 +81,7 @@
                     log.warn("Missing zip file for " + classname + " and " + paths[i]);
                 }
             } else {
-                StringBuffer path = new StringBuffer(256);
+                StringBuilder path = new StringBuilder(256);
 
                 // Search for the file
                 String extra = classname.replace('.', File.separatorChar);

Modified: trunk/jsword/src/main/java/org/crosswire/common/util/Convert.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/common/util/Convert.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword/src/main/java/org/crosswire/common/util/Convert.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -190,7 +190,7 @@
      */
     public static String map2String(Map commands) {
         Iterator it = commands.entrySet().iterator();
-        StringBuffer retcode = new StringBuffer();
+        StringBuilder retcode = new StringBuilder();
 
         while (it.hasNext()) {
             Map.Entry entry = (Map.Entry) it.next();

Modified: trunk/jsword/src/main/java/org/crosswire/common/util/EventListenerList.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/common/util/EventListenerList.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword/src/main/java/org/crosswire/common/util/EventListenerList.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -311,7 +311,7 @@
     /* @Override */
     public String toString() {
         Object[] lList = listenerList;
-        StringBuffer s = new StringBuffer("EventListenerList: ");
+        StringBuilder s = new StringBuilder("EventListenerList: ");
         s.append(lList.length / 2);
         s.append(" listeners: ");
 

Modified: trunk/jsword/src/main/java/org/crosswire/common/util/Histogram.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/common/util/Histogram.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword/src/main/java/org/crosswire/common/util/Histogram.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -67,7 +67,7 @@
      * @see java.lang.Object#toString()
      */
     public String toString() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         Iterator iter = hist.entrySet().iterator();
         while (iter.hasNext()) {
             Map.Entry entry = (Map.Entry) iter.next();

Modified: trunk/jsword/src/main/java/org/crosswire/common/util/NetUtil.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/common/util/NetUtil.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword/src/main/java/org/crosswire/common/util/NetUtil.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -379,7 +379,7 @@
     public static URI lengthenURI(URI orig, String anExtra) {
         String extra = anExtra;
         try {
-            StringBuffer path = new StringBuffer(orig.getPath());
+            StringBuilder path = new StringBuilder(orig.getPath());
             char lastChar = path.charAt(path.length() - 1);
             char firstChar = extra.charAt(0);
             if (isSeparator(firstChar)) {

Modified: trunk/jsword/src/main/java/org/crosswire/common/util/StringUtil.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/common/util/StringUtil.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword/src/main/java/org/crosswire/common/util/StringUtil.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -57,7 +57,7 @@
      * @return A string containing all the text from the Stream.
      */
     public static String read(Reader in) throws IOException {
-        StringBuffer retcode = new StringBuffer();
+        StringBuilder retcode = new StringBuilder();
         BufferedReader din = new BufferedReader(in);
 
         while (true) {
@@ -80,7 +80,7 @@
      * StringUtil.createTitle("oneTwo") = "One Two"
      */
     public static String createTitle(String variable) {
-        StringBuffer retcode = new StringBuffer();
+        StringBuilder retcode = new StringBuilder();
         boolean lastlower = false;
         boolean lastspace = true;
 
@@ -122,7 +122,7 @@
     public static String getInitials(String sentence) {
         String[] words = StringUtil.split(sentence);
 
-        StringBuffer retcode = new StringBuffer();
+        StringBuilder retcode = new StringBuilder();
         for (int i = 0; i < words.length; i++) {
             String word = words[i];
 
@@ -561,7 +561,7 @@
         // (Assuming that all Strings are roughly equally long)
         int bufSize = arraySize == 0 ? 0 : arraySize * ((array[0] == null ? 16 : array[0].toString().length()) + separator.length());
 
-        StringBuffer buf = new StringBuffer(bufSize);
+        StringBuilder buf = new StringBuilder(bufSize);
 
         for (int i = 0; i < arraySize; i++) {
             if (i > 0) {
@@ -587,7 +587,7 @@
      * <tt>null</tt>, in which case <tt>"null"</tt> is returned.
      * 
      * <p>
-     * This is borrowed from Java 1.5, but uses StringBuffer.
+     * This is borrowed from Java 1.5, but uses StringBuilder.
      * 
      * @param a
      *            the array whose string representation to return
@@ -603,7 +603,7 @@
             return "[]";
         }
 
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
 
         for (int i = 0; i < a.length; i++) {
             if (i == 0) {

Modified: trunk/jsword/src/main/java/org/crosswire/common/util/Translations.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/common/util/Translations.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword/src/main/java/org/crosswire/common/util/Translations.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -229,7 +229,7 @@
     }
 
     public String toString(String translationCode) {
-        StringBuffer currentTranslation = new StringBuffer(Languages.getLanguageName(translationCode));
+        StringBuilder currentTranslation = new StringBuilder(Languages.getLanguageName(translationCode));
 
         if (translationCode.indexOf('_') != -1) {
             String[] locale = StringUtil.split(translationCode, '_');

Modified: trunk/jsword/src/main/java/org/crosswire/common/xml/HTMLSerializingContentHandler.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/common/xml/HTMLSerializingContentHandler.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword/src/main/java/org/crosswire/common/xml/HTMLSerializingContentHandler.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -68,7 +68,7 @@
 
     /* @Override */
     protected String decorateTagName(String tagName) {
-        StringBuffer buf = new StringBuffer(50);
+        StringBuilder buf = new StringBuilder(50);
         buf.append("<font class='tag'>");
         buf.append(super.decorateTagName(tagName));
         buf.append("</font>");
@@ -83,7 +83,7 @@
      */
     /* @Override */
     protected String decorateAttributeName(String attrName) {
-        StringBuffer buf = new StringBuffer(50);
+        StringBuilder buf = new StringBuilder(50);
         buf.append("<font class='attr'>");
         buf.append(super.decorateAttributeName(attrName));
         buf.append("</font>");
@@ -98,7 +98,7 @@
      */
     /* @Override */
     protected String decorateAttributeValue(String attrValue) {
-        StringBuffer buf = new StringBuffer(50);
+        StringBuilder buf = new StringBuilder(50);
         buf.append("<font class='value'>");
         buf.append(super.decorateAttributeValue(attrValue));
         buf.append("</font>");
@@ -114,7 +114,7 @@
      */
     /* @Override */
     protected String decorateCharacters(String characters) {
-        StringBuffer buf = new StringBuffer(50);
+        StringBuilder buf = new StringBuilder(50);
         buf.append("<font class='text'>");
         buf.append(XMLUtil.escape(super.decorateCharacters(characters)).replaceAll("\n", "<br>"));
         buf.append("</font>");
@@ -130,7 +130,7 @@
      */
     /* @Override */
     protected String decorateIndent(int indentLevel) {
-        StringBuffer buf = new StringBuffer(100);
+        StringBuilder buf = new StringBuilder(100);
         buf.append("<font class='indent'>");
         buf.append(super.decorateIndent(indentLevel).replaceAll("\t", "&nbsp;&nbsp;&nbsp;&nbsp;"));
         buf.append("</font>");

Modified: trunk/jsword/src/main/java/org/crosswire/common/xml/SerializingContentHandler.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/common/xml/SerializingContentHandler.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword/src/main/java/org/crosswire/common/xml/SerializingContentHandler.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -200,5 +200,5 @@
     }
 
     private boolean newlines;
-    private StringBuffer buffer = new StringBuffer();
+    private StringBuilder buffer = new StringBuilder();
 }

Modified: trunk/jsword/src/main/java/org/crosswire/common/xml/XMLFeatureSet.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/common/xml/XMLFeatureSet.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword/src/main/java/org/crosswire/common/xml/XMLFeatureSet.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -107,7 +107,7 @@
      */
     /* @Override */
     public String toString() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         buf.append('\n');
         Iterator iter = features.values().iterator();
         while (iter.hasNext()) {

Modified: trunk/jsword/src/main/java/org/crosswire/common/xml/XMLUtil.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/common/xml/XMLUtil.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword/src/main/java/org/crosswire/common/xml/XMLUtil.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -122,7 +122,7 @@
             return s;
         }
         int len = s.length();
-        StringBuffer str = new StringBuffer(len);
+        StringBuilder str = new StringBuilder(len);
 
         for (int i = 0; i < len; i++) {
             char ch = s.charAt(i);

Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/BookData.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/BookData.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/BookData.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -185,7 +185,7 @@
 
                     if (showDiffs[i - 1]) {
                         doDiffs = true;
-                        StringBuffer buf = new StringBuffer(prevBook.getInitials());
+                        StringBuilder buf = new StringBuilder(prevBook.getInitials());
                         buf.append(" ==> ");
                         buf.append(book.getInitials());
 

Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/DataPolice.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/DataPolice.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/DataPolice.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -89,7 +89,7 @@
      *            the police report.
      */
     public static void report(Level lev, String message) {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         if (bmd != null) {
             buf.append(bmd.getInitials());
         }

Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/OSISUtil.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/OSISUtil.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/OSISUtil.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -630,7 +630,7 @@
      * @return The canonical text without markup
      */
     public static String getCanonicalText(Element root) {
-        StringBuffer buffer = new StringBuffer();
+        StringBuilder buffer = new StringBuilder();
 
         // Dig past osis, osisText, if present, to get to the real content.
         List frag = OSISUtil.getFragment(root);
@@ -693,7 +693,7 @@
      * @return The Strong's numbers in the text
      */
     public static String getStrongsNumbers(Element root) {
-        StringBuffer buffer = new StringBuffer();
+        StringBuilder buffer = new StringBuilder();
 
         Iterator contentIter = getDeepContent(root, OSISUtil.OSIS_ELEMENT_W).iterator();
         while (contentIter.hasNext()) {
@@ -746,7 +746,7 @@
      * @return The references in the text
      */
     public static String getNotes(Element root) {
-        StringBuffer buffer = new StringBuffer();
+        StringBuilder buffer = new StringBuilder();
 
         Iterator contentIter = getDeepContent(root, OSISUtil.OSIS_ELEMENT_NOTE).iterator();
         while (contentIter.hasNext()) {
@@ -769,7 +769,7 @@
      * @return The references in the text
      */
     public static String getHeadings(Element root) {
-        StringBuffer buffer = new StringBuffer();
+        StringBuilder buffer = new StringBuilder();
 
         Iterator contentIter = getDeepContent(root, OSISUtil.OSIS_ELEMENT_TITLE).iterator();
         while (contentIter.hasNext()) {
@@ -780,7 +780,7 @@
         return buffer.toString();
     }
 
-    private static void getCanonicalContent(Element parent, String sID, Iterator iter, StringBuffer buffer) {
+    private static void getCanonicalContent(Element parent, String sID, Iterator iter, StringBuilder buffer) {
         if (!isCanonical(parent)) {
             return;
         }
@@ -834,7 +834,7 @@
     }
 
     private static String getTextContent(List fragment) {
-        StringBuffer buffer = new StringBuffer();
+        StringBuilder buffer = new StringBuilder();
 
         Iterator contentIter = fragment.iterator();
         while (contentIter.hasNext()) {
@@ -948,7 +948,7 @@
 
         int strlen = rtf.length();
 
-        StringBuffer text = new StringBuffer(strlen);
+        StringBuilder text = new StringBuilder(strlen);
 
         int i = 0;
         for (i = 0; i < strlen; i++) {
@@ -999,7 +999,7 @@
 
             // convert Unicode representations to Unicode
             if (rtf.startsWith("\\u", i)) {
-                StringBuffer buf = new StringBuffer();
+                StringBuilder buf = new StringBuilder();
                 i += 2;
                 while (i < strlen) {
                     char curDigit = rtf.charAt(i);
@@ -1117,7 +1117,7 @@
      * If we have a String just add it to the buffer, but if we have an Element
      * then try to dig the strings out of it.
      */
-    private static void recurseElement(Object sub, StringBuffer buffer) {
+    private static void recurseElement(Object sub, StringBuilder buffer) {
         if (sub instanceof Text) {
             buffer.append(((Text) sub).getText());
         } else if (sub instanceof Element) {
@@ -1135,7 +1135,7 @@
      * @param buffer
      *            The place we accumulate strings.
      */
-    private static void recurseChildren(Element ele, StringBuffer buffer) {
+    private static void recurseChildren(Element ele, StringBuilder buffer) {
         // ele is a JDOM Element that might have a getContent() method
         Iterator contentIter = ele.getContent().iterator();
         while (contentIter.hasNext()) {

Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/gbf/GBFTags.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/gbf/GBFTags.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/gbf/GBFTags.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -405,7 +405,7 @@
                 }
 
                 String existingMorph = word.getAttributeValue(OSISUtil.ATTRIBUTE_W_MORPH);
-                StringBuffer newMorph = new StringBuffer();
+                StringBuilder newMorph = new StringBuilder();
 
                 if (existingMorph != null && existingMorph.length() > 0) {
                     newMorph.append(existingMorph).append('|');
@@ -457,7 +457,7 @@
                 }
 
                 String existingLemma = word.getAttributeValue(OSISUtil.ATTRIBUTE_W_LEMMA);
-                StringBuffer newLemma = new StringBuffer();
+                StringBuilder newLemma = new StringBuilder();
 
                 if (existingLemma != null && existingLemma.length() > 0) {
                     newLemma.append(existingLemma).append('|');

Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/thml/FontTag.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/thml/FontTag.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/thml/FontTag.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -54,7 +54,7 @@
     /* @Override */
     public Element processTag(Element ele, Attributes attrs) {
         Element seg = OSISUtil.factory().createSeg();
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
 
         String color = attrs.getValue("color");
         if (color != null) {

Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/thml/SyncTag.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/thml/SyncTag.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/thml/SyncTag.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -80,7 +80,7 @@
             } else if (lastEle instanceof Element) {
                 Element wEle = (Element) lastEle;
                 if (wEle.getName().equals(OSISUtil.OSIS_ELEMENT_W)) {
-                    StringBuffer buf = new StringBuffer();
+                    StringBuilder buf = new StringBuilder();
                     String strongsAttr = wEle.getAttributeValue(OSISUtil.ATTRIBUTE_W_LEMMA);
                     if (strongsAttr != null) {
                         buf.append(strongsAttr);
@@ -109,7 +109,7 @@
             } else if (lastEle instanceof Element) {
                 Element wEle = (Element) lastEle;
                 if (wEle.getName().equals(OSISUtil.OSIS_ELEMENT_W)) {
-                    StringBuffer buf = new StringBuffer();
+                    StringBuilder buf = new StringBuilder();
                     String strongsAttr = wEle.getAttributeValue(OSISUtil.ATTRIBUTE_W_MORPH);
                     if (strongsAttr != null) {
                         buf.append(strongsAttr);

Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/thml/THMLFilter.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/thml/THMLFilter.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/thml/THMLFilter.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -138,7 +138,7 @@
     private Element parse(Book book, Key key, String plain, String failMessage) {
         Exception ex = null;
         // We need to create a root element to house our document fragment
-        StringBuffer buf = new StringBuffer(15 + plain.length()); // 15 for the
+        StringBuilder buf = new StringBuilder(15 + plain.length()); // 15 for the
                                                                   // tags we add
         buf.append('<').append(RootTag.TAG_ROOT).append('>').append(plain).append("</").append(RootTag.TAG_ROOT).append('>');
         finalInput = buf.toString();

Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/install/InstallManager.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/install/InstallManager.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/install/InstallManager.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -90,7 +90,7 @@
      */
     public void save() {
         Properties props = new Properties();
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         int i = 1;
         Iterator it = installers.keySet().iterator();
         while (it.hasNext()) {

Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/install/sword/AbstractSwordInstaller.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/install/sword/AbstractSwordInstaller.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/install/sword/AbstractSwordInstaller.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -88,7 +88,7 @@
      * @see org.crosswire.jsword.book.install.Installer#getInstallerDefinition()
      */
     public String getInstallerDefinition() {
-        StringBuffer buf = new StringBuffer(host);
+        StringBuilder buf = new StringBuilder(host);
         buf.append(',');
         buf.append(packageDirectory);
         buf.append(',');

Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/study/StrongsNumber.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/study/StrongsNumber.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/study/StrongsNumber.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -97,7 +97,7 @@
      * @return the strongsNumber
      */
     public String getStrongsNumber() {
-        StringBuffer buf = new StringBuffer(5);
+        StringBuilder buf = new StringBuilder(5);
         buf.append(language);
         buf.append(ZERO_PAD.format(strongsNumber));
         return buf.toString();
@@ -109,7 +109,7 @@
      * @return the strongsNumber
      */
     public String getFullStrongsNumber() {
-        StringBuffer buf = new StringBuffer(5);
+        StringBuilder buf = new StringBuilder(5);
         buf.append(language);
         buf.append(ZERO_PAD.format(strongsNumber));
         if (part != null) {

Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/ConfigEntry.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/ConfigEntry.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/ConfigEntry.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -352,7 +352,7 @@
      * @return the well-formed conf.
      */
     public String toConf() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
 
         if (value != null) {
             buf.append(getName());
@@ -427,7 +427,7 @@
     }
 
     private String report(String issue, String confEntryName, String aValue) {
-        StringBuffer buf = new StringBuffer(100);
+        StringBuilder buf = new StringBuilder(100);
         buf.append(issue);
         buf.append(' ');
         buf.append(confEntryName);

Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/ConfigEntryTable.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/ConfigEntryTable.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/ConfigEntryTable.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -334,7 +334,7 @@
      * @return the well-formed conf.
      */
     public String toConf() {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         buf.append('[');
         buf.append(getValue(ConfigEntryType.INITIALS));
         buf.append("]\n");
@@ -373,7 +373,7 @@
     }
 
     private void loadContents(BufferedReader in) throws IOException {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         while (true) {
             // Empty out the buffer
             buf.setLength(0);
@@ -463,7 +463,7 @@
     /**
      * Get continuation lines, if any.
      */
-    private void getContinuation(ConfigEntry configEntry, BufferedReader bin, StringBuffer buf) throws IOException {
+    private void getContinuation(ConfigEntry configEntry, BufferedReader bin, StringBuilder buf) throws IOException {
         for (String line = advance(bin); line != null; line = advance(bin)) {
             int length = buf.length();
 
@@ -705,7 +705,7 @@
         }
     }
 
-    private void toConf(StringBuffer buf, ConfigEntryType[] category) {
+    private void toConf(StringBuilder buf, ConfigEntryType[] category) {
         for (int i = 0; i < category.length; i++) {
 
             ConfigEntry entry = (ConfigEntry) table.get(category[i]);
@@ -747,7 +747,7 @@
         }
     }
 
-    private void toConf(StringBuffer buf, Map map) {
+    private void toConf(StringBuilder buf, Map map) {
         Iterator iter = map.entrySet().iterator();
         while (iter.hasNext()) {
             Map.Entry mapEntry = (Map.Entry) iter.next();
@@ -760,7 +760,7 @@
     }
 
     private String report(String issue, String confEntryName, String line) {
-        StringBuffer buf = new StringBuffer(100);
+        StringBuilder buf = new StringBuilder(100);
         buf.append(issue);
         buf.append(' ');
         buf.append(confEntryName);

Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/RawFileBackend.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/RawFileBackend.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/RawFileBackend.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -206,7 +206,7 @@
     protected void updateDataFile(int testament, long ordinal) throws IOException {
         // JDK15: Use String.format instead
         // String fileName = String.format("%07d\r\n", ordinal);
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         buf.append(new DecimalFormat("0000000").format(ordinal));
         buf.append("\r\n");
         String fileName = buf.toString();

Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/RawLDBackend.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/RawLDBackend.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/RawLDBackend.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -428,7 +428,7 @@
             if (bmd.hasFeature(FeatureType.GREEK_DEFINITIONS) && bmd.hasFeature(FeatureType.HEBREW_DEFINITIONS)) {
                 // The convention is that a Strong's dictionary with both Greek
                 // and Hebrew have G or H prefix
-                StringBuffer buf = new StringBuffer();
+                StringBuilder buf = new StringBuilder();
                 buf.append(Character.toUpperCase(type));
                 buf.append(ZERO_4PAD.format(strongsNumber));
 

Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/SwordBookMetaData.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/SwordBookMetaData.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/SwordBookMetaData.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -316,7 +316,7 @@
         // Many "features" are GlobalOptionFilters, which in the Sword C++ API
         // indicate a class to use for filtering.
         // These mostly have the source type prepended to the feature
-        StringBuffer buffer = new StringBuffer((String) getProperty(ConfigEntryType.SOURCE_TYPE));
+        StringBuilder buffer = new StringBuilder((String) getProperty(ConfigEntryType.SOURCE_TYPE));
         buffer.append(feature);
         if (cet.match(ConfigEntryType.GLOBAL_OPTION_FILTER, buffer.toString())) {
             return true;
@@ -337,7 +337,7 @@
             }
             if (value instanceof List) {
                 List list = (List) value;
-                StringBuffer combined = new StringBuffer();
+                StringBuilder combined = new StringBuilder();
                 boolean appendSeparator = false;
                 Iterator it = list.iterator();
                 while (it.hasNext()) {

Modified: trunk/jsword/src/main/java/org/crosswire/jsword/bridge/BookExporter.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/bridge/BookExporter.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/bridge/BookExporter.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -53,7 +53,7 @@
         Key keys = book.getGlobalKeyList();
 
         Iterator iter = keys.iterator();
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
         while (iter.hasNext()) {
             Key key = (Key) iter.next();
             String rawText = book.getRawText(key);

Modified: trunk/jsword/src/main/java/org/crosswire/jsword/bridge/BookLookup.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/bridge/BookLookup.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/bridge/BookLookup.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -44,7 +44,7 @@
     }
 
     public String locate(Key key) throws BookException {
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
 
         Iterator iter = key.iterator();
         while (iter.hasNext()) {

Modified: trunk/jsword/src/main/java/org/crosswire/jsword/examples/StrongsAnalysis.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/examples/StrongsAnalysis.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/examples/StrongsAnalysis.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -81,7 +81,7 @@
         Key subkey = null;
         BookData data = null;
         Element osis = null;
-        StringBuffer buffer = new StringBuffer();
+        StringBuilder buffer = new StringBuilder();
         Iterator it = wholeBible.iterator();
         while (it.hasNext()) {
             subkey = (Key) it.next();

Modified: trunk/jsword/src/main/java/org/crosswire/jsword/index/lucene/LuceneIndex.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/index/lucene/LuceneIndex.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/index/lucene/LuceneIndex.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -211,7 +211,7 @@
                 }
 
                 if (!errors.isEmpty()) {
-                    StringBuffer buf = new StringBuffer();
+                    StringBuilder buf = new StringBuilder();
                     Iterator iter = errors.iterator();
                     while (iter.hasNext()) {
                         buf.append(iter.next());

Modified: trunk/jsword/src/main/java/org/crosswire/jsword/index/lucene/LuceneQueryDecorator.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/index/lucene/LuceneQueryDecorator.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/index/lucene/LuceneQueryDecorator.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -42,7 +42,7 @@
      */
     public String decorateAllWords(String queryWords) {
         String[] words = queryWords.split(SPACE);
-        StringBuffer search = new StringBuffer();
+        StringBuilder search = new StringBuilder();
         search.append(PLUS);
         search.append(StringUtil.join(words, SPACE_PLUS));
         return search.toString();
@@ -69,7 +69,7 @@
      */
     public String decoratePhrase(String queryWords) {
         // This performs a best match
-        StringBuffer search = new StringBuffer();
+        StringBuilder search = new StringBuilder();
         search.append(QUOTE);
         search.append(queryWords);
         search.append(QUOTE);
@@ -85,7 +85,7 @@
      */
     public String decorateNotWords(String queryWords) {
         String[] words = queryWords.split(SPACE);
-        StringBuffer search = new StringBuffer();
+        StringBuilder search = new StringBuilder();
         search.append(MINUS);
         search.append(StringUtil.join(words, SPACE_MINUS));
         return search.toString();
@@ -99,7 +99,7 @@
      * .String)
      */
     public String decorateRange(String queryWords) {
-        StringBuffer search = new StringBuffer();
+        StringBuilder search = new StringBuilder();
         search.append(PLUS);
         search.append(OPEN);
         search.append(queryWords);
@@ -116,7 +116,7 @@
      */
     public String decorateSpellWords(String queryWords) {
         String[] words = queryWords.split(SPACE);
-        StringBuffer search = new StringBuffer(StringUtil.join(words, FUZZY_SPACE));
+        StringBuilder search = new StringBuilder(StringUtil.join(words, FUZZY_SPACE));
         search.append(FUZZY);
         return search.toString();
     }
@@ -130,7 +130,7 @@
      */
     public String decorateStartWords(String queryWords) {
         String[] words = queryWords.split(SPACE);
-        StringBuffer search = new StringBuffer(StringUtil.join(words, WILD_SPACE));
+        StringBuilder search = new StringBuilder(StringUtil.join(words, WILD_SPACE));
         search.append(WILD);
         return search.toString();
     }

Modified: trunk/jsword/src/main/java/org/crosswire/jsword/passage/AbstractKeyList.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/passage/AbstractKeyList.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/passage/AbstractKeyList.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -281,7 +281,7 @@
          * Create a <code>NameVisitor</code>.
          */
         public NameVisitor() {
-            buffer = new StringBuffer();
+            buffer = new StringBuilder();
         }
 
         /*
@@ -311,7 +311,7 @@
             return reply;
         }
 
-        protected StringBuffer buffer;
+        protected StringBuilder buffer;
     }
 
     /**

Modified: trunk/jsword/src/main/java/org/crosswire/jsword/passage/AbstractPassage.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/passage/AbstractPassage.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/passage/AbstractPassage.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -171,7 +171,7 @@
             return originalName;
         }
 
-        StringBuffer retcode = new StringBuffer();
+        StringBuilder retcode = new StringBuilder();
 
         Iterator it = rangeIterator(RestrictionType.NONE);
         Verse current = null;
@@ -218,7 +218,7 @@
      * @see org.crosswire.jsword.passage.Passage#getOSISName()
      */
     public String getOsisRef() {
-        StringBuffer retcode = new StringBuffer();
+        StringBuilder retcode = new StringBuilder();
 
         Iterator it = rangeIterator(RestrictionType.NONE);
         boolean hasNext = it.hasNext();
@@ -241,7 +241,7 @@
      * @see org.crosswire.jsword.passage.Key#getOSISId()
      */
     public String getOsisID() {
-        StringBuffer retcode = new StringBuffer();
+        StringBuilder retcode = new StringBuilder();
 
         Iterator it = rangeIterator(RestrictionType.NONE);
         boolean hasNext = it.hasNext();

Modified: trunk/jsword/src/main/java/org/crosswire/jsword/passage/AccuracyType.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/passage/AccuracyType.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/passage/AccuracyType.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -604,7 +604,7 @@
     }
 
     private static NoSuchVerseException buildVersePartsException(String original, String[] parts) {
-        StringBuffer buffer = new StringBuffer(original);
+        StringBuilder buffer = new StringBuilder(original);
         for (int i = 0; i < parts.length; i++) {
             buffer.append(", ").append(parts[i]);
         }

Modified: trunk/jsword/src/main/java/org/crosswire/jsword/passage/PassageKeyFactory.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/passage/PassageKeyFactory.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/passage/PassageKeyFactory.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -473,7 +473,7 @@
 
         // Note this has a lot in common with AccuracyType.tokenize
         int size = name.length();
-        StringBuffer buf = new StringBuffer(size * 2);
+        StringBuilder buf = new StringBuilder(size * 2);
 
         char curChar = ' ';
         boolean isNumber = false;

Modified: trunk/jsword/src/main/java/org/crosswire/jsword/passage/PassageTally.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/passage/PassageTally.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/passage/PassageTally.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -221,7 +221,7 @@
             return originalName;
         }
 
-        StringBuffer retcode = new StringBuffer();
+        StringBuilder retcode = new StringBuilder();
 
         if (order == ORDER_BIBLICAL) {
             Iterator it = rangeIterator(RestrictionType.NONE);
@@ -281,7 +281,7 @@
      */
     public String getNameAndTally(int cnt) {
         int max_count = cnt;
-        StringBuffer retcode = new StringBuffer();
+        StringBuilder retcode = new StringBuilder();
         if (max_count == 0) {
             max_count = Integer.MAX_VALUE;
         }

Modified: trunk/jsword/src/main/java/org/crosswire/jsword/passage/VerseRange.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/passage/VerseRange.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/passage/VerseRange.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -186,7 +186,7 @@
 
             // If this is in 2 separate books
             if (startBook != endBook) {
-                StringBuffer buf = new StringBuffer();
+                StringBuilder buf = new StringBuilder();
                 if (start.isStartOfBook()) {
                     buf.append(BibleInfo.getOSISName(startBook));
                 } else if (start.isStartOfChapter()) {
@@ -224,7 +224,7 @@
 
             // If this is 2 separate chapters in the same book
             if (startChapter != endChapter) {
-                StringBuffer buf = new StringBuffer();
+                StringBuilder buf = new StringBuilder();
                 if (start.isStartOfChapter()) {
                     buf.append(BibleInfo.getOSISName(startBook));
                     buf.append(Verse.VERSE_OSIS_DELIM);
@@ -249,7 +249,7 @@
             // If this range is exactly a whole chapter
             if (isWholeChapter()) {
                 // Just report the name of the book and the chapter
-                StringBuffer buf = new StringBuffer();
+                StringBuilder buf = new StringBuilder();
                 buf.append(BibleInfo.getOSISName(startBook));
                 buf.append(Verse.VERSE_OSIS_DELIM);
                 buf.append(startChapter);
@@ -258,7 +258,7 @@
 
             // If this is 2 separate verses
             if (start.getVerse() != end.getVerse()) {
-                StringBuffer buf = new StringBuffer();
+                StringBuilder buf = new StringBuilder();
                 buf.append(start.getOsisRef());
                 buf.append(VerseRange.RANGE_PREF_DELIM);
                 buf.append(end.getOsisRef());
@@ -306,7 +306,7 @@
 
         // Estimate the size of the buffer: book.dd.dd (where book is 3-5, 3
         // typical)
-        StringBuffer buf = new StringBuffer((endOrdinal - startOrdinal + 1) * 10);
+        StringBuilder buf = new StringBuilder((endOrdinal - startOrdinal + 1) * 10);
         buf.append(start.getOsisID());
         for (int i = startOrdinal + 1; i < endOrdinal; i++) {
             try {

Modified: trunk/jsword-limbo/src/historic/java/org/crosswire/jsword/view/cli/Model.java
===================================================================
--- trunk/jsword-limbo/src/historic/java/org/crosswire/jsword/view/cli/Model.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword-limbo/src/historic/java/org/crosswire/jsword/view/cli/Model.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -53,7 +53,7 @@
 
         KeyList set = dict.getGlobalKeyList();
 
-        StringBuffer buffer = new StringBuffer();
+        StringBuilder buffer = new StringBuilder();
         for (Iterator it = set.iterator(); it.hasNext();)
         {
             Key key = (Key) it.next();
@@ -120,7 +120,7 @@
     
     private String display(BookFilter filter)
     {
-        StringBuffer buffer = new StringBuffer();
+        StringBuilder buffer = new StringBuilder();
 
         List list = Books.installed().getBooks(filter);
         for (Iterator it = list.iterator(); it.hasNext();)
@@ -139,7 +139,7 @@
     
     public String config()
     {
-        StringBuffer buffer = new StringBuffer();
+        StringBuilder buffer = new StringBuilder();
         
         for (Iterator it = config.getNames(); it.hasNext();)
         {

Modified: trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/desktop/DebugPane.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/desktop/DebugPane.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/desktop/DebugPane.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -131,7 +131,7 @@
      * Some debug action that we can configure
      */
     public String showViews() {
-        StringBuffer reply = new StringBuffer();
+        StringBuilder reply = new StringBuilder();
 
         reply.append('\n');
         reply.append(LimboMsg.DEBUG_VIEWS.toString());

Modified: trunk/jsword-limbo/src/main/java/org/crosswire/common/net/WebBrowser.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/common/net/WebBrowser.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/common/net/WebBrowser.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -115,7 +115,7 @@
         }
 
         // Create the cookies header
-        StringBuffer buffer = new StringBuffer();
+        StringBuilder buffer = new StringBuilder();
         for (Enumeration en = cookies.elements(); en.hasMoreElements();) {
             Cookie cookie = (Cookie) en.nextElement();
             buffer.append(cookie.getName() + "=" + cookie.getValue());

Modified: trunk/jsword-limbo/src/main/java/org/crosswire/common/swing/MoneyDocument.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/common/swing/MoneyDocument.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/common/swing/MoneyDocument.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -28,7 +28,7 @@
         boolean has_dot = current.indexOf('.') == -1 ? false : true;
 
         char[] addition = str.toCharArray();
-        StringBuffer clear = new StringBuffer();
+        StringBuilder clear = new StringBuilder();
 
         for (int i = 0; i < addition.length; i++) {
             if (Character.isDigit(addition[i]))

Modified: trunk/jsword-limbo/src/main/java/org/crosswire/common/util/OldStringUtil.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/common/util/OldStringUtil.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/common/util/OldStringUtil.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -18,7 +18,7 @@
      * @return The capital letters in the given words.
      */
     public static String getCapitals(String words) {
-        StringBuffer retcode = new StringBuffer();
+        StringBuilder retcode = new StringBuilder();
 
         for (int i = 0; i < words.length(); i++) {
             char c = words.charAt(i);
@@ -35,7 +35,7 @@
      * StringUtil.createTitle("oneTwo") = "OneTwo"
      */
     public static String createJavaName(String variable) {
-        StringBuffer retcode = new StringBuffer();
+        StringBuilder retcode = new StringBuilder();
         boolean newword = true;
 
         for (int i = 0; i < variable.length(); i++) {

Modified: trunk/jsword-limbo/src/main/java/org/crosswire/common/util/Validator.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/common/util/Validator.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/common/util/Validator.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -155,12 +155,12 @@
     }
 
     /**
-     * Take a string (for example "£2,000.00") and chop out any of the chars
+     * Take a string (for example "�2,000.00") and chop out any of the chars
      * that make it fail to parse (giving 2000.00) All we do is chop out any
      * chars that are not one of "+", "-", "." or a number
      */
     public static String trimToNumberic(String orig) {
-        StringBuffer buffer = new StringBuffer();
+        StringBuilder buffer = new StringBuilder();
 
         for (int i = 0; i < orig.length(); i++) {
             char c = orig.charAt(i);

Modified: trunk/jsword-limbo/src/main/java/org/crosswire/common/xml/DOMDefaultHandler.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/common/xml/DOMDefaultHandler.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/common/xml/DOMDefaultHandler.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -142,8 +142,8 @@
     /*
      * Normalizes the given string
      * 
-     * private String normalize(String s) { StringBuffer str = new
-     * StringBuffer();
+     * private String normalize(String s) { StringBuilder str = new
+     * StringBuilder();
      * 
      * int len = (s != null) ? s.length() : 0; for (int i = 0; i < len; i++) {
      * char ch = s.charAt(i); switch (ch) { case '<': str.append("&lt;"); break;

Modified: trunk/jsword-limbo/src/main/java/org/crosswire/common/xml/OldXMLUtil.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/common/xml/OldXMLUtil.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/common/xml/OldXMLUtil.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -81,7 +81,7 @@
      *            How far down have we gone?
      */
     private static void recurseNodes(Node node, PrintWriter out, int depth) {
-        StringBuffer buff = new StringBuffer();
+        StringBuilder buff = new StringBuilder();
 
         switch (node.getNodeType()) {
         case Node.TEXT_NODE:

Modified: trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/jdbc/JDBCBibleUtil.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/jdbc/JDBCBibleUtil.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/jdbc/JDBCBibleUtil.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -51,7 +51,7 @@
      * @return The string with the char replaced
      */
     protected static String swapChar(String orig, char x, char y) {
-        StringBuffer retcode = new StringBuffer(orig);
+        StringBuilder retcode = new StringBuilder(orig);
         int start = 0;
 
         while (true) {

Modified: trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/CaseInstsMem.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/CaseInstsMem.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/CaseInstsMem.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -67,7 +67,7 @@
      * @param messages
      *            We append stuff here if something went wrong
      */
-    public CaseInstsMem(RawBook raw, boolean create, StringBuffer messages) {
+    public CaseInstsMem(RawBook raw, boolean create, StringBuilder messages) {
         super(raw, RawConstants.FILE_CASE_INST, create, messages);
     }
 

Modified: trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/InstsDisk.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/InstsDisk.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/InstsDisk.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -57,7 +57,7 @@
      * @param messages
      *            We append stuff here if something went wrong
      */
-    public InstsDisk(RawBook raw, String leafname, boolean create, StringBuffer messages) {
+    public InstsDisk(RawBook raw, String leafname, boolean create, StringBuilder messages) {
         try {
             ctor(raw, leafname, create);
         } catch (Exception ex) {
@@ -66,7 +66,7 @@
     }
 
     /**
-     * This really should be a constructor, however the StringBuffer ctor wants
+     * This really should be a constructor, however the StringBuilder ctor wants
      * to trap and muffle exceptions. |I can't do this:
      * <code>try { this(...) } ...</code>
      * 

Modified: trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/InstsMem.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/InstsMem.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/InstsMem.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -61,7 +61,7 @@
      * @param messages
      *            We append stuff here if something went wrong
      */
-    public InstsMem(RawBook raw, String leafname, boolean create, StringBuffer messages) {
+    public InstsMem(RawBook raw, String leafname, boolean create, StringBuilder messages) {
         super(raw, leafname, create, messages);
     }
 

Modified: trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/ItemsMem.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/ItemsMem.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/ItemsMem.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -64,7 +64,7 @@
      * @param messages
      *            We append stuff here if something went wrong
      */
-    public ItemsMem(RawBook raw, String leafname, boolean create, StringBuffer messages) {
+    public ItemsMem(RawBook raw, String leafname, boolean create, StringBuilder messages) {
         super(raw, leafname, create, messages);
     }
 

Modified: trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/Mem.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/Mem.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/Mem.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -68,7 +68,7 @@
      * @param messages
      *            We append stuff here if something went wrong
      */
-    public Mem(RawBook raw, String leafname, boolean create, StringBuffer messages) {
+    public Mem(RawBook raw, String leafname, boolean create, StringBuilder messages) {
         try {
             ctor(raw, leafname, create);
         } catch (Exception ex) {
@@ -77,7 +77,7 @@
     }
 
     /**
-     * This really should be a constructor, however the StringBuffer ctor wants
+     * This really should be a constructor, however the StringBuilder ctor wants
      * to trap and muffle exceptions. I can't do this:
      * <code>try { this(...) } ...</code>
      * 

Modified: trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/ParaInstsMem.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/ParaInstsMem.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/ParaInstsMem.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -60,7 +60,7 @@
      * @param create
      *            Should we start all over again
      */
-    public ParaInstsMem(RawBook raw, boolean create, StringBuffer messages) {
+    public ParaInstsMem(RawBook raw, boolean create, StringBuilder messages) {
         super(raw, RawConstants.FILE_PARA_INST, create, messages);
     }
 

Modified: trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/PuncInstsDisk.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/PuncInstsDisk.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/PuncInstsDisk.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -61,7 +61,7 @@
      * @param messages
      *            We append stuff here if something went wrong
      */
-    public PuncInstsDisk(RawBook raw, boolean create, StringBuffer messages) {
+    public PuncInstsDisk(RawBook raw, boolean create, StringBuilder messages) {
         super(raw, RawConstants.FILE_PUNC_INST, create, messages);
     }
 

Modified: trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/PuncInstsMem.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/PuncInstsMem.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/PuncInstsMem.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -61,7 +61,7 @@
      * @param messages
      *            We append stuff here if something went wrong
      */
-    public PuncInstsMem(RawBook raw, boolean create, StringBuffer messages) {
+    public PuncInstsMem(RawBook raw, boolean create, StringBuilder messages) {
         super(raw, RawConstants.FILE_PUNC_INST, create, messages);
     }
 

Modified: trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/PuncItemsMem.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/PuncItemsMem.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/PuncItemsMem.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -60,7 +60,7 @@
      * @param messages
      *            We append stuff here if something went wrong
      */
-    public PuncItemsMem(RawBook raw, boolean create, StringBuffer messages) {
+    public PuncItemsMem(RawBook raw, boolean create, StringBuilder messages) {
         super(raw, RawConstants.FILE_PUNC_ITEM, create, messages);
     }
 

Modified: trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/RawBook.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/RawBook.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/RawBook.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -218,7 +218,7 @@
 
             // We can still produce text without these though so they
             // should not except if the load fails.
-            StringBuffer messages = new StringBuffer();
+            StringBuilder messages = new StringBuilder();
 
             if (memory) {
                 puncInsts = new PuncInstsMem(this, create, messages);
@@ -267,7 +267,7 @@
      * .jsword.passage.Key)
      */
     public String getRawText(Key key) {
-        StringBuffer retcode = new StringBuffer();
+        StringBuilder retcode = new StringBuilder();
         Verse verse = KeyUtil.getVerse(key);
 
         int[] wordIdxs = wordInsts.getIndexes(verse);

Modified: trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/WordInstsDisk.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/WordInstsDisk.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/WordInstsDisk.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -61,7 +61,7 @@
      * @param messages
      *            We append stuff here if something went wrong
      */
-    public WordInstsDisk(RawBook raw, boolean create, StringBuffer messages) {
+    public WordInstsDisk(RawBook raw, boolean create, StringBuilder messages) {
         super(raw, RawConstants.FILE_WORD_INST, create, messages);
     }
 

Modified: trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/remote/HttpRemoter.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/remote/HttpRemoter.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/remote/HttpRemoter.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -83,7 +83,7 @@
      * get a complete URL which will get us the required XML document.
      */
     public static String methodToParam(RemoteMethod method) {
-        StringBuffer buffer = new StringBuffer();
+        StringBuilder buffer = new StringBuilder();
 
         buffer.append("?method=");
         buffer.append(method.getMethodName());

Modified: trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/remote/RemoteBook.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/remote/RemoteBook.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/remote/RemoteBook.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -114,7 +114,7 @@
      * .Key)
      */
     public String getRawText(Key key) throws BookException {
-        StringBuffer buffer = new StringBuffer();
+        StringBuilder buffer = new StringBuilder();
         return buffer.toString();
     }
 

Modified: trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/search/parse/CustomTokenizer.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/search/parse/CustomTokenizer.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/search/parse/CustomTokenizer.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -178,7 +178,7 @@
      */
     private static String getSingleCharWords(Map commands) {
         Iterator it = commands.keySet().iterator();
-        StringBuffer buf = new StringBuffer();
+        StringBuilder buf = new StringBuilder();
 
         while (it.hasNext()) {
             String cmd = (String) it.next();

Modified: trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/search/parse/PassageLeftParamWord.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/search/parse/PassageLeftParamWord.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/search/parse/PassageLeftParamWord.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -57,7 +57,7 @@
      */
     public Key getKeyList(IndexSearcher engine) throws BookException {
         Iterator it = engine.iterator();
-        StringBuffer buff = new StringBuffer();
+        StringBuilder buff = new StringBuilder();
 
         int paren_level = 1;
         while (true) {

Modified: trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/search/parse/PhraseParamWord.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/search/parse/PhraseParamWord.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/search/parse/PhraseParamWord.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -61,7 +61,7 @@
      */
     public Key getKeyList(IndexSearcher engine) throws BookException {
         Iterator it = engine.iterator();
-        StringBuffer buff = new StringBuffer();
+        StringBuilder buff = new StringBuilder();
 
         while (true) {
             if (!it.hasNext()) {

Modified: trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/stub/StubDictionary.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/stub/StubDictionary.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/stub/StubDictionary.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -86,7 +86,7 @@
      * .Key)
      */
     public String getRawText(Key key) throws BookException {
-        StringBuffer buffer = new StringBuffer();
+        StringBuilder buffer = new StringBuilder();
         return buffer.toString();
     }
 

Modified: trunk/jsword-support/tools/checkstyle/checkstyle-5.3/contrib/JavadocCheckDefault.java
===================================================================
--- trunk/jsword-support/tools/checkstyle/checkstyle-5.3/contrib/JavadocCheckDefault.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword-support/tools/checkstyle/checkstyle-5.3/contrib/JavadocCheckDefault.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -36,7 +36,7 @@
             final Check check = (Check) clazz.newInstance();            
             final int[] defaultTokens = check.getDefaultTokens();
             if (defaultTokens.length > 0) {
-                final StringBuffer buf = new StringBuffer();
+                final StringBuilder buf = new StringBuilder();
                 buf.append(header);
                 final ArrayList tokenNames = new ArrayList();
                 for (int i = 0; i < defaultTokens.length; i++) {

Modified: trunk/jsword-sword/src/main/java/org/crosswire/sword/frontend/im/HebrewMCIM.java
===================================================================
--- trunk/jsword-sword/src/main/java/org/crosswire/sword/frontend/im/HebrewMCIM.java	2010-12-06 21:19:49 UTC (rev 2045)
+++ trunk/jsword-sword/src/main/java/org/crosswire/sword/frontend/im/HebrewMCIM.java	2010-12-06 21:42:24 UTC (rev 2046)
@@ -9,7 +9,7 @@
  * @version 1.0
  */
 
-import java.util.*;
+import java.util.Hashtable;
 
 public class HebrewMCIM extends SWInputMethod {
 
@@ -26,7 +26,7 @@
     public String translate(char in) {
 
         char retVal = 0;
-        StringBuffer retString = new StringBuffer();
+        StringBuilder retString = new StringBuilder();
         if (getState() > 1) {
             if (getState() >= subst2.length) { // serious issue with internal
                                                // structure




More information about the jsword-svn mailing list