Skip to content

Commit

Permalink
Adjust to API changes in ECJ 4dc7b558 (01Dec2023)
Browse files Browse the repository at this point in the history
Mostly StringBuffer -> StringBuilder API changes

Signed-off-by: Alexander Kriegisch <[email protected]>
  • Loading branch information
kriegaex committed Dec 1, 2023
1 parent e761f61 commit 8532087
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ public void postParse(TypeDeclaration typeDec) {
AspectDeclaration aspectDecl = (AspectDeclaration) typeDec;
adviceSequenceNumberInType = aspectDecl.adviceCounter++;

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

public StringBuffer printBody(int indent, StringBuffer output) {
public StringBuilder printBody(int indent, StringBuilder output) {
output.append(": ");
if (pointcutDesignator != null) {
output.append(pointcutDesignator.toString());
}
return super.printBody(indent, output);
}

public StringBuffer printReturnType(int indent, StringBuffer output) {
public StringBuilder printReturnType(int indent, StringBuilder output) {
if (this.kind == AdviceKind.Around) {
return super.printReturnType(indent, output);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1289,7 +1289,7 @@ private IntertypeMemberTypeFinder findOrCreateInterTypeMemberClassFinder(SourceT
return finder;
}

public StringBuffer printHeader(int indent, StringBuffer output) {
public StringBuilder printHeader(int indent, StringBuilder output) {
// since all aspects are made public we want to print the
// modifiers that were supplied in the original source code
printModifiers(this.declaredModifiers, output);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ public Declare build(ClassScope classScope) {
return declareDecl;
}

public StringBuffer print(int tab, StringBuffer output) {
public StringBuilder print(int tab, StringBuilder output) {
printIndent(tab, output);
if (declareDecl == null) {
output.append("<declare>");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,9 @@ public boolean isError() {
/*
* (non-Javadoc)
*
* @see org.eclipse.jdt.internal.compiler.ast.ASTNode#print(int, java.lang.StringBuffer)
* @see org.eclipse.jdt.internal.compiler.ast.ASTNode#print(int, java.lang.StringBuilder)
*/
public StringBuffer print(int indent, StringBuffer output) {
public StringBuilder print(int indent, StringBuilder output) {
if (pointcut == null)
return output.append("<pcd>");
return output.append(pointcut.toString());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,9 @@ public int postParse(TypeDeclaration typeDec, MethodDeclaration enclosingDec, in
}

/* (non-Javadoc)
* @see org.eclipse.jdt.internal.compiler.ast.ASTNode#print(int, java.lang.StringBuffer)
* @see org.eclipse.jdt.internal.compiler.ast.ASTNode#print(int, java.lang.StringBuilder)
*/
public StringBuffer print(int indent, StringBuffer output) {
public StringBuilder print(int indent, StringBuilder output) {
output.append("PseudoToken<" + getString() + ">");
return output;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,9 @@ public void postParse(TypeDeclaration typeDec, MethodDeclaration enclosingDec) {
}

/* (non-Javadoc)
* @see org.eclipse.jdt.internal.compiler.ast.ASTNode#print(int, java.lang.StringBuffer)
* @see org.eclipse.jdt.internal.compiler.ast.ASTNode#print(int, java.lang.StringBuilder)
*/
public StringBuffer print(int indent, StringBuffer output) {
public StringBuilder print(int indent, StringBuilder output) {
output.append(tokenSource.toString());
return output;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@ public void endVisit(TypeDeclaration memberTypeDeclaration, BlockScope scope) {
}

private String genSourceSignature(TypeDeclaration typeDeclaration) {
StringBuffer output = new StringBuffer();
StringBuilder output = new StringBuilder();
typeDeclaration.printHeader(0, output);
return output.toString();
}
Expand Down Expand Up @@ -689,7 +689,7 @@ private void addAllNamed(Pointcut pointcut, List<ReferencePointcut> pointcuts) {
}

private String genSourceSignature(MethodDeclaration methodDeclaration) {
StringBuffer output = new StringBuffer();
StringBuilder output = new StringBuilder();
ASTNode.printModifiers(methodDeclaration.modifiers, output);

// Append Type Parameters if any
Expand Down Expand Up @@ -815,7 +815,7 @@ public void endVisit(ImportReference importRef, CompilationUnitScope scope) {
}

private String genSourceSignature(ImportReference importreference) {
StringBuffer output = new StringBuffer();
StringBuilder output = new StringBuilder();
output.append("import ");
ASTNode.printModifiers(importreference.modifiers, output);
output.append(importreference);
Expand Down Expand Up @@ -939,7 +939,7 @@ protected String generateJavadocComment(ASTNode astNode) {
*
*/
protected String genSourceSignature(FieldDeclaration fieldDeclaration) {
StringBuffer output = new StringBuffer();
StringBuilder output = new StringBuilder();
if (fieldDeclaration.type == null) { // This is an enum value
output.append(fieldDeclaration.name); // the "," or ";" has to be
// put on by whatever uses
Expand Down Expand Up @@ -1032,7 +1032,7 @@ public void endVisit(ConstructorDeclaration constructorDeclaration, ClassScope s
}

private String genSourceSignature(ConstructorDeclaration constructorDeclaration) {
StringBuffer output = new StringBuffer();
StringBuilder output = new StringBuilder();
ASTNode.printModifiers(constructorDeclaration.modifiers, output);

// Append Type Parameters if any
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
compiler.name = AspectJ Compiler
compiler.version = Eclipse Compiler c13b03ceabf0c1 (26Nov2023) - Java21
compiler.version = Eclipse Compiler 4dc7b558f82274 (01Dec2023) - Java21
compiler.copyright =

misc.version = {0} {1} - {2} {3}
Expand Down

0 comments on commit 8532087

Please sign in to comment.