Skip to content

Commit 8532087

Browse files
committed
Adjust to API changes in ECJ 4dc7b558 (01Dec2023)
Mostly StringBuffer -> StringBuilder API changes Signed-off-by: Alexander Kriegisch <[email protected]>
1 parent e761f61 commit 8532087

File tree

8 files changed

+17
-17
lines changed

8 files changed

+17
-17
lines changed

org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AdviceDeclaration.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ public void postParse(TypeDeclaration typeDec) {
331331
AspectDeclaration aspectDecl = (AspectDeclaration) typeDec;
332332
adviceSequenceNumberInType = aspectDecl.adviceCounter++;
333333

334-
StringBuffer stringifiedPointcut = new StringBuffer(30);
334+
StringBuilder stringifiedPointcut = new StringBuilder(30);
335335
pointcutDesignator.print(0, stringifiedPointcut);
336336
this.selector = NameMangler.adviceName(EclipseFactory.getName(typeDec.binding).replace('.', '_'), kind,
337337
adviceSequenceNumberInType, stringifiedPointcut.toString().hashCode()).toCharArray();
@@ -459,15 +459,15 @@ private static Argument[] extendArgumentsLength(Argument[] args, int addedArgume
459459
// return s;
460460
// }
461461

462-
public StringBuffer printBody(int indent, StringBuffer output) {
462+
public StringBuilder printBody(int indent, StringBuilder output) {
463463
output.append(": ");
464464
if (pointcutDesignator != null) {
465465
output.append(pointcutDesignator.toString());
466466
}
467467
return super.printBody(indent, output);
468468
}
469469

470-
public StringBuffer printReturnType(int indent, StringBuffer output) {
470+
public StringBuilder printReturnType(int indent, StringBuilder output) {
471471
if (this.kind == AdviceKind.Around) {
472472
return super.printReturnType(indent, output);
473473
}

org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1289,7 +1289,7 @@ private IntertypeMemberTypeFinder findOrCreateInterTypeMemberClassFinder(SourceT
12891289
return finder;
12901290
}
12911291

1292-
public StringBuffer printHeader(int indent, StringBuffer output) {
1292+
public StringBuilder printHeader(int indent, StringBuilder output) {
12931293
// since all aspects are made public we want to print the
12941294
// modifiers that were supplied in the original source code
12951295
printModifiers(this.declaredModifiers, output);

org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/DeclareDeclaration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ public Declare build(ClassScope classScope) {
153153
return declareDecl;
154154
}
155155

156-
public StringBuffer print(int tab, StringBuffer output) {
156+
public StringBuilder print(int tab, StringBuilder output) {
157157
printIndent(tab, output);
158158
if (declareDecl == null) {
159159
output.append("<declare>");

org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/PointcutDesignator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,9 @@ public boolean isError() {
113113
/*
114114
* (non-Javadoc)
115115
*
116-
* @see org.eclipse.jdt.internal.compiler.ast.ASTNode#print(int, java.lang.StringBuffer)
116+
* @see org.eclipse.jdt.internal.compiler.ast.ASTNode#print(int, java.lang.StringBuilder)
117117
*/
118-
public StringBuffer print(int indent, StringBuffer output) {
118+
public StringBuilder print(int indent, StringBuilder output) {
119119
if (pointcut == null)
120120
return output.append("<pcd>");
121121
return output.append(pointcut.toString());

org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/PseudoToken.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@ public int postParse(TypeDeclaration typeDec, MethodDeclaration enclosingDec, in
8686
}
8787

8888
/* (non-Javadoc)
89-
* @see org.eclipse.jdt.internal.compiler.ast.ASTNode#print(int, java.lang.StringBuffer)
89+
* @see org.eclipse.jdt.internal.compiler.ast.ASTNode#print(int, java.lang.StringBuilder)
9090
*/
91-
public StringBuffer print(int indent, StringBuffer output) {
91+
public StringBuilder print(int indent, StringBuilder output) {
9292
output.append("PseudoToken<" + getString() + ">");
9393
return output;
9494
}

org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/PseudoTokens.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,9 +159,9 @@ public void postParse(TypeDeclaration typeDec, MethodDeclaration enclosingDec) {
159159
}
160160

161161
/* (non-Javadoc)
162-
* @see org.eclipse.jdt.internal.compiler.ast.ASTNode#print(int, java.lang.StringBuffer)
162+
* @see org.eclipse.jdt.internal.compiler.ast.ASTNode#print(int, java.lang.StringBuilder)
163163
*/
164-
public StringBuffer print(int indent, StringBuffer output) {
164+
public StringBuilder print(int indent, StringBuilder output) {
165165
output.append(tokenSource.toString());
166166
return output;
167167
}

org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AsmHierarchyBuilder.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@ public void endVisit(TypeDeclaration memberTypeDeclaration, BlockScope scope) {
497497
}
498498

499499
private String genSourceSignature(TypeDeclaration typeDeclaration) {
500-
StringBuffer output = new StringBuffer();
500+
StringBuilder output = new StringBuilder();
501501
typeDeclaration.printHeader(0, output);
502502
return output.toString();
503503
}
@@ -689,7 +689,7 @@ private void addAllNamed(Pointcut pointcut, List<ReferencePointcut> pointcuts) {
689689
}
690690

691691
private String genSourceSignature(MethodDeclaration methodDeclaration) {
692-
StringBuffer output = new StringBuffer();
692+
StringBuilder output = new StringBuilder();
693693
ASTNode.printModifiers(methodDeclaration.modifiers, output);
694694

695695
// Append Type Parameters if any
@@ -815,7 +815,7 @@ public void endVisit(ImportReference importRef, CompilationUnitScope scope) {
815815
}
816816

817817
private String genSourceSignature(ImportReference importreference) {
818-
StringBuffer output = new StringBuffer();
818+
StringBuilder output = new StringBuilder();
819819
output.append("import ");
820820
ASTNode.printModifiers(importreference.modifiers, output);
821821
output.append(importreference);
@@ -939,7 +939,7 @@ protected String generateJavadocComment(ASTNode astNode) {
939939
*
940940
*/
941941
protected String genSourceSignature(FieldDeclaration fieldDeclaration) {
942-
StringBuffer output = new StringBuffer();
942+
StringBuilder output = new StringBuilder();
943943
if (fieldDeclaration.type == null) { // This is an enum value
944944
output.append(fieldDeclaration.name); // the "," or ";" has to be
945945
// put on by whatever uses
@@ -1032,7 +1032,7 @@ public void endVisit(ConstructorDeclaration constructorDeclaration, ClassScope s
10321032
}
10331033

10341034
private String genSourceSignature(ConstructorDeclaration constructorDeclaration) {
1035-
StringBuffer output = new StringBuffer();
1035+
StringBuilder output = new StringBuilder();
10361036
ASTNode.printModifiers(constructorDeclaration.modifiers, output);
10371037

10381038
// Append Type Parameters if any

org.aspectj.ajdt.core/src/main/resources/org/aspectj/org/eclipse/jdt/internal/compiler/batch/messages_aspectj.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
compiler.name = AspectJ Compiler
2-
compiler.version = Eclipse Compiler c13b03ceabf0c1 (26Nov2023) - Java21
2+
compiler.version = Eclipse Compiler 4dc7b558f82274 (01Dec2023) - Java21
33
compiler.copyright =
44

55
misc.version = {0} {1} - {2} {3}

0 commit comments

Comments
 (0)