From 853208768355097f98ab9531aa1314c63a0e04a1 Mon Sep 17 00:00:00 2001 From: Alexander Kriegisch Date: Fri, 1 Dec 2023 20:13:12 +0700 Subject: [PATCH] Adjust to API changes in ECJ 4dc7b558 (01Dec2023) Mostly StringBuffer -> StringBuilder API changes Signed-off-by: Alexander Kriegisch --- .../ajdt/internal/compiler/ast/AdviceDeclaration.java | 6 +++--- .../ajdt/internal/compiler/ast/AspectDeclaration.java | 2 +- .../ajdt/internal/compiler/ast/DeclareDeclaration.java | 2 +- .../ajdt/internal/compiler/ast/PointcutDesignator.java | 4 ++-- .../ajdt/internal/compiler/ast/PseudoToken.java | 4 ++-- .../ajdt/internal/compiler/ast/PseudoTokens.java | 4 ++-- .../internal/core/builder/AsmHierarchyBuilder.java | 10 +++++----- .../compiler/batch/messages_aspectj.properties | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) 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 4579308b9..8d10b3676 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 @@ -331,7 +331,7 @@ public class AdviceDeclaration extends AjMethodDeclaration { 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(); @@ -459,7 +459,7 @@ public class AdviceDeclaration extends AjMethodDeclaration { // 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()); @@ -467,7 +467,7 @@ public class AdviceDeclaration extends AjMethodDeclaration { 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); } diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java index a1e7d5cdf..0daa12747 100644 --- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java +++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java @@ -1289,7 +1289,7 @@ public class AspectDeclaration extends TypeDeclaration { 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); 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 b085a0362..99a8a8dd0 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 @@ -153,7 +153,7 @@ public class DeclareDeclaration extends AjMethodDeclaration { return declareDecl; } - public StringBuffer print(int tab, StringBuffer output) { + public StringBuilder print(int tab, StringBuilder output) { printIndent(tab, output); if (declareDecl == null) { output.append(""); 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 65bc72bd9..006e54a2b 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 @@ -113,9 +113,9 @@ public class PointcutDesignator extends ASTNode { /* * (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(""); return output.append(pointcut.toString()); diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/PseudoToken.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/PseudoToken.java index 3b3a61bd8..9c97d1c12 100644 --- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/PseudoToken.java +++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/PseudoToken.java @@ -86,9 +86,9 @@ public class PseudoToken extends ASTNode implements IToken { } /* (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; } diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/PseudoTokens.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/PseudoTokens.java index 5cd976441..a9cf41801 100644 --- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/PseudoTokens.java +++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/compiler/ast/PseudoTokens.java @@ -159,9 +159,9 @@ public class PseudoTokens extends ASTNode { } /* (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; } 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 9410f1806..2d61403c0 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 @@ -497,7 +497,7 @@ public class AsmHierarchyBuilder extends ASTVisitor { } private String genSourceSignature(TypeDeclaration typeDeclaration) { - StringBuffer output = new StringBuffer(); + StringBuilder output = new StringBuilder(); typeDeclaration.printHeader(0, output); return output.toString(); } @@ -689,7 +689,7 @@ public class AsmHierarchyBuilder extends ASTVisitor { } private String genSourceSignature(MethodDeclaration methodDeclaration) { - StringBuffer output = new StringBuffer(); + StringBuilder output = new StringBuilder(); ASTNode.printModifiers(methodDeclaration.modifiers, output); // Append Type Parameters if any @@ -815,7 +815,7 @@ public class AsmHierarchyBuilder extends ASTVisitor { } private String genSourceSignature(ImportReference importreference) { - StringBuffer output = new StringBuffer(); + StringBuilder output = new StringBuilder(); output.append("import "); ASTNode.printModifiers(importreference.modifiers, output); output.append(importreference); @@ -939,7 +939,7 @@ public class AsmHierarchyBuilder extends ASTVisitor { * */ 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 @@ -1032,7 +1032,7 @@ public class AsmHierarchyBuilder extends ASTVisitor { } private String genSourceSignature(ConstructorDeclaration constructorDeclaration) { - StringBuffer output = new StringBuffer(); + StringBuilder output = new StringBuilder(); ASTNode.printModifiers(constructorDeclaration.modifiers, output); // Append Type Parameters if any diff --git a/org.aspectj.ajdt.core/src/main/resources/org/aspectj/org/eclipse/jdt/internal/compiler/batch/messages_aspectj.properties b/org.aspectj.ajdt.core/src/main/resources/org/aspectj/org/eclipse/jdt/internal/compiler/batch/messages_aspectj.properties index 4df93191a..a6b92abde 100644 --- a/org.aspectj.ajdt.core/src/main/resources/org/aspectj/org/eclipse/jdt/internal/compiler/batch/messages_aspectj.properties +++ b/org.aspectj.ajdt.core/src/main/resources/org/aspectj/org/eclipse/jdt/internal/compiler/batch/messages_aspectj.properties @@ -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} -- 2.39.5