Index: codegen/src/main/java/org/exolab/castor/builder/conflictresolution/InformViaLogClassNameCRStrategy.java =================================================================== --- codegen/src/main/java/org/exolab/castor/builder/conflictresolution/InformViaLogClassNameCRStrategy.java (revision 7915) +++ codegen/src/main/java/org/exolab/castor/builder/conflictresolution/InformViaLogClassNameCRStrategy.java (working copy) @@ -97,7 +97,7 @@ String annotated1XPath; String annotated2XPath; - StringBuffer message = new StringBuffer(); + StringBuilder message = new StringBuilder(); message.append("Warning: A class name generation conflict has occured between "); if (a1 != null) { Index: codegen/src/main/java/org/exolab/castor/builder/conflictresolution/WarningViaDialogClassNameCRStrategy.java =================================================================== --- codegen/src/main/java/org/exolab/castor/builder/conflictresolution/WarningViaDialogClassNameCRStrategy.java (revision 7915) +++ codegen/src/main/java/org/exolab/castor/builder/conflictresolution/WarningViaDialogClassNameCRStrategy.java (working copy) @@ -98,7 +98,7 @@ } } - StringBuffer error = new StringBuffer(); + StringBuilder error = new StringBuilder(64); error.append("Warning: A class name generation conflict has occured between "); if (a1 != null) { error.append(SchemaNames.getStructureName(a1)); Index: codegen/src/main/java/org/exolab/castor/builder/factory/BaseFactory.java =================================================================== --- codegen/src/main/java/org/exolab/castor/builder/factory/BaseFactory.java (revision 7915) +++ codegen/src/main/java/org/exolab/castor/builder/factory/BaseFactory.java (working copy) @@ -227,7 +227,7 @@ //-- process annotations Enumeration enumeration = annotated.getAnnotations(); if (enumeration.hasMoreElements()) { - StringBuffer comment = new StringBuffer(); + StringBuilder comment = new StringBuilder(); while (enumeration.hasMoreElements()) { Annotation ann = (Annotation) enumeration.nextElement(); Enumeration documentations = ann.getDocumentation(); Index: codegen/src/main/java/org/exolab/castor/builder/factory/EnumerationFactory.java =================================================================== --- codegen/src/main/java/org/exolab/castor/builder/factory/EnumerationFactory.java (revision 7915) +++ codegen/src/main/java/org/exolab/castor/builder/factory/EnumerationFactory.java (working copy) @@ -213,7 +213,7 @@ modifiers.setStatic(true); modifiers.makePublic(); - StringBuffer init = new StringBuffer(); + StringBuilder init = new StringBuilder(32); init.append("new "); init.append(className); init.append("("); @@ -240,7 +240,7 @@ if (generateConstantDefinitions) { jsc.append(objName); } else { - StringBuffer init = new StringBuffer(); + StringBuilder init = new StringBuilder(32); init.append("new "); init.append(className); init.append("("); @@ -600,7 +600,7 @@ //-- and create the default values for the type. int count = 0; - StringBuffer values = new StringBuffer("{\n"); + StringBuilder values = new StringBuilder("{\n"); while (enumeration.hasMoreElements()) { Facet facet = (Facet) enumeration.nextElement(); @@ -703,7 +703,7 @@ // just keep going } - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(32); String customMemberName = null; if (enumBinding != null) { @@ -770,7 +770,7 @@ return str; } - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); char[] chars = str.toCharArray(); for (int i = 0; i < chars.length; i++) { Index: codegen/src/main/java/org/exolab/castor/builder/factory/FieldMemberAndAccessorFactory.java =================================================================== --- codegen/src/main/java/org/exolab/castor/builder/factory/FieldMemberAndAccessorFactory.java (revision 7915) +++ codegen/src/main/java/org/exolab/castor/builder/factory/FieldMemberAndAccessorFactory.java (working copy) @@ -55,7 +55,7 @@ value = fieldInfo.getFixedValue(); } if (value != null) { - StringBuffer buffer = new StringBuffer(50); + StringBuilder buffer = new StringBuilder(50); //date/time constructors throw ParseException that //needs to be catched in the constructor--> not the prettiest solution //when mulitple date/time in a class. Index: codegen/src/main/java/org/exolab/castor/builder/factory/SourceFactory.java =================================================================== --- codegen/src/main/java/org/exolab/castor/builder/factory/SourceFactory.java (revision 7915) +++ codegen/src/main/java/org/exolab/castor/builder/factory/SourceFactory.java (working copy) @@ -1307,7 +1307,7 @@ // Prevent inheritance loops from causing infinite loops if (classes.contains(superClass)) { - StringBuffer buffer = new StringBuffer(); + StringBuilder buffer = new StringBuilder(64); buffer.append("Loop found in class hierarchy: "); for (Iterator i = classes.iterator(); i.hasNext(); ) { JClass element = (JClass) i.next(); Index: codegen/src/main/java/org/exolab/castor/builder/JClassRegistry.java =================================================================== --- codegen/src/main/java/org/exolab/castor/builder/JClassRegistry.java (revision 7915) +++ codegen/src/main/java/org/exolab/castor/builder/JClassRegistry.java (working copy) @@ -454,7 +454,7 @@ keyIterator = _localNames.keySet().iterator(); if (keyIterator.hasNext()) { - StringBuffer xmlFragment = new StringBuffer(); + StringBuilder xmlFragment = new StringBuilder(32); xmlFragment.append("\n"); while (keyIterator.hasNext()) { String localName = (String) keyIterator.next(); Index: codegen/src/main/java/org/exolab/castor/builder/printing/TemplateHelper.java =================================================================== --- codegen/src/main/java/org/exolab/castor/builder/printing/TemplateHelper.java (revision 7915) +++ codegen/src/main/java/org/exolab/castor/builder/printing/TemplateHelper.java (working copy) @@ -102,7 +102,7 @@ * @return A string representation of the annotation. */ public String printAnnotation(final JAnnotation annotation, String shift) { - StringBuffer stringBuffer = new StringBuffer(); + StringBuilder stringBuffer = new StringBuilder(32); stringBuffer.append(shift); stringBuffer.append("@"); stringBuffer.append(annotation.getAnnotationType().getLocalName()); @@ -166,7 +166,7 @@ return printAnnotationValue(Array.get(elementValue, 0), shift); } // Output list items - StringBuffer stringBuffer = new StringBuffer(); + StringBuilder stringBuffer = new StringBuilder(); stringBuffer.append("\n"); stringBuffer.append("{"); stringBuffer.append("\n"); Index: codegen/src/main/java/org/exolab/castor/builder/types/AbstractPatternFacet.java =================================================================== --- codegen/src/main/java/org/exolab/castor/builder/types/AbstractPatternFacet.java (revision 7915) +++ codegen/src/main/java/org/exolab/castor/builder/types/AbstractPatternFacet.java (working copy) @@ -99,7 +99,7 @@ //-- make sure we have characters to escape if (str.indexOf('\\') < 0 && str.indexOf('\"') < 0) { return str; } - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); char[] chars = str.toCharArray(); for (int i = 0; i < chars.length; i++) { Index: codegen/src/main/java/org/exolab/javasource/JAnnotationType.java =================================================================== --- codegen/src/main/java/org/exolab/javasource/JAnnotationType.java (revision 7915) +++ codegen/src/main/java/org/exolab/javasource/JAnnotationType.java (working copy) @@ -210,7 +210,7 @@ throw new IllegalArgumentException("argument 'jsw' should not be null."); } - StringBuffer buffer = new StringBuffer(); + StringBuilder buffer = new StringBuilder(100); printHeader(jsw); printPackageDeclaration(jsw); Index: codegen/src/main/java/org/exolab/javasource/JClass.java =================================================================== --- codegen/src/main/java/org/exolab/javasource/JClass.java (revision 7915) +++ codegen/src/main/java/org/exolab/javasource/JClass.java (working copy) @@ -189,7 +189,7 @@ * @param jsw The JSourceWriter to be used. */ private void printClassDefinitionLine(final JSourceWriter jsw) { - StringBuffer buffer = new StringBuffer(); + StringBuilder buffer = new StringBuilder(32); //-- first print our annotations getAnnotatedElementHelper().printAnnotations(jsw); Index: codegen/src/main/java/org/exolab/javasource/JCodeStatement.java =================================================================== --- codegen/src/main/java/org/exolab/javasource/JCodeStatement.java (revision 7915) +++ codegen/src/main/java/org/exolab/javasource/JCodeStatement.java (working copy) @@ -71,7 +71,7 @@ * {@inheritDoc} */ public String toString() { - StringBuffer sb = new StringBuffer(_indentSize + _value.length()); + StringBuilder sb = new StringBuilder(_indentSize + _value.length()); for (int i = 0; i < _indentSize; i++) { sb.append(' '); } sb.append(_value.toString()); return sb.toString(); Index: codegen/src/main/java/org/exolab/javasource/JCompUnit.java =================================================================== --- codegen/src/main/java/org/exolab/javasource/JCompUnit.java (revision 7915) +++ codegen/src/main/java/org/exolab/javasource/JCompUnit.java (working copy) @@ -356,7 +356,7 @@ // Traverse the nested class and interface heirarchy and // update the names to match the compilation unit. - StringBuffer buffer = new StringBuffer(); + StringBuilder buffer = new StringBuilder(32); // -- write file header if (_header != null) { Index: codegen/src/main/java/org/exolab/javasource/JConstructor.java =================================================================== --- codegen/src/main/java/org/exolab/javasource/JConstructor.java (revision 7915) +++ codegen/src/main/java/org/exolab/javasource/JConstructor.java (working copy) @@ -148,7 +148,7 @@ //-- check current params if (_params.get(parameter.getName()) != null) { - StringBuffer err = new StringBuffer(); + StringBuilder err = new StringBuilder(64); err.append("A parameter already exists for the constructor, "); err.append(this._declaringClass.getName()); err.append(", with the name: "); @@ -289,7 +289,7 @@ * {@inheritDoc} */ public String toString() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(32); sb.append(_declaringClass.getName()); sb.append('('); Index: codegen/src/main/java/org/exolab/javasource/JDocComment.java =================================================================== --- codegen/src/main/java/org/exolab/javasource/JDocComment.java (revision 7915) +++ codegen/src/main/java/org/exolab/javasource/JDocComment.java (working copy) @@ -217,7 +217,7 @@ * {@inheritDoc} */ public String toString() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("/**\n"); sb.append(" * "); sb.append(" */\n"); Index: codegen/src/main/java/org/exolab/javasource/JDocDescriptor.java =================================================================== --- codegen/src/main/java/org/exolab/javasource/JDocDescriptor.java (revision 7915) +++ codegen/src/main/java/org/exolab/javasource/JDocDescriptor.java (working copy) @@ -325,7 +325,7 @@ * {@inheritDoc} */ public String toString() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); boolean allowName = true; switch(_type) { case AUTHOR: Index: codegen/src/main/java/org/exolab/javasource/JEnum.java =================================================================== --- codegen/src/main/java/org/exolab/javasource/JEnum.java (revision 7915) +++ codegen/src/main/java/org/exolab/javasource/JEnum.java (working copy) @@ -204,8 +204,7 @@ * @param jsw The JSourceWriter to be used. */ private void printEnumDefinitionLine(final JSourceWriter jsw) { - StringBuffer buffer = new StringBuffer(); - buffer.setLength(0); + StringBuilder buffer = new StringBuilder(); //-- print annotations getAnnotatedElementHelper().printAnnotations(jsw); Index: codegen/src/main/java/org/exolab/javasource/JField.java =================================================================== --- codegen/src/main/java/org/exolab/javasource/JField.java (revision 7915) +++ codegen/src/main/java/org/exolab/javasource/JField.java (working copy) @@ -242,7 +242,7 @@ * {@inheritDoc} */ public String toString() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(_modifiers.toString()); sb.append(' '); sb.append(_type); Index: codegen/src/main/java/org/exolab/javasource/JInterface.java =================================================================== --- codegen/src/main/java/org/exolab/javasource/JInterface.java (revision 7915) +++ codegen/src/main/java/org/exolab/javasource/JInterface.java (working copy) @@ -326,7 +326,7 @@ throw new IllegalArgumentException("argument 'jsw' should not be null."); } - StringBuffer buffer = new StringBuffer(); + StringBuilder buffer = new StringBuilder(100); if (!classOnly) { printHeader(jsw); Index: codegen/src/main/java/org/exolab/javasource/JMethodSignature.java =================================================================== --- codegen/src/main/java/org/exolab/javasource/JMethodSignature.java (revision 7915) +++ codegen/src/main/java/org/exolab/javasource/JMethodSignature.java (working copy) @@ -42,6 +42,8 @@ */ package org.exolab.javasource; +import java.util.ArrayList; +import java.util.List; import java.util.Vector; /** @@ -147,7 +149,7 @@ String pName = parameter.getName(); //-- check current params if (_params.get(pName) != null) { - StringBuffer err = new StringBuffer(); + StringBuilder err = new StringBuilder(32); err.append("A parameter already exists for this method, "); err.append(_name); err.append(", with the name: "); @@ -279,7 +281,7 @@ * this JMethodSignature. */ protected String[] getParameterClassNames() { - Vector names = new Vector(_params.size()); + List names = new ArrayList(_params.size()); for (int i = 0; i < _params.size(); i++) { @@ -289,13 +291,12 @@ } if (!jType.isPrimitive()) { JClass jclass = (JClass) jType; - names.addElement(jclass.getName()); + names.add(jclass.getName()); } } String[] array = new String[names.size()]; - names.copyInto(array); - return array; + return names.toArray(array); } //-------------------------------------------------------------------------- @@ -378,7 +379,7 @@ * {@inheritDoc} */ public String toString() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(32); if (_returnType != null) { sb.append(_returnType); } else { Index: codegen/src/main/java/org/exolab/javasource/JModifiers.java =================================================================== --- codegen/src/main/java/org/exolab/javasource/JModifiers.java (revision 7915) +++ codegen/src/main/java/org/exolab/javasource/JModifiers.java (working copy) @@ -303,7 +303,7 @@ * {@inheritDoc} */ public String toString() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); //-- visibility switch(_visibility) { Index: codegen/src/main/java/org/exolab/javasource/JParameter.java =================================================================== --- codegen/src/main/java/org/exolab/javasource/JParameter.java (revision 7915) +++ codegen/src/main/java/org/exolab/javasource/JParameter.java (working copy) @@ -124,7 +124,7 @@ * by the name of the parameter. */ public String toString() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("final "); sb.append(_type.toString()); sb.append(' '); Index: codegen/src/main/java/org/exolab/javasource/JSourceCode.java =================================================================== --- codegen/src/main/java/org/exolab/javasource/JSourceCode.java (revision 7915) +++ codegen/src/main/java/org/exolab/javasource/JSourceCode.java (working copy) @@ -277,7 +277,7 @@ * {@inheritDoc} */ public String toString() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(100); String lineSeparator = System.getProperty("line.separator"); for (int i = 0; i < _source.size(); i++) { sb.append(_source.elementAt(i).toString());