Replace uses of StringBuffer with StringBuilder.

StringBuffer is a legacy synchronized class. StringBuilder is a direct replacement to StringBuffer which generally have better performance.

27 files changed, 50 insertions, 50 deletions

diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/ajc/BuildArgParser.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/ajc/BuildArgParser.java
index 175c813ed..a1560b07f 100644
--- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/ajc/BuildArgParser.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/ajc/BuildArgParser.java
@@ -708,7 +708,7 @@ public class BuildArgParser extends Main {
 			} else if (arg.equals("-bootclasspath")) {
 				if (args.size() > nextArgIndex) {
 					String bcpArg = args.get(nextArgIndex).getValue();
-					StringBuffer bcp = new StringBuffer();
+					StringBuilder bcp = new StringBuilder();
 					StringTokenizer strTok = new StringTokenizer(bcpArg, File.pathSeparator);
 					while (strTok.hasMoreTokens()) {
 						bcp.append(makeFile(strTok.nextToken()));
@@ -724,7 +724,7 @@ public class BuildArgParser extends Main {
 			} else if (arg.equals("-classpath") || arg.equals("-cp")) {
 				if (args.size() > nextArgIndex) {
 					String cpArg = args.get(nextArgIndex).getValue();
-					StringBuffer cp = new StringBuffer();
+					StringBuilder cp = new StringBuilder();
 					StringTokenizer strTok = new StringTokenizer(cpArg, File.pathSeparator);
 					while (strTok.hasMoreTokens()) {
 						cp.append(makeFile(strTok.nextToken()));
@@ -756,7 +756,7 @@ public class BuildArgParser extends Main {
 			} else if (arg.equals("-extdirs")) {
 				if (args.size() > nextArgIndex) {
 					String extdirsArg = args.get(nextArgIndex).getValue();
-					StringBuffer ed = new StringBuffer();
+					StringBuilder ed = new StringBuilder();
 					StringTokenizer strTok = new StringTokenizer(extdirsArg, File.pathSeparator);
 					while (strTok.hasMoreTokens()) {
 						ed.append(makeFile(strTok.nextToken()));
diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/AjPipeliningCompilerAdapter.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/AjPipeliningCompilerAdapter.java
index 2be73a629..2a0c99647 100644
--- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/AjPipeliningCompilerAdapter.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/AjPipeliningCompilerAdapter.java
@@ -230,7 +230,7 @@ public class AjPipeliningCompilerAdapter extends AbstractCompilerAdapter {
 				pipelineOutput = new Hashtable();
 			}
 			pipelineOutput.put("filesContainingAspects", Integer.toString(toWaitFor));
-			StringBuffer order = new StringBuffer();
+			StringBuilder order = new StringBuilder();
 			order.append("[");
 			for (int i = 0; i < units.length; i++) {
 				if (i != 0) {
diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/WeaverAdapter.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/WeaverAdapter.java
index a247f78eb..f93882f49 100644
--- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/WeaverAdapter.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/WeaverAdapter.java
@@ -199,7 +199,7 @@ public class WeaverAdapter implements IClassFileProvider, IWeaveRequestor, Itera
 		AjClassFile ajcf = new AjClassFile(key, result.getBytes());
 		lastReturnedResult.result().record(ajcf.fileName(), ajcf);
 		if (!weaverMessageHandler.isIgnoring(IMessage.INFO) || progressListener != null) {
-			StringBuffer msg = new StringBuffer();
+			StringBuilder msg = new StringBuilder();
 			msg.append(progressPhasePrefix).append(result.getClassName()).append(" (from ").append(nowProcessing.fileName())
 					.append(")");
 			weaverMessageHandler.handleMessage(MessageUtil.info(msg.toString()));
diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/WeaverMessageHandler.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/WeaverMessageHandler.java
index 0de3a5780..af28231d8 100644
--- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/WeaverMessageHandler.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/WeaverMessageHandler.java
@@ -113,7 +113,7 @@ public class WeaverMessageHandler implements IMessageHandler {
 				usedBinarySourceFileName);
 		problem.setSeeAlsoProblems(seeAlso);
 
-		StringBuffer details = new StringBuffer();
+		StringBuilder details = new StringBuilder();
 		// Stick more info in supplementary message info
 		if (message.getDetails() != null) {
 			details.append(message.getDetails());
diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AdviceDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AdviceDeclaration.java
index d3cd40be4..abbfdf974 100644
--- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AdviceDeclaration.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AdviceDeclaration.java
@@ -308,7 +308,7 @@ public class AdviceDeclaration extends AjMethodDeclaration {
 	}
 
 	private String buildArgNameRepresentation() {
-		StringBuffer args = new StringBuffer();
+		StringBuilder args = new StringBuilder();
 		int numArgsWeCareAbout = getDeclaredParameterCount();
 		if (this.arguments != null) {
 			for (int i = 0; i < numArgsWeCareAbout; i++) {
diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/DeclareDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/DeclareDeclaration.java
index fb1a81c87..072bbeee5 100644
--- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/DeclareDeclaration.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/DeclareDeclaration.java
@@ -75,7 +75,7 @@ public class DeclareDeclaration extends AjMethodDeclaration {
 			DeclareParents dp = (DeclareParents) declareDecl;
 			String childPattern = dp.getChild().toString();
 			Collection parentPatterns = dp.getParents().getExactTypes();
-			StringBuffer parents = new StringBuffer();
+			StringBuilder parents = new StringBuilder();
 			for (Iterator iter = parentPatterns.iterator(); iter.hasNext();) {
 				UnresolvedType urt = ((UnresolvedType) iter.next());
 				parents.append(urt.getName());
@@ -174,7 +174,7 @@ public class DeclareDeclaration extends AjMethodDeclaration {
 		super.postParse(typeDec);
 		int declareSequenceNumberInType = ((AspectDeclaration) typeDec).declareCounter++;
 		// FIXME asc the name should perhaps include the hashcode of the pattern (type/sig) for binary compatibility reasons!
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 		sb.append("ajc$declare");
 		// Declares can choose to provide a piece of the name - to enable
 		// them to be easily distinguised at weave time (e.g. see declare annotation)
diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/IfPseudoToken.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/IfPseudoToken.java
index 67b97374f..13681c4b4 100644
--- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/IfPseudoToken.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/IfPseudoToken.java
@@ -139,7 +139,7 @@ public class IfPseudoToken extends PseudoToken {
 
 
 		// create a more stable name 277508
-		StringBuffer ifSelector = new StringBuffer();
+		StringBuilder ifSelector = new StringBuilder();
 		ifSelector.append("ajc$if$");
 		if (nameSuffix == null || nameSuffix.length()==0) {
 			boolean computedName = false;
diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/PointcutDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/PointcutDeclaration.java
index d7e1423bc..8b0fbf107 100644
--- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/PointcutDeclaration.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/PointcutDeclaration.java
@@ -146,7 +146,7 @@ public class PointcutDeclaration extends AjMethodDeclaration {
 	}
 
 	private String buildArgNameRepresentation() {
-		StringBuffer args = new StringBuffer();
+		StringBuilder args = new StringBuilder();
 		if (this.arguments != null) {
 			for (int i = 0; i < this.arguments.length; i++) {
 				if (i != 0)
diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/PointcutDesignator.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/PointcutDesignator.java
index 1a46cb9a0..65bc72bd9 100644
--- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/PointcutDesignator.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/PointcutDesignator.java
@@ -97,7 +97,7 @@ public class PointcutDesignator extends ASTNode {
 	}
 
 	public String getPointcutDeclarationText() {
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 		PseudoToken[] toks = tokens.tokens;
 		for (int i = 0; i < (toks.length - 1); i++) {
 			sb.append(toks[i].getString());
diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java
index 19e39b07a..74ffa44d4 100644
--- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/AjLookupEnvironment.java
@@ -942,7 +942,7 @@ public class AjLookupEnvironment extends LookupEnvironment implements AnonymousC
 		if ((bits & TagBits.AnnotationForType) != 0) {
 			s.add("TYPE");
 		}
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 		sb.append("{");
 		for (Iterator<String> iter = s.iterator(); iter.hasNext();) {
 			String element = iter.next();
diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/EclipseResolvedMember.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/EclipseResolvedMember.java
index 34d8d13c1..31a71c3b8 100644
--- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/EclipseResolvedMember.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/EclipseResolvedMember.java
@@ -171,7 +171,7 @@ public class EclipseResolvedMember extends ResolvedMemberImpl {
 					QualifiedNameReference qnr = (QualifiedNameReference) e;
 					if (qnr.binding instanceof FieldBinding) {
 						FieldBinding fb = (FieldBinding) qnr.binding;
-						StringBuffer sb = new StringBuffer();
+						StringBuilder sb = new StringBuilder();
 						sb.append(fb.declaringClass.signature());
 						sb.append(fb.name);
 						return sb.toString();
diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceLocation.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceLocation.java
index 50f91611c..cbd21e585 100644
--- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceLocation.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceLocation.java
@@ -123,7 +123,7 @@ public class EclipseSourceLocation implements ISourceLocation {
 
     /** @return String {file:}line{:column} */
     public String toString() {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
 
         if (getSourceFile() != ISourceLocation.NO_FILE) {
             sb.append(getSourceFile().getPath());
diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/PushinCollector.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/PushinCollector.java
index 66e94b0c5..0d7da8ef0 100644
--- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/PushinCollector.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/lookup/PushinCollector.java
@@ -133,7 +133,7 @@ public class PushinCollector {
 		}
 
 		// Process all types working from end to start as whatever we do (insert-wise) will affect locations later in the file
-		StringBuffer sourceContents = new StringBuffer();
+		StringBuilder sourceContents = new StringBuilder();
 		// put the whole original file in the buffer
 		boolean changed = false;
 		sourceContents.append(compilationUnitDeclaration.compilationResult.compilationUnit.getContents());
@@ -165,8 +165,8 @@ public class PushinCollector {
 			TypeReference sr = sourceTypeBinding.scope.referenceContext.superclass;
 			TypeReference[] trs = sourceTypeBinding.scope.referenceContext.superInterfaces;
 			List<ExactTypePattern> newParents = additionalParents.get(sourceTypeBinding);
-			StringBuffer extendsString = new StringBuffer();
-			StringBuffer implementsString = new StringBuffer();
+			StringBuilder extendsString = new StringBuilder();
+			StringBuilder implementsString = new StringBuilder();
 			if (newParents != null && newParents.size() > 0) {
 				for (ExactTypePattern newParent : newParents) {
 					ResolvedType newParentType = newParent.getExactType().resolve(world);
@@ -272,7 +272,7 @@ public class PushinCollector {
 	}
 
 	private String getOutputFileFor(CompilationUnitDeclaration unit) {
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 
 		// Create the directory portion of the output location
 		if (specifiedOutputDirectory != null) {
diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/problem/AjProblemReporter.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/problem/AjProblemReporter.java
index 69170118b..a6504a5fe 100644
--- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/problem/AjProblemReporter.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/problem/AjProblemReporter.java
@@ -456,7 +456,7 @@ public class AjProblemReporter extends ProblemReporter {
 	}
 
 	private String typesAsString(boolean isVarargs, TypeBinding[] types, boolean makeShort) {
-		StringBuffer buffer = new StringBuffer(10);
+		StringBuilder buffer = new StringBuilder(10);
 		for (int i = 0, length = types.length; i < length; i++) {
 			if (i != 0)
 				buffer.append(", "); //$NON-NLS-1$
@@ -661,7 +661,7 @@ public class AjProblemReporter extends ProblemReporter {
 			ex.fillInStackTrace();
 			StringWriter sw = new StringWriter();
 			ex.printStackTrace(new PrintWriter(sw));
-			StringBuffer sb = new StringBuffer();
+			StringBuilder sb = new StringBuilder();
 			sb.append(CompilationAndWeavingContext.getCurrentContext());
 			sb.append(sw.toString());
 			problem = new PinpointedProblem(problem, sb.toString());
diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java
index 91ca329c9..8aecf7b10 100644
--- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java
@@ -98,7 +98,7 @@ public class AjBuildConfig implements CompilerConfigurationChangeFlags {
 
 	@Override
 	public String toString() {
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 		sb.append("BuildConfig[" + (configFile == null ? "null" : configFile.getAbsoluteFile().toString()) + "] #Files="
 				+ files.size() + " AopXmls=#" + xmlfiles.size());
 		return sb.toString();
diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
index ad7f27d33..301839e1f 100644
--- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
@@ -1301,7 +1301,7 @@ public class AjBuildManager implements IOutputClassFileNameProvider, IBinarySour
 		if (buildConfig == null || buildConfig.getFullClasspath() == null) {
 			return "";
 		}
-		StringBuffer buf = new StringBuffer();
+		StringBuilder buf = new StringBuilder();
 		boolean first = true;
         for (String s : buildConfig.getFullClasspath()) {
             if (first) {
@@ -1393,7 +1393,7 @@ public class AjBuildManager implements IOutputClassFileNameProvider, IBinarySour
 
 	@Override
 	public String toString() {
-		StringBuffer buf = new StringBuffer();
+		StringBuilder buf = new StringBuilder();
 		buf.append("AjBuildManager(");
 		buf.append(")");
 		return buf.toString();
@@ -1531,7 +1531,7 @@ public class AjBuildManager implements IOutputClassFileNameProvider, IBinarySour
 
 		@Override
 		public String formatEntry(int phaseId, Object data) {
-			StringBuffer sb = new StringBuffer();
+			StringBuilder sb = new StringBuilder();
 			if (phaseId == CompilationAndWeavingContext.BATCH_BUILD) {
 				sb.append("batch building ");
 			} else {
diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjCompilerOptions.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjCompilerOptions.java
index 6c60db9d0..bd9842fca 100644
--- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjCompilerOptions.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjCompilerOptions.java
@@ -286,7 +286,7 @@ public class AjCompilerOptions extends CompilerOptions {
 
 	@Override
 	public String toString() {
-		StringBuffer buf = new StringBuffer(super.toString());
+		StringBuilder buf = new StringBuilder(super.toString());
 		// now add AspectJ additional options
 		buf.append("\n\tAspectJ Specific Options:");
 		buf.append("\n\t- terminate after compilation: ").append(this.terminateAfterCompilation ? ENABLED : DISABLED); //$NON-NLS-1$
diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjState.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjState.java
index 54fee3bfa..86dd10744 100644
--- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjState.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AjState.java
@@ -802,7 +802,7 @@ public class AjState implements CompilerConfigurationChangeFlags, TypeDelegateRe
 
 	@Override
 	public String toString() {
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 		// null config means failed build i think as it is only set on successful full build?
 		sb.append("AjState(").append((buildConfig == null ? "NULLCONFIG" : buildConfig.getConfigFile().toString())).append(")");
 		return sb.toString();
@@ -2189,7 +2189,7 @@ public class AjState implements CompilerConfigurationChangeFlags, TypeDelegateRe
 	// }
 
 	private String stringifySet(Set<?> l) {
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 		sb.append("{");
 		for (Iterator<?> iter = l.iterator(); iter.hasNext();) {
 			Object el = iter.next();
diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AsmElementFormatter.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AsmElementFormatter.java
index 682969b09..19fb7bd78 100644
--- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AsmElementFormatter.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AsmElementFormatter.java
@@ -70,7 +70,7 @@ public class AsmElementFormatter {
 				node.setCorrespondingType(ad.returnType.toString()); // returnTypeToString(0));
 			}
 
-			StringBuffer details = new StringBuffer();
+			StringBuilder details = new StringBuilder();
 			if (ad.pointcutDesignator != null) {
 				details.append(AsmRelationshipUtils.genPointcutDetails(ad.pointcutDesignator.getPointcut()));
 			} else {
@@ -110,7 +110,7 @@ public class AsmElementFormatter {
 				node.setName(name + AsmRelationshipUtils.DECLARE_PARENTS);
 
 				String kindOfDP = null;
-				StringBuffer details = new StringBuffer("");
+				StringBuilder details = new StringBuilder("");
 				TypePattern[] newParents = dp.getParents().getTypePatterns();
 				for (int i = 0; i < newParents.length; i++) {
 					TypePattern tp = newParents[i];
@@ -248,7 +248,7 @@ public class AsmElementFormatter {
 	}
 
 	private String genDecaLabel(DeclareAnnotation deca) {
-		StringBuffer sb = new StringBuffer("");
+		StringBuilder sb = new StringBuilder("");
 		sb.append(deca.getPatternAsString());
 		sb.append(" : ");
 		sb.append(deca.getAnnotationString());
diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java
index fd014112e..0c5f447b7 100644
--- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java
@@ -249,7 +249,7 @@ public class AsmHierarchyBuilder extends ASTVisitor {
 			if (unitPackage == null) {
 				pkgName = "";
 			} else {
-				StringBuffer nameBuffer = new StringBuffer();
+				StringBuilder nameBuffer = new StringBuilder();
 				final char[][] importName = unitPackage.getImportName();
 				final int last = importName.length - 1;
 				for (int i = 0; i < importName.length; i++) {
@@ -357,7 +357,7 @@ public class AsmHierarchyBuilder extends ASTVisitor {
 			String packageString = packageDecl.toString();
 			ProgramElement packageDeclaration = new ProgramElement(activeStructureModel, packageString,
 					IProgramElement.Kind.PACKAGE_DECLARATION, makeLocation(packageDecl), 0, null, null);
-			StringBuffer packageSourceDeclaration = new StringBuffer();
+			StringBuilder packageSourceDeclaration = new StringBuilder();
 			packageSourceDeclaration.append("package ");
 			packageSourceDeclaration.append(packageString);
 			packageSourceDeclaration.append(";");
@@ -914,7 +914,7 @@ public class AsmHierarchyBuilder extends ASTVisitor {
 				if (star != 0 && (comment[star - 1] == '/') && (comment[star + 1] == '*')
 						&& (star - 2 < 0 || comment[star - 2] != '/')) {
 					boolean completed = false;
-					StringBuffer sb = new StringBuffer();
+					StringBuilder sb = new StringBuilder();
 					for (int i = 0; i < comment.length && !completed; i++) {
 						char curr = comment[i];
 						if (curr == '/' && sb.length() > 2 && sb.charAt(sb.length() - 1) == '*') {
@@ -985,7 +985,7 @@ public class AsmHierarchyBuilder extends ASTVisitor {
 			stack.push(null); // a little weird but does the job
 			return true;
 		}
-		StringBuffer argumentsSignature = new StringBuffer();
+		StringBuilder argumentsSignature = new StringBuilder();
 		argumentsSignature.append("(");
 		if (constructorDeclaration.arguments != null) {
 			for (int i = 0; i < constructorDeclaration.arguments.length; i++) {
diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/EclipseClassPathManager.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/EclipseClassPathManager.java
index cbb29a1d4..d2eeba822 100644
--- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/EclipseClassPathManager.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/EclipseClassPathManager.java
@@ -90,7 +90,7 @@ public class EclipseClassPathManager extends ClassPathManager {
 	 * @see java.lang.Object#toString()
 	 */
 	public String toString() {
-		StringBuffer buf = new StringBuffer("EclipseClassPathManager: ");
+		StringBuilder buf = new StringBuilder("EclipseClassPathManager: ");
 		buf.append(nameEnv.toString());
 		return buf.toString();
 	}
diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AjASTConverter.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AjASTConverter.java
index 64bb9cefe..c38fbd96e 100644
--- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AjASTConverter.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/org/eclipse/jdt/core/dom/AjASTConverter.java
@@ -695,7 +695,7 @@ public class AjASTConverter extends ASTConverter {
 	}
 
 	private String updateString(String message) {
-		StringBuffer sb = new StringBuffer(message);
+		StringBuilder sb = new StringBuilder(message);
 		int nextQuote = sb.toString().indexOf("\"");
 		while (nextQuote != -1) {
 			sb.insert(nextQuote, "\\");
diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/tools/ajc/Main.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/tools/ajc/Main.java
index 93e777481..add19704d 100644
--- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/tools/ajc/Main.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/tools/ajc/Main.java
@@ -554,7 +554,7 @@ public class Main {
 		public static String render(IMessage message) {
 			// IMessage.Kind kind = message.getKind();
 
-			StringBuffer sb = new StringBuffer();
+			StringBuilder sb = new StringBuilder();
 			String text = message.getMessage();
 			if (text.equals(AbortException.NO_MESSAGE_TEXT)) {
 				text = null;
diff --git a/org.aspectj.ajdt.core/src/test/java/WeaveTest.java b/org.aspectj.ajdt.core/src/test/java/WeaveTest.java
index 4bbc15768..4b3a11b0a 100644
--- a/org.aspectj.ajdt.core/src/test/java/WeaveTest.java
+++ b/org.aspectj.ajdt.core/src/test/java/WeaveTest.java
@@ -237,7 +237,7 @@ public class WeaveTest {
 
 		for(int classcounter = 0; classcounter < NUMCLASSES; classcounter++) {
 
-			StringBuffer classfile = new StringBuffer(1000);
+			StringBuilder classfile = new StringBuilder(1000);
 
 			classfile.append("// Auto-generated" + NL);
 			classfile.append("package " + OUTPUT_PACKAGE + ";" + NL + NL);
@@ -281,7 +281,7 @@ public class WeaveTest {
 		}
 
 		if (INCLUDE_TEST_CLASSES) {
-			StringBuffer testFiles = new StringBuffer(1000);
+			StringBuilder testFiles = new StringBuilder(1000);
 
 			try {
 				testFiles.append("// Auto generated" + NL);
@@ -307,7 +307,7 @@ public class WeaveTest {
 				System.exit(-1);
 			}
 
-			testFiles = new StringBuffer(1000);
+			testFiles = new StringBuilder(1000);
 
 			try {
 				testFiles.append("// Auto generated" + NL);
@@ -334,7 +334,7 @@ public class WeaveTest {
 			}
 		}
 
-		StringBuffer buildList = new StringBuffer(100);
+		StringBuilder buildList = new StringBuilder(100);
 
 		for(int i = 0; i < NUMCLASSES; i++)
 			buildList.append("C" + i + ".java" + NL);
@@ -392,7 +392,7 @@ public class WeaveTest {
 
 	private static void createAllAspects(String adviceType, int pointcut) {
 
-		StringBuffer aspectFile = new StringBuffer(1000);
+		StringBuilder aspectFile = new StringBuilder(1000);
 
 		// Capitalises the first char in the adviceType String, and then adds "Advice" to it.
 		String adviceName = (char)(adviceType.charAt(0) - 32) + adviceType.substring(1) + "Advice";
diff --git a/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/IncrementalCase.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/IncrementalCase.java
index 96c959970..b3acf954b 100644
--- a/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/IncrementalCase.java
+++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/ajdt/internal/compiler/batch/IncrementalCase.java
@@ -48,7 +48,7 @@ public class IncrementalCase { // XXX NOT bound to junit - bridge tests?
     	IncrementalCase me = new IncrementalCase();
 		MessageHandler h = new MessageHandler();
 //		boolean result;
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 		for (String arg : args) {
 			sb.append("\n###### results for " + arg);
 			sb.append("\n" + me.run(new File(arg), h) + ": " + h);
@@ -177,7 +177,7 @@ public class IncrementalCase { // XXX NOT bound to junit - bridge tests?
 		log("verifyCompile -        def ", def, handler);
         log("verifyCompile -    command ", commandLine.toString(), handler);
 		log("verifyCompile -   messages ", compilerMessages, handler);
-        StringBuffer failures = new StringBuffer();
+        StringBuilder failures = new StringBuilder();
         if (def.expectFail == result) {
              failures.append("iteration " + iteration +
                 " expected to " + (def.expectFail ? "fail\n" : "pass"));
@@ -303,7 +303,7 @@ public class IncrementalCase { // XXX NOT bound to junit - bridge tests?
 		}
 		boolean result = true;
 		final int[] exp = new int[expected.length];
-		StringBuffer sb = new StringBuffer();
+		StringBuilder sb = new StringBuilder();
 		sb.append("[");
 		for (int i = 0; i < exp.length; i++) {
 			String s = expected[i];
diff --git a/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTestCase.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTestCase.java
index 35bd22c68..bcc402685 100644
--- a/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTestCase.java
+++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/AjcTestCase.java
@@ -144,7 +144,7 @@ public abstract class AjcTestCase extends TestCase {
 		 */
 		public Message(int line, String srcFile, String text, ISourceLocation[] seeAlso) {
 			this.line = line;
-			StringBuffer srcFileName = new StringBuffer();
+			StringBuilder srcFileName = new StringBuilder();
 			if (srcFile != null) {
 				char[] chars = srcFile.toCharArray();
 				for (char c : chars) {
@@ -230,7 +230,7 @@ public abstract class AjcTestCase extends TestCase {
 		 */
 		@Override
 		public String toString() {
-			StringBuffer buff = new StringBuffer();
+			StringBuilder buff = new StringBuilder();
 			buff.append("message ");
 			if (sourceFileName != null) {
 				buff.append("in file ");
@@ -704,7 +704,7 @@ public abstract class AjcTestCase extends TestCase {
 		ByteArrayOutputStream baosErr = new ByteArrayOutputStream();
 
 
-		StringBuffer command = new StringBuffer();
+		StringBuilder command = new StringBuilder();
 		command.append("java -classpath ");
 		command.append(cp.toString());
 		command.append(" ");
diff --git a/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/CompilationResult.java b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/CompilationResult.java
index 17e2e7857..612f16539 100644
--- a/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/CompilationResult.java
+++ b/org.aspectj.ajdt.core/src/test/java/org/aspectj/tools/ajc/CompilationResult.java
@@ -153,7 +153,7 @@ public class CompilationResult {
 	 */
 	@Override
 	public String toString() {
-		StringBuffer buff = new StringBuffer();
+		StringBuilder buff = new StringBuilder();
 		buff.append("AspectJ Compilation Result:\n");
 		int totalMessages = infoMessages.size() + warningMessages.size() + errorMessages.size() + failMessages.size() + weaveMessages.size();
 		buff.append(totalMessages);