diff options
318 files changed, 1022 insertions, 967 deletions
diff --git a/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/core/BrowserCompilerConfiguration.java b/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/core/BrowserCompilerConfiguration.java index e1ec5c81d..24999b7b4 100644 --- a/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/core/BrowserCompilerConfiguration.java +++ b/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/core/BrowserCompilerConfiguration.java @@ -36,7 +36,7 @@ public class BrowserCompilerConfiguration implements ICompilerConfiguration { } public String getClasspath() { - StringBuffer classpath = new StringBuffer(); + StringBuilder classpath = new StringBuilder(); String userPath = preferencesAdapter.getProjectPreference(PreferenceStoreConstants.BUILD_CLASSPATH); if (userPath != null && userPath.trim().length() != 0) { classpath.append(userPath); diff --git a/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/BasicEditor.java b/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/BasicEditor.java index d81367a82..438b3c20f 100644 --- a/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/BasicEditor.java +++ b/ajbrowser/src/main/java/org/aspectj/tools/ajbrowser/ui/BasicEditor.java @@ -156,7 +156,7 @@ public class BasicEditor implements EditorAdapter { return "ERROR: file \"" + filePath + "\" does not exist."; } BufferedReader reader = new BufferedReader(new FileReader(file)); - StringBuffer contents = new StringBuffer(); + StringBuilder contents = new StringBuilder(); String line = reader.readLine(); int numLines = 0; while (line != null) { diff --git a/ajde.core/src/main/java/org/aspectj/ajde/core/internal/AjdeCoreBuildManager.java b/ajde.core/src/main/java/org/aspectj/ajde/core/internal/AjdeCoreBuildManager.java index d98f26462..47f402cd4 100644 --- a/ajde.core/src/main/java/org/aspectj/ajde/core/internal/AjdeCoreBuildManager.java +++ b/ajde.core/src/main/java/org/aspectj/ajde/core/internal/AjdeCoreBuildManager.java @@ -175,7 +175,7 @@ public class AjdeCoreBuildManager { return "none"; } - StringBuffer formattedOptions = new StringBuffer(); + StringBuilder formattedOptions = new StringBuilder(); for (Object option : options) { String o = option.toString(); if (formattedOptions.length() > 0) { diff --git a/ajde.core/src/test/java/org/aspectj/ajde/core/tests/AjConfigTest.java b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/AjConfigTest.java index e9acb3ae8..928106960 100644 --- a/ajde.core/src/test/java/org/aspectj/ajde/core/tests/AjConfigTest.java +++ b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/AjConfigTest.java @@ -145,7 +145,7 @@ public class AjConfigTest extends AjdeCoreTestCase { public void testClasspath() { String classpath = compilerConfig.getClasspath(); List<String> found = genAjBuildConfig().getClasspath(); - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); for (Iterator<String> iterator = found.iterator(); iterator.hasNext();) { String name = iterator.next(); sb.append(name); diff --git a/ajde.core/src/test/java/org/aspectj/ajde/core/tests/ShowWeaveMessagesTest.java b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/ShowWeaveMessagesTest.java index 543f70e2d..563f08666 100644 --- a/ajde.core/src/test/java/org/aspectj/ajde/core/tests/ShowWeaveMessagesTest.java +++ b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/ShowWeaveMessagesTest.java @@ -394,7 +394,7 @@ public class ShowWeaveMessagesTest extends AjdeCoreTestCase { } private String stringify(List<String> l) { - StringBuffer result = new StringBuffer(); + StringBuilder result = new StringBuilder(); for (String str: l) { result.append(str); result.append("\n"); diff --git a/ajde/src/main/java/org/aspectj/ajde/Ajde.java b/ajde/src/main/java/org/aspectj/ajde/Ajde.java index 3eef4fd06..5977feb16 100644 --- a/ajde/src/main/java/org/aspectj/ajde/Ajde.java +++ b/ajde/src/main/java/org/aspectj/ajde/Ajde.java @@ -258,7 +258,7 @@ public class Ajde { if (LangUtil.isEmpty(mainClass)) { showWarningMessage("No main class specified"); } else { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); List outputDirs = compilerConfig.getOutputLocationManager().getAllOutputLocations(); for (Object outputDir : outputDirs) { File dir = (File) outputDir; diff --git a/ajde/src/main/java/org/aspectj/ajde/internal/LstBuildConfigFileUpdater.java b/ajde/src/main/java/org/aspectj/ajde/internal/LstBuildConfigFileUpdater.java index 8e409b4d9..5b83060b8 100644 --- a/ajde/src/main/java/org/aspectj/ajde/internal/LstBuildConfigFileUpdater.java +++ b/ajde/src/main/java/org/aspectj/ajde/internal/LstBuildConfigFileUpdater.java @@ -185,7 +185,7 @@ class LstBuildConfigFileUpdater { */ public void writeConfigFile(String filePath, List<String> fileContents) { Set<String> contentsSet = new TreeSet<>(fileContents); - StringBuffer fileContentsSB = new StringBuffer(); + StringBuilder fileContentsSB = new StringBuilder(); for (String s : contentsSet) { fileContentsSB.append(s.toString()); fileContentsSB.append("\n"); diff --git a/ajdoc/src/main/java/org/aspectj/tools/ajdoc/HtmlDecorator.java b/ajdoc/src/main/java/org/aspectj/tools/ajdoc/HtmlDecorator.java index 8d36a2433..3f34d1b3d 100644 --- a/ajdoc/src/main/java/org/aspectj/tools/ajdoc/HtmlDecorator.java +++ b/ajdoc/src/main/java/org/aspectj/tools/ajdoc/HtmlDecorator.java @@ -168,7 +168,7 @@ class HtmlDecorator { System.out.println("> Decorating " + file.getCanonicalPath() + "..."); BufferedReader reader = new BufferedReader(new FileReader(file)); - StringBuffer fileContents = new StringBuffer(); + StringBuilder fileContents = new StringBuilder(); String line = reader.readLine(); while (line != null) { fileContents.append(line + "\n"); @@ -283,7 +283,7 @@ class HtmlDecorator { String name = decl.toSignatureString(); int classEndIndex = contents.indexOf(name + "</B><DT>"); if (classEndIndex != -1) { - StringBuffer sb = new StringBuffer(contents.substring(secondClassStartIndex, classEndIndex)); + StringBuilder sb = new StringBuilder(contents.substring(secondClassStartIndex, classEndIndex)); sb.replace(0, 5, "aspect"); fileContents.delete(secondClassStartIndex, classEndIndex); fileContents.insert(secondClassStartIndex, sb.toString()); @@ -327,7 +327,7 @@ class HtmlDecorator { fos.close(); } - static void addAspectDocumentation(IProgramElement node, StringBuffer fileBuffer, int index) { + static void addAspectDocumentation(IProgramElement node, StringBuilder fileBuffer, int index) { List<IProgramElement> pointcuts = new ArrayList<>(); List<IProgramElement> advice = new ArrayList<>(); List<IProgramElement> declares = new ArrayList<>(); @@ -381,7 +381,7 @@ class HtmlDecorator { } } - static void insertDeclarationsSummary(StringBuffer fileBuffer, List decls, String kind, int index) { + static void insertDeclarationsSummary(StringBuilder fileBuffer, List decls, String kind, int index) { if (!declsAboveVisibilityExist(decls)) return; @@ -479,7 +479,7 @@ class HtmlDecorator { } } - static void insertDeclarationsDetails(StringBuffer fileBuffer, List decls, String kind, int index) { + static void insertDeclarationsDetails(StringBuilder fileBuffer, List decls, String kind, int index) { if (!declsAboveVisibilityExist(decls)) return; int insertIndex = findDetailsIndex(fileBuffer, index); @@ -535,7 +535,7 @@ class HtmlDecorator { /** * TODO: don't place the summary first. */ - static int findSummaryIndex(StringBuffer fileBuffer, int index) { + static int findSummaryIndex(StringBuilder fileBuffer, int index) { String fbs = fileBuffer.toString(); String MARKER_1 = "<!-- =========== FIELD SUMMARY =========== -->"; String MARKER_2 = "<!-- ======== CONSTRUCTOR SUMMARY ======== -->"; @@ -550,7 +550,7 @@ class HtmlDecorator { } } - static int findDetailsIndex(StringBuffer fileBuffer, int index) { + static int findDetailsIndex(StringBuilder fileBuffer, int index) { String fbs = fileBuffer.toString(); String MARKER_1 = "<!-- ========= CONSTRUCTOR DETAIL ======== -->"; String MARKER_2 = "<!-- ============ FIELD DETAIL =========== -->"; @@ -569,7 +569,7 @@ class HtmlDecorator { } } - static void decorateDocWithRel(IProgramElement node, StringBuffer fileContentsBuffer, int index, List targets, + static void decorateDocWithRel(IProgramElement node, StringBuilder fileContentsBuffer, int index, List targets, HtmlRelationshipKind relKind) { if (targets != null && !targets.isEmpty()) { String adviceDoc = "<TABLE WIDTH=\"100%\" BGCOLOR=#FFFFFF><TR>" @@ -618,7 +618,7 @@ class HtmlDecorator { parent = parent.getParent(); names.add(parent.toLinkLabelString()); } - StringBuffer sbuff = new StringBuffer(); + StringBuilder sbuff = new StringBuilder(); for (int i = names.size() - 1; i >= 0; i--) { String element = (String) names.get(i); if (i == 0) { @@ -634,7 +634,7 @@ class HtmlDecorator { // need to replace " with quot; otherwise the links wont work // for 'matches declare' relationship - StringBuffer sb = new StringBuffer(currDecl.toLabelString()); + StringBuilder sb = new StringBuilder(currDecl.toLabelString()); int nextQuote = sb.toString().indexOf("\""); while (nextQuote != -1) { sb.deleteCharAt(nextQuote); @@ -656,7 +656,7 @@ class HtmlDecorator { } } - static void decorateMemberDocumentation(IProgramElement node, StringBuffer fileContentsBuffer, int index) { + static void decorateMemberDocumentation(IProgramElement node, StringBuilder fileContentsBuffer, int index) { List<String> targets = StructureUtil.getTargets(node, IRelationship.Kind.ADVICE); decorateDocWithRel(node, fileContentsBuffer, index, targets, HtmlRelationshipKind.ADVISED_BY); @@ -778,7 +778,7 @@ class HtmlDecorator { * @return String consisting of multiple "../" parts, one for each component part of the input <code>packagePath</code>. */ private static String getRelativePathFromHere(String packagePath) { - StringBuffer result = new StringBuffer(""); + StringBuilder result = new StringBuilder(""); if (packagePath != null && (packagePath.contains("/"))) { StringTokenizer sTok = new StringTokenizer(packagePath, "/", false); while (sTok.hasMoreTokens()) { @@ -839,7 +839,7 @@ class HtmlDecorator { } static String generateHREFName(IProgramElement decl) { - StringBuffer hrefLinkBuffer = new StringBuffer(); + StringBuilder hrefLinkBuffer = new StringBuilder(); char[] declChars = decl.toLabelString().toCharArray(); for (char declChar : declChars) { if (declChar == '"') { diff --git a/ajdoc/src/main/java/org/aspectj/tools/ajdoc/Main.java b/ajdoc/src/main/java/org/aspectj/tools/ajdoc/Main.java index 763a5f5d2..313c1af3b 100644 --- a/ajdoc/src/main/java/org/aspectj/tools/ajdoc/Main.java +++ b/ajdoc/src/main/java/org/aspectj/tools/ajdoc/Main.java @@ -334,7 +334,7 @@ public class Main implements Config { if (indexFile.exists()) { BufferedReader indexFileReader = new BufferedReader(new FileReader(indexFile)); // StringBuffer greatly reduces the time it takes to remove generated tags - StringBuffer indexFileBuffer = new StringBuffer((int) indexFile.length()); + StringBuilder indexFileBuffer = new StringBuilder((int) indexFile.length()); String line = indexFileReader.readLine(); while (line != null) { int indexStart = line.indexOf(Config.DECL_ID_STRING); diff --git a/ajdoc/src/main/java/org/aspectj/tools/ajdoc/StructureUtil.java b/ajdoc/src/main/java/org/aspectj/tools/ajdoc/StructureUtil.java index b615078ba..a6490bd52 100644 --- a/ajdoc/src/main/java/org/aspectj/tools/ajdoc/StructureUtil.java +++ b/ajdoc/src/main/java/org/aspectj/tools/ajdoc/StructureUtil.java @@ -112,7 +112,7 @@ public class StructureUtil { } public static String genSignature(IProgramElement node) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); String accessibility = node.getAccessibility().toString(); if (!accessibility.equals("package")) { diff --git a/asm/src/main/java/org/aspectj/asm/AsmManager.java b/asm/src/main/java/org/aspectj/asm/AsmManager.java index e81b91b4d..5a94c69fb 100644 --- a/asm/src/main/java/org/aspectj/asm/AsmManager.java +++ b/asm/src/main/java/org/aspectj/asm/AsmManager.java @@ -511,7 +511,7 @@ public class AsmManager implements IStructureModel { for (IRelationship ir : rels) { List<String> targets = ir.getTargets(); for (String thid : targets) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); if (modelFilter == null || modelFilter.wantsHandleIds()) { sb.append("Hid:" + (ctr++) + ":"); } @@ -637,7 +637,7 @@ public class AsmManager implements IStructureModel { // unexpected - time to give up return ""; } - StringBuffer qualifiedTypeNameFromHandle = new StringBuffer(); + StringBuilder qualifiedTypeNameFromHandle = new StringBuilder(); if (hasPackage != -1) { int classfileLoc = handle.indexOf(HandleProviderDelimiter.CLASSFILE.getDelimiter(), hasPackage); qualifiedTypeNameFromHandle.append(handle.substring(hasPackage + 1, classfileLoc)); @@ -1196,7 +1196,7 @@ public class AsmManager implements IStructureModel { } public String toString() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("Model node summary:\n"); Enumeration<String> nodeKeys = nodeTypeCount.keys(); while (nodeKeys.hasMoreElements()) { diff --git a/asm/src/main/java/org/aspectj/asm/internal/JDTLikeHandleProvider.java b/asm/src/main/java/org/aspectj/asm/internal/JDTLikeHandleProvider.java index 215a00f3b..8ae6feeff 100644 --- a/asm/src/main/java/org/aspectj/asm/internal/JDTLikeHandleProvider.java +++ b/asm/src/main/java/org/aspectj/asm/internal/JDTLikeHandleProvider.java @@ -60,12 +60,12 @@ public class JDTLikeHandleProvider implements IElementHandleProvider { if (end != -1) { configFile = configFile.substring(start + 1, end); } else { - configFile = new StringBuffer("=").append(configFile.substring(start + 1)).toString(); + configFile = new StringBuilder("=").append(configFile.substring(start + 1)).toString(); } ipe.setHandleIdentifier(configFile); return configFile; } else if (ipe.getKind() == IProgramElement.Kind.SOURCE_FOLDER) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(createHandleIdentifier(ipe.getParent())).append("/"); // pr249216 - escape any embedded slashes String folder = ipe.getName(); @@ -86,7 +86,7 @@ public class JDTLikeHandleProvider implements IElementHandleProvider { parent = ipe.getParent().getParent(); } - StringBuffer handle = new StringBuffer(); + StringBuilder handle = new StringBuilder(); // add the handle for the parent handle.append(createHandleIdentifier(parent)); // add the correct delimiter for this ipe @@ -133,7 +133,7 @@ public class JDTLikeHandleProvider implements IElementHandleProvider { } List<String> sourceRefs = ipe.getParameterSignaturesSourceRefs(); List<char[]> parameterTypes = ipe.getParameterSignatures(); - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); if (sourceRefs != null) { for (String sourceRef : sourceRefs) { sb.append(HandleProviderDelimiter.getDelimiter(ipe)); diff --git a/asm/src/main/java/org/aspectj/asm/internal/ProgramElement.java b/asm/src/main/java/org/aspectj/asm/internal/ProgramElement.java index 06dd1c6c6..02500018f 100644 --- a/asm/src/main/java/org/aspectj/asm/internal/ProgramElement.java +++ b/asm/src/main/java/org/aspectj/asm/internal/ProgramElement.java @@ -436,7 +436,7 @@ public class ProgramElement implements IProgramElement { // not parameterized return new StringBuilder("L").append(name.replace('.', '/')).append(';').toString(); } else { - StringBuffer nameBuff = new StringBuffer(); + StringBuilder nameBuff = new StringBuilder(); int nestLevel = 0; nameBuff.append("L"); for (int i = 0; i < name.length(); i++) { @@ -448,7 +448,7 @@ public class ProgramElement implements IProgramElement { case '<': nameBuff.append("<"); nestLevel++; - StringBuffer innerBuff = new StringBuffer(); + StringBuilder innerBuff = new StringBuilder(); while (nestLevel > 0) { c = name.charAt(++i); if (c == '<') { @@ -459,7 +459,7 @@ public class ProgramElement implements IProgramElement { } if (c == ',' && nestLevel == 1) { nameBuff.append(nameToSignature(innerBuff.toString())); - innerBuff = new StringBuffer(); + innerBuff = new StringBuilder(); } else { if (nestLevel > 0) { innerBuff.append(c); @@ -623,7 +623,7 @@ public class ProgramElement implements IProgramElement { } public String toSignatureString(boolean getFullyQualifiedArgTypes) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(name); List<char[]> ptypes = getParameterTypes(); diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/Repository.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/Repository.java index 073355b5b..43db69078 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/Repository.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/Repository.java @@ -63,10 +63,10 @@ import org.aspectj.apache.bcel.util.SyntheticRepository; /** * The repository maintains informations about class interdependencies, e.g., whether a class is a sub-class of another. Delegates * actual class loading to SyntheticRepository with current class path by default. - * + * * @see org.aspectj.apache.bcel.util.Repository * @see org.aspectj.apache.bcel.util.SyntheticRepository - * + * * @version $Id: Repository.java,v 1.6 2009/09/09 22:18:20 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> */ @@ -92,7 +92,7 @@ public abstract class Repository { /** * Lookup class somewhere found on your CLASSPATH, or whereever the repository instance looks for it. - * + * * @return class object for given fully qualified class name, or null if the class could not be found or parsed correctly */ public static JavaClass lookupClass(String class_name) { @@ -143,7 +143,7 @@ public abstract class Repository { /** * Add clazz to repository if there isn't an equally named class already in there. - * + * * @return old entry in repository */ public static JavaClass addClass(JavaClass clazz) { @@ -201,7 +201,7 @@ public abstract class Repository { /** * Equivalent to runtime "instanceof" operator. - * + * * @return true, if clazz is an instance of super_class */ public static boolean instanceOf(JavaClass clazz, JavaClass super_class) { diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/Attribute.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/Attribute.java index daeb59a38..bd80bfe4c 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/Attribute.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/Attribute.java @@ -71,7 +71,7 @@ import org.aspectj.apache.bcel.classfile.annotation.RuntimeVisTypeAnnos; * Abstract super class for <em>Attribute</em> objects. Currently the <em>ConstantValue</em>, <em>SourceFile</em>, <em>Code</em>, * <em>Exceptiontable</em>, <em>LineNumberTable</em>, <em>LocalVariableTable</em>, <em>InnerClasses</em> and <em>Synthetic</em> * attributes are supported. The <em>Unknown</em> attribute stands for non-standard-attributes. - * + * * @version $Id: Attribute.java,v 1.9 2009/12/09 18:01:31 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> * @see ConstantValue diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/BootstrapMethods.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/BootstrapMethods.java index 699cdc3ef..a1178fbfa 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/BootstrapMethods.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/BootstrapMethods.java @@ -63,7 +63,7 @@ import org.aspectj.apache.bcel.Constants; /** * Represents the BootstrapMethods attribute in Java 7 classes. - * + * * @author Andy Clement */ public final class BootstrapMethods extends Attribute { @@ -98,7 +98,7 @@ public final class BootstrapMethods extends Attribute { file.readFully(data); isInPackedState = true; } - + public static class BootstrapMethod { private int bootstrapMethodRef; private int[] bootstrapArguments; @@ -106,7 +106,7 @@ public final class BootstrapMethods extends Attribute { BootstrapMethod(DataInputStream file) throws IOException { this(file.readUnsignedShort(), readBootstrapArguments(file)); } - + private static int[] readBootstrapArguments(DataInputStream dis) throws IOException { int numBootstrapMethods = dis.readUnsignedShort(); int[] bootstrapArguments = new int[numBootstrapMethods]; @@ -115,16 +115,16 @@ public final class BootstrapMethods extends Attribute { } return bootstrapArguments; } - + public BootstrapMethod(int bootstrapMethodRef, int[] bootstrapArguments) { this.bootstrapMethodRef = bootstrapMethodRef; this.bootstrapArguments = bootstrapArguments; } - + public int getBootstrapMethodRef() { return bootstrapMethodRef; } - + public int[] getBootstrapArguments() { return bootstrapArguments; } @@ -137,15 +137,15 @@ public final class BootstrapMethods extends Attribute { file.writeShort(bootstrapArgument); } } - + public final int getLength() { return 2 /*bootstrapMethodRef*/+ 2 /*number of arguments*/+ 2 * bootstrapArguments.length; } - + } - + // Unpacks the byte array into the table private void unpack() { if (isInPackedState) { @@ -169,7 +169,7 @@ public final class BootstrapMethods extends Attribute { /** * Called by objects that are traversing the nodes of the tree implicitely defined by the contents of a Java class. I.e., the * hierarchy of methods, fields, attributes, etc. spawns a tree of objects. - * + * * @param v Visitor object */ @Override @@ -180,7 +180,7 @@ public final class BootstrapMethods extends Attribute { /** * Dump line number table attribute to file stream in binary format. - * + * * @param file Output file stream * @throws IOException */ @@ -210,8 +210,8 @@ public final class BootstrapMethods extends Attribute { @Override public final String toString() { unpack(); - StringBuffer buf = new StringBuffer(); - StringBuffer line = new StringBuffer(); + StringBuilder buf = new StringBuilder(); + StringBuilder line = new StringBuilder(); for (int i = 0; i < numBootstrapMethods; i++) { BootstrapMethod bm = bootstrapMethods[i]; @@ -228,8 +228,8 @@ public final class BootstrapMethods extends Attribute { line.append(arg).append("(").append(getConstantPool().getConstant(arg)).append(") "); } } - - + + if (i < numBootstrapMethods - 1) { line.append(", "); } diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ClassFormatException.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ClassFormatException.java index a958329e5..5cdec92c8 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ClassFormatException.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ClassFormatException.java @@ -54,7 +54,7 @@ package org.aspectj.apache.bcel.classfile; * <http://www.apache.org/>. */ -/** +/** * Thrown when the BCEL attempts to read a class file and determines * that the file is malformed or otherwise cannot be interpreted as a * class file. diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ClassParser.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ClassParser.java index 54882beee..48fb2d99c 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ClassParser.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ClassParser.java @@ -76,14 +76,14 @@ import org.aspectj.apache.bcel.Constants; * further details about the structure of a bytecode file. * * @version $Id: ClassParser.java,v 1.6 2008/05/30 17:29:14 aclement Exp $ - * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> + * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> */ public final class ClassParser { private DataInputStream file; private String filename; private int classnameIndex; private int superclassnameIndex; - private int major, minor; + private int major, minor; private int accessflags; private int[] interfaceIndices; private ConstantPool cpool; @@ -106,7 +106,7 @@ public final class ClassParser { } /** Parse class from given .class file */ - public ClassParser(String file_name) throws IOException { + public ClassParser(String file_name) throws IOException { this.filename = file_name; file = new DataInputStream(new BufferedInputStream(new FileInputStream(file_name),BUFSIZE)); } @@ -117,7 +117,7 @@ public final class ClassParser { * A <em>ClassFormatException</em> is raised, if the file is not a valid * .class file. (This does not include verification of the byte code as it * is performed by the java interpreter). - */ + */ public JavaClass parse() throws IOException, ClassFormatException { /****************** Read headers ********************************/ // Check magic tag of class file @@ -136,7 +136,7 @@ public final class ClassParser { // Get interface information, i.e., implemented interfaces readInterfaces(); - /****************** Read class fields and methods ***************/ + /****************** Read class fields and methods ***************/ // Read class fields, i.e., the variables of the class readFields(); @@ -150,13 +150,13 @@ public final class ClassParser { file.close(); // Return the information we have gathered in a new object - JavaClass jc= new JavaClass(classnameIndex, superclassnameIndex, + JavaClass jc= new JavaClass(classnameIndex, superclassnameIndex, filename, major, minor, accessflags, cpool, interfaceIndices, fields, methods, attributes); return jc; } - + /** Read information about the attributes of the class */ private final void readAttributes() { attributes = AttributeUtils.readAttributes(file,cpool); @@ -172,14 +172,14 @@ public final class ClassParser { accessflags |= Constants.ACC_ABSTRACT; // don't police it like this... leave higher level verification code to check it. -// if(((access_flags & Constants.ACC_ABSTRACT) != 0) && +// if(((access_flags & Constants.ACC_ABSTRACT) != 0) && // ((access_flags & Constants.ACC_FINAL) != 0 )) // throw new ClassFormatException("Class can't be both final and abstract"); classnameIndex = file.readUnsignedShort(); superclassnameIndex = file.readUnsignedShort(); } - + private final void readConstantPool() throws IOException { try { cpool = new ConstantPool(file); @@ -192,7 +192,7 @@ public final class ClassParser { } throw cfe; } - } + } /** Read information about the fields of the class */ private final void readFields() throws IOException, ClassFormatException { @@ -204,16 +204,16 @@ public final class ClassParser { for(int i=0; i < fieldCount; i++) fields[i] = new Field(file, cpool); } - } + } - /** Check whether the header of the file is ok. Of course, this has + /** Check whether the header of the file is ok. Of course, this has * to be the first action on successive file reads */ private final void readID() throws IOException { int magic = 0xCAFEBABE; - if (file.readInt() != magic) + if (file.readInt() != magic) throw new ClassFormatException(filename + " is not a Java .class file"); - } - + } + private static final int[] NO_INTERFACES = new int[0]; /** Read information about the interfaces implemented by this class */ @@ -226,8 +226,8 @@ public final class ClassParser { for(int i=0; i < interfacesCount; i++) interfaceIndices[i] = file.readUnsignedShort(); } - } - + } + /** Read information about the methods of the class */ private final void readMethods() throws IOException { int methodsCount = file.readUnsignedShort(); @@ -238,12 +238,12 @@ public final class ClassParser { for(int i=0; i < methodsCount; i++) methods[i] = new Method(file, cpool); } - } - + } + /** Read major and minor version of compiler which created the file */ private final void readVersion() throws IOException { minor = file.readUnsignedShort(); major = file.readUnsignedShort(); - } - + } + } diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/Code.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/Code.java index 10dbf8ffc..5f6af4518 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/Code.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/Code.java @@ -64,10 +64,10 @@ import org.aspectj.apache.bcel.Constants; * This class represents a chunk of Java byte code contained in a method. It is instantiated by the * <em>Attribute.readAttribute()</em> method. A <em>Code</em> attribute contains informations about operand stack, local variables, * byte code and the exceptions handled within this method. - * + * * This attribute has attributes itself, namely <em>LineNumberTable</em> which is used for debugging purposes and * <em>LocalVariableTable</em> which contains information about the local variables. - * + * * @version $Id: Code.java,v 1.9 2009/10/05 17:35:36 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> * @see Attribute @@ -149,7 +149,7 @@ public final class Code extends Attribute { /** * Called by objects that are traversing the nodes of the tree implicitely defined by the contents of a Java class. I.e., the * hierarchy of methods, fields, attributes, etc. spawns a tree of objects. - * + * * @param v Visitor object */ @Override @@ -159,7 +159,7 @@ public final class Code extends Attribute { /** * Dump code attribute to file stream in binary format. - * + * * @param file Output file stream * @throws IOException */ @@ -309,9 +309,9 @@ public final class Code extends Attribute { * @return String representation of code chunk. */ public final String toString(boolean verbose) { - StringBuffer buf; + StringBuilder buf; - buf = new StringBuffer("Code(max_stack = " + maxStack + ", max_locals = " + maxLocals + ", code_length = " + code.length + buf = new StringBuilder("Code(max_stack = " + maxStack + ", max_locals = " + maxLocals + ", code_length = " + code.length + ")\n" + Utility.codeToString(code, cpool, 0, -1, verbose)); if (exceptionTable.length > 0) { @@ -348,7 +348,7 @@ public final class Code extends Attribute { // Code c = (Code)clone(); // c.code = (byte[])code.clone(); // c.cpool = constant_pool; - // + // // c.exceptionTable = new CodeException[exceptionTable.length]; // for(int i=0; i < exceptionTable.length; i++) // c.exceptionTable[i] = exceptionTable[i].copy(); @@ -365,7 +365,7 @@ public final class Code extends Attribute { * whether two pieces of code are equivalent. */ public String getCodeString() { - StringBuffer codeString = new StringBuffer(); + StringBuilder codeString = new StringBuilder(); codeString.append("Code(max_stack = ").append(maxStack); codeString.append(", max_locals = ").append(maxLocals); codeString.append(", code_length = ").append(code.length).append(")\n"); diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/CodeException.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/CodeException.java index 85459d06a..328c458fb 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/CodeException.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/CodeException.java @@ -101,7 +101,7 @@ public final class CodeException implements Cloneable, Constants, Node, Serializ public void accept(ClassVisitor v) { v.visitCodeException(this); - } + } public final void dump(DataOutputStream file) throws IOException { file.writeShort(start_pc); @@ -113,17 +113,17 @@ public final class CodeException implements Cloneable, Constants, Node, Serializ /** * @return 0, if the handler catches any exception, otherwise it points to * the exception class which is to be caught. - */ - public final int getCatchType() { return catch_type; } + */ + public final int getCatchType() { return catch_type; } /** * @return Exclusive end index of the region where the handler is active. - */ + */ public final int getEndPC() { return end_pc; } /** * @return Starting address of exception handler, relative to the code. - */ + */ public final int getHandlerPC() { return handler_pc; } /** @@ -157,20 +157,20 @@ public final class CodeException implements Cloneable, Constants, Node, Serializ */ public final void setStartPC(int start_pc) { this.start_pc = start_pc; - } + } /** * @return String representation. - */ + */ public final String toString() { - return "CodeException(start_pc = " + start_pc + + return "CodeException(start_pc = " + start_pc + ", end_pc = " + end_pc + ", handler_pc = " + handler_pc + ", catch_type = " + catch_type + ")"; - } + } /** * @return String representation. - */ + */ public final String toString(ConstantPool cp, boolean verbose) { String str; diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/Constant.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/Constant.java index d391b75ea..86563c2e4 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/Constant.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/Constant.java @@ -63,7 +63,7 @@ import org.aspectj.apache.bcel.Constants; /** * Abstract superclass for classes to represent the different constant types in the constant pool of a class file. The classes keep * closely to the JVM specification. - * + * * @version $Id: Constant.java,v 1.5 2009/09/10 15:35:04 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> */ diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantCP.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantCP.java index a476c4d15..c37e61f27 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantCP.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantCP.java @@ -61,7 +61,7 @@ import org.aspectj.apache.bcel.Constants; /** * Abstract super class for Fieldref and Methodref constants. - * + * * @version $Id: ConstantCP.java,v 1.5 2009/09/16 00:43:49 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> * @see ConstantFieldref diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantClass.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantClass.java index 883f3b25f..b8154f7b5 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantClass.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantClass.java @@ -63,7 +63,7 @@ import org.aspectj.apache.bcel.Constants; /** * This class is derived from the abstract <A HREF="org.aspectj.apache.bcel.classfile.Constant.html">Constant</A> class and * represents a reference to a (external) class. - * + * * @version $Id: ConstantClass.java,v 1.6 2009/09/16 00:43:49 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> * @author Andy Clement diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantDouble.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantDouble.java index 813aec72a..4b2e373f0 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantDouble.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantDouble.java @@ -63,7 +63,7 @@ import org.aspectj.apache.bcel.Constants; /** * This class is derived from the abstract <A HREF="org.aspectj.apache.bcel.classfile.Constant.html">Constant</A> class and * represents a reference to a Double object. - * + * * @version $Id: ConstantDouble.java,v 1.6 2009/09/16 00:43:49 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> * @author Andy Clement diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantDynamic.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantDynamic.java index 40100f83b..ad9eb3049 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantDynamic.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantDynamic.java @@ -63,15 +63,15 @@ import org.aspectj.apache.bcel.Constants; /** * This class is derived from the abstract <A HREF="org.aspectj.apache.bcel.classfile.Constant.html">Constant</A> class and * represents a reference to the name and signature of a field or method. - * + * * http://docs.oracle.com/javase/specs/jvms/se7/html/jvms-4.html#jvms-4.4.10 - * + * * @author Andy Clement * @see Constant */ public final class ConstantDynamic extends Constant { private final int bootstrapMethodAttrIndex; - private final int nameAndTypeIndex; + private final int nameAndTypeIndex; ConstantDynamic(DataInputStream file) throws IOException { this(file.readUnsignedShort(), file.readUnsignedShort()); @@ -89,11 +89,11 @@ public final class ConstantDynamic extends Constant { file.writeShort(bootstrapMethodAttrIndex); file.writeShort(nameAndTypeIndex); } - + public final int getNameAndTypeIndex() { return nameAndTypeIndex; } - + public final int getBootstrapMethodAttrIndex() { return bootstrapMethodAttrIndex; } diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantFieldref.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantFieldref.java index 056f3e3fd..34423a860 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantFieldref.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantFieldref.java @@ -61,7 +61,7 @@ import org.aspectj.apache.bcel.Constants; /** * This class represents a constant pool reference to a field. - * + * * @version $Id: ConstantFieldref.java,v 1.5 2009/09/16 00:43:49 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> */ diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantFloat.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantFloat.java index 985c28125..bda7e8d4a 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantFloat.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantFloat.java @@ -63,7 +63,7 @@ import org.aspectj.apache.bcel.Constants; /** * This class is derived from the abstract <A HREF="org.aspectj.apache.bcel.classfile.Constant.html">Constant</A> class and * represents a reference to a float object. - * + * * @version $Id: ConstantFloat.java,v 1.5 2009/09/16 00:43:49 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> * @see Constant diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantInteger.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantInteger.java index 415706eed..933dc68ec 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantInteger.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantInteger.java @@ -63,7 +63,7 @@ import org.aspectj.apache.bcel.Constants; /** * This class is derived from the abstract <A HREF="org.aspectj.apache.bcel.classfile.Constant.html">Constant</A> class and * represents a reference to an int object. - * + * * @version $Id: ConstantInteger.java,v 1.5 2009/09/16 00:43:49 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> * @see Constant diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantInterfaceMethodref.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantInterfaceMethodref.java index b973c726e..495c5e5c0 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantInterfaceMethodref.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantInterfaceMethodref.java @@ -61,7 +61,7 @@ import org.aspectj.apache.bcel.Constants; /** * This class represents a constant pool reference to an interface method. - * + * * @version $Id: ConstantInterfaceMethodref.java,v 1.5 2009/09/16 00:43:49 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> */ diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantInvokeDynamic.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantInvokeDynamic.java index 0d263aa65..3db916ee2 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantInvokeDynamic.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantInvokeDynamic.java @@ -63,15 +63,15 @@ import org.aspectj.apache.bcel.Constants; /** * This class is derived from the abstract <A HREF="org.aspectj.apache.bcel.classfile.Constant.html">Constant</A> class and * represents a reference to the name and signature of a field or method. - * + * * http://docs.oracle.com/javase/specs/jvms/se7/html/jvms-4.html#jvms-4.4.10 - * + * * @author Andy Clement * @see Constant */ public final class ConstantInvokeDynamic extends Constant { private final int bootstrapMethodAttrIndex; - private final int nameAndTypeIndex; + private final int nameAndTypeIndex; ConstantInvokeDynamic(DataInputStream file) throws IOException { this(file.readUnsignedShort(), file.readUnsignedShort()); @@ -101,15 +101,15 @@ public final class ConstantInvokeDynamic extends Constant { // public final int getSignatureIndex() { // return referenceIndex; // } -// +// // public final String getSignature(ConstantPool cp) { // return cp.constantToString(getSignatureIndex(), Constants.CONSTANT_Utf8); // } - + public final int getNameAndTypeIndex() { return nameAndTypeIndex; } - + public final int getBootstrapMethodAttrIndex() { return bootstrapMethodAttrIndex; } diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantLong.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantLong.java index 1d56b98a3..160523739 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantLong.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantLong.java @@ -63,7 +63,7 @@ import org.aspectj.apache.bcel.Constants; /** * This class is derived from the abstract <A HREF="org.aspectj.apache.bcel.classfile.Constant.html">Constant</A> class and * represents a reference to a long object. - * + * * @version $Id: ConstantLong.java,v 1.5 2009/09/16 00:43:49 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> * @see Constant diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantMethodHandle.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantMethodHandle.java index 712a13f4c..8925d38ff 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantMethodHandle.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantMethodHandle.java @@ -63,15 +63,15 @@ import org.aspectj.apache.bcel.Constants; /** * This class is derived from the abstract <A HREF="org.aspectj.apache.bcel.classfile.Constant.html">Constant</A> class and * represents a reference to the name and signature of a field or method. - * + * * http://docs.oracle.com/javase/specs/jvms/se7/html/jvms-4.html#jvms-4.4.8 - * + * * @author Andy Clement * @see Constant */ public final class ConstantMethodHandle extends Constant { private byte referenceKind; - private int referenceIndex; + private int referenceIndex; ConstantMethodHandle(DataInputStream file) throws IOException { this(file.readByte(), file.readUnsignedShort()); @@ -93,7 +93,7 @@ public final class ConstantMethodHandle extends Constant { public final byte getReferenceKind() { return referenceKind; } - + public final int getReferenceIndex() { return referenceIndex; } diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantMethodType.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantMethodType.java index 867e7eb0a..be2f29e41 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantMethodType.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantMethodType.java @@ -63,9 +63,9 @@ import org.aspectj.apache.bcel.Constants; /** * This class is derived from the abstract <A HREF="org.aspectj.apache.bcel.classfile.Constant.html">Constant</A> class and * represents a reference to the name and signature of a field or method. - * + * * http://docs.oracle.com/javase/specs/jvms/se7/html/jvms-4.html#jvms-4.4.9 - * + * * @author Andy Clement * @see Constant */ @@ -98,7 +98,7 @@ public final class ConstantMethodType extends Constant { // public final int getSignatureIndex() { // return referenceIndex; // } -// +// // public final String getSignature(ConstantPool cp) { // return cp.constantToString(getSignatureIndex(), Constants.CONSTANT_Utf8); // } diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantMethodref.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantMethodref.java index 29b37c5d7..d59b6d57c 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantMethodref.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantMethodref.java @@ -61,7 +61,7 @@ import org.aspectj.apache.bcel.Constants; /** * This class represents a constant pool reference to a method. - * + * * @version $Id: ConstantMethodref.java,v 1.5 2009/09/16 00:43:49 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> */ diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantModule.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantModule.java index efe4d3a1b..793e3d2d0 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantModule.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantModule.java @@ -61,9 +61,9 @@ import org.aspectj.apache.bcel.Constants; /** * Represents a module. - * + * * See http://cr.openjdk.java.net/~mr/jigsaw/spec/java-se-9-jvms-diffs.pdf 4.4.11 - * + * * @author Andy Clement */ public final class ConstantModule extends Constant { diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantNameAndType.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantNameAndType.java index 8af80fab2..fd8f48000 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantNameAndType.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantNameAndType.java @@ -63,7 +63,7 @@ import org.aspectj.apache.bcel.Constants; /** * This class is derived from the abstract <A HREF="org.aspectj.apache.bcel.classfile.Constant.html">Constant</A> class and * represents a reference to the name and signature of a field or method. - * + * * @version $Id: ConstantNameAndType.java,v 1.5 2009/09/16 00:43:49 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> * @see Constant @@ -74,7 +74,7 @@ public final class ConstantNameAndType extends Constant { /** * Initialize instance from file data. - * + * * @param file Input stream * @throws IOException */ @@ -95,7 +95,7 @@ public final class ConstantNameAndType extends Constant { /** * Called by objects that are traversing the nodes of the tree implicitely defined by the contents of a Java class. I.e., the * hierarchy of methods, fields, attributes, etc. spawns a tree of objects. - * + * * @param v Visitor object */ @Override @@ -105,7 +105,7 @@ public final class ConstantNameAndType extends Constant { /** * Dump name and signature index to file stream in binary format. - * + * * @param file Output file stream * @throws IOException */ diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantPackage.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantPackage.java index 70f22c749..de3545339 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantPackage.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantPackage.java @@ -61,9 +61,9 @@ import org.aspectj.apache.bcel.Constants; /** * Represents a module. - * + * * See http://cr.openjdk.java.net/~mr/jigsaw/spec/java-se-9-jvms-diffs.pdf 4.4.12 - * + * * @author Andy Clement */ public final class ConstantPackage extends Constant { diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantPool.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantPool.java index 4609a3e09..2066b4569 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantPool.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantPool.java @@ -136,7 +136,7 @@ public class ConstantPool implements Node { /** * Get string from constant pool and bypass the indirection of `ConstantClass' and `ConstantString' objects. I.e. these classes * have an index field that points to another entry of the constant pool of type `ConstantUtf8' which contains the real data. - * + * * @param index Index in constant pool * @param tag Tag of expected constant, either ConstantClass or ConstantString * @return Contents of string reference @@ -207,7 +207,7 @@ public class ConstantPool implements Node { str = (constantToString(((ConstantCP) c).getClassIndex(), Constants.CONSTANT_Class) + "." + constantToString( ((ConstantCP) c).getNameAndTypeIndex(), Constants.CONSTANT_NameAndType)); break; - + case Constants.CONSTANT_InvokeDynamic: ConstantInvokeDynamic cID = ((ConstantInvokeDynamic)c); return "#"+cID.getBootstrapMethodAttrIndex()+"."+constantToString(cID.getNameAndTypeIndex(), Constants.CONSTANT_NameAndType); @@ -237,7 +237,7 @@ public class ConstantPool implements Node { private static final String escape(String str) { int len = str.length(); - StringBuffer buf = new StringBuffer(len + 5); + StringBuilder buf = new StringBuilder(len + 5); char[] ch = str.toCharArray(); for (int i = 0; i < len; i++) { @@ -296,7 +296,7 @@ public class ConstantPool implements Node { assert c.tag == Constants.CONSTANT_Utf8; return (ConstantUtf8) c; } - + public ConstantModule getConstantModule(int index) { Constant c = getConstant(index); assert c != null; @@ -323,7 +323,7 @@ public class ConstantPool implements Node { @Override public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); for (int i = 1; i < poolSize; i++) buf.append(i + ")" + pool[i] + "\n"); @@ -441,7 +441,7 @@ public class ConstantPool implements Node { public int lookupFieldref(String searchClassname, String searchFieldname, String searchSignature) { searchClassname = searchClassname.replace('.', '/'); - String k = new StringBuffer().append(searchClassname).append(searchFieldname).append(searchSignature).toString(); + String k = new StringBuilder().append(searchClassname).append(searchFieldname).append(searchSignature).toString(); Integer pos = fieldCache.get(k); if (pos != null) return pos; @@ -621,7 +621,7 @@ public class ConstantPool implements Node { return addNameAndType(u8.getValue(), u8_2.getValue()); } - + case Constants.CONSTANT_InvokeDynamic: { ConstantInvokeDynamic cid = (ConstantInvokeDynamic)c; int index1 = cid.getBootstrapMethodAttrIndex(); @@ -631,7 +631,7 @@ public class ConstantPool implements Node { int index2 = addNameAndType(name.getValue(), signature.getValue()); return addInvokeDynamic(index1,index2); } - + case Constants.CONSTANT_MethodHandle: ConstantMethodHandle cmh = (ConstantMethodHandle)c; return addMethodHandle(cmh.getReferenceKind(),addConstant(constants[cmh.getReferenceIndex()],cp)); @@ -650,7 +650,7 @@ public class ConstantPool implements Node { case Constants.CONSTANT_Integer: return addInteger(((ConstantInteger) c).getValue()); - + case Constants.CONSTANT_MethodType: ConstantMethodType cmt = (ConstantMethodType)c; return addMethodType(addConstant(constants[cmt.getDescriptorIndex()],cp)); @@ -689,14 +689,14 @@ public class ConstantPool implements Node { throw new RuntimeException("Unknown constant type " + c); } } - + public int addMethodHandle(byte referenceKind, int referenceIndex) { adjustSize(); int ret = poolSize; pool[poolSize++] = new ConstantMethodHandle(referenceKind, referenceIndex); return ret; } - + public int addMethodType(int descriptorIndex) { adjustSize(); int ret = poolSize; @@ -718,7 +718,7 @@ public class ConstantPool implements Node { pool[poolSize++] = new ConstantMethodref(class_index, name_and_type_index); return ret; } - + public int addInvokeDynamic(int bootstrapMethodIndex, int constantNameAndTypeIndex) { adjustSize(); int ret = poolSize; @@ -768,7 +768,7 @@ public class ConstantPool implements Node { } public int lookupMethodref(String searchClassname, String searchMethodName, String searchSignature) { - String key = new StringBuffer().append(searchClassname).append(searchMethodName).append(searchSignature).toString(); + String key = new StringBuilder().append(searchClassname).append(searchMethodName).append(searchSignature).toString(); Integer cached = methodCache.get(key); if (cached != null) return cached; @@ -813,4 +813,4 @@ public class ConstantPool implements Node { public String getPackageName(int packageIndex) { return getConstantPackage(packageIndex).getPackageName(this); } -}
\ No newline at end of file +} diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantString.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantString.java index ef9da55db..e3a28ffbc 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantString.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantString.java @@ -63,7 +63,7 @@ import org.aspectj.apache.bcel.Constants; /** * This class is derived from the abstract <A HREF="org.aspectj.apache.bcel.classfile.Constant.html">Constant</A> class and * represents a reference to a String object. - * + * * @version $Id: ConstantString.java,v 1.5 2009/09/16 00:43:49 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> * @see Constant diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantUtf8.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantUtf8.java index f8200db47..24e58a96c 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantUtf8.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantUtf8.java @@ -63,7 +63,7 @@ import org.aspectj.apache.bcel.Constants; /** * This class is derived from the abstract <A HREF="org.aspectj.apache.bcel.classfile.Constant.html">Constant</A> class and * represents a reference to a Utf8 encoded string. - * + * * @version $Id: ConstantUtf8.java,v 1.5 2009/09/16 00:43:49 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> * @see Constant diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantValue.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantValue.java index 730e8aff0..709700e91 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantValue.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ConstantValue.java @@ -63,7 +63,7 @@ import org.aspectj.apache.bcel.Constants; /** * This class is derived from <em>Attribute</em> and represents a constant value, i.e., a default value for initializing a class * field. This class is instantiated by the <em>Attribute.readAttribute()</em> method. - * + * * @version $Id: ConstantValue.java,v 1.6 2009/09/16 00:43:49 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> * @see Attribute diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/Deprecated.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/Deprecated.java index 21bbbcb46..bf34569ea 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/Deprecated.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/Deprecated.java @@ -63,7 +63,7 @@ import org.aspectj.apache.bcel.Constants; /** * This class is derived from <em>Attribute</em> and denotes that this is a deprecated method. It is instantiated from the * <em>Attribute.readAttribute()</em> method. - * + * * @version $Id: Deprecated.java,v 1.5 2009/09/15 19:40:12 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> * @see Attribute @@ -92,7 +92,7 @@ public final class Deprecated extends Attribute { /** * Construct object from file stream. - * + * * @param name_index Index in constant pool to CONSTANT_Utf8 * @param length Content length in bytes * @param file Input stream @@ -112,7 +112,7 @@ public final class Deprecated extends Attribute { /** * Called by objects that are traversing the nodes of the tree implicitely defined by the contents of a Java class. I.e., the * hierarchy of methods, fields, attributes, etc. spawns a tree of objects. - * + * * @param v Visitor object */ @Override @@ -122,7 +122,7 @@ public final class Deprecated extends Attribute { /** * Dump source file attribute to file stream in binary format. - * + * * @param file Output file stream * @throws IOException */ diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ExceptionTable.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ExceptionTable.java index ad7d43f2e..adb796249 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ExceptionTable.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ExceptionTable.java @@ -64,7 +64,7 @@ import org.aspectj.apache.bcel.Constants; * This class represents the table of exceptions that are thrown by a method. This attribute may be used once per method. The name * of this class is <em>ExceptionTable</em> for historical reasons; The Java Virtual Machine Specification, Second Edition defines * this attribute using the name <em>Exceptions</em> (which is inconsistent with the other classes). - * + * * @version $Id: ExceptionTable.java,v 1.5 2009/09/15 19:40:12 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> * @see Code @@ -94,7 +94,7 @@ public final class ExceptionTable extends Attribute { /** * Construct object from file stream. - * + * * @param name_index Index in constant pool * @param length Content length in bytes * @param file Input stream @@ -114,7 +114,7 @@ public final class ExceptionTable extends Attribute { /** * Called by objects that are traversing the nodes of the tree implicitely defined by the contents of a Java class. I.e., the * hierarchy of methods, fields, attributes, etc. spawns a tree of objects. - * + * * @param v Visitor object */ @Override @@ -124,7 +124,7 @@ public final class ExceptionTable extends Attribute { /** * Dump exceptions attribute to file stream in binary format. - * + * * @param file Output file stream * @throws IOException */ @@ -173,7 +173,7 @@ public final class ExceptionTable extends Attribute { */ @Override public final String toString() { - StringBuffer buf = new StringBuffer(""); + StringBuilder buf = new StringBuilder(""); String str; for (int i = 0; i < number_of_exceptions; i++) { diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/Field.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/Field.java index f34464375..2d3c276b5 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/Field.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/Field.java @@ -61,7 +61,7 @@ import org.aspectj.apache.bcel.generic.Type; /** * This class represents the field info structure, i.e., the representation for a variable in the class. See JVM specification for * details. - * + * * @version $Id: Field.java,v 1.6 2009/09/15 03:33:52 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> */ @@ -103,7 +103,7 @@ public final class Field extends FieldOrMethod { @Override public final String toString() { // Get names from constant pool - StringBuffer buf = new StringBuffer(Utility.accessToString(modifiers)); + StringBuilder buf = new StringBuilder(Utility.accessToString(modifiers)); if (buf.length() > 0) { buf.append(" "); } diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/FieldOrMethod.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/FieldOrMethod.java index f0fc8c5a7..67f70e1b4 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/FieldOrMethod.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/FieldOrMethod.java @@ -65,7 +65,7 @@ import org.aspectj.apache.bcel.classfile.annotation.RuntimeAnnos; /** * Abstract super class for fields and methods. - * + * * @version $Id: FieldOrMethod.java,v 1.12 2009/09/15 19:40:12 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> */ diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/InnerClass.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/InnerClass.java index d3b1eb0a8..59fd62075 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/InnerClass.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/InnerClass.java @@ -63,7 +63,7 @@ import org.aspectj.apache.bcel.Constants; /** * This class represents a inner class attribute, i.e., the class indices of the inner and outer classes, the name and the * attributes of the inner class. - * + * * @version $Id: InnerClass.java,v 1.4 2009/09/10 15:35:05 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> * @see InnerClasses @@ -83,7 +83,7 @@ public final class InnerClass implements Cloneable, Node { /** * Construct object from file stream. - * + * * @param file Input stream * @throws IOException */ @@ -107,7 +107,7 @@ public final class InnerClass implements Cloneable, Node { /** * Called by objects that are traversing the nodes of the tree implicitely defined by the contents of a Java class. I.e., the * hierarchy of methods, fields, attributes, etc. spawns a tree of objects. - * + * * @param v Visitor object */ public void accept(ClassVisitor v) { @@ -116,7 +116,7 @@ public final class InnerClass implements Cloneable, Node { /** * Dump inner class attribute to file stream in binary format. - * + * * @param file Output file stream * @throws IOException */ diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/InnerClasses.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/InnerClasses.java index 0078156ed..16a609814 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/InnerClasses.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/InnerClasses.java @@ -63,7 +63,7 @@ import org.aspectj.apache.bcel.Constants; /** * This class is derived from <em>Attribute</em> and denotes that this class is an Inner class of another. to the source file of * this class. It is instantiated from the <em>Attribute.readAttribute()</em> method. - * + * * @version $Id: InnerClasses.java,v 1.5 2009/09/15 19:40:12 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> * @see Attribute @@ -94,7 +94,7 @@ public final class InnerClasses extends Attribute { /** * Construct object from file stream. - * + * * @param name_index Index in constant pool to CONSTANT_Utf8 * @param length Content length in bytes * @param file Input stream @@ -114,7 +114,7 @@ public final class InnerClasses extends Attribute { /** * Called by objects that are traversing the nodes of the tree implicitely defined by the contents of a Java class. I.e., the * hierarchy of methods, fields, attributes, etc. spawns a tree of objects. - * + * * @param v Visitor object */ @Override @@ -124,7 +124,7 @@ public final class InnerClasses extends Attribute { /** * Dump source file attribute to file stream in binary format. - * + * * @param file Output file stream * @throws IOException */ @@ -157,7 +157,7 @@ public final class InnerClasses extends Attribute { */ @Override public final String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); for (int i = 0; i < number_of_classes; i++) buf.append(inner_classes[i].toString(cpool) + "\n"); diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/JavaClass.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/JavaClass.java index a1a7a57de..0be2b8ae5 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/JavaClass.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/JavaClass.java @@ -77,10 +77,10 @@ import org.aspectj.apache.bcel.util.SyntheticRepository; /** * Represents a Java class, i.e., the data structures, constant pool, fields, methods and commands contained in a Java .class file. * See <a href="ftp://java.sun.com/docs/specs/">JVM specification</a> for details. - * + * * The intent of this class is to represent a parsed or otherwise existing class file. Those interested in programatically * generating classes should see the <a href="../generic/ClassGen.html">ClassGen</a> class. - * + * * @version $Id: JavaClass.java,v 1.22 2009/09/15 19:40:14 aclement Exp $ * @see org.aspectj.apache.bcel.generic.ClassGen * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> @@ -185,7 +185,7 @@ public class JavaClass extends Modifiers implements Cloneable, Node { /** * Called by objects that are traversing the nodes of the tree implicitely defined by the contents of a Java class. I.e., the * hierarchy of methods, fields, attributes, etc. spawns a tree of objects. - * + * * @param v Visitor object */ public void accept(ClassVisitor v) { @@ -194,7 +194,7 @@ public class JavaClass extends Modifiers implements Cloneable, Node { /** * Dump class to a file. - * + * * @param file Output file * @throws IOException */ @@ -209,7 +209,7 @@ public class JavaClass extends Modifiers implements Cloneable, Node { /** * Dump class to a file named file_name. - * + * * @param file_name Output file name * @exception IOException */ @@ -523,7 +523,7 @@ public class JavaClass extends Modifiers implements Cloneable, Node { String access = Utility.accessToString(modifiers, true); access = access.equals("") ? "" : access + " "; - StringBuffer buf = new StringBuffer(access + Utility.classOrInterface(modifiers) + " " + classname + " extends " + StringBuilder buf = new StringBuilder(access + Utility.classOrInterface(modifiers) + " " + classname + " extends " + Utility.compactClassName(superclassname, false) + '\n'); int size = interfaces.length; @@ -580,7 +580,7 @@ public class JavaClass extends Modifiers implements Cloneable, Node { private static final String indent(Object obj) { StringTokenizer tok = new StringTokenizer(obj.toString(), "\n"); - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); while (tok.hasMoreTokens()) { buf.append("\t" + tok.nextToken() + "\n"); @@ -671,7 +671,7 @@ public class JavaClass extends Modifiers implements Cloneable, Node { /** * Equivalent to runtime "instanceof" operator. - * + * * @return true if this JavaClass is derived from teh super class */ public final boolean instanceOf(JavaClass super_class) { diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/LineNumber.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/LineNumber.java index 6b2a64877..8b86ad384 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/LineNumber.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/LineNumber.java @@ -61,7 +61,7 @@ import java.io.IOException; /** * This class represents a (PC offset, line number) pair, i.e., a line number in the source that corresponds to a relative address * in the byte code. This is used for debugging purposes. - * + * * @version $Id: LineNumber.java,v 1.6 2009/09/09 21:26:54 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> * @author Andy Clement diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/LineNumberTable.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/LineNumberTable.java index 871bfe6bf..ee852cf23 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/LineNumberTable.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/LineNumberTable.java @@ -64,7 +64,7 @@ import org.aspectj.apache.bcel.Constants; /** * This class represents a table of line numbers for debugging purposes. This attribute is used by the <em>Code</em> attribute. It * contains pairs of PCs and line numbers. - * + * * @version $Id: LineNumberTable.java,v 1.8 2009/09/15 19:40:12 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> * @see Code changes: asc Feb06 Made unpacking lazy @@ -94,7 +94,7 @@ public final class LineNumberTable extends Attribute { /** * Construct object from file stream. - * + * * @param name_index Index of name * @param length Content length in bytes * @param file Input stream @@ -132,7 +132,7 @@ public final class LineNumberTable extends Attribute { /** * Called by objects that are traversing the nodes of the tree implicitely defined by the contents of a Java class. I.e., the * hierarchy of methods, fields, attributes, etc. spawns a tree of objects. - * + * * @param v Visitor object */ @Override @@ -143,7 +143,7 @@ public final class LineNumberTable extends Attribute { /** * Dump line number table attribute to file stream in binary format. - * + * * @param file Output file stream * @throws IOException */ @@ -184,8 +184,8 @@ public final class LineNumberTable extends Attribute { @Override public final String toString() { unpack(); - StringBuffer buf = new StringBuffer(); - StringBuffer line = new StringBuffer(); + StringBuilder buf = new StringBuilder(); + StringBuilder line = new StringBuilder(); for (int i = 0; i < tableLength; i++) { line.append(table[i].toString()); @@ -208,7 +208,7 @@ public final class LineNumberTable extends Attribute { /** * Map byte code positions to source code lines. - * + * * @param pos byte code offset * @return corresponding line in source code */ diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/LocalVariable.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/LocalVariable.java index c8d5cd87f..13ff6b2fc 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/LocalVariable.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/LocalVariable.java @@ -62,7 +62,7 @@ import org.aspectj.apache.bcel.Constants; /** * This class represents a local variable within a method. It contains its scope, name, signature and index on the method's frame. - * + * * @version $Id: LocalVariable.java,v 1.5 2009/09/10 15:35:05 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> * @see LocalVariableTable @@ -89,7 +89,7 @@ public final class LocalVariable implements Constants, Cloneable, Node { /** * Construct object from file stream. - * + * * @param file Input stream * @throws IOException */ @@ -118,7 +118,7 @@ public final class LocalVariable implements Constants, Cloneable, Node { /** * Called by objects that are traversing the nodes of the tree implicitely defined by the contents of a Java class. I.e., the * hierarchy of methods, fields, attributes, etc. spawns a tree of objects. - * + * * @param v Visitor object */ public void accept(ClassVisitor v) { @@ -127,7 +127,7 @@ public final class LocalVariable implements Constants, Cloneable, Node { /** * Dump local variable to file stream in binary format. - * + * * @param file Output file stream * @throws IOException */ diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/LocalVariableTable.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/LocalVariableTable.java index 96c52d20f..b32ca7179 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/LocalVariableTable.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/LocalVariableTable.java @@ -177,7 +177,7 @@ public class LocalVariableTable extends Attribute { */ @Override public final String toString() { - StringBuffer buf = new StringBuffer(""); + StringBuilder buf = new StringBuilder(""); unpack(); for (int i = 0; i < localVariableTableLength; i++) { buf.append(localVariableTable[i].toString()); diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/LocalVariableTypeTable.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/LocalVariableTypeTable.java index 93951faf8..2258652ce 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/LocalVariableTypeTable.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/LocalVariableTypeTable.java @@ -104,7 +104,7 @@ public class LocalVariableTypeTable extends Attribute { */ @Override public final String toString() { - StringBuffer buf = new StringBuffer(""); + StringBuilder buf = new StringBuilder(""); for (int i = 0; i < local_variable_type_table_length; i++) { buf.append(local_variable_type_table[i].toString()); diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/Method.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/Method.java index 12608940a..316eaa4c9 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/Method.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/Method.java @@ -67,7 +67,7 @@ import org.aspectj.apache.bcel.generic.Type; /** * This class represents the method info structure, i.e., the representation for a method in the class. See JVM specification for * details. A method has access flags, a name, a signature and a number of attributes. - * + * * @version $Id: Method.java,v 1.11 2009/09/15 19:40:12 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> */ @@ -151,7 +151,7 @@ public final class Method extends FieldOrMethod { public final String toString() { ConstantUtf8 c; String name, signature, access; // Short cuts to constant pool - StringBuffer buf; + StringBuilder buf; access = Utility.accessToString(modifiers); @@ -163,7 +163,7 @@ public final class Method extends FieldOrMethod { name = c.getValue(); signature = Utility.methodSignatureToString(signature, name, access, true, getLocalVariableTable()); - buf = new StringBuffer(signature); + buf = new StringBuilder(signature); for (Attribute a : attributes) { if (!((a instanceof Code) || (a instanceof ExceptionTable))) diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/Modifiers.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/Modifiers.java index 63719913d..8804a8d7b 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/Modifiers.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/Modifiers.java @@ -60,7 +60,7 @@ import org.aspectj.apache.bcel.Constants; * Super class for all objects that have modifiers like private, final, ... I.e. * classes, fields, and methods. * was AccessFlags - * + * * @version $Id: Modifiers.java,v 1.2 2008/05/28 23:53:01 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> */ @@ -77,7 +77,7 @@ public abstract class Modifiers { public final int getModifiers() { return modifiers; } - + public final void setModifiers(int modifiers) { this.modifiers = modifiers; } diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/Module.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/Module.java index 1302aeede..a1dbc2322 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/Module.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/Module.java @@ -64,13 +64,13 @@ import org.aspectj.apache.bcel.Constants; * information captured in a class file. * http://cr.openjdk.java.net/~mr/jigsaw/spec/lang-vm.html * http://cr.openjdk.java.net/~mr/jigsaw/spec/java-se-9-jvms-diffs.pdf 4.7.25 - * + * * @author Andy Clement */ public final class Module extends Attribute { private static final String[] NO_MODULE_NAMES = {}; - + private int moduleNameIndex; // u2 module_name_index private int moduleFlags; // u2 module_flags private int moduleVersionIndex; // u2 module_version_index @@ -88,18 +88,18 @@ public final class Module extends Attribute { super(module.getTag(), module.getNameIndex(), module.getLength(), module.getConstantPool()); moduleInfo = module.getBytes(); } - + public Module(int nameIndex, int length, byte[] data, ConstantPool cp) { super(Constants.ATTR_MODULE, nameIndex, length, cp); } - + Module(int nameIndex, int length, DataInputStream stream, ConstantPool cp) throws IOException { this(nameIndex, length, (byte[])null, cp); moduleInfo = new byte[length]; stream.read(moduleInfo); unpacked = false; } - + public class Require { private final int moduleIndex; @@ -111,19 +111,19 @@ public final class Module extends Attribute { this.flags = flags; this.versionIndex = versionIndex; } - + public String getModuleName() { return cpool.getModuleName(moduleIndex); } - + public int getFlags() { return flags; } - + public int getVersionIndex() { return versionIndex; } - + public String getVersionString() { if (versionIndex == 0) { return null; @@ -148,13 +148,13 @@ public final class Module extends Attribute { } return s.toString(); } - + public String toString() { return "requires"+getFlagsAsString()+" "+getModuleName()+(versionIndex==0?"":" "+getVersionString()); } } - + public class Export { private final int packageIndex; @@ -170,19 +170,19 @@ public final class Module extends Attribute { public int getPackageIndex() { return packageIndex; } - + public int getFlags() { return flags; } - + public int[] getToModuleIndices() { return toModuleIndices; } - + public String getPackage() { return cpool.getPackageName(packageIndex); - } - + } + public String getFlagsAsString() { StringBuilder s = new StringBuilder(); if ((flags & Constants.MODULE_ACC_SYNTHETIC)!=0) { @@ -204,7 +204,7 @@ public final class Module extends Attribute { } return toModuleNames; } - + public String toString() { StringBuilder s =new StringBuilder(); s.append("exports").append(getFlagsAsString()).append(" ").append(getPackage().replace('/', '.')); @@ -221,7 +221,7 @@ public final class Module extends Attribute { return s.toString().trim(); } } - + public class Open { @@ -238,19 +238,19 @@ public final class Module extends Attribute { public int getPackageIndex() { return packageIndex; } - + public int getFlags() { return flags; } - + public int[] getToModuleIndices() { return toModuleIndices; } - + public String getPackage() { return cpool.getPackageName(packageIndex); - } - + } + public String getFlagsAsString() { StringBuilder s = new StringBuilder(); if ((flags & Constants.MODULE_ACC_SYNTHETIC)!=0) { @@ -272,7 +272,7 @@ public final class Module extends Attribute { } return toModuleNames; } - + public String toString() { StringBuilder s =new StringBuilder(); s.append("opens").append(getFlagsAsString()).append(" ").append(getPackage().replace('/', '.')); @@ -289,7 +289,7 @@ public final class Module extends Attribute { return s.toString().trim(); } } - + public class Provide { private final int providedTypeIndex; private final int[] withTypeIndices; @@ -298,11 +298,11 @@ public final class Module extends Attribute { this.providedTypeIndex = providedTypeIndex; this.withTypeIndices = withTypeIndices; } - + public String getProvidedType() { return cpool.getConstantString_CONSTANTClass(providedTypeIndex); } - + public int getProvidedTypeIndex() { return providedTypeIndex; } @@ -334,7 +334,7 @@ public final class Module extends Attribute { public class Uses { private final int typeNameIndex; - + public Uses(int typeNameIndex) { this.typeNameIndex = typeNameIndex; } @@ -346,14 +346,14 @@ public final class Module extends Attribute { public int getTypeNameIndex() { return typeNameIndex; } - + public String toString() { StringBuilder s =new StringBuilder(); s.append("uses ").append(getTypeName().replace('/', '.')); return s.toString().trim(); } } - + private final int readInt() { return ((moduleInfo[ptr++] & 0xFF) << 24) + ((moduleInfo[ptr++] & 0xFF) << 16) + ((moduleInfo[ptr++] & 0xFF) << 8) + (moduleInfo[ptr++] & 0xFF); @@ -374,13 +374,13 @@ public final class Module extends Attribute { moduleNameIndex = readUnsignedShort(); moduleFlags = readUnsignedShort(); moduleVersionIndex = readUnsignedShort(); - + int count = readUnsignedShort(); requires = new Require[count]; for (int i = 0; i < count; i++) { requires[i] = new Require(readUnsignedShort(), readUnsignedShort(), readUnsignedShort()); } - + count = readUnsignedShort(); exports = new Export[count]; for (int i = 0; i < count; i++) { @@ -393,7 +393,7 @@ public final class Module extends Attribute { } exports[i] = new Export(index, flags, to); } - + count = readUnsignedShort(); opens = new Open[count]; for (int i = 0; i < count; i++) { @@ -436,7 +436,7 @@ public final class Module extends Attribute { file.writeShort(moduleNameIndex); file.writeShort(moduleFlags); file.writeShort(moduleVersionIndex); - + file.writeShort(requires.length); for (Require require : requires) { file.writeShort(require.moduleIndex); @@ -507,7 +507,7 @@ public final class Module extends Attribute { } return s.toString(); } - + public String toStringOpens() { StringBuilder s = new StringBuilder(); s.append('#').append(opens.length); @@ -598,12 +598,12 @@ public final class Module extends Attribute { // public Attribute copy(ConstantPool constant_pool) { // return (Module) clone(); // } - + @Override public void accept(ClassVisitor v) { v.visitModule(this); } - + public Require[] getRequires() { ensureUnpacked(); return requires; @@ -617,7 +617,7 @@ public final class Module extends Attribute { } return results; } - + public byte[] getBytes() { return moduleInfo; } @@ -626,7 +626,7 @@ public final class Module extends Attribute { ensureUnpacked(); return exports; } - + public Open[] getOpens() { ensureUnpacked(); return opens; @@ -641,18 +641,18 @@ public final class Module extends Attribute { ensureUnpacked(); return provides; } - + public String getModuleName() { return ((ConstantModule)cpool.getConstant(moduleNameIndex)).getModuleName(cpool); } - + public int getModuleFlags() { // 0x0020 (ACC_OPEN) - Indicates that this module is open. // 0x1000 (ACC_SYNTHETIC) - Indicates that this module was not explicitly or implicitly declared. // 0x8000 (ACC_MANDATED) - Indicates that this module was implicitly declared return moduleFlags; } - + /** @return the module version or null if no version information specified */ public String getModuleVersion() { if (moduleVersionIndex == 0) { diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ModuleMainClass.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ModuleMainClass.java index 3fa500a8e..c9357eeb2 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ModuleMainClass.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ModuleMainClass.java @@ -62,7 +62,7 @@ import org.aspectj.apache.bcel.Constants; /** * Indicates the main class of a module. * http://cr.openjdk.java.net/~mr/jigsaw/spec/java-se-9-jvms-diffs.pdf 4.7.26 - * + * * @author Andy Clement */ public final class ModuleMainClass extends Attribute { diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ModulePackages.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ModulePackages.java index 6f96ae0fd..1ce96a8ba 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ModulePackages.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/ModulePackages.java @@ -62,7 +62,7 @@ import org.aspectj.apache.bcel.Constants; /** * Indicates all the packages of a module that are exported or opened by the module attribute. * http://cr.openjdk.java.net/~mr/jigsaw/spec/java-se-9-jvms-diffs.pdf 4.7.26 - * + * * @author Andy Clement */ public final class ModulePackages extends Attribute { @@ -116,7 +116,7 @@ public final class ModulePackages extends Attribute { @Override public final String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); for (int packageIndex : packageIndices) { buf.append(cpool.getPackageName(packageIndex) + "\n"); } diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/NestHost.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/NestHost.java index 52d312659..547b71dae 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/NestHost.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/NestHost.java @@ -62,7 +62,7 @@ import org.aspectj.apache.bcel.Constants; /** * https://docs.oracle.com/javase/specs/jvms/se11/html/jvms-4.html#jvms-4.7.28 - * + * * @see Attribute */ public final class NestHost extends Attribute { @@ -100,7 +100,7 @@ public final class NestHost extends Attribute { public final void setHostClassIndex(int hostClassIndex) { this.hostClassIndex = hostClassIndex; } - + public final String getHostClassName() { ConstantClass constantClass = (ConstantClass)cpool.getConstant(hostClassIndex,Constants.CONSTANT_Class); return constantClass.getClassname(cpool); @@ -108,7 +108,7 @@ public final class NestHost extends Attribute { @Override public final String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("NestHost("); ConstantClass constantClass = (ConstantClass)cpool.getConstant(hostClassIndex,Constants.CONSTANT_Class); buf.append(constantClass.getClassname(cpool)); diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/NestMembers.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/NestMembers.java index 9d273966f..8179aaf18 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/NestMembers.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/NestMembers.java @@ -62,7 +62,7 @@ import org.aspectj.apache.bcel.Constants; /** * https://docs.oracle.com/javase/specs/jvms/se11/html/jvms-4.html#jvms-4.7.29 - * + * * @see Attribute */ public final class NestMembers extends Attribute { @@ -109,7 +109,7 @@ public final class NestMembers extends Attribute { this.classes = inner_classes; numberOfClasses = (inner_classes == null) ? 0 : inner_classes.length; } - + public final String[] getClassesNames() { String[] result = new String[numberOfClasses]; for (int i = 0; i < numberOfClasses; i++) { @@ -121,7 +121,7 @@ public final class NestMembers extends Attribute { @Override public final String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); for (int i = 0; i < numberOfClasses; i++) { ConstantClass constantClass = (ConstantClass)cpool.getConstant(classes[i],Constants.CONSTANT_Class); buf.append(constantClass.getClassname(cpool)).append(" "); diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/Signature.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/Signature.java index b7488e9a4..a9a9b1a92 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/Signature.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/Signature.java @@ -52,7 +52,7 @@ package org.aspectj.apache.bcel.classfile; * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * <http://www.apache.org/>. - * + * * Extended by Adrian Colyer, June 2005 to support unpacking of Signature * attribute */ @@ -67,7 +67,7 @@ import org.aspectj.apache.bcel.Constants; /** * This class is derived from <em>Attribute</em> and represents a reference to a <href="http://wwwipd.ira.uka.de/~pizza/gj/">GJ</a> * attribute. - * + * * @version $Id: Signature.java,v 1.11 2009/09/15 19:40:12 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> * @see Attribute @@ -85,7 +85,7 @@ public final class Signature extends Attribute { /** * Construct object from file stream. - * + * * @param name_index Index in constant pool to CONSTANT_Utf8 * @param length Content length in bytes * @param file Input stream @@ -110,7 +110,7 @@ public final class Signature extends Attribute { /** * Called by objects that are traversing the nodes of the tree implicitely defined by the contents of a Java class. I.e., the * hierarchy of methods, fields, attributes, etc. spawns a tree of objects. - * + * * @param v Visitor object */ @Override @@ -121,7 +121,7 @@ public final class Signature extends Attribute { /** * Dump source file attribute to file stream in binary format. - * + * * @param file Output file stream * @throws IOException */ @@ -183,7 +183,7 @@ public final class Signature extends Attribute { return ch == 'T' || ch == 'L'; } - private static final void matchIdent(MyByteArrayInputStream in, StringBuffer buf) { + private static final void matchIdent(MyByteArrayInputStream in, StringBuilder buf) { int ch; if ((ch = in.read()) == -1) @@ -192,7 +192,7 @@ public final class Signature extends Attribute { // System.out.println("return from ident:" + (char)ch); if (!identStart(ch)) { - StringBuffer buf2 = new StringBuffer(); + StringBuilder buf2 = new StringBuilder(); int count = 1; while (Character.isJavaIdentifierPart((char) ch)) { @@ -216,7 +216,7 @@ public final class Signature extends Attribute { return; } - StringBuffer buf2 = new StringBuffer(); + StringBuilder buf2 = new StringBuilder(); ch = in.read(); do { @@ -234,7 +234,7 @@ public final class Signature extends Attribute { in.unread(); } - private static final void matchGJIdent(MyByteArrayInputStream in, StringBuffer buf) { + private static final void matchGJIdent(MyByteArrayInputStream in, StringBuilder buf) { int ch; matchIdent(in, buf); @@ -274,7 +274,7 @@ public final class Signature extends Attribute { public static String translate(String s) { // System.out.println("Sig:" + s); - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); matchGJIdent(new MyByteArrayInputStream(s), buf); diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/SourceFile.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/SourceFile.java index 9fd840fc0..1e7ef1ea5 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/SourceFile.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/SourceFile.java @@ -64,7 +64,7 @@ import org.aspectj.apache.bcel.Constants; * This class is derived from <em>Attribute</em> and represents a reference to the source file of this class. At most one SourceFile * attribute should appear per classfile. The intention of this class is that it is instantiated from the * <em>Attribute.readAttribute()</em> method. - * + * * @version $Id: SourceFile.java,v 1.5 2009/09/15 19:40:12 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> * @see Attribute @@ -82,7 +82,7 @@ public final class SourceFile extends Attribute { /** * Construct object from file stream. - * + * * @param name_index Index in constant pool to CONSTANT_Utf8 * @param length Content length in bytes * @param file Input stream @@ -109,7 +109,7 @@ public final class SourceFile extends Attribute { /** * Called by objects that are traversing the nodes of the tree implicitely defined by the contents of a Java class. I.e., the * hierarchy of methods, fields, attributes, etc. spawns a tree of objects. - * + * * @param v Visitor object */ @Override @@ -119,7 +119,7 @@ public final class SourceFile extends Attribute { /** * Dump source file attribute to file stream in binary format. - * + * * @param file Output file stream * @throws IOException */ diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/StackMap.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/StackMap.java index 29f9c1535..263cda9af 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/StackMap.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/StackMap.java @@ -64,7 +64,7 @@ import org.aspectj.apache.bcel.Constants; * This class represents a stack map attribute used for preverification of Java classes for the <a href="http://java.sun.com/j2me/"> * Java 2 Micro Edition</a> (J2ME). This attribute is used by the <a href="http://java.sun.com/products/cldc/">KVM</a> and contained * within the Code attribute of a method. See CLDC specification 5.3.1.2 - * + * * @version $Id: StackMap.java,v 1.6 2009/09/15 19:40:12 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> * @see Code @@ -77,11 +77,11 @@ public final class StackMap extends Attribute { /* * @param name_index Index of name - * + * * @param length Content length in bytes - * + * * @param map Table of stack map entries - * + * * @param constant_pool Array of constants */ public StackMap(int name_index, int length, StackMapEntry[] map, ConstantPool constant_pool) { @@ -92,7 +92,7 @@ public final class StackMap extends Attribute { /** * Construct object from file stream. - * + * * @param name_index Index of name * @param length Content length in bytes * @param file Input stream @@ -111,7 +111,7 @@ public final class StackMap extends Attribute { /** * Dump line number table attribute to file stream in binary format. - * + * * @param file Output file stream * @throws IOException */ @@ -144,7 +144,7 @@ public final class StackMap extends Attribute { */ @Override public final String toString() { - StringBuffer buf = new StringBuffer("StackMap("); + StringBuilder buf = new StringBuilder("StackMap("); for (int i = 0; i < map_length; i++) { buf.append(map[i].toString()); @@ -176,7 +176,7 @@ public final class StackMap extends Attribute { /** * Called by objects that are traversing the nodes of the tree implicitely defined by the contents of a Java class. I.e., the * hierarchy of methods, fields, attributes, etc. spawns a tree of objects. - * + * * @param v Visitor object */ @Override diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/StackMapEntry.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/StackMapEntry.java index 76bb2ab79..1ed14cd01 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/StackMapEntry.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/StackMapEntry.java @@ -113,7 +113,7 @@ public final class StackMapEntry implements Cloneable { * * @param file Output file stream * @throws IOException - */ + */ public final void dump(DataOutputStream file) throws IOException { file.writeShort(byte_code_offset); @@ -129,9 +129,9 @@ public final class StackMapEntry implements Cloneable { /** * @return String representation. - */ + */ public final String toString() { - StringBuffer buf = new StringBuffer("(offset=" + byte_code_offset); + StringBuilder buf = new StringBuilder("(offset=" + byte_code_offset); if(number_of_locals > 0) { buf.append(", locals={"); @@ -159,7 +159,7 @@ public final class StackMapEntry implements Cloneable { buf.append(")"); - return buf.toString(); + return buf.toString(); } @@ -198,12 +198,12 @@ public final class StackMapEntry implements Cloneable { /** * @return Constant pool used by this object. - */ + */ public final ConstantPool getConstantPool() { return constant_pool; } /** * @param constant_pool Constant pool to be used for this object. - */ + */ public final void setConstantPool(ConstantPool constant_pool) { this.constant_pool = constant_pool; } diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/StackMapType.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/StackMapType.java index 5a8d16d72..d4c358915 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/StackMapType.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/StackMapType.java @@ -113,19 +113,19 @@ public final class StackMapType implements Cloneable { * in byte code, if type == ITEM_NewObject, and -1 otherwise */ public int getIndex() { return index; } - + /** * Dump type entries to file. * * @param file Output file stream * @throws IOException - */ + */ public final void dump(DataOutputStream file) throws IOException { file.writeByte(type); if(hasIndex()) file.writeShort(getIndex()); - } + } /** @return true, if type is either ITEM_Object or ITEM_NewObject */ @@ -145,10 +145,10 @@ public final class StackMapType implements Cloneable { /** * @return String representation - */ + */ public final String toString() { return "(type=" + Constants.ITEM_NAMES[type] + printIndex() + ")"; - } + } /** * @return deep copy of this object @@ -163,12 +163,12 @@ public final class StackMapType implements Cloneable { /** * @return Constant pool used by this object. - */ + */ public final ConstantPool getConstantPool() { return constant_pool; } /** * @param constant_pool Constant pool to be used for this object. - */ + */ public final void setConstantPool(ConstantPool constant_pool) { this.constant_pool = constant_pool; } diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/Synthetic.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/Synthetic.java index 57fe97468..3c63f1131 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/Synthetic.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/Synthetic.java @@ -65,7 +65,7 @@ import org.aspectj.apache.bcel.Constants; * specification states "A class member that does not appear in the source code must be marked using a Synthetic attribute." It may * appear in the ClassFile attribute table, a field_info table or a method_info table. This class is intended to be instantiated * from the <em>Attribute.readAttribute()</em> method. - * + * * @version $Id: Synthetic.java,v 1.5 2009/09/15 19:40:12 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> * @see Attribute @@ -81,7 +81,7 @@ public final class Synthetic extends Attribute { this(c.getNameIndex(), c.getLength(), c.getBytes(), c.getConstantPool()); } - // + // // public Synthetic(ConstantPoolGen cpool) { // super(Constants.ATTR_SYNTHETIC, cpool.addUtf8("Synthetic"), 0, cpool); // ConstantPoolGen cpg = myGen.getConstantPool(); @@ -102,7 +102,7 @@ public final class Synthetic extends Attribute { /** * Construct object from file stream. - * + * * @param name_index Index in constant pool to CONSTANT_Utf8 * @param length Content length in bytes * @param file Input stream @@ -122,7 +122,7 @@ public final class Synthetic extends Attribute { /** * Called by objects that are traversing the nodes of the tree implicitely defined by the contents of a Java class. I.e., the * hierarchy of methods, fields, attributes, etc. spawns a tree of objects. - * + * * @param v Visitor object */ @Override @@ -132,7 +132,7 @@ public final class Synthetic extends Attribute { /** * Dump source file attribute to file stream in binary format. - * + * * @param file Output file stream * @throws IOException */ @@ -162,7 +162,7 @@ public final class Synthetic extends Attribute { */ @Override public final String toString() { - StringBuffer buf = new StringBuffer("Synthetic"); + StringBuilder buf = new StringBuilder("Synthetic"); if (length > 0) buf.append(" " + Utility.toHexString(bytes)); diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/Unknown.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/Unknown.java index 416d105b1..6d55e311e 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/Unknown.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/Unknown.java @@ -66,8 +66,8 @@ import org.aspectj.apache.bcel.Constants; * href="./AttributeReader.html">AttributeReader</a> implementation and attach it via <a * href="./Attribute.html#addAttributeReader(java.lang.String, * org.aspectj.apache.bcel.classfile.AttributeReader)">Attribute.addAttributeReader</a>. - * - * + * + * * @version $Id: Unknown.java,v 1.6 2009/09/15 19:40:12 aclement Exp $ * @see org.aspectj.apache.bcel.classfile.Attribute * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> @@ -102,7 +102,7 @@ public final class Unknown extends Attribute { /** * Create a non-standard attribute. - * + * * @param name_index Index in constant pool * @param length Content length in bytes * @param bytes Attribute contents @@ -118,7 +118,7 @@ public final class Unknown extends Attribute { /** * Construct object from file stream. - * + * * @param name_index Index in constant pool * @param length Content length in bytes * @param file Input stream @@ -137,7 +137,7 @@ public final class Unknown extends Attribute { /** * Called by objects that are traversing the nodes of the tree implicitely defined by the contents of a Java class. I.e., the * hierarchy of methods, fields, attributes, etc. spawns a tree of objects. - * + * * @param v Visitor object */ @Override @@ -147,7 +147,7 @@ public final class Unknown extends Attribute { /** * Dump unknown bytes to file stream. - * + * * @param file Output file stream * @throws IOException */ diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/Utility.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/Utility.java index 71573a311..921570515 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/Utility.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/Utility.java @@ -74,10 +74,10 @@ import org.aspectj.apache.bcel.util.ByteSequence; /** * Utility functions that do not really belong to any class in particular. - * + * * @version $Id: Utility.java,v 1.14 2009/09/28 16:39:46 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> - * + * * modified: Andy Clement 2-mar-05 Removed unnecessary static and optimized */ public abstract class Utility { @@ -91,7 +91,7 @@ public abstract class Utility { /** * Convert bit field of flags into string such as 'static final'. - * + * * @param access_flags Access flags * @return String representation of flags */ @@ -101,16 +101,16 @@ public abstract class Utility { /** * Convert bit field of flags into string such as 'static final'. - * + * * Special case: Classes compiled with new compilers and with the 'ACC_SUPER' flag would be said to be "synchronized". This is * because SUN used the same value for the flags 'ACC_SUPER' and 'ACC_SYNCHRONIZED'. - * + * * @param access_flags Access flags * @param for_class access flags are for class qualifiers ? * @return String representation of flags */ public static final String accessToString(int access_flags, boolean for_class) { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); int p = 0; for (int i = 0; p < Constants.MAX_ACC_FLAG; i++) { // Loop through known flags @@ -136,7 +136,7 @@ public abstract class Utility { /** * Disassemble a byte array of JVM byte codes starting from code line 'index' and return the disassembled string representation. * Decode only 'num' opcodes (including their operands), use -1 if you want to decompile everything. - * + * * @param code byte code array * @param constant_pool Array of constants * @param index offset in `code' array <EM>(number of opcodes, not bytes!)</EM> @@ -145,7 +145,7 @@ public abstract class Utility { * @return String representation of byte codes */ public static final String codeToString(byte[] code, ConstantPool constant_pool, int index, int length, boolean verbose) { - StringBuffer buf = new StringBuffer(code.length * 20); // Should be sufficient + StringBuilder buf = new StringBuilder(code.length * 20); // Should be sufficient ByteSequence stream = new ByteSequence(code); try { @@ -182,7 +182,7 @@ public abstract class Utility { /** * Shorten long class names, <em>java/lang/String</em> becomes <em>String</em>. - * + * * @param str The long class name * @return Compacted class name */ @@ -193,7 +193,7 @@ public abstract class Utility { /** * Shorten long class name <em>str</em>, i.e., chop off the <em>prefix</em>, if the class name starts with this string and the * flag <em>chopit</em> is true. Slashes <em>/</em> are converted to dots <em>.</em>. - * + * * @param str The long class name * @param prefix The prefix the get rid off * @param chopit Flag that determines whether chopping is executed or not @@ -217,7 +217,7 @@ public abstract class Utility { /** * Shorten long class names, <em>java/lang/String</em> becomes <em>java.lang.String</em>, e.g.. If <em>chopit</em> is * <em>true</em> the prefix <em>java.lang</em> is also removed. - * + * * @param str The long class name * @param chopit Flag that determines whether chopping is executed or not * @return Compacted class name @@ -240,7 +240,7 @@ public abstract class Utility { */ public static final String methodSignatureToString(String signature, String name, String access, boolean chopit, LocalVariableTable vars) throws ClassFormatException { - StringBuffer buf = new StringBuffer("("); + StringBuilder buf = new StringBuilder("("); String type; int index; int var_index = (access.contains("static")) ? 0 : 1; @@ -298,7 +298,7 @@ public abstract class Utility { /** * Replace all occurences of <em>old</em> in <em>str</em> with <em>new</em>. - * + * * @param str String to permute * @param old String to be replaced * @param new Replacement string @@ -306,7 +306,7 @@ public abstract class Utility { */ public static final String replace(String str, String old, String new_) { int index, old_index; - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); try { index = str.indexOf(old); @@ -332,7 +332,7 @@ public abstract class Utility { /** * Converts signature to string with all class names compacted. - * + * * @param signature to convert * @return Human readable signature */ @@ -381,7 +381,7 @@ public abstract class Utility { int genericEnd = signature.indexOf('>'); // FIXME asc going to need a lot more work in here for generics ResultHolder rh = signatureToStringInternal(signature.substring(genericStart + 1, genericEnd), chopit); - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(signature.substring(1, genericStart)); sb.append("<").append(rh.getResult()).append(">"); ResultHolder retval = new ResultHolder(compactClassName(sb.toString(), chopit), genericEnd + 1); @@ -399,10 +399,10 @@ public abstract class Utility { return ResultHolder.BOOLEAN; case '[': { // Array declaration - StringBuffer brackets; + StringBuilder brackets; int consumedChars, n; - brackets = new StringBuffer(); // Accumulate []'s + brackets = new StringBuilder(); // Accumulate []'s // Count opening brackets and look for optional size argument for (n = 0; signature.charAt(n) == '['; n++) { brackets.append("[]"); @@ -426,7 +426,7 @@ public abstract class Utility { /** * Return type of method signature as a byte value as defined in <em>Constants</em> - * + * * @param signature in format described above * @return type of method signature * @see Constants @@ -453,11 +453,11 @@ public abstract class Utility { /** * Convert bytes into hexidecimal string - * + * * @return bytes as hexidecimal string, e.g. 00 FA 12 ... */ public static final String toHexString(byte[] bytes) { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); for (int i = 0; i < bytes.length; i++) { short b = byteToShort(bytes[i]); @@ -480,7 +480,7 @@ public abstract class Utility { /** * Return a string for an integer justified left or right and filled up with 'fill' characters if necessary. - * + * * @param i integer to format * @param length length of desired string * @param left_justify format left or right @@ -493,7 +493,7 @@ public abstract class Utility { /** * Fillup char with up to length characters with char `fill' and justify it left or right. - * + * * @param str string to format * @param length length of desired string * @param left_justify format left or right @@ -520,7 +520,7 @@ public abstract class Utility { */ public static final String convertString(String label) { char[] ch = label.toCharArray(); - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); for (char c : ch) { switch (c) { @@ -550,7 +550,7 @@ public abstract class Utility { /** * Converts a list of AnnotationGen objects into a set of attributes that can be attached to the class file. - * + * * @param cp The constant pool gen where we can create the necessary name refs * @param annotations A list of AnnotationGen objects */ @@ -747,7 +747,7 @@ public abstract class Utility { /** * Return type of signature as a byte value as defined in <em>Constants</em> - * + * * @param signature in format described above * @return type of signature * @see Constants @@ -816,7 +816,7 @@ public abstract class Utility { /** * Disassemble a stream of byte codes and return the string representation. - * + * * @param bytes stream of bytes * @param constant_pool Array of constants * @param verbose be verbose, e.g. print constant pool index @@ -828,7 +828,7 @@ public abstract class Utility { int index, vindex, constant; int[] match, jump_table; int no_pad_bytes = 0, offset; - StringBuffer buf = new StringBuffer(Constants.OPCODE_NAMES[opcode]); + StringBuilder buf = new StringBuilder(Constants.OPCODE_NAMES[opcode]); /* * Special case: Skip (0-3) padding bytes, i.e., the following bytes are 4-byte-aligned @@ -995,13 +995,13 @@ public abstract class Utility { + bytes.readUnsignedByte()); // Last byte is a reserved // space break; - + case Constants.INVOKEDYNAMIC://http://docs.oracle.com/javase/specs/jvms/se7/html/jvms-6.html#jvms-6.5.invokedynamic index = bytes.readUnsignedShort(); bytes.readUnsignedShort(); // zeroes buf.append("\t" + constant_pool.constantToString(index) + (verbose ? " (" + index + ")" : "")); break; - + // Operands are references to items in constant pool case Constants.LDC_W: case Constants.LDC2_W: @@ -1076,13 +1076,13 @@ public abstract class Utility { /** * Convert type to Java method signature, e.g. int[] f(java.lang.String x) becomes (Ljava/lang/String;)[I - * + * * @param returnType what the method returns * @param argTypes what are the argument types * @return method signature for given type(s). */ public static String toMethodSignature(Type returnType, Type[] argTypes) { - StringBuffer buf = new StringBuffer("("); + StringBuilder buf = new StringBuilder("("); int length = (argTypes == null) ? 0 : argTypes.length; for (int i = 0; i < length; i++) { buf.append(argTypes[i].getSignature()); diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/annotation/AnnotationElementValue.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/annotation/AnnotationElementValue.java index d5995b274..3fb6de6d7 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/annotation/AnnotationElementValue.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/annotation/AnnotationElementValue.java @@ -48,7 +48,7 @@ public class AnnotationElementValue extends ElementValue { @Override public String stringifyValue() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); ConstantUtf8 cu8 = (ConstantUtf8) cpool.getConstant(a.getTypeIndex(), Constants.CONSTANT_Utf8); sb.append(cu8.getValue()); // haven't really tested this values section: diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/annotation/AnnotationGen.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/annotation/AnnotationGen.java index 93c875d4c..b05a02705 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/annotation/AnnotationGen.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/annotation/AnnotationGen.java @@ -113,7 +113,7 @@ public class AnnotationGen { @Override public String toString() { - StringBuffer s = new StringBuffer(); + StringBuilder s = new StringBuilder(); s.append("AnnotationGen:[" + getTypeName() + " #" + pairs.size() + " {"); for (int i = 0; i < pairs.size(); i++) { s.append(pairs.get(i)); @@ -125,7 +125,7 @@ public class AnnotationGen { } public String toShortString() { - StringBuffer s = new StringBuffer(); + StringBuilder s = new StringBuilder(); s.append("@").append(getTypeName()); if (pairs.size()!=0) { s.append("("); diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/annotation/ArrayElementValue.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/annotation/ArrayElementValue.java index 3481f64a8..68b7db7c8 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/annotation/ArrayElementValue.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/annotation/ArrayElementValue.java @@ -62,7 +62,7 @@ public class ArrayElementValue extends ElementValue { @Override public String stringifyValue() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("["); for (int i = 0; i < evalues.length; i++) { ElementValue element = evalues[i]; diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/annotation/EnumElementValue.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/annotation/EnumElementValue.java index 6d16ff732..29e4d8710 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/annotation/EnumElementValue.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/annotation/EnumElementValue.java @@ -76,7 +76,7 @@ public class EnumElementValue extends ElementValue { */ @Override public String stringifyValue() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); ConstantUtf8 cu8 = (ConstantUtf8) cpool.getConstant(typeIdx, Constants.CONSTANT_Utf8); sb.append(cu8.getValue()); cu8 = (ConstantUtf8) cpool.getConstant(valueIdx, Constants.CONSTANT_Utf8); diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/annotation/NameValuePair.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/annotation/NameValuePair.java index 0140b34cb..8da630400 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/annotation/NameValuePair.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/classfile/annotation/NameValuePair.java @@ -68,7 +68,7 @@ public class NameValuePair { @Override public String toString() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(getNameString()).append("=").append(value.stringifyValue()); return sb.toString(); } diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/ArrayType.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/ArrayType.java index d9599289b..63f6db57b 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/ArrayType.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/ArrayType.java @@ -55,7 +55,7 @@ package org.aspectj.apache.bcel.generic; */ import org.aspectj.apache.bcel.Constants; -/** +/** * Denotes array type, such as int[][] * * @version $Id: ArrayType.java,v 1.4 2008/08/26 15:02:04 aclement Exp $ @@ -69,7 +69,7 @@ public final class ArrayType extends ReferenceType { * Convenience constructor for array type, e.g. int[] * * @param type array type, e.g. T_INT - */ + */ public ArrayType(byte type, int dimensions) { this(BasicType.getType(type), dimensions); } @@ -78,7 +78,7 @@ public final class ArrayType extends ReferenceType { * Convenience constructor for reference array type, e.g. Object[] * * @param class_name complete name of class (java.lang.String, e.g.) - */ + */ public ArrayType(String class_name, int dimensions) { this(new ObjectType(class_name), dimensions); } @@ -87,7 +87,7 @@ public final class ArrayType extends ReferenceType { * Constructor for array of given type * * @param type type of array (may be an array itself) - */ + */ public ArrayType(Type type, int dimensions) { super(Constants.T_ARRAY, "<dummy>"); @@ -100,7 +100,7 @@ public final class ArrayType extends ReferenceType { this.dimensions = dimensions + array.dimensions; basic_type = array.basic_type; break; - + case Constants.T_VOID: throw new ClassGenException("Invalid type: void[]"); @@ -110,7 +110,7 @@ public final class ArrayType extends ReferenceType { break; } - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); for(int i=0; i < this.dimensions; i++) buf.append('['); diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/BasicType.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/BasicType.java index 477fb1dff..2c0970b3a 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/BasicType.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/BasicType.java @@ -57,14 +57,14 @@ import org.aspectj.apache.bcel.Constants; /** * Denotes basic type such as int. - * + * * @version $Id: BasicType.java,v 1.4 2008/08/28 00:05:57 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> */ public final class BasicType extends Type { /** * Constructor for basic types such as int, long, `void' - * + * * @param type one of T_INT, T_BOOLEAN, ..., T_VOID * @see org.aspectj.apache.bcel.Constants */ diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/BranchHandle.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/BranchHandle.java index 35d9528b8..09b5cd807 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/BranchHandle.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/BranchHandle.java @@ -57,7 +57,7 @@ package org.aspectj.apache.bcel.generic; /** * BranchHandle is returned by specialized InstructionList.append() whenever a BranchInstruction is appended. This is useful when * the target of this instruction is not known at time of creation and must be set later via setTarget(). - * + * * @see InstructionHandle * @see Instruction * @see InstructionList @@ -92,7 +92,7 @@ public final class BranchHandle extends InstructionHandle { * Called by InstructionList.setPositions when setting the position for every instruction. In the presence of variable length * instructions 'setPositions()' performs multiple passes over the instruction list to calculate the correct (byte) positions * and offsets by calling this function. - * + * * @param offset additional offset caused by preceding (variable length) instructions * @param max_offset the maximum offset that may be caused by these instructions * @return additional offset caused by possible change of this instruction's length diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/ClassGen.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/ClassGen.java index 9bc67c9fd..fc8112858 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/ClassGen.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/ClassGen.java @@ -79,11 +79,11 @@ import org.aspectj.apache.bcel.classfile.annotation.RuntimeVisAnnos; /** * Template class for building up a java class. May be initialized with an existing java class. - * + * * @see JavaClass * @version $Id: ClassGen.java,v 1.15 2009/09/15 19:40:14 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> - * + * * Upgraded, Andy Clement 9th Mar 06 - calculates SUID */ public class ClassGen extends Modifiers implements Cloneable { @@ -236,9 +236,9 @@ public class ClassGen extends Modifiers implements Cloneable { /** * Convenience method. - * + * * Add an empty constructor to this class that does nothing but calling super(). - * + * * @param access rights for constructor */ public void addEmptyConstructor(int access_flags) { @@ -255,7 +255,7 @@ public class ClassGen extends Modifiers implements Cloneable { /** * Add a field to this class. - * + * * @param f field to add */ public void addField(Field f) { diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/ClassGenException.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/ClassGenException.java index b981dc8dc..e87aacaa6 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/ClassGenException.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/ClassGenException.java @@ -54,7 +54,7 @@ package org.aspectj.apache.bcel.generic; * <http://www.apache.org/>. */ -/** +/** * Thrown on internal errors. Extends RuntimeException so it hasn't to be declared * in the throws clause every time. * diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/CodeExceptionGen.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/CodeExceptionGen.java index 01b839207..2e0b0ddd9 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/CodeExceptionGen.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/CodeExceptionGen.java @@ -57,7 +57,7 @@ package org.aspectj.apache.bcel.generic; import org.aspectj.apache.bcel.classfile.CodeException; import org.aspectj.apache.bcel.classfile.ConstantPool; -/** +/** * This class represents an exception handler, i.e., specifies the region where * a handler is active and an instruction where the actual handling is done. * pool as parameters. Opposed to the JVM specification the end of the handled @@ -78,7 +78,7 @@ public final class CodeExceptionGen private InstructionHandle end_pc; private InstructionHandle handler_pc; private ObjectType catch_type; - + /** * Add an exception handler, i.e., specify region where a handler is active and an * instruction where the actual handling is done. @@ -112,15 +112,15 @@ public final class CodeExceptionGen (catch_type == null)? 0 : cp.addClass(catch_type)); } - /* Set start of handler + /* Set start of handler * @param start_pc Start of handled region (inclusive) */ public void setStartPC(InstructionHandle start_pc) { InstructionBranch.notifyTarget(this.start_pc, start_pc, this); - this.start_pc = start_pc; + this.start_pc = start_pc; } - /* Set end of handler + /* Set end of handler * @param end_pc End of handled region (inclusive) */ public void setEndPC(InstructionHandle end_pc) { diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/FieldGen.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/FieldGen.java index 454b74203..78ba1f465 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/FieldGen.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/FieldGen.java @@ -75,7 +75,7 @@ import org.aspectj.apache.bcel.classfile.annotation.RuntimeAnnos; /** * Template class for building up a field. The only extraordinary thing one can do is to add a constant value attribute to a field * (which must of course be compatible with the declared type). - * + * * @version $Id: FieldGen.java,v 1.11 2011/10/03 22:41:24 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> * @see Field @@ -86,7 +86,7 @@ public class FieldGen extends FieldGenOrMethodGen { /** * Declare a field. If it is static (isStatic() == true) and has a basic type like int or String it may have an initial value * associated with it as defined by setInitValue(). - * + * * @param modifiers access qualifiers * @param type field type * @param name field name @@ -101,7 +101,7 @@ public class FieldGen extends FieldGenOrMethodGen { /** * Instantiate from existing field. - * + * * @param field Field object * @param cp constant pool (must contain the same entries as the field's constant pool) */ @@ -230,7 +230,7 @@ public class FieldGen extends FieldGenOrMethodGen { String signature = type.toString(); String name = getName(); - StringBuffer buf = new StringBuffer(access).append(signature).append(" ").append(name); + StringBuilder buf = new StringBuilder(access).append(signature).append(" ").append(name); String value = getInitialValue(); if (value != null) { diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/FieldGenOrMethodGen.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/FieldGenOrMethodGen.java index 5b4256685..7d5a9b22b 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/FieldGenOrMethodGen.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/FieldGenOrMethodGen.java @@ -67,7 +67,7 @@ import org.aspectj.apache.bcel.classfile.annotation.RuntimeAnnos; /** * Super class for FieldGen and MethodGen objects, since they have some methods in common! - * + * * @version $Id: FieldGenOrMethodGen.java,v 1.8 2009/09/15 19:40:14 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> */ diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/FieldInstruction.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/FieldInstruction.java index 54983e7c9..ce82c6c43 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/FieldInstruction.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/FieldInstruction.java @@ -58,7 +58,7 @@ import org.aspectj.apache.bcel.classfile.ConstantPool; /** * Super class for the GET/PUTxxx family of instructions. - * + * * @version $Id: FieldInstruction.java,v 1.7 2009/10/05 17:35:36 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> */ diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/FieldOrMethod.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/FieldOrMethod.java index 44b263ffb..987b6c6b9 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/FieldOrMethod.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/FieldOrMethod.java @@ -61,7 +61,7 @@ import org.aspectj.apache.bcel.classfile.ConstantUtf8; /** * Super class for InvokeInstruction and FieldInstruction, since they have some methods in common! - * + * * @version $Id: FieldOrMethod.java,v 1.8 2009/10/05 17:35:36 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> */ diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/IINC.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/IINC.java index d70e20308..a80d2cb02 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/IINC.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/IINC.java @@ -60,7 +60,7 @@ import org.aspectj.apache.bcel.Constants; /** * IINC - Increment local variable by constant - * + * * @version $Id: IINC.java,v 1.5 2009/10/05 17:35:36 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> */ diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/INVOKEINTERFACE.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/INVOKEINTERFACE.java index b545f4d37..9e63d1f4c 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/INVOKEINTERFACE.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/INVOKEINTERFACE.java @@ -61,11 +61,11 @@ import org.aspectj.apache.bcel.classfile.ConstantPool; /** * INVOKEINTERFACE - Invoke interface method - * + * * <PRE> * Stack: ..., objectref, [arg1, [arg2 ...]] -> ... * </PRE> - * + * * @version $Id: INVOKEINTERFACE.java,v 1.4 2009/10/05 17:35:36 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> */ @@ -84,7 +84,7 @@ public final class INVOKEINTERFACE extends InvokeInstruction { /** * Dump instruction as byte code to stream out. - * + * * @param out Output stream */ public void dump(DataOutputStream out) throws IOException { diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/Instruction.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/Instruction.java index 3fa40ac0f..3754e47b9 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/Instruction.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/Instruction.java @@ -64,7 +64,7 @@ import org.aspectj.apache.bcel.util.ByteSequence; /** * Abstract super class for all Java byte codes. - * + * * @version $Id: Instruction.java,v 1.10 2011/04/05 15:15:33 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> */ @@ -86,7 +86,7 @@ public class Instruction implements Cloneable, Serializable, Constants { /** * Use with caution, since 'BranchInstruction's have a 'target' reference which is not copied correctly (only basic types are). * This also applies for 'Select' instructions with their multiple branch targets. - * + * * @return (shallow) copy of an instruction */ // GET RID OF THIS - make it throw an exception and track the callers @@ -107,7 +107,7 @@ public class Instruction implements Cloneable, Serializable, Constants { /** * Read an instruction bytecode from an input stream and return the appropriate object. - * + * * @param file file to read from * @return instruction object being read */ @@ -439,7 +439,7 @@ public class Instruction implements Cloneable, Serializable, Constants { */ public String toString(boolean verbose) { if (verbose) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(getName()).append("[").append(opcode).append("](size").append(Constants.iLen[opcode]).append(")"); return sb.toString(); } else { diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InstructionBranch.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InstructionBranch.java index 53fed8e52..aedd31aaf 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InstructionBranch.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InstructionBranch.java @@ -63,7 +63,7 @@ import org.aspectj.apache.bcel.classfile.ConstantPool; * Abstract super class for branching instructions like GOTO, IFEQ, etc.. Branch instructions may have a variable length, namely * GOTO, JSR, LOOKUPSWITCH and TABLESWITCH. A branch instruction may be talking in terms of absolute destination (targetIndex) or * about an instruction it doesnt yet know the position if (targetInstruction). targetInstruction (if set) overrides targetIndex - * + * * @see InstructionList * @version $Id: InstructionBranch.java,v 1.6 2009/10/05 17:35:36 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> @@ -153,7 +153,7 @@ public class InstructionBranch extends Instruction implements InstructionTargete * Called by InstructionList.setPositions when setting the position for every instruction. In the presence of variable length * instructions `setPositions' performs multiple passes over the instruction list to calculate the correct (byte) positions and * offsets by calling this function. - * + * * @param offset additional offset caused by preceding (variable length) instructions * @param max_offset the maximum offset that may be caused by these instructions * @return additional offset caused by possible change of this instruction's length @@ -183,7 +183,7 @@ public class InstructionBranch extends Instruction implements InstructionTargete /** * Long output format: - * + * * @param verbose long/short format switch * @return mnemonic for instruction */ @@ -227,7 +227,7 @@ public class InstructionBranch extends Instruction implements InstructionTargete /** * Set branch target - * + * * @param target branch target */ public void setTarget(InstructionHandle target) { @@ -250,7 +250,7 @@ public class InstructionBranch extends Instruction implements InstructionTargete /** * Update the target destination for this instruction. If an oldHandle is provided it is checked to verify that is where the * target currently points to before changing it. - * + * * @param oldHandle old target * @param newHandle new target */ @@ -289,7 +289,7 @@ public class InstructionBranch extends Instruction implements InstructionTargete * Returns an InstructionHandle to the physical successor of this JsrInstruction. <B>For this method to work, this * JsrInstruction object must not be shared between multiple InstructionHandle objects!</B> Formally, there must not be * InstructionHandle objects i, j where i != j and i.getInstruction() == this == j.getInstruction(). - * + * * @return an InstructionHandle to the "next" instruction that will be executed when RETurned from a subroutine. */ public InstructionHandle physicalSuccessor() { diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InstructionByte.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InstructionByte.java index 5ba8a9abe..dfac2a9bd 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InstructionByte.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InstructionByte.java @@ -78,7 +78,7 @@ public class InstructionByte extends Instruction { /** * For supporting NEWARRAY - * + * * @return typecode of the array */ public final byte getTypecode() { @@ -87,7 +87,7 @@ public class InstructionByte extends Instruction { /** * For supporting NEWARRAY - * + * * @return type of the array */ public final Type getType() { @@ -105,4 +105,4 @@ public class InstructionByte extends Instruction { public int hashCode() { return opcode * 37 + theByte; } -}
\ No newline at end of file +} diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InstructionCLV.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InstructionCLV.java index 85ae588e5..95db41a42 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InstructionCLV.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InstructionCLV.java @@ -9,11 +9,11 @@ public class InstructionCLV extends InstructionLV { public InstructionCLV(short opcode) { super(opcode); } - + public InstructionCLV(short opcode,int localVariableIndex) { super(opcode,localVariableIndex); } - + public void setIndex(int localVariableIndex) { if (localVariableIndex!=getIndex()) { throw new ClassGenException("Do not attempt to modify the index to '"+localVariableIndex+"' for this constant instruction: "+this); diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InstructionCP.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InstructionCP.java index 09222d6a4..77fadcf26 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InstructionCP.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InstructionCP.java @@ -70,7 +70,7 @@ import org.aspectj.apache.bcel.classfile.ConstantUtf8; /** * Class for instructions that use an index into the constant pool such as LDC, INVOKEVIRTUAL, etc. - * + * * @version $Id: InstructionCP.java,v 1.6 2009/10/05 17:35:36 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> */ @@ -111,10 +111,10 @@ public class InstructionCP extends Instruction { /** * Long output format: - * + * * <name of opcode> "["<opcode number>"]" "("<length of instruction>")" "<"< constant pool * index>">" - * + * * @param verbose long/short format switch * @return mnemonic for instruction */ @@ -172,7 +172,7 @@ public class InstructionCP extends Instruction { // ConstantPool cp = cpg.getConstantPool(); // String name = cp.getConstantString(index, CONSTANT_Class); if (!name.startsWith("[")) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("L").append(name).append(";"); return Type.getType(sb.toString()); } else { diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InstructionFactory.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InstructionFactory.java index a3b1fb30e..39e61bd29 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InstructionFactory.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InstructionFactory.java @@ -60,7 +60,7 @@ import org.aspectj.apache.bcel.classfile.Utility; /** * Instances of this class may be used, e.g., to generate typed versions of instructions. Its main purpose is to be used as the byte * code generating backend of a compiler. You can subclass it to add your own create methods. - * + * * @version $Id: InstructionFactory.java,v 1.7 2010/08/23 20:44:10 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> * @see Constants @@ -85,10 +85,10 @@ public class InstructionFactory implements InstructionConstants { public InvokeInstruction createInvoke(String class_name, String name, Type ret_type, Type[] arg_types, short kind) { return createInvoke(class_name, name, ret_type, arg_types, kind, false); } - + /** * Create an invoke instruction. - * + * * @param class_name name of the called class * @param name name of the called method * @param ret_type return type of method @@ -173,7 +173,7 @@ public class InstructionFactory implements InstructionConstants { /** * Uses PUSH to push a constant value onto the stack. - * + * * @param value must be of type Number, Boolean, Character or String */ // OPTIMIZE callers should use the PUSH methods where possible if they know the types @@ -199,7 +199,7 @@ public class InstructionFactory implements InstructionConstants { /** * Create a field instruction. - * + * * @param class_name name of the accessed class * @param name name of the referenced field * @param type type of field @@ -520,7 +520,7 @@ public class InstructionFactory implements InstructionConstants { /** * Create new array of given size and type. - * + * * @return an instruction that creates the corresponding array at runtime, i.e. is an AllocationInstruction */ public Instruction createNewArray(Type t, short dim) { diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InstructionHandle.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InstructionHandle.java index 8c9c65ab7..7192e6cff 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InstructionHandle.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InstructionHandle.java @@ -63,11 +63,11 @@ import org.aspectj.apache.bcel.classfile.Utility; /** * Instances of this class give users a handle to the instructions contained in an InstructionList. Instruction objects may be used * more than once within a list, this is useful because it saves memory and may be much faster. - * + * * Within an InstructionList an InstructionHandle object is wrapped around all instructions, i.e., it implements a cell in a * doubly-linked list. From the outside only the next and the previous instruction (handle) are accessible. One can traverse the * list via an Enumeration returned by InstructionList.elements(). - * + * * @version $Id: InstructionHandle.java,v 1.9 2009/10/05 17:35:36 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> * @see Instruction diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InstructionLV.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InstructionLV.java index 73c278016..64a2a388a 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InstructionLV.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InstructionLV.java @@ -60,7 +60,7 @@ import org.aspectj.apache.bcel.Constants; /** * Abstract super class for instructions dealing with local variables. - * + * * @version $Id: InstructionLV.java,v 1.5 2009/10/05 17:35:36 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> */ @@ -128,7 +128,7 @@ public class InstructionLV extends Instruction { /** * Long output format: - * + * * 'name of opcode' "[" 'opcode number' "]" "(" 'length of instruction' ")" "<" 'local variable index' ">" */ public String toString(boolean verbose) { diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InstructionList.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InstructionList.java index 690c9f600..cb580de26 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InstructionList.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InstructionList.java @@ -74,9 +74,9 @@ import org.aspectj.apache.bcel.util.ByteSequence; * inserted, moved, deleted, etc.. Instructions are being wrapped into <a href="InstructionHandle.html">InstructionHandles</a> * objects that are returned upon append/insert operations. They give the user (read only) access to the list structure, such that * it can be traversed and manipulated in a controlled way. - * + * * A list is finally dumped to a byte code array with <a href="#getByteCode()">getByteCode</a>. - * + * * @version $Id: InstructionList.java,v 1.12 2011/09/02 22:33:04 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> * @author Abraham Nevado @@ -106,7 +106,7 @@ public class InstructionList implements Serializable { /** * Find the target instruction (handle) that corresponds to the given target position (byte code offset). - * + * * @param ihs array of instruction handles, i.e. il.getInstructionHandles() * @param pos array of positions corresponding to ihs, i.e. il.getInstructionPositions() * @param count length of arrays @@ -143,7 +143,7 @@ public class InstructionList implements Serializable { /** * Get instruction handle for instruction at byte code position pos. This only works properly, if the list is freshly * initialized from a byte array or setPositions() has been called before this method. - * + * * @param pos byte code position to search for * @return target position's instruction handle if available */ @@ -166,7 +166,7 @@ public class InstructionList implements Serializable { /** * Initialize instruction list from byte array. - * + * * @param code byte array containing the instructions */ public InstructionList(byte[] code) { @@ -248,7 +248,7 @@ public class InstructionList implements Serializable { /** * Append another list after instruction (handle) ih contained in this list. Consumes argument list, i.e., it becomes empty. - * + * * @param appendTo where to append the instruction list * @param appendee Instruction list to append to this one * @return instruction handle pointing to the <B>first</B> appended instruction @@ -283,7 +283,7 @@ public class InstructionList implements Serializable { /** * Append another list after instruction i contained in this list. Consumes argument list, i.e., it becomes empty. - * + * * @param i where to append the instruction list * @param il Instruction list to append to this one * @return instruction handle pointing to the <B>first</B> appended instruction @@ -300,7 +300,7 @@ public class InstructionList implements Serializable { /** * Append another list to this one. Consumes argument list, i.e., it becomes empty. - * + * * @param il list to append to end of this list * @return instruction handle of the <B>first</B> appended instruction */ @@ -326,7 +326,7 @@ public class InstructionList implements Serializable { /** * Append an instruction to the end of this list. - * + * * @param ih instruction to append */ private void append(InstructionHandle ih) { @@ -345,7 +345,7 @@ public class InstructionList implements Serializable { /** * Append an instruction to the end of this list. - * + * * @param i instruction to append * @return instruction handle of the appended instruction */ @@ -376,7 +376,7 @@ public class InstructionList implements Serializable { /** * Append a branch instruction to the end of this list. - * + * * @param i branch instruction to append * @return branch instruction handle of the appended instruction */ @@ -389,7 +389,7 @@ public class InstructionList implements Serializable { /** * Append a single instruction j after another instruction i, which must be in this list of course! - * + * * @param i Instruction in list * @param j Instruction to append after i in list * @return instruction handle of the first appended instruction @@ -400,7 +400,7 @@ public class InstructionList implements Serializable { /** * Append an instruction after instruction (handle) ih contained in this list. - * + * * @param ih where to append the instruction list * @param i Instruction to append * @return instruction handle pointing to the <B>first</B> appended instruction @@ -411,7 +411,7 @@ public class InstructionList implements Serializable { /** * Append an instruction after instruction (handle) ih contained in this list. - * + * * @param ih where to append the instruction list * @param i Instruction to append * @return instruction handle pointing to the <B>first</B> appended instruction @@ -428,7 +428,7 @@ public class InstructionList implements Serializable { /** * Insert another list before Instruction handle ih contained in this list. Consumes argument list, i.e., it becomes empty. - * + * * @param i where to append the instruction list * @param il Instruction list to insert * @return instruction handle of the first inserted instruction @@ -464,7 +464,7 @@ public class InstructionList implements Serializable { /** * Insert another list. - * + * * @param il list to insert before start of this list * @return instruction handle of the first inserted instruction */ @@ -479,7 +479,7 @@ public class InstructionList implements Serializable { /** * Insert an instruction at start of this list. - * + * * @param ih instruction to insert */ private void insert(InstructionHandle ih) { @@ -498,7 +498,7 @@ public class InstructionList implements Serializable { /** * Insert another list before Instruction i contained in this list. Consumes argument list, i.e., it becomes empty. - * + * * @param i where to append the instruction list * @param il Instruction list to insert * @return instruction handle pointing to the first inserted instruction, i.e., il.getStart() @@ -515,7 +515,7 @@ public class InstructionList implements Serializable { /** * Insert an instruction at start of this list. - * + * * @param i instruction to insert * @return instruction handle of the inserted instruction */ @@ -528,7 +528,7 @@ public class InstructionList implements Serializable { /** * Insert a branch instruction at start of this list. - * + * * @param i branch instruction to insert * @return branch instruction handle of the appended instruction */ @@ -540,7 +540,7 @@ public class InstructionList implements Serializable { /** * Insert a single instruction j before another instruction i, which must be in this list of course! - * + * * @param i Instruction in list * @param j Instruction to insert before i in list * @return instruction handle of the first inserted instruction @@ -551,7 +551,7 @@ public class InstructionList implements Serializable { /** * Insert an instruction before instruction (handle) ih contained in this list. - * + * * @param ih where to insert to the instruction list * @param i Instruction to insert * @return instruction handle of the first inserted instruction @@ -562,7 +562,7 @@ public class InstructionList implements Serializable { /** * Insert an instruction before instruction (handle) ih contained in this list. - * + * * @param ih where to insert to the instruction list * @param i Instruction to insert * @return instruction handle of the first inserted instruction @@ -582,7 +582,7 @@ public class InstructionList implements Serializable { * be after "start" and target must not be located withing this range. If you want to move something to the start of the list * use null as value for target.<br> * Any instruction targeters pointing to handles within the block, keep their targets. - * + * * @param start of moved block * @param end of moved block * @param target of moved block @@ -644,7 +644,7 @@ public class InstructionList implements Serializable { /** * Move a single instruction (handle) to a new location. - * + * * @param ih moved instruction * @param target new location of moved instruction */ @@ -654,10 +654,10 @@ public class InstructionList implements Serializable { /** * Remove from instruction 'prev' to instruction 'next' both contained in this list. - * + * * If careAboutLostTargeters is true then this method will throw a TargetLostException when one of the removed instruction * handles is still being targeted. - * + * * @param prev where to start deleting (predecessor, exclusive) * @param next where to end deleting (successor, exclusive) */ @@ -697,7 +697,7 @@ public class InstructionList implements Serializable { ih.getInstruction().dispose(); // e.g. BranchInstructions release their targets } - StringBuffer buf = new StringBuffer("{ "); + StringBuilder buf = new StringBuilder("{ "); for (InstructionHandle ih = first; ih != null; ih = next) { next = ih.next; length--; @@ -757,7 +757,7 @@ public class InstructionList implements Serializable { /** * Remove instruction from this list. The corresponding Instruction handles must not be reused! - * + * * @param ih instruction (handle) to remove */ public void delete(InstructionHandle ih) throws TargetLostException { @@ -766,7 +766,7 @@ public class InstructionList implements Serializable { /** * Remove instruction from this list. The corresponding Instruction handles must not be reused! - * + * * @param i instruction to remove */ // public void delete(Instruction i) throws TargetLostException { @@ -780,7 +780,7 @@ public class InstructionList implements Serializable { /** * Remove instructions from instruction `from' to instruction `to' contained in this list. The user must ensure that `from' is * an instruction before `to', or risk havoc. The corresponding Instruction handles must not be reused! - * + * * @param from where to start deleting (inclusive) * @param to where to end deleting (inclusive) */ @@ -791,7 +791,7 @@ public class InstructionList implements Serializable { /** * Remove instructions from instruction `from' to instruction `to' contained in this list. The user must ensure that `from' is * an instruction before `to', or risk havoc. The corresponding Instruction handles must not be reused! - * + * * @param from where to start deleting (inclusive) * @param to where to end deleting (inclusive) */ @@ -810,7 +810,7 @@ public class InstructionList implements Serializable { /** * Search for given Instruction reference, start at beginning of list. - * + * * @param i instruction to search for * @return instruction found on success, null otherwise */ @@ -826,7 +826,7 @@ public class InstructionList implements Serializable { /** * Search for given Instruction reference, start at end of list - * + * * @param i instruction to search for * @return instruction found on success, null otherwise */ @@ -864,7 +864,7 @@ public class InstructionList implements Serializable { /** * Give all instructions their position number (offset in byte stream), i.e., make the list ready to be dumped. - * + * * @param check Perform sanity checks, e.g. if all targeted instructions really belong to this list */ public void setPositions(boolean check) { @@ -972,7 +972,7 @@ public class InstructionList implements Serializable { /** * When everything is finished, use this method to convert the instruction list into an array of bytes. - * + * * @return the byte code ready to be dumped */ public byte[] getByteCode() { @@ -1029,7 +1029,7 @@ public class InstructionList implements Serializable { * @return String containing all instructions in this list. */ public String toString(boolean verbose) { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); for (InstructionHandle ih = start; ih != null; ih = ih.next) { buf.append(ih.toString(verbose) + "\n"); @@ -1079,7 +1079,7 @@ public class InstructionList implements Serializable { /** * Get positions (offsets) of all instructions in the list. This relies on that the list has been freshly created from an byte * code array, or that setPositions() has been called. Otherwise this may be inaccurate. - * + * * @return array containing all instruction's offset in byte code */ public int[] getInstructionPositions() { @@ -1208,7 +1208,7 @@ public class InstructionList implements Serializable { /** * Redirect all references from old_target to new_target, i.e., update targets of branch instructions. - * + * * @param old_target the old target instruction handle * @param new_target the new target instruction handle */ @@ -1239,7 +1239,7 @@ public class InstructionList implements Serializable { /** * Redirect all references of local variables from old_target to new_target. - * + * * @param lg array of local variables * @param old_target the old target instruction handle * @param new_target the new target instruction handle @@ -1261,7 +1261,7 @@ public class InstructionList implements Serializable { /** * Redirect all references of exception handlers from old_target to new_target. - * + * * @param exceptions array of exception handlers * @param old_target the old target instruction handle * @param new_target the new target instruction handle diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InstructionSelect.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InstructionSelect.java index 408f801ff..771461ab5 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InstructionSelect.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InstructionSelect.java @@ -60,7 +60,7 @@ import org.aspectj.apache.bcel.util.ByteSequence; /** * Select - Abstract super class for LOOKUPSWITCH and TABLESWITCH instructions. - * + * * @version $Id: InstructionSelect.java,v 1.4 2009/10/05 17:35:36 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> * @see LOOKUPSWITCH @@ -79,7 +79,7 @@ public abstract class InstructionSelect extends InstructionBranch { /** * (Match, target) pairs for switch. `Match' and `targets' must have the same length of course. - * + * * @param match array of matching values * @param targets instruction targets * @param target default instruction target @@ -119,11 +119,11 @@ public abstract class InstructionSelect extends InstructionBranch { /** * Since this is a variable length instruction, it may shift the following instructions which then need to update their * position. - * + * * Called by InstructionList.setPositions when setting the position for every instruction. In the presence of variable length * instructions `setPositions' performs multiple passes over the instruction list to calculate the correct (byte) positions and * offsets by calling this function. - * + * * @param offset additional offset caused by preceding (variable length) instructions * @param max_offset the maximum offset that may be caused by these instructions * @return additional offset caused by possible change of this instruction's length @@ -146,7 +146,7 @@ public abstract class InstructionSelect extends InstructionBranch { /** * Dump instruction as byte code to stream out. - * + * * @param out Output stream */ public void dump(DataOutputStream out) throws IOException { @@ -177,7 +177,7 @@ public abstract class InstructionSelect extends InstructionBranch { * @return mnemonic for instruction */ public String toString(boolean verbose) { - StringBuffer buf = new StringBuffer(super.toString(verbose)); + StringBuilder buf = new StringBuilder(super.toString(verbose)); if (verbose) { for (int i = 0; i < matchLength; i++) { diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InvokeDynamic.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InvokeDynamic.java index b3c7ba85a..43ac4a1a5 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InvokeDynamic.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InvokeDynamic.java @@ -64,7 +64,7 @@ import org.aspectj.apache.bcel.classfile.ConstantPool; /** * INVOKEDYNAMIC - * + * * @author Andy Clement */ public final class InvokeDynamic extends InvokeInstruction { @@ -78,7 +78,7 @@ public final class InvokeDynamic extends InvokeInstruction { out.writeShort(index); out.writeShort(0); } - + public String toString(ConstantPool cp) { return super.toString(cp) + " " + index; } @@ -94,7 +94,7 @@ public final class InvokeDynamic extends InvokeInstruction { public int hashCode() { return opcode * 37 + index; } - + public Type getReturnType(ConstantPool cp) { return Type.getReturnType(getSignature(cp)); } @@ -102,7 +102,7 @@ public final class InvokeDynamic extends InvokeInstruction { public Type[] getArgumentTypes(ConstantPool cp) { return Type.getArgumentTypes(getSignature(cp)); } - + public String getSignature(ConstantPool cp) { if (signature == null) { ConstantInvokeDynamic cid = (ConstantInvokeDynamic)cp.getConstant(index); @@ -111,7 +111,7 @@ public final class InvokeDynamic extends InvokeInstruction { } return signature; } - + @Override public String getName(ConstantPool cp) { if (name == null) { @@ -121,7 +121,7 @@ public final class InvokeDynamic extends InvokeInstruction { } return name; } - + public String getClassName(ConstantPool cp) { throw new IllegalStateException("there is no classname for invokedynamic"); } diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InvokeInstruction.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InvokeInstruction.java index 89cd43474..f3030eaab 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InvokeInstruction.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/InvokeInstruction.java @@ -61,7 +61,7 @@ import org.aspectj.apache.bcel.classfile.ConstantPool; /** * Super class for the INVOKExxx family of instructions. - * + * * @version $Id: InvokeInstruction.java,v 1.6 2009/10/05 17:35:36 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> */ @@ -86,7 +86,7 @@ public class InvokeInstruction extends FieldOrMethod { /** * Also works for instructions whose stack effect depends on the constant pool entry they reference. - * + * * @return Number of words consumed from stack by this instruction */ public int consumeStack(ConstantPool cpg) { @@ -100,7 +100,7 @@ public class InvokeInstruction extends FieldOrMethod { /** * Also works for instructions whose stack effect depends on the constant pool entry they reference. - * + * * @return Number of words produced onto stack by this instruction */ public int produceStack(ConstantPool cpg) { diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/LOOKUPSWITCH.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/LOOKUPSWITCH.java index c8ebcba4c..722bff6ee 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/LOOKUPSWITCH.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/LOOKUPSWITCH.java @@ -61,7 +61,7 @@ import org.aspectj.apache.bcel.util.ByteSequence; /** * LOOKUPSWITCH - Switch with unordered set of values - * + * * @version $Id: LOOKUPSWITCH.java,v 1.5 2011/04/05 15:15:33 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> */ @@ -76,7 +76,7 @@ public class LOOKUPSWITCH extends InstructionSelect { /** * Dump instruction as byte code to stream out. - * + * * @param out Output stream */ public void dump(DataOutputStream out) throws IOException { diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/LineNumberGen.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/LineNumberGen.java index 237720c7b..94112f34e 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/LineNumberGen.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/LineNumberGen.java @@ -56,7 +56,7 @@ package org.aspectj.apache.bcel.generic; import org.aspectj.apache.bcel.classfile.LineNumber; -/** +/** * This class represents a line number within a method, i.e., give an instruction * a line number corresponding to the source code line. * diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/LocalVariableGen.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/LocalVariableGen.java index b701e7274..e99d1e740 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/LocalVariableGen.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/LocalVariableGen.java @@ -61,7 +61,7 @@ import org.aspectj.apache.bcel.classfile.LocalVariable; /** * This class represents a local variable within a method. It contains its scope, name and type. The generated LocalVariable object * can be obtained with getLocalVariable which needs the instruction list and the constant pool as parameters. - * + * * @version $Id: LocalVariableGen.java,v 1.7 2008/08/28 00:04:23 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> * @see LocalVariable @@ -76,7 +76,7 @@ public class LocalVariableGen implements InstructionTargeter, Cloneable, java.io /** * Generate a local variable that with index `index'. Note that double and long variables need two indexs. Index indices have to * be provided by the user. - * + * * @param index index of local variable * @param name its name * @param type its type @@ -97,14 +97,14 @@ public class LocalVariableGen implements InstructionTargeter, Cloneable, java.io /** * Get LocalVariable object. - * + * * This relies on that the instruction list has already been dumped to byte code or or that the `setPositions' methods has been * called for the instruction list. - * + * * Note that for local variables whose scope end at the last instruction of the method's code, the JVM specification is * ambiguous: both a start_pc+length ending at the last instruction and start_pc+length ending at first index beyond the end of * the code are valid. - * + * * @param il instruction list (byte code) which this variable belongs to * @param cp constant pool */ diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/MULTIANEWARRAY.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/MULTIANEWARRAY.java index 94a213a25..ad0994e52 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/MULTIANEWARRAY.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/MULTIANEWARRAY.java @@ -62,11 +62,11 @@ import org.aspectj.apache.bcel.classfile.ConstantPool; /** * MULTIANEWARRAY - Create new mutidimensional array of references - * + * * <PRE> * Stack: ..., count1, [count2, ...] -> ..., arrayref * </PRE> - * + * * @version $Id: MULTIANEWARRAY.java,v 1.4 2009/10/05 17:35:36 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> */ @@ -80,7 +80,7 @@ public class MULTIANEWARRAY extends InstructionCP { /** * Dump instruction as byte code to stream out. - * + * * @param out Output stream */ public void dump(DataOutputStream out) throws IOException { @@ -123,7 +123,7 @@ public class MULTIANEWARRAY extends InstructionCP { /** * Also works for instructions whose stack effect depends on the constant pool entry they reference. - * + * * @return Number of words consumed from stack by this instruction */ public int consumeStack(ConstantPool cpg) { diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/MethodGen.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/MethodGen.java index 6bc66480f..ced5e3be5 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/MethodGen.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/MethodGen.java @@ -79,10 +79,10 @@ import org.aspectj.apache.bcel.classfile.annotation.RuntimeParamAnnos; * Template class for building up a method. This is done by defining exception handlers, adding thrown exceptions, local variables * and attributes, whereas the 'LocalVariableTable' and 'LineNumberTable' attributes will be set automatically for the code. Use * stripAttributes() if you don't like this. - * + * * While generating code it may be necessary to insert NOP operations. You can use the `removeNOPs' method to get rid off them. The * resulting method object can be obtained via the `getMethod()' method. - * + * * @version $Id: MethodGen.java,v 1.17 2011/05/19 23:23:46 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> * @author <A HREF="http://www.vmeng.com/beard">Patrick C. Beard</A> [setMaxStack()] @@ -115,10 +115,10 @@ public class MethodGen extends FieldGenOrMethodGen { * Declare method. If the method is non-static the constructor automatically declares a local variable `$this' in slot 0. The * actual code is contained in the `il' parameter, which may further manipulated by the user. But he must take care not to * remove any instruction (handles) that are still referenced from this object. - * + * * For example one may not add a local variable and later remove the instructions it refers to without causing havoc. It is safe * however if you remove that local variable, too. - * + * * @param access_flags access qualifiers * @param return_type method type * @param arg_types argument types @@ -164,7 +164,7 @@ public class MethodGen extends FieldGenOrMethodGen { // throw new ClassGenException("'void' is an illegal argument type for a method"); // } // } - // + // // if(arg_names != null) { // Names for variables provided? // if(size != arg_names.length) // throw new ClassGenException("Mismatch in argument array lengths: " + @@ -192,7 +192,7 @@ public class MethodGen extends FieldGenOrMethodGen { /** * Instantiate from existing method. - * + * * @param m method * @param class_name class name containing this method * @param cp constant pool @@ -362,7 +362,7 @@ public class MethodGen extends FieldGenOrMethodGen { /** * Adds a local variable to this method and assigns an index automatically. - * + * * @param name variable name * @param type variable type * @param start from where the variable is valid, if this is null, it is valid from the start @@ -424,7 +424,7 @@ public class MethodGen extends FieldGenOrMethodGen { /* * If the range of the variable has not been set yet, it will be set to be valid from the start to the end of the instruction * list. - * + * * @return array of declared local variables sorted by index */ public LocalVariableGen[] getLocalVariables() { @@ -466,7 +466,7 @@ public class MethodGen extends FieldGenOrMethodGen { /** * Give an instruction a line number corresponding to the source code line. - * + * * @param ih instruction to tag * @return new line number object * @see LineNumber @@ -517,7 +517,7 @@ public class MethodGen extends FieldGenOrMethodGen { /** * Add an exception handler, i.e., specify region where a handler is active and an instruction where the actual handling is * done. - * + * * @param start_pc Start of region (inclusive) * @param end_pc End of region (inclusive) * @param handler_pc Where handling is done @@ -578,7 +578,7 @@ public class MethodGen extends FieldGenOrMethodGen { /** * Add an exception possibly thrown by this method. - * + * * @param class_name (fully qualified) name of exception */ public void addException(String class_name) { @@ -629,7 +629,7 @@ public class MethodGen extends FieldGenOrMethodGen { * Add an attribute to the code. Currently, the JVM knows about the LineNumberTable, LocalVariableTable and StackMap attributes, * where the former two will be generated automatically and the latter is used for the MIDP only. Other attributes will be * ignored by the JVM but do no harm. - * + * * @param a attribute to be added */ public void addCodeAttribute(Attribute a) { @@ -674,7 +674,7 @@ public class MethodGen extends FieldGenOrMethodGen { /** * Get method object. Never forget to call setMaxStack() or setMaxStack(max), respectively, before calling this method (the same * applies for max locals). - * + * * @return method object */ public Method getMethod() { @@ -879,10 +879,10 @@ public class MethodGen extends FieldGenOrMethodGen { public void setMaxLocals() { setMaxLocals(false); } - + /** * Compute maximum number of local variables. - * + * * @param respectLocalVariableTable if true and the local variable table indicates more are in use * than the code suggests, respect the higher value from the local variable table data. */ @@ -966,7 +966,7 @@ public class MethodGen extends FieldGenOrMethodGen { /** * Computes stack usage of an instruction list by performing control flow analysis. - * + * * @return maximum stack depth used by method */ public static int getMaxStack(ConstantPool cp, InstructionList il, CodeExceptionGen[] et) { @@ -1050,7 +1050,7 @@ public class MethodGen extends FieldGenOrMethodGen { /** * Return string representation close to declaration format, `public static void main(String[]) throws IOException', e.g. - * + * * @return String representation of the method. */ @Override @@ -1060,7 +1060,7 @@ public class MethodGen extends FieldGenOrMethodGen { signature = Utility.methodSignatureToString(signature, name, access, true, getLocalVariableTable(cp)); - StringBuffer buf = new StringBuffer(signature); + StringBuilder buf = new StringBuilder(signature); if (exceptionsThrown.size() > 0) { for (String s : exceptionsThrown) { diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/ObjectType.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/ObjectType.java index 544363f16..d7282122c 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/ObjectType.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/ObjectType.java @@ -59,7 +59,7 @@ import org.aspectj.apache.bcel.classfile.JavaClass; /** * Denotes reference such as java.lang.String. - * + * * @version $Id: ObjectType.java,v 1.7 2009/09/28 16:39:46 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> */ @@ -84,7 +84,7 @@ public class ObjectType extends ReferenceType { } private static String toSignature(String classname) { - StringBuffer sig = new StringBuffer(); + StringBuilder sig = new StringBuilder(); sig.append("L").append(classname.replace('.', '/')); sig.append(";"); return sig.toString(); diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/RET.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/RET.java index 0fd2f498d..47d469064 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/RET.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/RET.java @@ -61,11 +61,11 @@ import org.aspectj.apache.bcel.classfile.ConstantPool; /** * RET - Return from subroutine - * + * * <PRE> * Stack: ..., -> ..., address * </PRE> - * + * * @version $Id: RET.java,v 1.5 2009/10/05 17:35:36 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> */ diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/ReferenceType.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/ReferenceType.java index f29569cb5..0cbb6f09f 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/ReferenceType.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/ReferenceType.java @@ -60,7 +60,7 @@ import org.aspectj.apache.bcel.classfile.JavaClass; /** * Super class for object and array types. - * + * * @version $Id: ReferenceType.java,v 1.6 2009/09/09 22:18:20 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> */ diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/ReturnaddressType.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/ReturnaddressType.java index bccd83342..d22f66130 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/ReturnaddressType.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/ReturnaddressType.java @@ -55,7 +55,7 @@ package org.aspectj.apache.bcel.generic; */ import org.aspectj.apache.bcel.Constants; -/** +/** * Returnaddress, the type JSR or JSR_W instructions push upon the stack. * * see vmspec2 3.3.3 @@ -66,14 +66,14 @@ public class ReturnaddressType extends Type { public static final ReturnaddressType NO_TARGET = new ReturnaddressType(); private InstructionHandle returnTarget; - + /** * A Returnaddress [that doesn't know where to return to]. */ private ReturnaddressType(){ super(Constants.T_ADDRESS, "<return address>"); } - + /** * Creates a ReturnaddressType object with a target. */ @@ -81,7 +81,7 @@ public class ReturnaddressType extends Type { super(Constants.T_ADDRESS, "<return address targeting "+returnTarget+">"); this.returnTarget = returnTarget; } - + /** * Returns if the two Returnaddresses refer to the same target. */ @@ -90,7 +90,7 @@ public class ReturnaddressType extends Type { return false; return ((ReturnaddressType)rat).returnTarget.equals(this.returnTarget); - } + } /** * @return the target of this ReturnaddressType diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/SwitchBuilder.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/SwitchBuilder.java index eac6bf364..aad791f42 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/SwitchBuilder.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/SwitchBuilder.java @@ -54,7 +54,7 @@ package org.aspectj.apache.bcel.generic; * <http://www.apache.org/>. */ -/** +/** * SWITCH - Branch depending on int value, generates either LOOKUPSWITCH or * TABLESWITCH instruction, depending on whether the match values (int[]) can be * sorted with no gaps between the numbers. @@ -74,7 +74,7 @@ public final class SwitchBuilder { * between the numbers, a TABLESWITCH instruction is generated, and * a LOOKUPSWITCH otherwise. The former may be more efficient, but * needs more space. - * + * * Note, that the key array always will be sorted, though we leave * the original arrays unaltered. * @@ -95,7 +95,7 @@ public final class SwitchBuilder { } else { sort(0, match_length - 1); - + if(matchIsOrdered(max_gap)) { fillup(max_gap, target); @@ -109,7 +109,7 @@ public final class SwitchBuilder { public SwitchBuilder(int[] match, InstructionHandle[] targets, InstructionHandle target) { this(match, targets, target, 1); } - + private final void fillup(int max_gap, InstructionHandle target) { int max_size = match_length + match_length * max_gap; int[] m_vec = new int[max_size]; @@ -121,7 +121,7 @@ public final class SwitchBuilder { for(int i=1; i < match_length; i++) { int prev = match[i-1]; - int gap = match[i] - prev; + int gap = match[i] - prev; for(int j=1; j < gap; j++) { m_vec[count] = prev + j; @@ -132,7 +132,7 @@ public final class SwitchBuilder { m_vec[count] = match[i]; t_vec[count] = targets[i]; count++; - } + } match = new int[count]; targets = new InstructionHandle[count]; diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/TABLESWITCH.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/TABLESWITCH.java index 201e1e508..518530985 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/TABLESWITCH.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/TABLESWITCH.java @@ -61,7 +61,7 @@ import org.aspectj.apache.bcel.util.ByteSequence; /** * TABLESWITCH - Switch within given range of values, i.e., low..high - * + * * @version $Id: TABLESWITCH.java,v 1.5 2008/08/28 00:05:29 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> * @see SWITCH @@ -87,7 +87,7 @@ public class TABLESWITCH extends InstructionSelect { /** * Dump instruction as byte code to stream out. - * + * * @param out Output stream */ public void dump(DataOutputStream out) throws IOException { diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/TargetLostException.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/TargetLostException.java index 3a195705c..9b3d5971b 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/TargetLostException.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/TargetLostException.java @@ -72,7 +72,7 @@ package org.aspectj.apache.bcel.generic; * InstructionHandle[] targets = e.getTargets(); * for(int i=0; i < targets.length; i++) { * InstructionTargeter[] targeters = targets[i].getTargeters(); - * + * * for(int j=0; j < targeters.length; j++) * targeters[j].updateTarget(targets[i], new_target); * } diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/Type.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/Type.java index ed8995ef0..79361a7ed 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/Type.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/generic/Type.java @@ -67,10 +67,10 @@ import org.aspectj.apache.bcel.classfile.Utility; /** * Abstract super class for all possible java types, namely basic types such as int, object types like String and array types, e.g. * int[] - * + * * @version $Id: Type.java,v 1.14 2011/09/28 01:14:54 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> - * + * * modified: AndyClement 2-mar-05: Removed unnecessary static and optimized */ public abstract class Type { @@ -233,7 +233,7 @@ public abstract class Type { /** * Convert signature to a Type object. - * + * * @param signature signature string such as Ljava/lang/String; * @return type object */ @@ -292,7 +292,7 @@ public abstract class Type { /** * Convert return value of a method (signature) to a Type object. - * + * * @param signature signature string such as (Ljava/lang/String;)V * @return return type */ @@ -308,7 +308,7 @@ public abstract class Type { /** * Convert arguments of a method (signature) to an array of Type objects. - * + * * @param signature signature string such as (Ljava/lang/String;)V * @return array of argument types */ @@ -419,7 +419,7 @@ public abstract class Type { /** * Convert runtime java.lang.Class to BCEL Type object. - * + * * @param cl Java class * @return corresponding Type object */ @@ -463,7 +463,7 @@ public abstract class Type { } public static String getSignature(java.lang.reflect.Method meth) { - StringBuffer sb = new StringBuffer("("); + StringBuilder sb = new StringBuilder("("); Class[] params = meth.getParameterTypes(); // avoid clone for (Class param : params) { @@ -476,7 +476,7 @@ public abstract class Type { } public static String getSignature(java.lang.reflect.Constructor<?> cons) { - StringBuffer sb = new StringBuffer("("); + StringBuilder sb = new StringBuilder("("); Class<?>[] params = cons.getParameterTypes(); // avoid clone for (Class<?> param : params) { diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/util/ByteSequence.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/util/ByteSequence.java index 37216344b..37951c25f 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/util/ByteSequence.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/util/ByteSequence.java @@ -58,7 +58,7 @@ import java.io.DataInputStream; /** * Utility class that implements a sequence of bytes which can be read - * via the `readByte()' method. This is used to implement a wrapper for the + * via the `readByte()' method. This is used to implement a wrapper for the * Java byte code stream to gain some more readability. * * @version $Id: ByteSequence.java,v 1.3 2008/05/28 23:52:53 aclement Exp $ @@ -67,12 +67,12 @@ import java.io.DataInputStream; public final class ByteSequence extends DataInputStream { private ByteArrayStream byte_stream; - public ByteSequence(byte[] bytes) { + public ByteSequence(byte[] bytes) { super(new ByteArrayStream(bytes)); byte_stream = (ByteArrayStream)in; } - public final int getIndex() { return byte_stream.getPosition(); } + public final int getIndex() { return byte_stream.getPosition(); } final void unreadByte() { byte_stream.unreadByte(); } private static final class ByteArrayStream extends ByteArrayInputStream { diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/util/ClassLoaderReference.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/util/ClassLoaderReference.java index f6fcbf5f8..7465a92b4 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/util/ClassLoaderReference.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/util/ClassLoaderReference.java @@ -63,5 +63,5 @@ package org.aspectj.apache.bcel.util; public interface ClassLoaderReference { java.lang.ClassLoader getClassLoader(); - + } diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/util/ClassLoaderRepository.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/util/ClassLoaderRepository.java index be9aa0b45..e16d0efff 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/util/ClassLoaderRepository.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/util/ClassLoaderRepository.java @@ -73,11 +73,11 @@ import org.aspectj.apache.bcel.classfile.JavaClass; /** * The repository maintains information about which classes have been loaded. - * + * * It loads its data from the ClassLoader implementation passed into its constructor. - * + * * @see org.aspectj.apache.bcel.Repository - * + * * @version $Id: ClassLoaderRepository.java,v 1.13 2009/09/09 19:56:20 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> * @author David Dixon-Peugh @@ -334,7 +334,7 @@ public class ClassLoaderRepository implements Repository { * Produce a report on cache usage. */ public String report() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("BCEL repository report."); if (useSharedCache) sb.append(" (shared cache)"); diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/util/ClassPath.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/util/ClassPath.java index 29f8f6d6d..bb9e3c3f5 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/util/ClassPath.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/util/ClassPath.java @@ -117,10 +117,10 @@ public class ClassPath implements Serializable { File file = new File(path); try { - if (file.exists()) { - if (file.isDirectory()) { - vec.add(new Dir(path)); - } else if (file.getName().endsWith("jrt-fs.jar")) { // TODO a bit crude... + if (file.isDirectory()) { + vec.add(new Dir(path)); + } else if (file.exists()) { + if (file.getName().endsWith("jrt-fs.jar")) { // TODO a bit crude... vec.add(new JImage()); } else { vec.add(new Zip(new ZipFile(file))); @@ -217,7 +217,7 @@ public class ClassPath implements Serializable { list.add(ext_dir.toString() + File.separatorChar + extension); } - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); for (Iterator<String> e = list.iterator(); e.hasNext();) { buf.append(e.next()); diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/util/DefaultClassLoaderReference.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/util/DefaultClassLoaderReference.java index 259991308..e12405120 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/util/DefaultClassLoaderReference.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/util/DefaultClassLoaderReference.java @@ -57,13 +57,13 @@ package org.aspectj.apache.bcel.util; /** * Simplistic ClassLoaderReference that merely delegates to a classloader. More sophisticated ones could allow for the * loader to be weakly referenced. - * + * * @author Andy Clement */ public class DefaultClassLoaderReference implements ClassLoaderReference { private java.lang.ClassLoader loader; - + public DefaultClassLoaderReference(java.lang.ClassLoader classLoader) { this.loader = classLoader; } diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/util/NonCachingClassLoaderRepository.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/util/NonCachingClassLoaderRepository.java index e2e5f38bb..88616fe83 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/util/NonCachingClassLoaderRepository.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/util/NonCachingClassLoaderRepository.java @@ -70,15 +70,15 @@ import org.aspectj.apache.bcel.classfile.JavaClass; /** * The repository maintains information about which classes have been loaded. - * + * * It loads its data from the ClassLoader implementation passed into its constructor. - * + * * @see org.aspectj.apache.bcel.Repository - * + * * @version $Id: NonCachingClassLoaderRepository.java,v 1.6 2009/09/09 19:56:20 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> * @author David Dixon-Peugh - * + * */ public class NonCachingClassLoaderRepository implements Repository { private static java.lang.ClassLoader bootClassLoader = null; diff --git a/bcel-builder/src/main/java/org/aspectj/apache/bcel/util/SyntheticRepository.java b/bcel-builder/src/main/java/org/aspectj/apache/bcel/util/SyntheticRepository.java index baf3b75cd..052c503e5 100644 --- a/bcel-builder/src/main/java/org/aspectj/apache/bcel/util/SyntheticRepository.java +++ b/bcel-builder/src/main/java/org/aspectj/apache/bcel/util/SyntheticRepository.java @@ -67,12 +67,12 @@ import org.aspectj.apache.bcel.classfile.JavaClass; * file systems using the paths specified in the given class path. By default, this is the value returned by * ClassPath.getClassPath(). <br> * It is designed to be used as a singleton, however it can also be used with custom classpaths. - * + * * /** Abstract definition of a class repository. Instances may be used to load classes from different sources and may be used in * the Repository.setRepository method. - * + * * @see org.aspectj.apache.bcel.Repository - * + * * @version $Id: SyntheticRepository.java,v 1.8 2009/09/09 19:56:20 aclement Exp $ * @author <A HREF="mailto:markus.dahm@berlin.de">M. Dahm</A> * @author David Dixon-Peugh @@ -147,7 +147,7 @@ public class SyntheticRepository implements Repository { /** * Try to find class source via getResourceAsStream(). - * + * * @see Class * @return JavaClass object for given runtime class */ diff --git a/bcel-builder/src/test/java/org/aspectj/apache/bcel/classfile/tests/BcelTestCase.java b/bcel-builder/src/test/java/org/aspectj/apache/bcel/classfile/tests/BcelTestCase.java index a67eaca0a..17d24d272 100644 --- a/bcel-builder/src/test/java/org/aspectj/apache/bcel/classfile/tests/BcelTestCase.java +++ b/bcel-builder/src/test/java/org/aspectj/apache/bcel/classfile/tests/BcelTestCase.java @@ -116,7 +116,7 @@ public abstract class BcelTestCase extends TestCase { } protected String dumpAnnotations(AnnotationGen[] as) { - StringBuffer result = new StringBuffer(); + StringBuilder result = new StringBuilder(); result.append("["); for (int i = 0; i < as.length; i++) { AnnotationGen annotation = as[i]; @@ -129,7 +129,7 @@ public abstract class BcelTestCase extends TestCase { } protected String dumpAnnotations(List<AnnotationGen> as) { - StringBuffer result = new StringBuffer(); + StringBuilder result = new StringBuilder(); result.append("["); for (int i = 0; i < as.size(); i++) { AnnotationGen annotation = as.get(i); @@ -142,7 +142,7 @@ public abstract class BcelTestCase extends TestCase { } protected String dumpAttributes(Attribute[] as) { - StringBuffer result = new StringBuffer(); + StringBuilder result = new StringBuilder(); result.append("AttributeArray:["); for (int i = 0; i < as.length; i++) { Attribute attr = as[i]; diff --git a/bcel-builder/src/test/java/org/aspectj/apache/bcel/classfile/tests/ClassloaderRepositoryTest.java b/bcel-builder/src/test/java/org/aspectj/apache/bcel/classfile/tests/ClassloaderRepositoryTest.java index 7202be3fa..05e9f8f73 100644 --- a/bcel-builder/src/test/java/org/aspectj/apache/bcel/classfile/tests/ClassloaderRepositoryTest.java +++ b/bcel-builder/src/test/java/org/aspectj/apache/bcel/classfile/tests/ClassloaderRepositoryTest.java @@ -14,7 +14,7 @@ import junit.framework.TestCase; public class ClassloaderRepositoryTest extends TestCase { private ClassLoaderRepository rep1,rep2; - + public void setUp() throws Exception { super.setUp(); ClassLoader cl = Thread.currentThread().getContextClassLoader(); @@ -25,7 +25,7 @@ public class ClassloaderRepositoryTest extends TestCase { } // Retrieve string 5 times from same repository, 4 hits should be from local cache - public void testLocalCacheWorks() throws ClassNotFoundException { + public void testLocalCacheWorks() throws ClassNotFoundException { ClassLoaderRepository.useSharedCache=false; JavaClass jc = rep1.loadClass("java.lang.String"); jc = rep1.loadClass("java.lang.String"); @@ -36,7 +36,7 @@ public class ClassloaderRepositoryTest extends TestCase { } // Retrieve string 5 times from same repository, 4 hits should be from local cache - public void testSharedCacheWorksOnOne() throws ClassNotFoundException { + public void testSharedCacheWorksOnOne() throws ClassNotFoundException { ClassLoaderRepository.useSharedCache=true; JavaClass jc = rep1.loadClass("java.lang.String"); jc = rep1.loadClass("java.lang.String"); @@ -47,16 +47,16 @@ public class ClassloaderRepositoryTest extends TestCase { } // Retrieve String through one repository then load again through another, should be shared cache hit - public void testSharedCacheWorks() throws ClassNotFoundException { + public void testSharedCacheWorks() throws ClassNotFoundException { ClassLoaderRepository.useSharedCache=true; JavaClass jc = rep1.loadClass("java.lang.String"); jc = rep2.loadClass("java.lang.String"); assertTrue("Should have retrieved String from shared cache: "+reportSharedCacheHits(rep1), reportSharedCacheHits(rep1)==1); } - + // Shared cache OFF, shouldn't get a shared cache hit - public void testSharedCacheCanBeDeactivated() throws ClassNotFoundException { + public void testSharedCacheCanBeDeactivated() throws ClassNotFoundException { try { ClassLoaderRepository.useSharedCache=false; JavaClass jc = rep1.loadClass("java.lang.String"); @@ -68,7 +68,7 @@ public class ClassloaderRepositoryTest extends TestCase { ClassLoaderRepository.useSharedCache=true; } } - + public void tearDown() throws Exception { super.tearDown(); System.err.println("Rep1: "+rep1.reportStats()); diff --git a/bcel-builder/src/test/java/org/aspectj/apache/bcel/classfile/tests/Fundamentals.java b/bcel-builder/src/test/java/org/aspectj/apache/bcel/classfile/tests/Fundamentals.java index c54beb5b3..c47e60e37 100644 --- a/bcel-builder/src/test/java/org/aspectj/apache/bcel/classfile/tests/Fundamentals.java +++ b/bcel-builder/src/test/java/org/aspectj/apache/bcel/classfile/tests/Fundamentals.java @@ -22,10 +22,10 @@ import junit.framework.TestCase; // Check things that have to be true based on the specification public class Fundamentals extends TestCase { - + // Checking: opcode, length, consumed stack entries, produced stack entries public void testInstructions() { - + // Instructions 000-009 checkInstruction(InstructionConstants.NOP,0,1,0,0); checkInstruction(InstructionConstants.ACONST_NULL,1,1,0,1); @@ -49,7 +49,7 @@ public class Fundamentals extends TestCase { checkInstruction(new InstructionShort(Constants.SIPUSH,s0),17,3,0,1); checkInstruction(new InstructionCP(Constants.LDC,b0),18,2,0,1); checkInstruction(new InstructionCP(Constants.LDC_W,s0),19,2,0,1); - + // Instructions 020-029 checkInstruction(new InstructionCP(Constants.LDC2_W,s0),20,3,0,2); checkInstruction(new InstructionLV(Constants.ILOAD,s20),21,2,0,1); @@ -61,7 +61,7 @@ public class Fundamentals extends TestCase { checkInstruction(InstructionConstants.ILOAD_1,27,1,0,1); checkInstruction(InstructionConstants.ILOAD_2,28,1,0,1); checkInstruction(InstructionConstants.ILOAD_3,29,1,0,1); - + // Instructions 030-039 checkInstruction(InstructionConstants.LLOAD_0,30,1,0,2); checkInstruction(InstructionConstants.LLOAD_1,31,1,0,2); @@ -73,7 +73,7 @@ public class Fundamentals extends TestCase { checkInstruction(InstructionConstants.FLOAD_3,37,1,0,1); checkInstruction(InstructionConstants.DLOAD_0,38,1,0,2); checkInstruction(InstructionConstants.DLOAD_1,39,1,0,2); - + // Instructions 040-049 checkInstruction(InstructionConstants.DLOAD_2,40,1,0,2); checkInstruction(InstructionConstants.DLOAD_3,41,1,0,2); @@ -97,7 +97,7 @@ public class Fundamentals extends TestCase { checkInstruction(new InstructionLV(Constants.DSTORE,s20),57,2,2,0); checkInstruction(new InstructionLV(Constants.ASTORE,s20),58,2,1,0); checkInstruction(InstructionConstants.ISTORE_0,59,1,1,0); - + // Instructions 060-069 checkInstruction(InstructionConstants.ISTORE_1,60,1,1,0); checkInstruction(InstructionConstants.ISTORE_2,61,1,1,0); @@ -109,7 +109,7 @@ public class Fundamentals extends TestCase { checkInstruction(InstructionConstants.FSTORE_0,67,1,1,0); checkInstruction(InstructionConstants.FSTORE_1,68,1,1,0); checkInstruction(InstructionConstants.FSTORE_2,69,1,1,0); - + // Instructions 070-079 checkInstruction(InstructionConstants.FSTORE_3,70,1,1,0); checkInstruction(InstructionConstants.DSTORE_0,71,1,2,0); @@ -121,7 +121,7 @@ public class Fundamentals extends TestCase { checkInstruction(InstructionConstants.ASTORE_2,77,1,1,0); checkInstruction(InstructionConstants.ASTORE_3,78,1,1,0); checkInstruction(InstructionConstants.IASTORE,79,1,3,0); - + // Instructions 080-089 checkInstruction(InstructionConstants.LASTORE,80,1,4,0); checkInstruction(InstructionConstants.FASTORE,81,1,3,0); @@ -133,7 +133,7 @@ public class Fundamentals extends TestCase { checkInstruction(InstructionConstants.POP,87,1,1,0); checkInstruction(InstructionConstants.POP2,88,1,2,0); checkInstruction(InstructionConstants.DUP,89,1,1,2); - + // Instructions 090-099 checkInstruction(InstructionConstants.DUP_X1,90,1,2,3); checkInstruction(InstructionConstants.DUP_X2,91,1,3,4); @@ -157,7 +157,7 @@ public class Fundamentals extends TestCase { checkInstruction(InstructionConstants.DMUL,107,1,4,2); checkInstruction(InstructionConstants.IDIV,108,1,2,1); checkInstruction(InstructionConstants.LDIV,109,1,4,2); - + // Instructions 110-119 checkInstruction(InstructionConstants.FDIV,110,1,2,1); checkInstruction(InstructionConstants.DDIV,111,1,4,2); @@ -169,7 +169,7 @@ public class Fundamentals extends TestCase { checkInstruction(InstructionConstants.LNEG,117,1,2,2); checkInstruction(InstructionConstants.FNEG,118,1,1,1); checkInstruction(InstructionConstants.DNEG,119,1,2,2); - + // Instructions 120-129 checkInstruction(InstructionConstants.ISHL,120,1,2,1); checkInstruction(InstructionConstants.LSHL,121,1,3,2); @@ -181,7 +181,7 @@ public class Fundamentals extends TestCase { checkInstruction(InstructionConstants.LAND,127,1,4,2); checkInstruction(InstructionConstants.IOR,128,1,2,1); checkInstruction(InstructionConstants.LOR,129,1,4,2); - + // Instructions 130-139 checkInstruction(InstructionConstants.IXOR,130,1,2,1); checkInstruction(InstructionConstants.LXOR,131,1,4,2); @@ -229,7 +229,7 @@ public class Fundamentals extends TestCase { checkInstruction(new InstructionBranch(Constants.GOTO,s0),167,3,0,0); checkInstruction(new InstructionBranch(Constants.JSR,s0),168,3,0,1); checkInstruction(new RET(0,false),169,2,0,0); - + // Instructions 170-179 checkInstruction(new TABLESWITCH(new int[]{},new InstructionHandle[]{},null),170,VARIES,1,0); checkInstruction(new LOOKUPSWITCH(new int[]{},new InstructionHandle[]{},null),171,VARIES,1,0); @@ -265,19 +265,19 @@ public class Fundamentals extends TestCase { checkInstruction(new MULTIANEWARRAY(s0,b0),197,4,VARIES,1); checkInstruction(new InstructionBranch(Constants.IFNULL,s0),198,3,1,0); checkInstruction(new InstructionBranch(Constants.IFNONNULL,s0),199,3,1,0); - - // Instructions 200-209 + + // Instructions 200-209 checkInstruction(new InstructionBranch(Constants.GOTO_W,0),200,5,0,0); checkInstruction(new InstructionBranch(Constants.JSR_W,0),201,5,0,1); - + // Internally used instructions skipped } - + public void checkInstruction(Instruction i,int opcode, int length, int stackConsumed, int stackProduced) { String header = new String("Checking instruction '"+i+"' "); if (i.opcode!=opcode) fail(header+" expected opcode "+opcode+" but it is "+i.opcode); - + if (length!=VARIES && i.getLength()!=length) fail(header+" expected length "+length+" but it is "+i.getLength()); // if (stackConsumed>0) { @@ -290,7 +290,7 @@ public class Fundamentals extends TestCase { if (stackConsumed==VARIES) { if (Constants.CONSUME_STACK[opcode]!=Constants.UNPREDICTABLE) fail("Instruction '"+i+"' should be consuming some unpredictable number of stack entries but it says it will consume "+Constants.CONSUME_STACK[opcode]); - + } else { if (Constants.CONSUME_STACK[opcode]!=stackConsumed) fail("Instruction '"+i+"' should be consuming "+stackConsumed+" stack entries but it says it will consume "+Constants.CONSUME_STACK[opcode]); @@ -305,8 +305,8 @@ public class Fundamentals extends TestCase { if (stackProduced==VARIES) { if (Constants.stackEntriesProduced[opcode]!=Constants.UNPREDICTABLE) fail(header+" should be producing some unpredictable number of stack entries but it says it will produce "+Constants.stackEntriesProduced[opcode]); - - } else { + + } else { if (Constants.stackEntriesProduced[opcode]!=stackProduced) fail(header+" should be producing "+stackProduced+" stack entries but it says it will produce "+Constants.stackEntriesProduced[opcode]); } diff --git a/bcel-builder/src/test/java/org/aspectj/apache/bcel/classfile/tests/GenericSignatureParsingTest.java b/bcel-builder/src/test/java/org/aspectj/apache/bcel/classfile/tests/GenericSignatureParsingTest.java index d5f53c98d..2b2b5eb46 100644 --- a/bcel-builder/src/test/java/org/aspectj/apache/bcel/classfile/tests/GenericSignatureParsingTest.java +++ b/bcel-builder/src/test/java/org/aspectj/apache/bcel/classfile/tests/GenericSignatureParsingTest.java @@ -153,7 +153,7 @@ public class GenericSignatureParsingTest extends BcelTestCase { // These routines call BCEL to determine if it can correctly translate from one form to the other. private void checkClassTypeSignature(String sig, String expected) { - StringBuffer result = new StringBuffer(); + StringBuilder result = new StringBuilder(); int p = GenericSignatureParsingTest.readClassTypeSignatureFrom(sig,0,result,false); assertTrue("Only swallowed "+p+" chars of this sig "+sig+" (len="+sig.length()+")",p==sig.length()); assertTrue("Expected '"+expected+"' but got '"+result.toString()+"'",result.toString().equals(expected)); @@ -204,7 +204,7 @@ public class GenericSignatureParsingTest extends BcelTestCase { * * FIXME asc this should also create some kind of object you can query for information about whether its parameterized, what the bounds are, etc... */ - public static final int readClassTypeSignatureFrom(String signature, int posn, StringBuffer result, boolean chopit) { + public static final int readClassTypeSignatureFrom(String signature, int posn, StringBuilder result, boolean chopit) { int idx = posn; try { switch (signature.charAt(idx)) { @@ -282,7 +282,7 @@ public class GenericSignatureParsingTest extends BcelTestCase { public static final String readClassTypeSignatureFrom(String signature) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); GenericSignatureParsingTest.readClassTypeSignatureFrom(signature,0,sb,false); return sb.toString(); } @@ -324,7 +324,7 @@ public class GenericSignatureParsingTest extends BcelTestCase { * @return byte code signature */ public static String getSignature(String type) { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); char[] chars = type.toCharArray(); boolean char_found = false, delim = false; int index = -1; @@ -451,7 +451,7 @@ public class GenericSignatureParsingTest extends BcelTestCase { */ public final static String methodTypeToSignature(String returnType, String[] methodArgs) throws ClassFormatException { - StringBuffer buf = new StringBuffer("("); + StringBuilder buf = new StringBuilder("("); if (methodArgs != null) { for (String methodArg : methodArgs) { diff --git a/bcel-builder/src/test/java/org/aspectj/apache/bcel/util/Play.java b/bcel-builder/src/test/java/org/aspectj/apache/bcel/util/Play.java index abea68c1d..2db809184 100644 --- a/bcel-builder/src/test/java/org/aspectj/apache/bcel/util/Play.java +++ b/bcel-builder/src/test/java/org/aspectj/apache/bcel/util/Play.java @@ -11,7 +11,7 @@ import org.aspectj.apache.bcel.classfile.Method; import org.aspectj.apache.bcel.classfile.annotation.RuntimeAnnos; public class Play { - + public static void printBytes(byte[] bs) { StringBuilder sb = new StringBuilder("Bytes:"+bs.length+"["); for (int i=0;i<bs.length;i++) { @@ -21,7 +21,7 @@ public class Play { sb.append("]"); System.out.println(sb); } - + public static void main(String[] args) throws Exception { if (args==null || args.length==0 ) { System.out.println("Specify a file"); diff --git a/bridge/src/main/java/org/aspectj/bridge/MessageUtil.java b/bridge/src/main/java/org/aspectj/bridge/MessageUtil.java index 8c17cd947..0a765e503 100644 --- a/bridge/src/main/java/org/aspectj/bridge/MessageUtil.java +++ b/bridge/src/main/java/org/aspectj/bridge/MessageUtil.java @@ -851,7 +851,7 @@ public class MessageUtil { if (null == loc) { return "((ISourceLocation) null)"; } - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); File sourceFile = loc.getSourceFile(); if (sourceFile != ISourceLocation.NO_FILE) { @@ -901,7 +901,7 @@ public class MessageUtil { Throwable thrown = message.getThrown(); ISourceLocation sl = message.getSourceLocation(); IMessage.Kind kind = message.getKind(); - StringBuffer result = new StringBuffer(); + StringBuilder result = new StringBuilder(); result.append(kind.toString()); result.append(": "); if (null != thrown) { @@ -988,7 +988,7 @@ public class MessageUtil { if (0 == holder.numMessages(null, false)) { return "(0 messages)"; } - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); for (IMessage.Kind kind : IMessage.KINDS) { int num = holder.numMessages(kind, false); if (0 < num) { diff --git a/bridge/src/main/java/org/aspectj/bridge/SourceLocation.java b/bridge/src/main/java/org/aspectj/bridge/SourceLocation.java index e6cbe0bc2..88bcd4b48 100644 --- a/bridge/src/main/java/org/aspectj/bridge/SourceLocation.java +++ b/bridge/src/main/java/org/aspectj/bridge/SourceLocation.java @@ -131,7 +131,7 @@ public class SourceLocation implements ISourceLocation { /** @return String {context\n}{file:}line{:column} */ public String toString() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); if (null != context) { sb.append(context); sb.append(LangUtil.EOL); diff --git a/bridge/src/main/java/org/aspectj/bridge/WeaveMessage.java b/bridge/src/main/java/org/aspectj/bridge/WeaveMessage.java index ba6baab5b..454a3e6be 100644 --- a/bridge/src/main/java/org/aspectj/bridge/WeaveMessage.java +++ b/bridge/src/main/java/org/aspectj/bridge/WeaveMessage.java @@ -57,7 +57,7 @@ public class WeaveMessage extends Message { * @return new weaving message */ public static WeaveMessage constructWeavingMessage(WeaveMessageKind kind, String[] inserts) { - StringBuffer str = new StringBuffer(kind.getMessage()); + StringBuilder str = new StringBuilder(kind.getMessage()); int pos = -1; while ((pos = new String(str).indexOf("%")) != -1) { int n = Character.getNumericValue(str.charAt(pos + 1)); @@ -77,7 +77,7 @@ public class WeaveMessage extends Message { */ public static WeaveMessage constructWeavingMessage(WeaveMessageKind kind, String[] inserts, String affectedtypename, String aspectname) { - StringBuffer str = new StringBuffer(kind.getMessage()); + StringBuilder str = new StringBuilder(kind.getMessage()); int pos = -1; while ((pos = new String(str).indexOf("%")) != -1) { int n = Character.getNumericValue(str.charAt(pos + 1)); diff --git a/bridge/src/main/java/org/aspectj/bridge/context/CompilationAndWeavingContext.java b/bridge/src/main/java/org/aspectj/bridge/context/CompilationAndWeavingContext.java index cd750e4ab..bfb8ec190 100644 --- a/bridge/src/main/java/org/aspectj/bridge/context/CompilationAndWeavingContext.java +++ b/bridge/src/main/java/org/aspectj/bridge/context/CompilationAndWeavingContext.java @@ -138,7 +138,7 @@ public class CompilationAndWeavingContext { explanationStack.push(getFormatter(entry).formatEntry(entry.phaseId, data)); } } - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); while (!explanationStack.isEmpty()) { sb.append("when "); sb.append(explanationStack.pop().toString()); @@ -240,7 +240,7 @@ public class CompilationAndWeavingContext { private static class DefaultFormatter implements ContextFormatter { public String formatEntry(int phaseId, Object data) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(PHASE_NAMES[phaseId]); sb.append(" "); if (data instanceof char[]) { diff --git a/bridge/src/main/java/org/aspectj/bridge/context/PinpointingMessageHandler.java b/bridge/src/main/java/org/aspectj/bridge/context/PinpointingMessageHandler.java index fe2239d7a..c041adf65 100644 --- a/bridge/src/main/java/org/aspectj/bridge/context/PinpointingMessageHandler.java +++ b/bridge/src/main/java/org/aspectj/bridge/context/PinpointingMessageHandler.java @@ -44,7 +44,7 @@ public class PinpointingMessageHandler implements IMessageHandler { 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()); IMessage pinpointedMessage = new PinpointedMessage(message,sb.toString()); diff --git a/bridge/src/test/java/org/aspectj/bridge/MessageTest.java b/bridge/src/test/java/org/aspectj/bridge/MessageTest.java index c4e6b6a3c..b36442afb 100644 --- a/bridge/src/test/java/org/aspectj/bridge/MessageTest.java +++ b/bridge/src/test/java/org/aspectj/bridge/MessageTest.java @@ -286,7 +286,7 @@ class KindTest { /** @return error if failed */ String checkExpectedKind(IMessage m) { - StringBuffer result = new StringBuffer(); + StringBuilder result = new StringBuilder(); for (int i = 0; i < KINDS.length; i++) { if (expected.get(i) != checkKindMethods(m, i)) { String s = "expected " + expected.get(i) diff --git a/build/build.xml b/build/build.xml index 1ea2f5aa7..f5a6eef8f 100644 --- a/build/build.xml +++ b/build/build.xml @@ -806,11 +806,11 @@ ant -propertyfile XXX publishtomaven <property name="maven.central.repository" value="https://repo.spring.io/libs-snapshot-local/org/aspectj/aspectjweaver"/> --> -<!-- aspectjtools/target/aspectjtools-1.9.7-SNAPSHOT.jar --> +<!-- aspectjtools/target/aspectjtools-1.9.8-SNAPSHOT.jar --> <property name="bin.jars.folder" value="${build.root}/dist/tools/lib"/> <property name="src.jars.folder" value="${build.root}/src"/> - <property name="suffix" value="1.9.7-SNAPSHOT"/> + <property name="suffix" value="1.9.8-SNAPSHOT"/> <!-- ASPECTJRT --> <maven:deploy file="${build.root}/aspectjrt/target/aspectjrt-${suffix}.jar"> @@ -856,7 +856,7 @@ ant -propertyfile XXX publishtomaven <target name="publishtomaven_milestone" depends="maven.init"> <property name="build.root" value="/Users/aclement/gits/org.aspectj"/> - <property name="suffix" value="1.9.7.M1"/> + <property name="suffix" value="1.9.8.M1"/> <property name="adjusted.release.type" value="milestone"/> <property name="maven.central.repository" value="s3://maven.springframework.org/${adjusted.release.type}"/> @@ -985,4 +985,3 @@ ant -propertyfile XXX publishtomaven </project> - diff --git a/build/src/main/java/$installer$/org/aspectj/Main.java b/build/src/main/java/$installer$/org/aspectj/Main.java index 745c9d715..e4c649094 100644 --- a/build/src/main/java/$installer$/org/aspectj/Main.java +++ b/build/src/main/java/$installer$/org/aspectj/Main.java @@ -799,7 +799,7 @@ abstract class WizardPane { public static String stringFromStream(InputStream stream) throws IOException { BufferedReader reader = new BufferedReader(new InputStreamReader(stream, "US-ASCII")); - StringBuffer ret = new StringBuffer(); + StringBuilder ret = new StringBuilder(); int data; while ((data = reader.read()) != -1) { ret.append((char) data); @@ -827,7 +827,7 @@ abstract class WizardPane { public static String applyProperties(String text, Map<String,String> map) { // ${name} -> map.get(name).toString() int lastIndex = 0; - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); int startIndex; while ((startIndex = text.indexOf("${", lastIndex)) != -1) { diff --git a/build/src/main/java/org/aspectj/internal/tools/ant/taskdefs/AJInstaller.java b/build/src/main/java/org/aspectj/internal/tools/ant/taskdefs/AJInstaller.java index f432af159..a25d4bbe2 100644 --- a/build/src/main/java/org/aspectj/internal/tools/ant/taskdefs/AJInstaller.java +++ b/build/src/main/java/org/aspectj/internal/tools/ant/taskdefs/AJInstaller.java @@ -148,7 +148,7 @@ public class AJInstaller extends MatchingTask { protected void writeContents(ZipOutputStream zOut) throws IOException { // write to a StringBuffer - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append(contentsBytes); buf.append(NEWLINE); for (String name : contentsNames) { @@ -160,7 +160,7 @@ public class AJInstaller extends MatchingTask { protected void writeManifest(ZipOutputStream zOut) throws IOException { // write to a StringBuffer - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("Manifest-Version: 1.0"); buf.append(NEWLINE); buf.append("Main-Class: " + MAIN_CLASS); diff --git a/build/src/main/java/org/aspectj/internal/tools/ant/taskdefs/AntBuilder.java b/build/src/main/java/org/aspectj/internal/tools/ant/taskdefs/AntBuilder.java index 1bfdf8a63..f547d83e0 100644 --- a/build/src/main/java/org/aspectj/internal/tools/ant/taskdefs/AntBuilder.java +++ b/build/src/main/java/org/aspectj/internal/tools/ant/taskdefs/AntBuilder.java @@ -92,7 +92,7 @@ public class AntBuilder extends Builder { target.setName(resultTargetName); Result[] reqs = result.getRequired(); - StringBuffer depends = new StringBuffer(); + StringBuilder depends = new StringBuilder(); boolean first = true; for (Result reqResult : reqs) { if (!first) { @@ -616,7 +616,7 @@ public class AntBuilder extends Builder { } catch (BuildException e) { throw e; } catch (Throwable t) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("classpath="); sb.append(url); throw new BuildException(sb.toString(), t); diff --git a/build/src/main/java/org/aspectj/internal/tools/ant/taskdefs/Checklics.java b/build/src/main/java/org/aspectj/internal/tools/ant/taskdefs/Checklics.java index 20b4b8353..aa3d2ba28 100644 --- a/build/src/main/java/org/aspectj/internal/tools/ant/taskdefs/Checklics.java +++ b/build/src/main/java/org/aspectj/internal/tools/ant/taskdefs/Checklics.java @@ -314,7 +314,7 @@ public class Checklics extends MatchingTask { private void list() { Iterator enu = LICENSES.keySet().iterator(); - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("known license keys:"); boolean first = true; while (enu.hasNext()) { diff --git a/build/src/main/java/org/aspectj/internal/tools/ant/taskdefs/StripNonBodyHtml.java b/build/src/main/java/org/aspectj/internal/tools/ant/taskdefs/StripNonBodyHtml.java index dd63ee7e8..b5b41a93b 100644 --- a/build/src/main/java/org/aspectj/internal/tools/ant/taskdefs/StripNonBodyHtml.java +++ b/build/src/main/java/org/aspectj/internal/tools/ant/taskdefs/StripNonBodyHtml.java @@ -176,7 +176,7 @@ public class StripNonBodyHtml extends MatchingTask { String stripTags(String input, final String SOURCE, final String START, final String END) { if (null == input) return input; - StringBuffer buffer = new StringBuffer(input.length()); + StringBuilder buffer = new StringBuilder(input.length()); String result = input; int curLoc = 0; while (true) { diff --git a/build/src/main/java/org/aspectj/internal/tools/build/Builder.java b/build/src/main/java/org/aspectj/internal/tools/build/Builder.java index 94e8c7997..71cb3bac2 100644 --- a/build/src/main/java/org/aspectj/internal/tools/build/Builder.java +++ b/build/src/main/java/org/aspectj/internal/tools/build/Builder.java @@ -473,7 +473,7 @@ public abstract class Builder { // copy binaries (but not module flag files) String excludes = null; { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); for (ProductModule productModule : productModules) { if (0 < buf.length()) { buf.append(","); diff --git a/build/src/main/java/org/aspectj/internal/tools/build/Module.java b/build/src/main/java/org/aspectj/internal/tools/build/Module.java index 07743a5db..622625872 100644 --- a/build/src/main/java/org/aspectj/internal/tools/build/Module.java +++ b/build/src/main/java/org/aspectj/internal/tools/build/Module.java @@ -610,7 +610,7 @@ public class Module { final String DELIM = " \n\t\\<>\"="; StringTokenizer st = new StringTokenizer(line, DELIM, true); ArrayList<String> result = new ArrayList<>(); - StringBuffer quote = new StringBuffer(); + StringBuilder quote = new StringBuilder(); boolean inQuote = false; while (st.hasMoreTokens()) { String s = st.nextToken(); diff --git a/build/src/main/java/org/aspectj/internal/tools/build/SampleGatherer.java b/build/src/main/java/org/aspectj/internal/tools/build/SampleGatherer.java index 6ac1f45eb..29468af65 100644 --- a/build/src/main/java/org/aspectj/internal/tools/build/SampleGatherer.java +++ b/build/src/main/java/org/aspectj/internal/tools/build/SampleGatherer.java @@ -167,7 +167,7 @@ public class SampleGatherer { Reader reader = null; try { String author = null; - StringBuffer sampleCode = new StringBuffer(); + StringBuilder sampleCode = new StringBuilder(); String anchorName = null; String anchorTitle = null; ArrayList<String> flags = new ArrayList<>(); @@ -747,7 +747,7 @@ class HTMLSamplesRenderer extends SamplesRenderer { } } // build up prefix - StringBuffer branchAnchor = new StringBuffer(); + StringBuilder branchAnchor = new StringBuilder(); for (int i = 0; i < firstDiff;) { branchAnchor.append(parts[i]); i++; @@ -991,7 +991,7 @@ class SampleUtil { if (from.length != to.length) { throw new IllegalArgumentException("unmatched from/to"); } - StringBuffer result = new StringBuffer(); + StringBuilder result = new StringBuilder(); int LEN = source.length(); int start = 0; for (int i = 0; i < LEN; i++) { diff --git a/build/src/main/java/org/aspectj/internal/tools/build/Util.java b/build/src/main/java/org/aspectj/internal/tools/build/Util.java index 071826b47..69582bb0a 100644 --- a/build/src/main/java/org/aspectj/internal/tools/build/Util.java +++ b/build/src/main/java/org/aspectj/internal/tools/build/Util.java @@ -151,7 +151,7 @@ public class Util { } public static String path(String[] segments) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); if ((null != segments)) { for (int i = 0; i < segments.length; i++) { if (0 < i) { diff --git a/build/src/test/java/org/aspectj/build/BuildModuleTests.java b/build/src/test/java/org/aspectj/build/BuildModuleTests.java index 64f8b1016..181d84fcc 100644 --- a/build/src/test/java/org/aspectj/build/BuildModuleTests.java +++ b/build/src/test/java/org/aspectj/build/BuildModuleTests.java @@ -175,7 +175,7 @@ public class BuildModuleTests extends TestCase { void checkSourceDirectory(File srcDir, String module) { final String label = "source dir " + srcDir + " (module " + module + ")"; - assertTrue(label, (srcDir.exists() && srcDir.isDirectory())); + assertTrue(label, srcDir.isDirectory()); String license = getLicense(module); // if (replacing) { // if (replacing && true) { diff --git a/build/src/test/java/org/aspectj/internal/build/BuildModuleTest.java b/build/src/test/java/org/aspectj/internal/build/BuildModuleTest.java index f8f0b4bde..b8a6c6d15 100644 --- a/build/src/test/java/org/aspectj/internal/build/BuildModuleTest.java +++ b/build/src/test/java/org/aspectj/internal/build/BuildModuleTest.java @@ -107,7 +107,7 @@ public class BuildModuleTest extends TestCase { if (!Util.delete(file)) { File[] list = file.listFiles(); if (!Util.isEmpty(list)) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("warning: BuildModuleTest unable to delete "); sb.append(file.toString()); sb.append("\n"); // XXX platform diff --git a/build/src/test/java/org/aspectj/internal/build/ModulesTest.java b/build/src/test/java/org/aspectj/internal/build/ModulesTest.java index 52f6f48dc..5b1692570 100644 --- a/build/src/test/java/org/aspectj/internal/build/ModulesTest.java +++ b/build/src/test/java/org/aspectj/internal/build/ModulesTest.java @@ -115,7 +115,7 @@ public class ModulesTest extends TestCase { } } if (!badModules.isEmpty()) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); for (Module module: badModules) { System.err.println(module.toLongString()); sb.append("\n"); diff --git a/docs/developer/IDE.md b/docs/developer/IDE.md index 3dfb38eef..14621ecee 100644 --- a/docs/developer/IDE.md +++ b/docs/developer/IDE.md @@ -32,6 +32,7 @@ projects using AspectJ Maven Plugin. #### AspectJ Development Tools (AJDT) Use an update sites corresponding to your Eclipse version (minimal version listed): +* Eclipse 2021-09 (4.21): https://aspectj.dev/eclipse/ajdt/421 * Eclipse 2021-03 (4.19): https://aspectj.dev/eclipse/ajdt/419 * Eclipse 2018-12 (4.10): https://download.eclipse.org/tools/ajdt/410/dev/update * For older versions, please refer to https://www.eclipse.org/ajdt/downloads (page was not updated in a long time, diff --git a/docs/developer/RELEASE.md b/docs/developer/RELEASE.md index 7c8b04d9f..3d0db25be 100644 --- a/docs/developer/RELEASE.md +++ b/docs/developer/RELEASE.md @@ -27,7 +27,7 @@ To publish a snapshot, set up your credentials in `~/.m2/settings.xml` something </settings> ``` -Assuming that you are currently working on version 1.9.7-SNAPSHOT, you simply call: +Assuming that you are currently working on version 1.9.8-SNAPSHOT, you simply call: ```shell mvn clean deploy @@ -86,7 +86,7 @@ java -version git status # Set release version in all POMs -mvn versions:set -DnewVersion=1.9.7.M2 +mvn versions:set -DnewVersion=1.9.8.M2 # Verify if the POM changes are OK, then remove the POM backup files mvn versions:commit @@ -118,25 +118,25 @@ Before we release the staging repository though, we want to commit and tag the r ```shell # Commit the release POMs to Git (better do this from your IDE, verifying the # changes before staging them for Git commit) -git commit -am "Set version to 1.9.7.M2" +git commit -am "Set version to 1.9.8.M2" # Tag release -git tag V1_9_7_M2 +git tag V1_9_8_M2 # Set new snapshot version, increasing the version number after a final release -mvn versions:set -DnewVersion=1.9.7-SNAPSHOT +mvn versions:set -DnewVersion=1.9.8-SNAPSHOT # Verify if the POM changes are OK, then remove the POM backup files mvn versions:commit # Commit the snapshot POMs to Git -git commit -am "Set version to 1.9.7-SNAPSHOT" +git commit -am "Set version to 1.9.8-SNAPSHOT" # Push the previous commits to GitHub git push origin # Push the release tag to GitHub -git push origin V1_9_7_M2 +git push origin V1_9_8_M2 ``` OK, the Git house-keeping is done. Now finally, let us enjoy the fruits of our work and release the staging repository @@ -156,7 +156,7 @@ to Maven Central: # repositories there are. mvn nexus-staging:rc-list # [INFO] ID State Description -# [INFO] orgaspectj-1106 CLOSED org.aspectj:aspectjrt:1.9.7.M2 +# [INFO] orgaspectj-1106 CLOSED org.aspectj:aspectjrt:1.9.8.M2 # Use the ID of the corresponding CLOSED staging repository for releasing to # Maven Central @@ -164,8 +164,8 @@ mvn nexus-staging:rc-release -DstagingRepositoryId=orgaspectj-1106 ``` Tadaa! We have performed an AspectJ release. In a few minutes, the artifacts should appear on Maven Central somewhere -under https://repo1.maven.org/maven2/org/aspectj/, e.g. AspectJ Tools 1.9.7.M2 would appear under -https://repo1.maven.org/maven2/org/aspectj/aspectjtools/1.9.7.M2/. As soon as you see the artifacts there instead of +under https://repo1.maven.org/maven2/org/aspectj/, e.g. AspectJ Tools 1.9.8.M2 would appear under +https://repo1.maven.org/maven2/org/aspectj/aspectjtools/1.9.8.M2/. As soon as you see the artifacts there instead of "404 not found", you can announce release availability on the AspectJ mailing list and wherever else appropriate. Finally, you probably want to publish the AspectJ installer (`installer/target/aspectj-[VERSION].jar`), e.g. by creating a diff --git a/docs/dist/doc/README-198.html b/docs/dist/doc/README-198.html index 24abfdb95..57165e5c0 100644 --- a/docs/dist/doc/README-198.html +++ b/docs/dist/doc/README-198.html @@ -99,6 +99,11 @@ <li>Document build profiles and properties in <i>docs/developer/BUILD.md</i></li> <li>Add a guide for setting up an AspectJ development environment in <i>docs/developer/IDE.md</i></li> <li>Allow JAR saving if <tt>-proceedOnError</tt> is specified</li> + <li> + Fix <a href="https://github.com/eclipse/org.aspectj/issues/105">issue #105</a>: Compilation fails when using an + aspect library via <tt>-aspectpath</tt> in combination with introducing an annotation via ITD. This was broken since + version 1.9.5 and fixed in 1.9.8.RC3. + </li> </ul> <p> diff --git a/loadtime/src/main/java/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java b/loadtime/src/main/java/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java index 0f1d7baca..43a73b1ef 100644 --- a/loadtime/src/main/java/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java +++ b/loadtime/src/main/java/org/aspectj/weaver/loadtime/ClassLoaderWeavingAdaptor.java @@ -345,7 +345,7 @@ public class ClassLoaderWeavingAdaptor extends WeavingAdaptor { * @param definitions */ private void registerOptions(final BcelWeaver weaver, final ClassLoader loader, final List<Definition> definitions) { - StringBuffer allOptions = new StringBuffer(); + StringBuilder allOptions = new StringBuilder(); for (Definition definition : definitions) { allOptions.append(definition.getWeaverOptions()).append(' '); } @@ -956,7 +956,7 @@ public class ClassLoaderWeavingAdaptor extends WeavingAdaptor { @Override protected String getDumpDir() { if (dumpDirPerClassloader) { - StringBuffer dir = new StringBuffer(); + StringBuilder dir = new StringBuilder(); dir.append("_ajdump").append(File.separator).append(weavingContext.getId()); return dir.toString(); } else { diff --git a/loadtime/src/main/java/org/aspectj/weaver/loadtime/ConcreteAspectCodeGen.java b/loadtime/src/main/java/org/aspectj/weaver/loadtime/ConcreteAspectCodeGen.java index 5816a0bc4..459a0f86c 100644 --- a/loadtime/src/main/java/org/aspectj/weaver/loadtime/ConcreteAspectCodeGen.java +++ b/loadtime/src/main/java/org/aspectj/weaver/loadtime/ConcreteAspectCodeGen.java @@ -321,7 +321,7 @@ public class ConcreteAspectCodeGen { * @return string repr. */ private String stringify() { - StringBuffer sb = new StringBuffer("<concrete-aspect name='"); + StringBuilder sb = new StringBuilder("<concrete-aspect name='"); sb.append(concreteAspect.name); sb.append("' extends='"); sb.append(concreteAspect.extend); 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..a354e0d92 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(); @@ -993,7 +993,7 @@ public class AjState implements CompilerConfigurationChangeFlags, TypeDelegateRe if (f.exists() && !f.isDirectory() && (f.lastModified() >= lastSuccessfulBuildTime)) { return true; } - if (checkClassFiles && f.exists() && f.isDirectory()) { + if (checkClassFiles && f.isDirectory()) { // We should use here a list/set of directories we know have or have not changed - some kind of // List<File> buildConfig.getClasspathEntriesWithChangedContents() @@ -1045,7 +1045,7 @@ public class AjState implements CompilerConfigurationChangeFlags, TypeDelegateRe if (f.exists() && !f.isDirectory() && (f.lastModified() >= lastSuccessfulBuildTime)) { return true; } - if (checkClassFiles && f.exists() && f.isDirectory()) { + if (checkClassFiles && f.isDirectory()) { // We should use here a list/set of directories we know have or have not changed - some kind of // List<File> buildConfig.getClasspathEntriesWithChangedContents() @@ -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..5ce84dca7 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()); @@ -284,7 +284,7 @@ public class AsmElementFormatter { private String handleSigForReference(TypeReference ref, TypeBinding tb, MethodScope scope) { try { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); createHandleSigForReference(ref, tb, scope, sb); return sb.toString(); } catch (Throwable t) { @@ -299,7 +299,7 @@ public class AsmElementFormatter { * handle. Whether a type is qualified or unqualified in its source reference is actually reflected in the handle and this code * allows for that. */ - private void createHandleSigForReference(TypeReference ref, TypeBinding tb, MethodScope scope, StringBuffer handleSig) { + private void createHandleSigForReference(TypeReference ref, TypeBinding tb, MethodScope scope, StringBuilder handleSig) { if (ref instanceof Wildcard) { Wildcard w = (Wildcard) ref; if (w.bound == null) { 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..de69b6d37 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 @@ -153,7 +153,7 @@ public class Main { * append nothing if numItems is 0, numItems + label + (numItems > 1? "s" : "") otherwise, prefixing with " " if sink has * content */ - private static void appendNLabel(StringBuffer sink, String label, int numItems) { + private static void appendNLabel(StringBuilder sink, String label, int numItems) { if (0 == numItems) { return; } @@ -496,7 +496,7 @@ public class Main { if (holder == ourHandler) { lastErrors = holder.numMessages(IMessage.ERROR, false); int warnings = holder.numMessages(IMessage.WARNING, false); - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); appendNLabel(sb, "fail|abort", lastFails); appendNLabel(sb, "error", lastErrors); appendNLabel(sb, "warning", warnings); @@ -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/RunWeaveTests.java b/org.aspectj.ajdt.core/src/test/java/RunWeaveTests.java index d8d080518..912ced3b6 100644 --- a/org.aspectj.ajdt.core/src/test/java/RunWeaveTests.java +++ b/org.aspectj.ajdt.core/src/test/java/RunWeaveTests.java @@ -146,7 +146,7 @@ public class RunWeaveTests { private static void createCSV() { String NL = System.getProperty("line.separator", "\n"); - StringBuffer csv = new StringBuffer(1000); + StringBuilder csv = new StringBuilder(1000); csv.append("Test Results"); @@ -219,10 +219,10 @@ public class RunWeaveTests { return (getVMInfo() + "_" + getDateAndTime()).replace('.', '_') + ".csv"; } - private static StringBuffer getDateAndTime() { + private static StringBuilder getDateAndTime() { Calendar c = Calendar.getInstance(); - StringBuffer sb = new StringBuffer(15); + StringBuilder sb = new StringBuilder(15); sb.append(c.get(Calendar.YEAR)); int month = (c.get(Calendar.MONTH)) + 1; if(month < 10) sb.append(0); @@ -247,8 +247,8 @@ public class RunWeaveTests { return sb; } - private static StringBuffer getVMInfo() { - StringBuffer sb = new StringBuffer(40); + private static StringBuilder getVMInfo() { + StringBuilder sb = new StringBuilder(40); String vm = System.getProperty("java.vm.vendor"); 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 cf753b8c6..d0862b980 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); @@ -104,7 +104,7 @@ public class IncrementalCase { // XXX NOT bound to junit - bridge tests? throw new Error("did not get definitions"); } MessageHandler compilerMessages = new MessageHandler(); - StringBuffer commandLine = new StringBuffer(); + StringBuilder commandLine = new StringBuilder(); for (int i = 1; result && (i < 10); i++) { String fromSuffix = "." + i + "0.java"; // copy files, collecting as we go... @@ -171,13 +171,13 @@ public class IncrementalCase { // XXX NOT bound to junit - bridge tests? File sandboxClassesDir, Definition def, IMessageHolder compilerMessages, - StringBuffer commandLine, + StringBuilder commandLine, IMessageHandler handler) { log("verifyCompile - iteration ", iteration, handler); 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 d5df01079..0bf08886c 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 "); @@ -443,7 +443,7 @@ public abstract class AjcTestCase extends TestCase { boolean infosEmpty = expected.isIgnoringInfoMessages() || missingInfos.isEmpty() && extraInfos.isEmpty(); if (!(missingFails.isEmpty() && missingWarnings.isEmpty() && missingErrors.isEmpty() && missingWeaves.isEmpty() && extraFails.isEmpty() && extraWarnings.isEmpty() && extraErrors.isEmpty() && extraWeaves.isEmpty() && infosEmpty)) { - StringBuffer failureReport = new StringBuffer(assertionFailedMessage); + StringBuilder failureReport = new StringBuilder(assertionFailedMessage); failureReport.append("\n"); if (!expected.isIgnoringInfoMessages()) { addMissing(failureReport, "info", missingInfos); @@ -576,7 +576,7 @@ public abstract class AjcTestCase extends TestCase { } } lastRunResult = null; - StringBuffer cp = new StringBuffer(); + StringBuilder cp = new StringBuilder(); if (classpath != null) { // allow replacing this special variable, rather than copying all files to allow tests of jars that don't end in .jar cp.append(substituteSandbox(classpath)); @@ -587,7 +587,7 @@ public abstract class AjcTestCase extends TestCase { cp.append(ajc.getSandboxDirectory().getAbsolutePath()); getAnyJars(ajc.getSandboxDirectory(), cp); } - StringBuffer mp = new StringBuffer(); + StringBuilder mp = new StringBuilder(); if (modulepath != null) { mp.append(substituteSandbox(modulepath)); mp.append(File.pathSeparator); @@ -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(" "); @@ -983,7 +983,7 @@ public abstract class AjcTestCase extends TestCase { } } - private void addMissing(StringBuffer buff, String type, List<AjcTestCase.Message> messages) { + private void addMissing(StringBuilder buff, String type, List<AjcTestCase.Message> messages) { if (!messages.isEmpty()) { buff.append("Missing expected "); buff.append(type); @@ -996,7 +996,7 @@ public abstract class AjcTestCase extends TestCase { } } - private void addExtra(StringBuffer buff, String type, List messages) { + private void addExtra(StringBuilder buff, String type, List messages) { if (!messages.isEmpty()) { buff.append("Unexpected "); buff.append(type); @@ -1010,7 +1010,7 @@ public abstract class AjcTestCase extends TestCase { } // add any jars in the directory to the classpath - private void getAnyJars(File dir, StringBuffer buff) { + private void getAnyJars(File dir, StringBuilder buff) { File[] files = dir.listFiles(); for (File file : files) { if (file.getName().endsWith(".jar")) { 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); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AbstractAnnotationAJ.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AbstractAnnotationAJ.java index a4d47ecc6..648a6aa76 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AbstractAnnotationAJ.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AbstractAnnotationAJ.java @@ -95,7 +95,7 @@ public abstract class AbstractAnnotationAJ implements AnnotationAJ { * {@inheritDoc} */ public final String getValidTargets() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("{"); for (Iterator<String> iter = supportedTargets.iterator(); iter.hasNext();) { String evalue = iter.next(); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Advice.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Advice.java index cc9d3112d..284786213 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Advice.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Advice.java @@ -429,7 +429,7 @@ public abstract class Advice extends ShadowMunger { @Override public String toString() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("(").append(getKind()).append(extraParametersToString()); sb.append(": ").append(pointcut).append("->").append(signature).append(")"); return sb.toString(); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AjcMemberMaker.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AjcMemberMaker.java index 01809e1ec..b20d0c2ca 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AjcMemberMaker.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AjcMemberMaker.java @@ -255,7 +255,7 @@ public class AjcMemberMaker { } else { args = new UnresolvedType[] { fieldDeclaringType }; } - StringBuffer name = new StringBuffer("ajc$get$"); + StringBuilder name = new StringBuilder("ajc$get$"); name.append(field.getName()); return new ResolvedMemberImpl(Member.METHOD, fieldDeclaringType, PUBLIC_STATIC, field.getReturnType(), name.toString(), args); @@ -289,7 +289,7 @@ public class AjcMemberMaker { } else { args = new UnresolvedType[] { fieldDeclaringType, field.getType() }; } - StringBuffer name = new StringBuffer("ajc$set$"); + StringBuilder name = new StringBuilder("ajc$set$"); name.append(field.getName()); return new ResolvedMemberImpl(Member.METHOD, fieldDeclaringType, PUBLIC_STATIC, UnresolvedType.VOID, name.toString(), args); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationNameValuePair.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationNameValuePair.java index 081989330..80453b1b4 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationNameValuePair.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationNameValuePair.java @@ -31,13 +31,13 @@ public class AnnotationNameValuePair { } public String toString() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(name + "=" + val.toString()); return sb.toString(); } public String stringify() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); if (!name.equals("value")) { sb.append(name + "="); } diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ArrayAnnotationValue.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ArrayAnnotationValue.java index 7c674b361..ba2ed7c83 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ArrayAnnotationValue.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ArrayAnnotationValue.java @@ -33,7 +33,7 @@ public class ArrayAnnotationValue extends AnnotationValue { } public String stringify() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("["); for (int i = 0; i < values.length; i++) { sb.append(values[i].stringify()); @@ -45,7 +45,7 @@ public class ArrayAnnotationValue extends AnnotationValue { } public String toString() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("{"); for (int i = 0; i < values.length; i++) { sb.append(values[i].toString()); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/BoundedReferenceTypeDelegate.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/BoundedReferenceTypeDelegate.java index f928b729b..e8a98d91f 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/BoundedReferenceTypeDelegate.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/BoundedReferenceTypeDelegate.java @@ -1,5 +1,5 @@ /** - * + * */ package org.aspectj.weaver; @@ -78,7 +78,7 @@ class BoundedReferenceTypeDelegate extends AbstractReferenceTypeDelegate { public AnnotationAJ[] getAnnotations() { return resolvedTypeX.getAnnotations(); } - + public boolean hasAnnotations() { return resolvedTypeX.hasAnnotations(); } @@ -135,4 +135,4 @@ class BoundedReferenceTypeDelegate extends AbstractReferenceTypeDelegate { return resolvedTypeX.getTypeVariables(); } -}
\ No newline at end of file +} diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Checker.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Checker.java index 6acb432a7..ea3abd8a8 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Checker.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Checker.java @@ -192,7 +192,7 @@ public class Checker extends ShadowMunger { return msg; } } - StringBuffer ret = new StringBuffer(); + StringBuilder ret = new StringBuilder(); while (curlyIndex >= 0) { if (curlyIndex > 0) { ret.append(msg.substring(pos, curlyIndex).replace("\\{", "{")); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IntMap.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IntMap.java index 067d0937a..f6d08c3d8 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IntMap.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IntMap.java @@ -130,7 +130,7 @@ public class IntMap { // ---- from object public String toString() { - StringBuffer buf = new StringBuffer("["); + StringBuilder buf = new StringBuilder("["); boolean seenFirst = false; for (int i = 0, len = map.length; i < len; i++) { if (map[i] != MISSING) { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/JoinPointSignature.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/JoinPointSignature.java index e058bb2ca..b25727498 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/JoinPointSignature.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/JoinPointSignature.java @@ -291,7 +291,7 @@ public class JoinPointSignature implements ResolvedMember { @Override public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append(getReturnType().getName()); buf.append(' '); buf.append(getDeclaringType().getName()); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/MemberImpl.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/MemberImpl.java index f5f8cc96b..33111fc65 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/MemberImpl.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/MemberImpl.java @@ -125,7 +125,7 @@ public class MemberImpl implements Member { * just deals with the parameter types. */ public static String typesToSignature(UnresolvedType[] paramTypes) { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("("); for (UnresolvedType paramType : paramTypes) { buf.append(paramType.getSignature()); @@ -316,7 +316,7 @@ public class MemberImpl implements Member { @Override public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append(returnType.getName()); buf.append(' '); if (declaringType == null) { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/NameMangler.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/NameMangler.java index 55be28a0d..5975d74b9 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/NameMangler.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/NameMangler.java @@ -327,13 +327,13 @@ public class NameMangler { } public static String aroundShadowMethodName(Member shadowSig, String suffixTag) { - StringBuffer ret = new StringBuffer(); + StringBuilder ret = new StringBuilder(); ret.append(getExtractableName(shadowSig)).append("_aroundBody").append(suffixTag); return ret.toString(); } public static String aroundAdviceMethodName(Member shadowSig, String suffixTag) { - StringBuffer ret = new StringBuffer(); + StringBuilder ret = new StringBuilder(); ret.append(getExtractableName(shadowSig)).append("_aroundBody").append(suffixTag).append("$advice"); return ret.toString(); } diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ReferenceType.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ReferenceType.java index 7dd98234b..022d8242f 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ReferenceType.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ReferenceType.java @@ -1127,7 +1127,7 @@ public class ReferenceType extends ResolvedType { private static String makeParameterizedSignature(ResolvedType aGenericType, ResolvedType[] someParameters) { String rawSignature = aGenericType.getErasureSignature(); - StringBuffer ret = new StringBuffer(); + StringBuilder ret = new StringBuilder(); ret.append(PARAMETERIZED_TYPE_IDENTIFIER); ret.append(rawSignature.substring(1, rawSignature.length() - 1)); ret.append("<"); @@ -1140,7 +1140,7 @@ public class ReferenceType extends ResolvedType { private static String makeDeclaredSignature(ResolvedType aGenericType, UnresolvedType[] someParameters) { - StringBuffer ret = new StringBuffer(); + StringBuilder ret = new StringBuilder(); String rawSig = aGenericType.getErasureSignature(); ret.append(rawSig.substring(0, rawSig.length() - 1)); ret.append("<"); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedMemberImpl.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedMemberImpl.java index fd4cfa48d..ffc9da817 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedMemberImpl.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedMemberImpl.java @@ -468,7 +468,7 @@ public class ResolvedMemberImpl extends MemberImpl implements IHasPosition, Reso * @return the generic signature for the member that could be inserted into a class file */ public String getSignatureForAttribute() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); if (typeVariables != null) { sb.append("<"); for (TypeVariable typeVariable : typeVariables) { @@ -489,7 +489,7 @@ public class ResolvedMemberImpl extends MemberImpl implements IHasPosition, Reso } public String getGenericSignature() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); if (typeVariables != null) { sb.append("<"); for (TypeVariable typeVariable : typeVariables) { @@ -912,7 +912,7 @@ public class ResolvedMemberImpl extends MemberImpl implements IHasPosition, Reso && typeVariableMap.containsKey(((UnresolvedTypeVariableReferenceType) parameterizedComponentSig) .getTypeVariable().getName())) { // pr250632 // TODO ASC bah, this code is rubbish - i should fix it properly - StringBuffer newsig = new StringBuffer(); + StringBuilder newsig = new StringBuilder(); newsig.append("[T"); newsig.append(((UnresolvedTypeVariableReferenceType) parameterizedComponentSig).getTypeVariable().getName()); newsig.append(";"); @@ -1080,7 +1080,7 @@ public class ResolvedMemberImpl extends MemberImpl implements IHasPosition, Reso } public String getSignatureErased() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("("); sb.append(getParameterSignatureErased()); sb.append(")"); @@ -1119,7 +1119,7 @@ public class ResolvedMemberImpl extends MemberImpl implements IHasPosition, Reso * Useful for writing tests, returns *everything* we know about this member. */ public String toDebugString() { - StringBuffer r = new StringBuffer(); + StringBuilder r = new StringBuilder(); // modifiers int mods = modifiers; @@ -1188,7 +1188,7 @@ public class ResolvedMemberImpl extends MemberImpl implements IHasPosition, Reso public static boolean showParameterNames = true; public String toGenericString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append(getGenericReturnType().getSimpleName()); buf.append(' '); buf.append(declaringType.getName()); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedPointcutDefinition.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedPointcutDefinition.java index 09d0f8ac4..f04867859 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedPointcutDefinition.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedPointcutDefinition.java @@ -64,7 +64,7 @@ public class ResolvedPointcutDefinition extends ResolvedMemberImpl { @Override public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("pointcut "); buf.append((getDeclaringType() == null ? "<nullDeclaringType>" : getDeclaringType().getName())); buf.append("."); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedType.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedType.java index 9f33cab4f..dcf5f21ae 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedType.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedType.java @@ -1784,7 +1784,7 @@ public abstract class ResolvedType extends UnresolvedType implements AnnotatedEl .equals(newFieldTypeMunger.getSignature().getDeclaringType())) { // report error on the aspect - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("Cannot handle two aspects both attempting to use new style ITDs for the same named field "); sb.append("on the same target type. Please recompile at least one aspect with '-Xset:itdVersion=1'."); sb.append(" Aspects involved: " + munger.getAspectType().getName() + " and " @@ -2262,7 +2262,7 @@ public abstract class ResolvedType extends UnresolvedType implements AnnotatedEl int count = ret.getParameterTypes().length; String[] paramNames = new String[count]; for (int i = 0; i < count; i++) { - paramNames[i] = new StringBuffer("dim").append(i).toString(); + paramNames[i] = new StringBuilder("dim").append(i).toString(); } ret.setParameterNames(paramNames); return ret; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Shadow.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Shadow.java index 5ab8feae0..6d5520b03 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Shadow.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Shadow.java @@ -657,7 +657,7 @@ public abstract class Shadow { } public String toResolvedString(World world) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(getKind()); sb.append("("); Member m = getSignature(); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/SignatureUtils.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/SignatureUtils.java index 4df6681aa..1d7f146da 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/SignatureUtils.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/SignatureUtils.java @@ -90,7 +90,7 @@ public class SignatureUtils { // --- private static String getHandlerSignatureString(Member m, World world) { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append(makeString(0)); buf.append('-'); // buf.append(getName()); @@ -109,7 +109,7 @@ public class SignatureUtils { } private static String getStaticInitializationSignatureString(Member m, World world) { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append(makeString(m.getModifiers(world))); buf.append('-'); // buf.append(getName()); @@ -120,7 +120,7 @@ public class SignatureUtils { } protected static String getAdviceSignatureString(Member m, World world) { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append(makeString(m.getModifiers(world))); buf.append('-'); buf.append(m.getName()); @@ -139,7 +139,7 @@ public class SignatureUtils { } protected static String getMethodSignatureString(Member m, World world) { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append(makeString(m.getModifiers(world))); buf.append('-'); buf.append(m.getName()); @@ -158,7 +158,7 @@ public class SignatureUtils { } protected static String getMonitorSignatureString(Member m, World world) { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append(makeString(Modifier.STATIC)); // modifiers buf.append('-'); buf.append(m.getName()); // name @@ -173,7 +173,7 @@ public class SignatureUtils { } protected static String getConstructorSignatureString(Member m, World world) { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append(makeString(m.getModifiers(world))); buf.append('-'); buf.append('-'); @@ -189,7 +189,7 @@ public class SignatureUtils { } protected static String getFieldSignatureString(Member m, World world) { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append(makeString(m.getModifiers(world))); buf.append('-'); buf.append(m.getName()); @@ -218,7 +218,7 @@ public class SignatureUtils { protected static String makeString(UnresolvedType[] types) { if (types == null) return ""; - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); for (UnresolvedType type : types) { buf.append(makeString(type)); buf.append(':'); @@ -229,7 +229,7 @@ public class SignatureUtils { protected static String makeString(String[] names) { if (names == null) return ""; - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); for (String name : names) { buf.append(name); buf.append(':'); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/StandardAnnotation.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/StandardAnnotation.java index 8d6915396..a90fbee28 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/StandardAnnotation.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/StandardAnnotation.java @@ -45,7 +45,7 @@ public class StandardAnnotation extends AbstractAnnotationAJ { * {@inheritDoc} */ public String stringify() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("@").append(type.getClassName()); if (hasNameValuePairs()) { sb.append("("); @@ -58,7 +58,7 @@ public class StandardAnnotation extends AbstractAnnotationAJ { } public String toString() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("Anno[" + getTypeSignature() + " " + (isRuntimeVisible ? "rVis" : "rInvis")); if (nvPairs != null) { sb.append(" "); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeFactory.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeFactory.java index b73c09f1c..3d4c0d46d 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeFactory.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeFactory.java @@ -113,7 +113,7 @@ public class TypeFactory { return new UnresolvedType(signature, signatureErasure, UnresolvedType.NONE); } else { int endOfParams = locateMatchingEndAngleBracket(signature, startOfParams); - StringBuffer erasureSig = new StringBuffer(signature); + StringBuilder erasureSig = new StringBuilder(signature); erasureSig.setCharAt(0, 'L'); while (startOfParams != -1) { erasureSig.delete(startOfParams, endOfParams + 1); @@ -210,7 +210,7 @@ public class TypeFactory { return new UnresolvedType(signature); } else { int endOfParams = locateMatchingEndAngleBracket(signature, leftAngleBracket); - StringBuffer erasureSig = new StringBuffer(signature); + StringBuilder erasureSig = new StringBuilder(signature); erasureSig.setCharAt(0, 'L'); while (leftAngleBracket != -1) { erasureSig.delete(leftAngleBracket, endOfParams + 1); @@ -275,7 +275,7 @@ public class TypeFactory { return idx; } - private static int locateFirstBracket(StringBuffer signature) { + private static int locateFirstBracket(StringBuilder signature) { int idx = 0; int max = signature.length(); while (idx < max) { @@ -361,7 +361,7 @@ public class TypeFactory { * something with sig "Pcom/Foo<Ljava/lang/String;>;" signature created = "PSomeType<Pcom/Foo<Ljava/lang/String;>;>;" */ public static UnresolvedType createUnresolvedParameterizedType(String baseTypeSignature, UnresolvedType[] arguments) { - StringBuffer parameterizedSig = new StringBuffer(); + StringBuilder parameterizedSig = new StringBuilder(); parameterizedSig.append(ResolvedType.PARAMETERIZED_TYPE_IDENTIFIER); parameterizedSig.append(baseTypeSignature.substring(1, baseTypeSignature.length() - 1)); if (arguments.length > 0) { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeVariable.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeVariable.java index 1126fd43c..563ffbe1a 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeVariable.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeVariable.java @@ -224,7 +224,7 @@ public class TypeVariable { } public String getDisplayName() { - StringBuffer ret = new StringBuffer(); + StringBuilder ret = new StringBuilder(); ret.append(name); if (!getFirstBound().getName().equals("java.lang.Object")) { ret.append(" extends "); @@ -251,7 +251,7 @@ public class TypeVariable { * are parameterized types */ public String getSignature() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(name); sb.append(":"); if (superInterfaces.length == 0 || !superclass.getSignature().equals(UnresolvedType.OBJECT.getSignature())) { @@ -271,7 +271,7 @@ public class TypeVariable { * @return signature for inclusion in an attribute, there must be no 'P' in it signatures */ public String getSignatureForAttribute() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(name); sb.append(":"); if (superInterfaces.length == 0 || !superclass.getSignature().equals(UnresolvedType.OBJECT.getSignature())) { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeVariableReferenceType.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeVariableReferenceType.java index 6672c475c..d9b151f05 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeVariableReferenceType.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeVariableReferenceType.java @@ -117,7 +117,7 @@ public class TypeVariableReferenceType extends ReferenceType implements TypeVari */ @Override public String getSignature() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("T"); sb.append(typeVariable.getName()); sb.append(";"); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/UnresolvedType.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/UnresolvedType.java index 1f314f713..16e3b9879 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/UnresolvedType.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/UnresolvedType.java @@ -451,7 +451,7 @@ public class UnresolvedType implements Traceable, TypeVariableDeclaringElement { name = name.substring(lastDot + 1); } if (isParameterizedType()) { - StringBuffer sb = new StringBuffer(name); + StringBuilder sb = new StringBuilder(name); sb.append("<"); for (int i = 0; i < (typeParameters.length - 1); i++) { sb.append(typeParameters[i].getSimpleName()); @@ -636,13 +636,13 @@ public class UnresolvedType implements Traceable, TypeVariableDeclaringElement { String name = signature.substring(1, signature.length() - 1).replace('/', '.'); return name; case 'T': - StringBuffer nameBuff2 = new StringBuffer(); + StringBuilder nameBuff2 = new StringBuilder(); int colon = signature.indexOf(";"); String tvarName = signature.substring(1, colon); nameBuff2.append(tvarName); return nameBuff2.toString(); case 'P': // it's one of our parameterized type sigs - StringBuffer nameBuff = new StringBuffer(); + StringBuilder nameBuff = new StringBuilder(); // signature for parameterized types is e.g. // List<String> -> Ljava/util/List<Ljava/lang/String;>; // Map<String,List<Integer>> -> Ljava/util/Map<java/lang/String;Ljava/util/List<Ljava/lang/Integer;>;>; @@ -656,7 +656,7 @@ public class UnresolvedType implements Traceable, TypeVariableDeclaringElement { case '<': nameBuff.append("<"); paramNestLevel++; - StringBuffer innerBuff = new StringBuffer(); + StringBuilder innerBuff = new StringBuilder(); while (paramNestLevel > 0) { c = signature.charAt(++i); if (c == '<') { @@ -673,7 +673,7 @@ public class UnresolvedType implements Traceable, TypeVariableDeclaringElement { if (signature.charAt(i + 1) != '>') { nameBuff.append(','); } - innerBuff = new StringBuffer(); + innerBuff = new StringBuilder(); } } nameBuff.append(">"); @@ -757,7 +757,7 @@ public class UnresolvedType implements Traceable, TypeVariableDeclaringElement { // not parameterized return new StringBuilder("L").append(name.replace('.', '/')).append(';').toString(); } else { - StringBuffer nameBuff = new StringBuffer(); + StringBuilder nameBuff = new StringBuilder(); int nestLevel = 0; nameBuff.append("P"); for (int i = 0; i < len; i++) { @@ -769,7 +769,7 @@ public class UnresolvedType implements Traceable, TypeVariableDeclaringElement { case '<': nameBuff.append("<"); nestLevel++; - StringBuffer innerBuff = new StringBuffer(); + StringBuilder innerBuff = new StringBuilder(); while (nestLevel > 0) { c = name.charAt(++i); if (c == '<') { @@ -779,7 +779,7 @@ public class UnresolvedType implements Traceable, TypeVariableDeclaringElement { } if (c == ',' && nestLevel == 1) { nameBuff.append(nameToSignature(innerBuff.toString())); - innerBuff = new StringBuffer(); + innerBuff = new StringBuilder(); } else { if (nestLevel > 0) { innerBuff.append(c); @@ -957,7 +957,7 @@ public class UnresolvedType implements Traceable, TypeVariableDeclaringElement { } public static UnresolvedType makeArray(UnresolvedType base, int dims) { - StringBuffer sig = new StringBuffer(); + StringBuilder sig = new StringBuilder(); for (int i = 0; i < dims; i++) { sig.append("["); } diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/World.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/World.java index b5e6fe362..6eab96f15 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/World.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/World.java @@ -1910,7 +1910,7 @@ public abstract class World implements Dump.INode { MessageUtil.info("Pointcut matching cost (total=" + (totalTime / 1000000) + "ms for " + joinpointCount + " joinpoint match calls):")); for (String p : joinpointsPerPointcut.keySet()) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("Time:" + (timePerPointcut.get(p) / 1000000) + "ms (jps:#" + joinpointsPerPointcut.get(p) + ") matching against " + p); world.getMessageHandler().handleMessage(MessageUtil.info(sb.toString())); @@ -1925,7 +1925,7 @@ public abstract class World implements Dump.INode { MessageUtil.info("Pointcut fast matching cost (total=" + (totalTime / 1000000) + "ms for " + typeCount + " fast match calls):")); for (String p : fastMatchTimesPerPointcut.keySet()) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("Time:" + (fastMatchTimesPerPointcut.get(p) / 1000000) + "ms (types:#" + fastMatchTypesPerPointcut.get(p) + ") fast matching against " + p); world.getMessageHandler().handleMessage(MessageUtil.info(sb.toString())); @@ -1962,7 +1962,7 @@ public abstract class World implements Dump.INode { MessageUtil.info("Pointcut matching cost (total=" + (totalTime / 1000000) + "ms for " + joinpointCount + " joinpoint match calls):")); for (String p : joinpointsPerPointcut.keySet()) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("Time:" + (timePerPointcut.get(p) / 1000000) + "ms (jps:#" + joinpointsPerPointcut.get(p) + ") matching against " + p); world.getMessageHandler().handleMessage(MessageUtil.info(sb.toString())); @@ -2000,7 +2000,7 @@ public abstract class World implements Dump.INode { MessageUtil.info("Pointcut fast matching cost (total=" + (totalTime / 1000000) + "ms for " + typeCount + " fast match calls):")); for (String p : fastMatchTimesPerPointcut.keySet()) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("Time:" + (fastMatchTimesPerPointcut.get(p) / 1000000) + "ms (types:#" + fastMatchTypesPerPointcut.get(p) + ") fast matching against " + p); world.getMessageHandler().handleMessage(MessageUtil.info(sb.toString())); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AndTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AndTypePattern.java index 1fc6d1be1..83004d468 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AndTypePattern.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AndTypePattern.java @@ -130,7 +130,7 @@ public class AndTypePattern extends TypePattern { @Override public String toString() { - StringBuffer buff = new StringBuffer(); + StringBuilder buff = new StringBuilder(); if (annotationPattern != AnnotationTypePattern.ANY) { buff.append('('); buff.append(annotationPattern.toString()); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnnotationPatternList.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnnotationPatternList.java index 1e80e1134..d9b61c603 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnnotationPatternList.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnnotationPatternList.java @@ -138,7 +138,7 @@ public class AnnotationPatternList extends PatternNode { } public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("("); for (int i = 0, len = typePatterns.length; i < len; i++) { AnnotationTypePattern type = typePatterns[i]; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnnotationPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnnotationPointcut.java index 292df0a8a..e751821dc 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnnotationPointcut.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnnotationPointcut.java @@ -316,7 +316,7 @@ public class AnnotationPointcut extends NameBindingPointcut { } public void buildDeclarationText() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("@annotation("); String annPatt = annotationTypePattern.toString(); buf.append(annPatt.startsWith("@") ? annPatt.substring(1) : annPatt); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ArgsAnnotationPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ArgsAnnotationPointcut.java index 02eff8395..8494a97b1 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ArgsAnnotationPointcut.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ArgsAnnotationPointcut.java @@ -235,7 +235,7 @@ public class ArgsAnnotationPointcut extends NameBindingPointcut { * @see java.lang.Object#toString() */ private void buildDeclarationText() { - StringBuffer buf = new StringBuffer("@args"); + StringBuilder buf = new StringBuilder("@args"); buf.append(arguments.toString()); this.declarationText = buf.toString(); } diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/BasicTokenSource.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/BasicTokenSource.java index 7656bc2d8..70b9c398c 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/BasicTokenSource.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/BasicTokenSource.java @@ -63,7 +63,7 @@ public class BasicTokenSource implements ITokenSource { } public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("["); for (int i = 0; i < tokens.length; i++) { IToken t = tokens[i]; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/Bindings.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/Bindings.java index de86f5639..72d438210 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/Bindings.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/Bindings.java @@ -69,7 +69,7 @@ public class Bindings { } public String toString() { - StringBuffer buf = new StringBuffer("Bindings("); + StringBuilder buf = new StringBuilder("Bindings("); for (int i = 0, len = bindings.length; i < len; i++) { if (i > 0) buf.append(", "); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/CflowPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/CflowPointcut.java index bd7bdb952..0c746239f 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/CflowPointcut.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/CflowPointcut.java @@ -316,7 +316,7 @@ public class CflowPointcut extends Pointcut { } private String getKey(Pointcut p, ResolvedType a, String stackOrCounter) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(a.getName()); sb.append("::"); sb.append(p.toString()); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareErrorOrWarning.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareErrorOrWarning.java index dae13ec1c..de04e61f4 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareErrorOrWarning.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareErrorOrWarning.java @@ -36,7 +36,7 @@ public class DeclareErrorOrWarning extends Declare { * returns "declare warning: <message>" or "declare error: <message>" */ public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("declare "); if (isError) { buf.append("error: "); @@ -118,7 +118,7 @@ public class DeclareErrorOrWarning extends Declare { * returns "declare warning" or "declare error" */ public String getName() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("declare "); if (isError) { buf.append("error"); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareParents.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareParents.java index f3f9f2b62..32e4654e3 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareParents.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareParents.java @@ -76,7 +76,7 @@ public class DeclareParents extends Declare { @Override public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("declare parents: "); buf.append(child); buf.append(isExtends ? " extends " : " implements "); // extends and implements are treated equivalently diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareParentsMixin.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareParentsMixin.java index fc63a6e5e..206bd4b1c 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareParentsMixin.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareParentsMixin.java @@ -66,7 +66,7 @@ public class DeclareParentsMixin extends DeclareParents { } public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("declare parents mixin: "); buf.append(child); buf.append(" implements "); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclarePrecedence.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclarePrecedence.java index 504a7e6c0..880fd8e44 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclarePrecedence.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclarePrecedence.java @@ -47,7 +47,7 @@ public class DeclarePrecedence extends Declare { } public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("declare precedence: "); buf.append(patterns); buf.append(";"); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareSoft.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareSoft.java index 4b8be00de..3384f3346 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareSoft.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareSoft.java @@ -49,7 +49,7 @@ public class DeclareSoft extends Declare { @Override public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("declare soft: "); buf.append(exception); buf.append(": "); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareTypeErrorOrWarning.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareTypeErrorOrWarning.java index a6ae608c6..8f7954a1b 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareTypeErrorOrWarning.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareTypeErrorOrWarning.java @@ -41,7 +41,7 @@ public class DeclareTypeErrorOrWarning extends Declare { * returns "declare warning: <typepattern>: <message>" or "declare error: <typepattern>: <message>" */ public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("declare "); if (isError) { buf.append("error: "); @@ -123,7 +123,7 @@ public class DeclareTypeErrorOrWarning extends Declare { * returns "declare type warning" or "declare type error" */ public String getName() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("declare type "); if (isError) { buf.append("error"); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ExactAnnotationFieldTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ExactAnnotationFieldTypePattern.java index b13cb34e7..73d6b5c58 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ExactAnnotationFieldTypePattern.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ExactAnnotationFieldTypePattern.java @@ -243,7 +243,7 @@ public class ExactAnnotationFieldTypePattern extends ExactAnnotationTypePattern if (!resolved && formalName != null) { return formalName; } - StringBuffer ret = new StringBuffer(); + StringBuilder ret = new StringBuilder(); ret.append("@").append(annotationType.toString()); ret.append("(").append(formalName).append(")"); return ret.toString(); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ExactTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ExactTypePattern.java index b75ad764f..bedbc4732 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ExactTypePattern.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ExactTypePattern.java @@ -284,7 +284,7 @@ public class ExactTypePattern extends TypePattern { @Override public String toString() { - StringBuffer buff = new StringBuffer(); + StringBuilder buff = new StringBuilder(); if (annotationPattern != AnnotationTypePattern.ANY) { buff.append('('); buff.append(annotationPattern.toString()); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/HandlerPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/HandlerPointcut.java index 0fa172ec7..c2ab41811 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/HandlerPointcut.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/HandlerPointcut.java @@ -84,7 +84,7 @@ public class HandlerPointcut extends Pointcut { } public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("handler("); buf.append(exceptionType.toString()); buf.append(")"); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/HasMemberTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/HasMemberTypePattern.java index 38512a73f..af5ab567e 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/HasMemberTypePattern.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/HasMemberTypePattern.java @@ -162,7 +162,7 @@ public class HasMemberTypePattern extends TypePattern { @Override public String toString() { - StringBuffer buff = new StringBuffer(); + StringBuilder buff = new StringBuilder(); if (signaturePattern.getKind() == Member.FIELD) { buff.append("hasfield("); } else { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/IfPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/IfPointcut.java index e1e747e35..40014cda4 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/IfPointcut.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/IfPointcut.java @@ -273,7 +273,7 @@ public class IfPointcut extends Pointcut { } else { if (state.size() == 0 || currentStateIndex > state.size()) { String[] paramNames = testMethod.getParameterNames(); - StringBuffer errorParameter = new StringBuffer(); + StringBuilder errorParameter = new StringBuilder(); if (paramNames != null) { errorParameter.append(testMethod.getParameterTypes()[i].getName()).append(" "); errorParameter.append(paramNames[i]); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/KindedPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/KindedPointcut.java index 317899970..278ff8f5b 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/KindedPointcut.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/KindedPointcut.java @@ -309,7 +309,7 @@ public class KindedPointcut extends Pointcut { @Override public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append(kind.getSimpleName()); buf.append("("); buf.append(signature.toString()); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NotTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NotTypePattern.java index 8bb04673a..dca24c8f3 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NotTypePattern.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NotTypePattern.java @@ -128,7 +128,7 @@ public class NotTypePattern extends TypePattern { @Override public String toString() { - StringBuffer buff = new StringBuffer(); + StringBuilder buff = new StringBuilder(); if (annotationPattern != AnnotationTypePattern.ANY) { buff.append('('); buff.append(annotationPattern.toString()); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/OrTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/OrTypePattern.java index 27c565c3f..4d0f9157f 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/OrTypePattern.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/OrTypePattern.java @@ -133,7 +133,7 @@ public class OrTypePattern extends TypePattern { } public String toString() { - StringBuffer buff = new StringBuffer(); + StringBuilder buff = new StringBuilder(); if (annotationPattern != AnnotationTypePattern.ANY) { buff.append('('); buff.append(annotationPattern.toString()); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PatternParser.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PatternParser.java index e355f4a91..b573ea5e9 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PatternParser.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PatternParser.java @@ -660,7 +660,7 @@ public class PatternParser { private Pointcut parseDesignatorPointcut(PointcutDesignatorHandler pcdHandler) { eat("("); int parenCount = 1; - StringBuffer pointcutBody = new StringBuffer(); + StringBuilder pointcutBody = new StringBuilder(); while (parenCount > 0) { if (maybeEat("(")) { parenCount++; @@ -1203,7 +1203,7 @@ public class PatternParser { private ExactAnnotationTypePattern parseSimpleAnnotationName() { // the @ has already been eaten... ExactAnnotationTypePattern p; - StringBuffer annotationName = new StringBuffer(); + StringBuilder annotationName = new StringBuilder(); annotationName.append(parseIdentifier()); while (maybeEat(".")) { annotationName.append('.'); @@ -1243,7 +1243,7 @@ public class PatternParser { public List<NamePattern> parseDottedNamePattern() { List<NamePattern> names = new ArrayList<>(); - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); IToken previous = null; boolean justProcessedEllipsis = false; // Remember if we just dealt with an ellipsis (PR61536) boolean justProcessedDot = false; @@ -1329,7 +1329,7 @@ public class PatternParser { // supported form 'a.b.c.d' or just 'a' public String parseAnnotationNameValuePattern() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); IToken tok; // int startPos = tokenSource.peek().getStart(); @@ -1379,7 +1379,7 @@ public class PatternParser { } public NamePattern parseNamePattern() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); IToken previous = null; IToken tok; int startPos = tokenSource.peek().getStart(); @@ -1765,7 +1765,7 @@ public class PatternParser { } public String parsePossibleStringSequence(boolean shouldEnd) { - StringBuffer result = new StringBuffer(); + StringBuilder result = new StringBuilder(); IToken token = tokenSource.next(); if (token.getLiteralKind() == null) { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ReferencePointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ReferencePointcut.java index 404057756..030131414 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ReferencePointcut.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ReferencePointcut.java @@ -82,7 +82,7 @@ public class ReferencePointcut extends Pointcut { } public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); if (onType != null) { buf.append(onType); buf.append("."); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/SignaturePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/SignaturePattern.java index 323308d79..250d125b8 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/SignaturePattern.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/SignaturePattern.java @@ -149,7 +149,7 @@ public class SignaturePattern extends PatternNode implements ISignaturePattern { private void reportUnmatchedTargetKindMessage(AnnotationTargetKind[] annotationTargetKinds, PatternNode node, IScope scope, boolean checkMatchesMemberKindName) { - StringBuffer targetNames = new StringBuffer("{"); + StringBuilder targetNames = new StringBuilder("{"); for (int i = 0; i < annotationTargetKinds.length; i++) { AnnotationTargetKind targetKind = annotationTargetKinds[i]; if (checkMatchesMemberKindName && kind.getName().equals(targetKind.getName())) { @@ -819,7 +819,7 @@ public class SignaturePattern extends PatternNode implements ISignaturePattern { @Override public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); if (annotationPattern != AnnotationTypePattern.ANY) { buf.append(annotationPattern.toString()); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ThisOrTargetAnnotationPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ThisOrTargetAnnotationPointcut.java index 9e3fe33f8..83774bcb7 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ThisOrTargetAnnotationPointcut.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ThisOrTargetAnnotationPointcut.java @@ -317,7 +317,7 @@ public class ThisOrTargetAnnotationPointcut extends NameBindingPointcut { * @see java.lang.Object#toString() */ private void buildDeclarationText() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append(isThis ? "@this(" : "@target("); String annPatt = annotationTypePattern.toString(); buf.append(annPatt.startsWith("@") ? annPatt.substring(1) : annPatt); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypePatternList.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypePatternList.java index 1650514b0..4d9a28e2d 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypePatternList.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypePatternList.java @@ -72,7 +72,7 @@ public class TypePatternList extends PatternNode { @Override public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("("); for (int i = 0, len = typePatterns.length; i < len; i++) { TypePattern type = typePatterns[i]; diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypePatternQuestions.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypePatternQuestions.java index be6d01a3b..da227d6ec 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypePatternQuestions.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypePatternQuestions.java @@ -51,7 +51,7 @@ public class TypePatternQuestions { } public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("TypePatternQuestions{"); for (Map.Entry<Question,FuzzyBoolean> entry: questionsAndAnswers.entrySet()) { Question question = (Question)entry.getKey(); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypeVariablePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypeVariablePattern.java index 18b13172d..f887a4077 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypeVariablePattern.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypeVariablePattern.java @@ -171,7 +171,7 @@ public class TypeVariablePattern extends PatternNode { } public String toString() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(name); sb.append(getExtendsClause()); if (interfaceBounds != null) { diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WildTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WildTypePattern.java index 43a59df10..671989cd0 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WildTypePattern.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WildTypePattern.java @@ -569,7 +569,7 @@ public class WildTypePattern extends TypePattern { throw new RuntimeException("bad name: " + namePatterns); } // System.out.println("get clean: " + this); - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); for (int i = 0, len = namePatterns.length; i < len; i++) { NamePattern p = namePatterns[i]; String simpleName = p.maybeGetSimpleName(); @@ -1179,7 +1179,7 @@ public class WildTypePattern extends TypePattern { @Override public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); if (annotationPattern != AnnotationTypePattern.ANY) { buf.append('('); buf.append(annotationPattern.toString()); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WithinAnnotationPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WithinAnnotationPointcut.java index b1a93a21f..ba568a3fd 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WithinAnnotationPointcut.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WithinAnnotationPointcut.java @@ -221,7 +221,7 @@ public class WithinAnnotationPointcut extends NameBindingPointcut { * @see java.lang.Object#toString() */ private void buildDeclarationText() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("@within("); String annPatt = annotationTypePattern.toString(); buf.append(annPatt.startsWith("@") ? annPatt.substring(1) : annPatt); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WithinCodeAnnotationPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WithinCodeAnnotationPointcut.java index af65c8165..7c0458935 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WithinCodeAnnotationPointcut.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WithinCodeAnnotationPointcut.java @@ -212,7 +212,7 @@ public class WithinCodeAnnotationPointcut extends NameBindingPointcut { } private void buildDeclarationText() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("@withincode("); String annPatt = annotationTypePattern.toString(); buf.append(annPatt.startsWith("@") ? annPatt.substring(1) : annPatt); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/AbstractTrace.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/AbstractTrace.java index a141b5b4c..8b77c1a00 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/AbstractTrace.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/AbstractTrace.java @@ -95,7 +95,7 @@ public abstract class AbstractTrace implements Trace { * Formatting */ protected String formatMessage(String kind, String className, String methodName, Object thiz, Object[] args) { - StringBuffer message = new StringBuffer(); + StringBuilder message = new StringBuilder(); Date now = new Date(); message.append(formatDate(now)).append(" "); message.append(Thread.currentThread().getName()).append(" "); @@ -116,7 +116,7 @@ public abstract class AbstractTrace implements Trace { } protected String formatMessage(String kind, String text, Throwable th) { - StringBuffer message = new StringBuffer(); + StringBuilder message = new StringBuilder(); Date now = new Date(); message.append(formatDate(now)).append(" "); message.append(Thread.currentThread().getName()).append(" "); @@ -193,7 +193,7 @@ public abstract class AbstractTrace implements Trace { * @return the formated list */ protected String formatArgs(Object[] args) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); for (int i = 0; i < args.length; i++) { sb.append(formatObj(args[i])); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/PointcutParser.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/PointcutParser.java index 80612362c..0e5b807b8 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/PointcutParser.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/PointcutParser.java @@ -559,7 +559,7 @@ public class PointcutParser { } private String buildUserMessageFromParserException(String pc, ParserException ex) { - StringBuffer msg = new StringBuffer(); + StringBuilder msg = new StringBuilder(); msg.append("Pointcut is not well-formed: expecting '"); msg.append(ex.getMessage()); msg.append("'"); diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/StandardPointcutParser.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/StandardPointcutParser.java index 1fdb29055..6bab3f507 100644 --- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/StandardPointcutParser.java +++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/StandardPointcutParser.java @@ -485,7 +485,7 @@ public class StandardPointcutParser { } private String buildUserMessageFromParserException(String pc, ParserException ex) { - StringBuffer msg = new StringBuffer(); + StringBuilder msg = new StringBuilder(); msg.append("Pointcut is not well-formed: expecting '"); msg.append(ex.getMessage()); msg.append("'"); diff --git a/org.aspectj.matcher/src/test/java/org/aspectj/matcher/tools/ReflectionWorldPointcutExpressionTest.java b/org.aspectj.matcher/src/test/java/org/aspectj/matcher/tools/ReflectionWorldPointcutExpressionTest.java index b057b4ab8..c1b71b528 100644 --- a/org.aspectj.matcher/src/test/java/org/aspectj/matcher/tools/ReflectionWorldPointcutExpressionTest.java +++ b/org.aspectj.matcher/src/test/java/org/aspectj/matcher/tools/ReflectionWorldPointcutExpressionTest.java @@ -5,7 +5,7 @@ import org.aspectj.weaver.reflect.ReflectionWorld; /** * Run all the pointcut parsing/matching tests against a ReflectionWorld. - * + * * @author Andy Clement */ public class ReflectionWorldPointcutExpressionTest extends CommonPointcutExpressionTests { diff --git a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ParserTestCase.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ParserTestCase.java index 31897365f..8c7258d59 100644 --- a/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ParserTestCase.java +++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ParserTestCase.java @@ -702,7 +702,7 @@ public class ParserTestCase extends PatternsTestCase { Set<String> keys = m.keySet(); List<String> orderedKeys = new ArrayList<>(keys); Collections.sort(orderedKeys); - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); for (Iterator<String> iterator = orderedKeys.iterator(); iterator.hasNext();) { String object = (String) iterator.next(); sb.append(object).append("=").append(m.get(object)); @@ -21,7 +21,7 @@ <maven.javadoc.skip>true</maven.javadoc.skip> <!-- Dependency versions --> - <jdt.core.version>1.9.8.RC2</jdt.core.version> + <jdt.core.version>1.9.8.RC3</jdt.core.version> <asm.version>9.2</asm.version> <lib.ant.version>1.6.3</lib.ant.version> <lib.ant.xerces.version>2.6.2</lib.ant.xerces.version> @@ -68,22 +68,8 @@ </releases> </repository> <repository> - <id>aspectj-dev</id> - <name>AspectJ artifacts on aspectj.dev</name> - <url>https://aspectj.dev/maven</url> - <layout>default</layout> - <snapshots> - <enabled>true</enabled> - <updatePolicy>always</updatePolicy> - </snapshots> - <releases> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </releases> - </repository> - <repository> - <id>ossrh-snapshots-classic</id> - <name>Sonatype OSSRH snapshots classic</name> + <id>ossrh-snapshots</id> + <name>Sonatype OSSRH snapshots</name> <url>https://oss.sonatype.org/content/repositories/snapshots</url> <layout>default</layout> <snapshots> @@ -96,23 +82,9 @@ </releases> </repository> <repository> - <id>ossrh-snapshots-new</id> - <name>Sonatype OSSRH snapshots new</name> - <url> https://s01.oss.sonatype.org/content/repositories/snapshots</url> - <layout>default</layout> - <snapshots> - <enabled>true</enabled> - <updatePolicy>always</updatePolicy> - </snapshots> - <releases> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </releases> - </repository> - <repository> - <id>ossrh-snapshots</id> - <name>Sonatype OSSRH snapshots</name> - <url>https://oss.sonatype.org/content/repositories/snapshots</url> + <id>aspectj-dev</id> + <name>AspectJ artifacts on aspectj.dev</name> + <url>https://aspectj.dev/maven</url> <layout>default</layout> <snapshots> <enabled>true</enabled> diff --git a/runtime/src/main/java/org/aspectj/internal/lang/reflect/AdviceImpl.java b/runtime/src/main/java/org/aspectj/internal/lang/reflect/AdviceImpl.java index 94cb80912..cba9413c0 100644 --- a/runtime/src/main/java/org/aspectj/internal/lang/reflect/AdviceImpl.java +++ b/runtime/src/main/java/org/aspectj/internal/lang/reflect/AdviceImpl.java @@ -118,7 +118,7 @@ public class AdviceImpl implements Advice { } public String toString() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); if (getName().length() > 0) { sb.append("@AdviceName(\""); sb.append(getName()); diff --git a/runtime/src/main/java/org/aspectj/internal/lang/reflect/DeclareAnnotationImpl.java b/runtime/src/main/java/org/aspectj/internal/lang/reflect/DeclareAnnotationImpl.java index 977ff097a..bac781056 100644 --- a/runtime/src/main/java/org/aspectj/internal/lang/reflect/DeclareAnnotationImpl.java +++ b/runtime/src/main/java/org/aspectj/internal/lang/reflect/DeclareAnnotationImpl.java @@ -72,7 +72,7 @@ public class DeclareAnnotationImpl implements DeclareAnnotation { } public String toString() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("declare @"); switch(getKind()) { case Type: diff --git a/runtime/src/main/java/org/aspectj/internal/lang/reflect/DeclareErrorOrWarningImpl.java b/runtime/src/main/java/org/aspectj/internal/lang/reflect/DeclareErrorOrWarningImpl.java index 7a38780b8..aebd58211 100644 --- a/runtime/src/main/java/org/aspectj/internal/lang/reflect/DeclareErrorOrWarningImpl.java +++ b/runtime/src/main/java/org/aspectj/internal/lang/reflect/DeclareErrorOrWarningImpl.java @@ -48,7 +48,7 @@ public class DeclareErrorOrWarningImpl implements DeclareErrorOrWarning { } public String toString() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("declare "); sb.append(isError() ? "error : " : "warning : "); sb.append(getPointcutExpression().asString()); diff --git a/runtime/src/main/java/org/aspectj/internal/lang/reflect/DeclareParentsImpl.java b/runtime/src/main/java/org/aspectj/internal/lang/reflect/DeclareParentsImpl.java index 432d04bb3..7b5aa8c86 100644 --- a/runtime/src/main/java/org/aspectj/internal/lang/reflect/DeclareParentsImpl.java +++ b/runtime/src/main/java/org/aspectj/internal/lang/reflect/DeclareParentsImpl.java @@ -72,7 +72,7 @@ public class DeclareParentsImpl implements DeclareParents { } public String toString() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("declare parents : "); sb.append(getTargetTypesPattern().asString()); sb.append(isExtends() ? " extends " : " implements "); diff --git a/runtime/src/main/java/org/aspectj/internal/lang/reflect/DeclareSoftImpl.java b/runtime/src/main/java/org/aspectj/internal/lang/reflect/DeclareSoftImpl.java index 3dfba60aa..8011791e2 100644 --- a/runtime/src/main/java/org/aspectj/internal/lang/reflect/DeclareSoftImpl.java +++ b/runtime/src/main/java/org/aspectj/internal/lang/reflect/DeclareSoftImpl.java @@ -53,7 +53,7 @@ public class DeclareSoftImpl implements DeclareSoft { } public String toString() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("declare soft : "); if (this.missingTypeName != null) { sb.append(this.exceptionType.getName()); diff --git a/runtime/src/main/java/org/aspectj/internal/lang/reflect/InterTypeConstructorDeclarationImpl.java b/runtime/src/main/java/org/aspectj/internal/lang/reflect/InterTypeConstructorDeclarationImpl.java index 6e17debf8..1042da49c 100644 --- a/runtime/src/main/java/org/aspectj/internal/lang/reflect/InterTypeConstructorDeclarationImpl.java +++ b/runtime/src/main/java/org/aspectj/internal/lang/reflect/InterTypeConstructorDeclarationImpl.java @@ -65,7 +65,7 @@ public class InterTypeConstructorDeclarationImpl extends } public String toString() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(java.lang.reflect.Modifier.toString(getModifiers())); sb.append(" "); sb.append(this.targetTypeName); diff --git a/runtime/src/main/java/org/aspectj/internal/lang/reflect/InterTypeFieldDeclarationImpl.java b/runtime/src/main/java/org/aspectj/internal/lang/reflect/InterTypeFieldDeclarationImpl.java index 67bd2e5c9..243b7249d 100644 --- a/runtime/src/main/java/org/aspectj/internal/lang/reflect/InterTypeFieldDeclarationImpl.java +++ b/runtime/src/main/java/org/aspectj/internal/lang/reflect/InterTypeFieldDeclarationImpl.java @@ -62,7 +62,7 @@ public class InterTypeFieldDeclarationImpl extends InterTypeDeclarationImpl } public String toString() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(java.lang.reflect.Modifier.toString(getModifiers())); sb.append(" "); sb.append(getType().toString()); diff --git a/runtime/src/main/java/org/aspectj/internal/lang/reflect/InterTypeMethodDeclarationImpl.java b/runtime/src/main/java/org/aspectj/internal/lang/reflect/InterTypeMethodDeclarationImpl.java index 89ebf387f..ab807e5b3 100644 --- a/runtime/src/main/java/org/aspectj/internal/lang/reflect/InterTypeMethodDeclarationImpl.java +++ b/runtime/src/main/java/org/aspectj/internal/lang/reflect/InterTypeMethodDeclarationImpl.java @@ -101,7 +101,7 @@ public class InterTypeMethodDeclarationImpl extends InterTypeDeclarationImpl } public String toString() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(java.lang.reflect.Modifier.toString(getModifiers())); sb.append(" "); sb.append(getReturnType().toString()); diff --git a/runtime/src/main/java/org/aspectj/internal/lang/reflect/PointcutBasedPerClauseImpl.java b/runtime/src/main/java/org/aspectj/internal/lang/reflect/PointcutBasedPerClauseImpl.java index 4cbe0a265..c1380be53 100644 --- a/runtime/src/main/java/org/aspectj/internal/lang/reflect/PointcutBasedPerClauseImpl.java +++ b/runtime/src/main/java/org/aspectj/internal/lang/reflect/PointcutBasedPerClauseImpl.java @@ -35,7 +35,7 @@ public class PointcutBasedPerClauseImpl extends PerClauseImpl implements } public String toString() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); switch(getKind()) { case PERCFLOW: sb.append("percflow("); break; case PERCFLOWBELOW: sb.append("percflowbelow("); break; diff --git a/runtime/src/main/java/org/aspectj/internal/lang/reflect/PointcutImpl.java b/runtime/src/main/java/org/aspectj/internal/lang/reflect/PointcutImpl.java index 6a84f2104..a43e29b9b 100644 --- a/runtime/src/main/java/org/aspectj/internal/lang/reflect/PointcutImpl.java +++ b/runtime/src/main/java/org/aspectj/internal/lang/reflect/PointcutImpl.java @@ -81,7 +81,7 @@ public class PointcutImpl implements Pointcut { } public String toString() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(getName()); sb.append("("); AjType<?>[] ptypes = getParameterTypes(); diff --git a/runtime/src/main/java/org/aspectj/runtime/reflect/FieldSignatureImpl.java b/runtime/src/main/java/org/aspectj/runtime/reflect/FieldSignatureImpl.java index 396164691..ea3243948 100644 --- a/runtime/src/main/java/org/aspectj/runtime/reflect/FieldSignatureImpl.java +++ b/runtime/src/main/java/org/aspectj/runtime/reflect/FieldSignatureImpl.java @@ -39,7 +39,7 @@ public class FieldSignatureImpl extends MemberSignatureImpl implements FieldSign } protected String createToString(StringMaker sm) { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append(sm.makeModifiersString(getModifiers())); if (sm.includeArgs) buf.append(sm.makeTypeName(getFieldType())); if (sm.includeArgs) buf.append(" "); diff --git a/runtime/src/main/java/org/aspectj/runtime/reflect/InitializerSignatureImpl.java b/runtime/src/main/java/org/aspectj/runtime/reflect/InitializerSignatureImpl.java index d9315ac55..500d3a67c 100644 --- a/runtime/src/main/java/org/aspectj/runtime/reflect/InitializerSignatureImpl.java +++ b/runtime/src/main/java/org/aspectj/runtime/reflect/InitializerSignatureImpl.java @@ -36,7 +36,7 @@ class InitializerSignatureImpl extends CodeSignatureImpl implements InitializerS } protected String createToString(StringMaker sm) { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append(sm.makeModifiersString(getModifiers())); buf.append(sm.makePrimaryTypeName(getDeclaringType(),getDeclaringTypeName())); buf.append("."); diff --git a/runtime/src/main/java/org/aspectj/runtime/reflect/JoinPointImpl.java b/runtime/src/main/java/org/aspectj/runtime/reflect/JoinPointImpl.java index e6f5c20c3..bb09e6869 100644 --- a/runtime/src/main/java/org/aspectj/runtime/reflect/JoinPointImpl.java +++ b/runtime/src/main/java/org/aspectj/runtime/reflect/JoinPointImpl.java @@ -52,7 +52,7 @@ class JoinPointImpl implements ProceedingJoinPoint { } String toString(StringMaker sm) { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append(sm.makeKindName(getKind())); buf.append("("); buf.append(((SignatureImpl) getSignature()).toString(sm)); diff --git a/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/Ajc10.java b/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/Ajc10.java index ae50afe8e..b4eb1f020 100644 --- a/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/Ajc10.java +++ b/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/Ajc10.java @@ -566,7 +566,7 @@ public class Ajc10 extends MatchingTask { /** utility to render String[] for logging */ public static String render(String[] args) { if (null == args) return ""; - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); for (String arg : args) { sb.append(arg); sb.append(" "); diff --git a/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/Ajc2.java b/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/Ajc2.java index 4c3bb93ea..7755718dd 100644 --- a/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/Ajc2.java +++ b/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/Ajc2.java @@ -465,7 +465,7 @@ public class Ajc2 extends Javac { File parent = argfile.getParentFile(); // Sanity check - if (parent == null || !parent.exists() || !parent.isDirectory()) { + if (parent == null || !parent.isDirectory()) { return; } diff --git a/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/AjcTask.java b/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/AjcTask.java index 218fc56d5..c0c50ed99 100644 --- a/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/AjcTask.java +++ b/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/AjcTask.java @@ -250,9 +250,9 @@ public class AjcTask extends MatchingTask { public static final String COMMAND_EDITOR_NAME = AjcTask.class.getName() + ".COMMAND_EDITOR"; - static final String[] TARGET_INPUTS = new String[] { "1.1", "1.2", "1.3", "1.4", "1.5", "1.6", "1.7", "1.8", "1.9", "9", "10", "11", "12", "13", "14", "15" }; - static final String[] SOURCE_INPUTS = new String[] { "1.3", "1.4", "1.5", "1.6", "1.7", "1.8", "1.9", "9", "10", "11", "12", "13", "14", "15" }; - static final String[] COMPLIANCE_INPUTS = new String[] { "-1.3", "-1.4", "-1.5", "-1.6", "-1.7", "-1.8", "-1.9", "-9", "-10", "-11", "-12", "-13", "-14", "15" }; + static final String[] TARGET_INPUTS = new String[] { "1.1", "1.2", "1.3", "1.4", "1.5", "1.6", "1.7", "1.8", "1.9", "9", "10", "11", "12", "13", "14", "15", "16", "17" }; + static final String[] SOURCE_INPUTS = new String[] { "1.3", "1.4", "1.5", "1.6", "1.7", "1.8", "1.9", "9", "10", "11", "12", "13", "14", "15", "16", "17" }; + static final String[] COMPLIANCE_INPUTS = new String[] { "-1.3", "-1.4", "-1.5", "-1.6", "-1.7", "-1.8", "-1.9", "-9", "-10", "-11", "-12", "-13", "-14", "-15", "-16", "-17" }; private static final ICommandEditor COMMAND_EDITOR; @@ -439,7 +439,7 @@ public class AjcTask extends MatchingTask { } protected String validCommaList(String list, List valid, String label, int max) { - StringBuffer result = new StringBuffer(); + StringBuilder result = new StringBuilder(); StringTokenizer st = new StringTokenizer(list, ","); int num = 0; while (st.hasMoreTokens()) { @@ -1253,7 +1253,7 @@ public class AjcTask extends MatchingTask { * @throws BuildException if options conflict */ protected void verifyOptions() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); if (fork && isInIncrementalMode() && !isInIncrementalFileMode()) { sb.append("can fork incremental only using tag file.\n"); } @@ -1333,7 +1333,7 @@ public class AjcTask extends MatchingTask { { IMessage[] fails = holder.getMessages(IMessage.FAIL, true); if (!LangUtil.isEmpty(fails)) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); String prefix = "fail due to "; int numThrown = 0; for (IMessage fail : fails) { diff --git a/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/compilers/Ajc.java b/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/compilers/Ajc.java index db9687ed1..e64080968 100644 --- a/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/compilers/Ajc.java +++ b/taskdefs/src/main/java/org/aspectj/tools/ant/taskdefs/compilers/Ajc.java @@ -190,7 +190,7 @@ public class Ajc extends DefaultCompilerAdapter { // Same behavior as DefaultCompilerAdapter.logAndAddFilesToCompile attributes.log("Compilation args: " + cmd.toString(), Project.MSG_VERBOSE); - StringBuffer niceSourceList = new StringBuffer("File"); + StringBuilder niceSourceList = new StringBuilder("File"); if (compileList.length != 1) { niceSourceList.append("s"); } diff --git a/testing-drivers/src/test/java/org/aspectj/testing/drivers/Harness.java b/testing-drivers/src/test/java/org/aspectj/testing/drivers/Harness.java index 3f3ab1c25..8112400d0 100644 --- a/testing-drivers/src/test/java/org/aspectj/testing/drivers/Harness.java +++ b/testing-drivers/src/test/java/org/aspectj/testing/drivers/Harness.java @@ -889,7 +889,7 @@ class TestMaker { if (fileName.endsWith(".java")) { fileName = fileName.substring(0, fileName.length() - 5); } - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); String filePath = file.getParentFile().getAbsolutePath(); String dirPath = baseDir.getAbsolutePath(); String pack = null; @@ -970,7 +970,7 @@ class TestMaker { } else if (null == dir) { dir = new File("."); } - StringBuffer testName = new StringBuffer(); + StringBuilder testName = new StringBuilder(); int pr = spec.getBugId(); if (0 < pr) { testName.append("PR#" + pr + " "); diff --git a/testing-util/src/main/java/org/aspectj/testing/util/TestUtil.java b/testing-util/src/main/java/org/aspectj/testing/util/TestUtil.java index a6f8303ce..54e1f017d 100644 --- a/testing-util/src/main/java/org/aspectj/testing/util/TestUtil.java +++ b/testing-util/src/main/java/org/aspectj/testing/util/TestUtil.java @@ -197,7 +197,7 @@ public final class TestUtil { if ((null == entries) || (0 == entries.length)) { return ""; } - StringBuffer path = new StringBuffer(); + StringBuilder path = new StringBuilder(); boolean started = false; for (Object entry : entries) { if (null != entry) { diff --git a/testing/src/test/java/org/aspectj/internal/tools/ant/taskdefs/Ajctest.java b/testing/src/test/java/org/aspectj/internal/tools/ant/taskdefs/Ajctest.java index d9a91703b..9132a6c81 100644 --- a/testing/src/test/java/org/aspectj/internal/tools/ant/taskdefs/Ajctest.java +++ b/testing/src/test/java/org/aspectj/internal/tools/ant/taskdefs/Ajctest.java @@ -1125,7 +1125,7 @@ public class Ajctest extends Task implements PropertyChangeListener { if (null == current) { oneLine = "\nRESULT=\"ERROR\" null ACJTEST"; } else { - StringBuffer sb = new StringBuffer("\n"); + StringBuilder sb = new StringBuilder("\n"); int errs = Ajctest.allErrors.size(); int allFails = errs + current.ajdocStats.fails diff --git a/testing/src/test/java/org/aspectj/testing/CompileSpec.java b/testing/src/test/java/org/aspectj/testing/CompileSpec.java index 33e3d49aa..889183303 100644 --- a/testing/src/test/java/org/aspectj/testing/CompileSpec.java +++ b/testing/src/test/java/org/aspectj/testing/CompileSpec.java @@ -216,7 +216,7 @@ public class CompileSpec implements ITestStep { public void setExtdirs(String extdirs) { this.extdirs = extdirs; } protected String[] buildArgs() { - StringBuffer args = new StringBuffer(); + StringBuilder args = new StringBuilder(); // add any set options, and then files to compile at the end if (getAspectpath() != null) { args.append("-aspectpath "); diff --git a/testing/src/test/java/org/aspectj/testing/OutputSpec.java b/testing/src/test/java/org/aspectj/testing/OutputSpec.java index 210dc24a8..5a6594756 100644 --- a/testing/src/test/java/org/aspectj/testing/OutputSpec.java +++ b/testing/src/test/java/org/aspectj/testing/OutputSpec.java @@ -104,7 +104,7 @@ public class OutputSpec { } private void createFailureMessage(String output, int lineNo, int sizeFound) { - StringBuffer failMessage = new StringBuffer(); + StringBuilder failMessage = new StringBuilder(); failMessage.append("\n expecting output:\n"); for (String line: expectedOutputLines) { failMessage.append(line+"\n"); diff --git a/testing/src/test/java/org/aspectj/testing/WeaveSpec.java b/testing/src/test/java/org/aspectj/testing/WeaveSpec.java index c840f4261..50a78d39e 100644 --- a/testing/src/test/java/org/aspectj/testing/WeaveSpec.java +++ b/testing/src/test/java/org/aspectj/testing/WeaveSpec.java @@ -137,7 +137,7 @@ public class WeaveSpec extends CompileSpec { } private String[] buildWeaveArgs() { - StringBuffer args = new StringBuffer(); + StringBuilder args = new StringBuilder(); if (getOptions() != null) { StringTokenizer strTok = new StringTokenizer(getOptions(),","); while (strTok.hasMoreTokens()) { diff --git a/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCase.java b/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCase.java index c332ab6f2..3954c7ecc 100644 --- a/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCase.java +++ b/testing/src/test/java/org/aspectj/testing/XMLBasedAjcTestCase.java @@ -429,7 +429,7 @@ public abstract class XMLBasedAjcTestCase extends AjcTestCase { public String stringify(LocalVariableTable lvt, int slotIndex) { LocalVariable lv[] = lvt.getLocalVariableTable(); LocalVariable lvEntry = lv[slotIndex]; - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(lvEntry.getSignature()).append(" ").append(lvEntry.getName()).append("(").append(lvEntry.getIndex()) .append(") start=").append(lvEntry.getStartPC()).append(" len=").append(lvEntry.getLength()); return sb.toString(); @@ -437,7 +437,7 @@ public abstract class XMLBasedAjcTestCase extends AjcTestCase { public String stringify(List<LocalVariable> l, int slotIndex) { LocalVariable lvEntry = (LocalVariable) l.get(slotIndex); - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(lvEntry.getSignature()).append(" ").append(lvEntry.getName()).append("(").append(lvEntry.getIndex()) .append(") start=").append(lvEntry.getStartPC()).append(" len=").append(lvEntry.getLength()); return sb.toString(); @@ -447,7 +447,7 @@ public abstract class XMLBasedAjcTestCase extends AjcTestCase { if (lvt == null) { return ""; } - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("LocalVariableTable. Entries=#" + lvt.getTableLength()).append("\n"); LocalVariable lv[] = lvt.getLocalVariableTable(); for (LocalVariable lvEntry : lv) { diff --git a/testing/src/test/java/org/aspectj/testing/ajde/CompileCommand.java b/testing/src/test/java/org/aspectj/testing/ajde/CompileCommand.java index d78c4e68d..ae33b944b 100644 --- a/testing/src/test/java/org/aspectj/testing/ajde/CompileCommand.java +++ b/testing/src/test/java/org/aspectj/testing/ajde/CompileCommand.java @@ -260,7 +260,7 @@ class LoggingInvocationHandler implements InvocationHandler { } public static String render(Method method, Object[] args) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(render(method.getReturnType())); sb.append(" "); sb.append(method.getName()); diff --git a/testing/src/test/java/org/aspectj/testing/harness/bridge/AjcSpecTest.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/AjcSpecTest.java index 3da7a6a32..4b7b6ab0f 100644 --- a/testing/src/test/java/org/aspectj/testing/harness/bridge/AjcSpecTest.java +++ b/testing/src/test/java/org/aspectj/testing/harness/bridge/AjcSpecTest.java @@ -118,7 +118,7 @@ public class AjcSpecTest extends TestCase { /** @return normal form for list items */ static String normal(List list) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("["); boolean first = true; for (Object o : list) { diff --git a/testing/src/test/java/org/aspectj/testing/harness/bridge/CompilerRunSpecTest.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/CompilerRunSpecTest.java index 419740329..80168e890 100644 --- a/testing/src/test/java/org/aspectj/testing/harness/bridge/CompilerRunSpecTest.java +++ b/testing/src/test/java/org/aspectj/testing/harness/bridge/CompilerRunSpecTest.java @@ -202,7 +202,7 @@ public class CompilerRunSpecTest extends TestCase { CRSOptions crsOptions = CompilerRun.Spec.testAccessToCRSOptions(); Set options = crsOptions.compilerOptions(); assertTrue(null != options); - StringBuffer notLoaded = new StringBuffer(); + StringBuilder notLoaded = new StringBuilder(); for (Object option : options) { Option compilerOption = (Option) option; if (!(crsOptions.compilerIsLoadable(compilerOption))) { diff --git a/testing/src/test/java/org/aspectj/testing/harness/bridge/DirChangesTest.java b/testing/src/test/java/org/aspectj/testing/harness/bridge/DirChangesTest.java index 07e6a5036..acb4bcf7c 100644 --- a/testing/src/test/java/org/aspectj/testing/harness/bridge/DirChangesTest.java +++ b/testing/src/test/java/org/aspectj/testing/harness/bridge/DirChangesTest.java @@ -180,7 +180,7 @@ public class DirChangesTest extends TestCase { actual[i] = null; } } - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); { IMessage[] expNotFound = (IMessage[]) LangUtil.safeCopy(expected, new IMessage[0]); diff --git a/testing/src/test/java/org/aspectj/testing/run/RunStatus.java b/testing/src/test/java/org/aspectj/testing/run/RunStatus.java index 2cf949f6c..6b93727cf 100644 --- a/testing/src/test/java/org/aspectj/testing/run/RunStatus.java +++ b/testing/src/test/java/org/aspectj/testing/run/RunStatus.java @@ -423,7 +423,7 @@ public class RunStatus implements IRunStatus { } public String toLongString() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(BridgeUtil.toShortString(this)); if ((null != children) && (0 < children.size())) { String label = "### --------- " + name; diff --git a/testing/src/test/java/org/aspectj/testing/util/BridgeUtil.java b/testing/src/test/java/org/aspectj/testing/util/BridgeUtil.java index 0e75a7c8b..eb5349667 100644 --- a/testing/src/test/java/org/aspectj/testing/util/BridgeUtil.java +++ b/testing/src/test/java/org/aspectj/testing/util/BridgeUtil.java @@ -443,7 +443,7 @@ public class BridgeUtil { if (0 > numIncomplete) { numIncomplete = 0; } - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); if (RunValidator.NORMAL.runPassed(runStatus)) { sb.append("PASS "); } else { @@ -500,7 +500,7 @@ public class BridgeUtil { if (null == runStatus) { return "((RunStatus) null)"; } - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); if (RunValidator.NORMAL.runPassed(runStatus)) { sb.append("PASS "); } else { diff --git a/testing/src/test/java/org/aspectj/testing/util/FileUtil.java b/testing/src/test/java/org/aspectj/testing/util/FileUtil.java index 6aea81dfa..03b29a85a 100644 --- a/testing/src/test/java/org/aspectj/testing/util/FileUtil.java +++ b/testing/src/test/java/org/aspectj/testing/util/FileUtil.java @@ -267,7 +267,7 @@ public class FileUtil { * return true; * }}, true);</code></pre> * @param file root/starting point. If a file, the only one visited. - * @param filter supplies boolean accept(File) method + * @param fileFilter supplies boolean accept(File) method * @param userRecursion - if true, do accept() on dirs; else, recurse * @return false if any fileFilter.accept(File) did. * @throws IllegalArgumentException if file or fileFilter is null @@ -655,7 +655,6 @@ public class FileUtil { */ protected static boolean deleteDirectory(File dir) { return ((null != dir) - && dir.exists() && dir.isDirectory() && FileUtil.descendFileTree(dir, DELETE_FILES, false) && FileUtil.descendFileTree(dir, DELETE_DIRS, true) @@ -675,7 +674,7 @@ public class FileUtil { protected static final FileFilter DELETE_DIRS = new FileFilter() { public boolean accept(File file) { return ((null != file) && file.isDirectory() - && file.exists() && file.delete()); + && file.delete()); } }; protected static final FileFilter DELETE_FILES = new FileFilter() { diff --git a/testing/src/test/java/org/aspectj/testing/util/LangUtil.java b/testing/src/test/java/org/aspectj/testing/util/LangUtil.java index c156962df..6b28c8803 100644 --- a/testing/src/test/java/org/aspectj/testing/util/LangUtil.java +++ b/testing/src/test/java/org/aspectj/testing/util/LangUtil.java @@ -242,7 +242,7 @@ public class LangUtil { } else if (0 == ra.length) { return null; } - StringBuffer result = new StringBuffer(); + StringBuilder result = new StringBuilder(); final String cname = LangUtil.unqualifiedClassName(superType); // int index = 0; for (int i = 0; i < ra.length; i++) { @@ -478,7 +478,7 @@ public class LangUtil { * @param errs the StringBuffer for error messages (if any) */ public static String unsplit(String[] input, StringBuffer errs) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(SPLIT_START); for (int i = 0; i < input.length; i++) { if (input[i].contains(SPLIT_DELIM)) { @@ -604,7 +604,7 @@ public class LangUtil { } boolean longFormat = (args.length < 10); String sep = (longFormat ? ", " : "\n\t"); - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); if (!longFormat) sb.append("["); for (int i = 0; i < args.length; i++) { if (0 < i) sb.append(sep); @@ -693,7 +693,7 @@ public class LangUtil { Class c = o.getClass(); if (c.isArray()) { Object[] ra = (Object[]) o; - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("["); for (int i = 0; i < ra.length; i++) { if (i > 0) { @@ -808,7 +808,7 @@ public class LangUtil { if (null == suffix) { suffix = SPLIT_END; } - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); if (null != source) { sb.append(org.aspectj.util.LangUtil.unqualifiedClassName(source)); } diff --git a/testing/src/test/java/org/aspectj/testing/util/LineReader.java b/testing/src/test/java/org/aspectj/testing/util/LineReader.java index b8a29ebdd..f1fbcd91a 100644 --- a/testing/src/test/java/org/aspectj/testing/util/LineReader.java +++ b/testing/src/test/java/org/aspectj/testing/util/LineReader.java @@ -135,7 +135,7 @@ public class LineReader extends LineNumberReader { * @return the String containing all lines skipped (delimited with RETURN) */ public String readToBlankLine() throws IOException { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); String input; while (null != (input = nextLine(false))) { // get next empty line to restart sb.append(input); diff --git a/testing/src/test/java/org/aspectj/testing/util/LinkCheck.java b/testing/src/test/java/org/aspectj/testing/util/LinkCheck.java index 103d201d2..8004c3f67 100644 --- a/testing/src/test/java/org/aspectj/testing/util/LinkCheck.java +++ b/testing/src/test/java/org/aspectj/testing/util/LinkCheck.java @@ -127,7 +127,7 @@ public class LinkCheck { long numChecked = me.checkedUrls.size(); if (numChecked > 0) { float cps = (float) duration / (float) numChecked; - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("DONE. Checked " + numChecked); sb.append(" URL's in " + duration); sb.append(" seconds (" + cps); diff --git a/testing/src/test/java/org/aspectj/testing/util/UtilLineReader.java b/testing/src/test/java/org/aspectj/testing/util/UtilLineReader.java index b46db2ae1..de1d9e477 100644 --- a/testing/src/test/java/org/aspectj/testing/util/UtilLineReader.java +++ b/testing/src/test/java/org/aspectj/testing/util/UtilLineReader.java @@ -135,7 +135,7 @@ public class UtilLineReader extends LineNumberReader { * @return the String containing all lines skipped (delimited with RETURN) */ public String readToBlankLine() throws IOException { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); String input; while (null != (input = nextLine(false))) { // get next empty line to restart sb.append(input); diff --git a/testing/src/test/java/org/aspectj/testing/util/WebInstall.java b/testing/src/test/java/org/aspectj/testing/util/WebInstall.java index 805703ddb..6512eb0e6 100644 --- a/testing/src/test/java/org/aspectj/testing/util/WebInstall.java +++ b/testing/src/test/java/org/aspectj/testing/util/WebInstall.java @@ -183,7 +183,7 @@ public class WebInstall { ms.invoke(null, new Object[] { args }); } public static final String render(String[] args) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("["); for (int i = 0; i < args.length; i++) { if (0 < i) sb.append(", "); diff --git a/testing/src/test/java/org/aspectj/testing/util/options/Options.java b/testing/src/test/java/org/aspectj/testing/util/options/Options.java index 873b00786..cb9ac2540 100644 --- a/testing/src/test/java/org/aspectj/testing/util/options/Options.java +++ b/testing/src/test/java/org/aspectj/testing/util/options/Options.java @@ -48,7 +48,7 @@ public class Options { if (0 == missed.length) { return null; } - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("missed values: ["); for (int i = 0; i < missed.length; i++) { if (i > 0) { diff --git a/testing/src/test/java/org/aspectj/testing/util/options/Values.java b/testing/src/test/java/org/aspectj/testing/util/options/Values.java index c1ded7fab..3d4ed0f73 100644 --- a/testing/src/test/java/org/aspectj/testing/util/options/Values.java +++ b/testing/src/test/java/org/aspectj/testing/util/options/Values.java @@ -680,7 +680,7 @@ public class Values { if (null == input) { return "null"; } - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("["); for (int i = 0; i < input.length; i++) { if (i > 0) { diff --git a/testing/src/test/java/org/aspectj/testing/xml/MessageListXmlReader.java b/testing/src/test/java/org/aspectj/testing/xml/MessageListXmlReader.java index 48b22f19c..46352a0a2 100644 --- a/testing/src/test/java/org/aspectj/testing/xml/MessageListXmlReader.java +++ b/testing/src/test/java/org/aspectj/testing/xml/MessageListXmlReader.java @@ -36,7 +36,7 @@ public class MessageListXmlReader { private static final String INLINE_DOCTYPE; static { final String EOL = LangUtil.EOL; - final StringBuffer r = new StringBuffer(); + final StringBuilder r = new StringBuilder(); r.append("<!DOCTYPE "); r.append(MessageList.XMLNAME); diff --git a/testing/src/test/java/org/aspectj/testing/xml/SoftMessage.java b/testing/src/test/java/org/aspectj/testing/xml/SoftMessage.java index be3541e4d..ae08ec389 100644 --- a/testing/src/test/java/org/aspectj/testing/xml/SoftMessage.java +++ b/testing/src/test/java/org/aspectj/testing/xml/SoftMessage.java @@ -309,7 +309,7 @@ public class SoftMessage implements IMessage { } public String toString() { - StringBuffer result = new StringBuffer(); + StringBuilder result = new StringBuilder(); result.append(null == getKind() ? "<null kind>" : getKind().toString()); diff --git a/testing/src/test/java/org/aspectj/testing/xml/XMLWriter.java b/testing/src/test/java/org/aspectj/testing/xml/XMLWriter.java index f74b87da5..f4b9dd990 100644 --- a/testing/src/test/java/org/aspectj/testing/xml/XMLWriter.java +++ b/testing/src/test/java/org/aspectj/testing/xml/XMLWriter.java @@ -121,7 +121,7 @@ public class XMLWriter { * @throws IllegalArgumentException if list[i].toString() contains a comma */ public static String flattenList(Object[] list) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); if (null != list) { boolean printed = false; for (Object o : list) { @@ -228,7 +228,7 @@ public class XMLWriter { if (0 < stack.size()) { indent += TAB; } - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(indent); sb.append("<"); sb.append(name); diff --git a/tests/bugs198/github_105/Application.java b/tests/bugs198/github_105/Application.java new file mode 100644 index 000000000..bcf4f5624 --- /dev/null +++ b/tests/bugs198/github_105/Application.java @@ -0,0 +1,18 @@ +import java.lang.annotation.Annotation; + +/** + * {@code FooAspect} should add {@code @BarAnnotation(name = "from FooAspect")}. + * <p> + * This fails in AspectJ 1.9.5 to 1.9.8.RC2 due to a removed safeguard in JDT Core, + * if the aspect is in a separate library on the aspectpath. + * <p> + * See https://github.com/eclipse/org.aspectj/issues/105 + */ +@FooAnnotation +public class Application { + public static void main(String[] args) { + for (Annotation annotation : Application.class.getDeclaredAnnotations()) { + System.out.println(annotation); + } + } +} diff --git a/tests/bugs198/github_105/BarAnnotation.java b/tests/bugs198/github_105/BarAnnotation.java new file mode 100644 index 000000000..eaee4af2a --- /dev/null +++ b/tests/bugs198/github_105/BarAnnotation.java @@ -0,0 +1,11 @@ +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target({ ElementType.TYPE }) +@Retention(RetentionPolicy.RUNTIME) +public @interface BarAnnotation { + // Note: no default value + String name(); +} diff --git a/tests/bugs198/github_105/FooAnnotation.java b/tests/bugs198/github_105/FooAnnotation.java new file mode 100644 index 000000000..17e79deb4 --- /dev/null +++ b/tests/bugs198/github_105/FooAnnotation.java @@ -0,0 +1,8 @@ +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target({ElementType.TYPE}) +@Retention(RetentionPolicy.RUNTIME) +public @interface FooAnnotation {} diff --git a/tests/bugs198/github_105/FooAspect.aj b/tests/bugs198/github_105/FooAspect.aj new file mode 100644 index 000000000..0d8e10d9b --- /dev/null +++ b/tests/bugs198/github_105/FooAspect.aj @@ -0,0 +1,4 @@ +public aspect FooAspect { + declare @type:(@FooAnnotation *) : + @BarAnnotation(name = "from FooAspect"); +} diff --git a/tests/src/test/java/org/aspectj/systemtest/AllTests17.java b/tests/src/test/java/org/aspectj/systemtest/AllTests17.java index cc1e480ef..642e00041 100644 --- a/tests/src/test/java/org/aspectj/systemtest/AllTests17.java +++ b/tests/src/test/java/org/aspectj/systemtest/AllTests17.java @@ -18,9 +18,9 @@ public class AllTests17 { public static Test suite() { TestSuite suite = new TestSuite("AspectJ System Test Suite - 1.7"); // $JUnit-BEGIN$ - suite.addTest(AllTestsAspectJ175.suite()); - suite.addTest(AllTestsAspectJ174.suite()); - suite.addTest(AllTestsAspectJ173.suite()); + suite.addTest(AllTestsAspectJ175.suite()); + suite.addTest(AllTestsAspectJ174.suite()); + suite.addTest(AllTestsAspectJ173.suite()); suite.addTest(AllTestsAspectJ172.suite()); suite.addTest(AllTestsAspectJ171.suite()); suite.addTest(AllTestsAspectJ170.suite()); diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/GenericITDsDesign.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/GenericITDsDesign.java index fd3152558..609ac7a27 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/GenericITDsDesign.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/GenericITDsDesign.java @@ -245,7 +245,7 @@ public class GenericITDsDesign extends XMLBasedAjcTestCase { // // Verify: a) sharing type vars with some target type results in the correct variable names in the serialized form // public void testDesignE() { // runTest("generic itds - design E"); - // + // // } } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/GenericsTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/GenericsTests.java index 8bb04f389..ae44e9a60 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/GenericsTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/GenericsTests.java @@ -880,7 +880,7 @@ public class GenericsTests extends XMLBasedAjcTestCase { */ public void checkMethodsExist(String classname,String[] methods) { Set<String> methodsFound = new HashSet<>(); - StringBuffer debugString = new StringBuffer(); + StringBuilder debugString = new StringBuilder(); try { ClassLoader cl = new URLClassLoader(new URL[]{ajc.getSandboxDirectory().toURI().toURL()}); Class<?> clz = Class.forName(classname,false,cl); @@ -906,7 +906,7 @@ public class GenericsTests extends XMLBasedAjcTestCase { fail("Couldn't find [" + string + "] in the set of methods in " + classname + " => " + debugString); } } - StringBuffer unexpectedMethods = new StringBuffer(); + StringBuilder unexpectedMethods = new StringBuilder(); if (!methodsFound.isEmpty()) { for (String element: methodsFound) { unexpectedMethods.append("[").append(element).append("]"); @@ -959,7 +959,7 @@ public class GenericsTests extends XMLBasedAjcTestCase { JavaClass clazz = getClass(ajc,classname); Attribute[] attrs = clazz.getAttributes(); int signatureCount = 0; - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); for (Attribute attribute : attrs) { if (attribute.getName().equals("Signature")) { signatureCount++; @@ -979,7 +979,7 @@ public class GenericsTests extends XMLBasedAjcTestCase { private static String stringify(Class<?>[] clazzes) { if (clazzes==null) return ""; - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); for (int i = 0; i < clazzes.length; i++) { if (i>0) sb.append(","); sb.append(clazzes[i].getName()); diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc150/ltw/LTWServerTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc150/ltw/LTWServerTests.java index 9164c7225..ad1055938 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc150/ltw/LTWServerTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc150/ltw/LTWServerTests.java @@ -13,11 +13,11 @@ public class LTWServerTests extends XMLBasedAjcTestCase { protected java.net.URL getSpecFile() { return getClassResource("ltw.xml"); } - + public void testServerWithHelloWorld () { runTest("TestServer with HelloWorld"); } - + public void testServerWithParentAndChild () { runTest("TestServer with Parent and Child"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc152/SynchronizationTransformTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc152/SynchronizationTransformTests.java index e7ff69f57..03cb07828 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc152/SynchronizationTransformTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc152/SynchronizationTransformTests.java @@ -255,7 +255,7 @@ public class SynchronizationTransformTests extends XMLBasedAjcTestCase { } private String stringify(List<String> l) { - StringBuffer result = new StringBuffer(); + StringBuilder result = new StringBuilder(); for (String str : l) { result.append(str); result.append("\n"); diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc153/LTWServer153Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc153/LTWServer153Tests.java index 939dfe92e..3469b2ce4 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc153/LTWServer153Tests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc153/LTWServer153Tests.java @@ -15,7 +15,7 @@ public class LTWServer153Tests extends XMLBasedAjcTestCase { protected URL getSpecFile() { return getClassResource("ajc153.xml"); } - + public void testHandleDuplicateConfiguration_pr157474 () { runTest("TestServer with duplicate configuration"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc169/TransparentWeavingTests.java b/tests/src/test/java/org/aspectj/systemtest/ajc169/TransparentWeavingTests.java index 3289e3331..a43907df0 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc169/TransparentWeavingTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc169/TransparentWeavingTests.java @@ -159,7 +159,7 @@ public class TransparentWeavingTests extends org.aspectj.testing.XMLBasedAjcTest try { JavaClass jc = getClassFrom(ajc.getSandboxDirectory(), clazzname); Field[] fs = jc.getFields(); - StringBuffer fields = new StringBuffer(); + StringBuilder fields = new StringBuilder(); for (Field f : fs) { fields.append(f.getName()).append(" "); if (f.getName().equals(name)) { @@ -175,7 +175,7 @@ public class TransparentWeavingTests extends org.aspectj.testing.XMLBasedAjcTest private Field checkForField(String clazzname, int modifiers, String name) throws Exception { JavaClass jc = getClassFrom(ajc.getSandboxDirectory(), clazzname); Field[] fs = jc.getFields(); - StringBuffer fields = new StringBuffer(); + StringBuilder fields = new StringBuilder(); for (Field f : fs) { fields.append(f.getName()).append(" "); if (f.getName().equals(name)) { @@ -192,7 +192,7 @@ public class TransparentWeavingTests extends org.aspectj.testing.XMLBasedAjcTest private Method checkForMethod(String clazzname, int modifiers, String name) throws Exception { JavaClass jc = getClassFrom(ajc.getSandboxDirectory(), clazzname); Method[] fs = jc.getMethods(); - StringBuffer methods = new StringBuffer(); + StringBuilder methods = new StringBuilder(); methods.append("\n"); for (Method f : fs) { methods.append(f.getName()).append("\n"); diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc198/AllTestsAspectJ198.java b/tests/src/test/java/org/aspectj/systemtest/ajc198/AllTestsAspectJ198.java index 69ed09593..4aac84810 100644 --- a/tests/src/test/java/org/aspectj/systemtest/ajc198/AllTestsAspectJ198.java +++ b/tests/src/test/java/org/aspectj/systemtest/ajc198/AllTestsAspectJ198.java @@ -18,6 +18,7 @@ public class AllTestsAspectJ198 { public static Test suite() { TestSuite suite = new TestSuite("AspectJ 1.9.8 tests"); + suite.addTest(Bugs198Tests.suite()); if (LangUtil.is9VMOrGreater()) { suite.addTest(CompileWithReleaseTests.suite()); } diff --git a/tests/src/test/java/org/aspectj/systemtest/ajc198/Bugs198Tests.java b/tests/src/test/java/org/aspectj/systemtest/ajc198/Bugs198Tests.java new file mode 100644 index 000000000..d8e57b534 --- /dev/null +++ b/tests/src/test/java/org/aspectj/systemtest/ajc198/Bugs198Tests.java @@ -0,0 +1,31 @@ +/******************************************************************************* + * Copyright (c) 2021 Contributors + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v 2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt + *******************************************************************************/ +package org.aspectj.systemtest.ajc198; + +import junit.framework.Test; +import org.aspectj.testing.XMLBasedAjcTestCase; + +/** + * @author Alexander Kriegisch + */ +public class Bugs198Tests extends XMLBasedAjcTestCase { + + public void testGitHub_105() { + runTest("ITD annotation with mandatory parameter via aspectpath"); + } + + public static Test suite() { + return XMLBasedAjcTestCase.loadSuite(Bugs198Tests.class); + } + + @Override + protected java.net.URL getSpecFile() { + return getClassResource("ajc198.xml"); + } + +} diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/AjdeInteractionTestbed.java b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/AjdeInteractionTestbed.java index 0f776db9c..8fc389e5b 100644 --- a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/AjdeInteractionTestbed.java +++ b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/AjdeInteractionTestbed.java @@ -386,7 +386,7 @@ public class AjdeInteractionTestbed extends TestCase { * Helper method for dumping info about which files were compiled and woven during the last build. */ public String printCompiledAndWovenFiles(String projectName) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); if (getCompiledFiles(projectName).size() == 0 && getWovenClasses(projectName).size() == 0) { sb.append("No files were compiled or woven\n"); } diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjTestCompilerConfiguration.java b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjTestCompilerConfiguration.java index f3dd09c4d..5a3cab221 100644 --- a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjTestCompilerConfiguration.java +++ b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjTestCompilerConfiguration.java @@ -62,7 +62,7 @@ public class MultiProjTestCompilerConfiguration implements ICompilerConfiguratio public String getClasspath() { log("ICompilerConfiguration.getClasspath()"); // AJDT has all the output directories on it's classpath - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); List<File> allOutputPaths = getOutputLocationManager().getAllOutputLocations(); for (File dir: allOutputPaths) { sb.append(File.pathSeparator + dir.getAbsolutePath()); diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java index b132bfc92..4249f1578 100644 --- a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java +++ b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java @@ -2208,7 +2208,7 @@ public class MultiProjectIncrementalTests extends AbstractMultiProjectIncrementa } private String toString(List<ResolvedMember> list) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); for (ResolvedMember m : list) { sb.append(m).append("\n"); } @@ -2216,7 +2216,7 @@ public class MultiProjectIncrementalTests extends AbstractMultiProjectIncrementa } private String typeListToString(List<String> list) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); for (String m : list) { sb.append(m).append("\n"); } @@ -2224,7 +2224,7 @@ public class MultiProjectIncrementalTests extends AbstractMultiProjectIncrementa } private String toString(List<ResolvedMember> one, List<ResolvedMember> two, boolean shouldIncludeGenerics) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("Through iterator\n"); for (ResolvedMember m : one) { sb.append(m).append("\n"); @@ -2237,7 +2237,7 @@ public class MultiProjectIncrementalTests extends AbstractMultiProjectIncrementa } private String typeListsToString(List<String> one, List<String> two) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("Through iterator\n"); for (String m : one) { sb.append(">" + m).append("\n"); @@ -3901,7 +3901,7 @@ public class MultiProjectIncrementalTests extends AbstractMultiProjectIncrementa */ private List<String> getRelatedElements(AsmManager model, IProgramElement programElement, int expected) { List<String> relatedElements = getRelatedElements(model, programElement); - StringBuffer debugString = new StringBuffer(); + StringBuilder debugString = new StringBuilder(); if (relatedElements != null) { for (String element : relatedElements) { debugString.append(model.getHierarchy().findElementForHandle(element).toLabelString()).append("\n"); diff --git a/tests/src/test/resources/org/aspectj/systemtest/ajc198/ajc198.xml b/tests/src/test/resources/org/aspectj/systemtest/ajc198/ajc198.xml index c182b58b9..dfe86e2a9 100644 --- a/tests/src/test/resources/org/aspectj/systemtest/ajc198/ajc198.xml +++ b/tests/src/test/resources/org/aspectj/systemtest/ajc198/ajc198.xml @@ -3,6 +3,12 @@ <suite> + <!-- https://github.com/eclipse/org.aspectj/issues/105 --> + <ajc-test dir="bugs198/github_105" vm="8" title="ITD annotation with mandatory parameter via aspectpath"> + <compile files="FooAnnotation.java BarAnnotation.java FooAspect.aj" options="-8" outjar="aspect.jar"/> + <compile files="Application.java" options="-8" aspectpath="aspect.jar"/> + </ajc-test> + <!-- Java 17 final, Java 16, 15 preview --> <ajc-test dir="features197/java15" vm="17" title="sealed class with legal subclasses"> <compile files="Person.java Employee.java Manager.java" options="-17" /> diff --git a/util/src/main/java/org/aspectj/util/FileUtil.java b/util/src/main/java/org/aspectj/util/FileUtil.java index cf798617d..c572e5950 100644 --- a/util/src/main/java/org/aspectj/util/FileUtil.java +++ b/util/src/main/java/org/aspectj/util/FileUtil.java @@ -336,7 +336,7 @@ public class FileUtil { if (null == infix) { infix = File.pathSeparator; } - StringBuffer result = new StringBuffer(); + StringBuilder result = new StringBuilder(); boolean first = true; for (String path : paths) { if (null == path) { @@ -1131,7 +1131,7 @@ public class FileUtil { */ public static String readAsString(File file) throws IOException { BufferedReader r = new BufferedReader(new FileReader(file)); - StringBuffer b = new StringBuffer(); + StringBuilder b = new StringBuilder(); while (true) { int ch = r.read(); if (ch == -1) { diff --git a/util/src/main/java/org/aspectj/util/GenericSignature.java b/util/src/main/java/org/aspectj/util/GenericSignature.java index f128ba4a5..e68a78b7e 100644 --- a/util/src/main/java/org/aspectj/util/GenericSignature.java +++ b/util/src/main/java/org/aspectj/util/GenericSignature.java @@ -27,7 +27,7 @@ public class GenericSignature { public ClassTypeSignature[] superInterfaceSignatures = ClassTypeSignature.NONE; public String toString() { - StringBuffer ret = new StringBuffer(); + StringBuilder ret = new StringBuilder(); ret.append(formalTypeParameters.toString()); ret.append(superclassSignature.toString()); for (ClassTypeSignature superInterfaceSignature : superInterfaceSignatures) { @@ -52,7 +52,7 @@ public class GenericSignature { } public String toString() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); if (formalTypeParameters.length > 0) { sb.append("<"); for (FormalTypeParameter formalTypeParameter : formalTypeParameters) { @@ -84,7 +84,7 @@ public class GenericSignature { public FieldTypeSignature[] interfaceBounds; public String toString() { - StringBuffer ret = new StringBuffer(); + StringBuilder ret = new StringBuilder(); ret.append("T"); ret.append(identifier); ret.append(":"); @@ -208,7 +208,7 @@ public class GenericSignature { } public String toString() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(identifier); if (typeArguments.length > 0) { sb.append("<"); @@ -240,7 +240,7 @@ public class GenericSignature { public String toString() { if (isWildcard) return "*"; - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); if (isPlus) sb.append("+"); if (isMinus) diff --git a/util/src/main/java/org/aspectj/util/GenericSignatureParser.java b/util/src/main/java/org/aspectj/util/GenericSignatureParser.java index ba45ecc99..3f1f3d52a 100644 --- a/util/src/main/java/org/aspectj/util/GenericSignatureParser.java +++ b/util/src/main/java/org/aspectj/util/GenericSignatureParser.java @@ -176,7 +176,7 @@ public class GenericSignatureParser { private ClassTypeSignature parseClassTypeSignature() { SimpleClassTypeSignature outerType = null; SimpleClassTypeSignature[] nestedTypes = new SimpleClassTypeSignature[0]; - StringBuffer ret = new StringBuffer(); + StringBuilder ret = new StringBuilder(); String identifier = eatIdentifier(); ret.append(identifier); while (maybeEat("/")) { @@ -215,7 +215,7 @@ public class GenericSignatureParser { * Helper method to digest nested types, slightly more complex than necessary to cope with some android related * incorrect classes (see bug 406167) */ - private SimpleClassTypeSignature[] parseNestedTypesHelper(StringBuffer ret) { + private SimpleClassTypeSignature[] parseNestedTypesHelper(StringBuilder ret) { boolean brokenSignature = false; SimpleClassTypeSignature[] nestedTypes; List<SimpleClassTypeSignature> nestedTypeList = new ArrayList<>(); @@ -318,7 +318,7 @@ public class GenericSignatureParser { char[] chars = signatureString.toCharArray(); int index = 0; List<String> tokens = new ArrayList<>(); - StringBuffer identifier = new StringBuffer(); + StringBuilder identifier = new StringBuilder(); boolean inParens = false; boolean inArray = false; boolean couldSeePrimitive = false; @@ -327,32 +327,32 @@ public class GenericSignatureParser { case '<': if (identifier.length() > 0) tokens.add(identifier.toString()); - identifier = new StringBuffer(); + identifier = new StringBuilder(); tokens.add("<"); break; case '>': if (identifier.length() > 0) tokens.add(identifier.toString()); - identifier = new StringBuffer(); + identifier = new StringBuilder(); tokens.add(">"); break; case ':': if (identifier.length() > 0) tokens.add(identifier.toString()); - identifier = new StringBuffer(); + identifier = new StringBuilder(); tokens.add(":"); break; case '/': if (identifier.length() > 0) tokens.add(identifier.toString()); - identifier = new StringBuffer(); + identifier = new StringBuilder(); tokens.add("/"); couldSeePrimitive = false; break; case ';': if (identifier.length() > 0) tokens.add(identifier.toString()); - identifier = new StringBuffer(); + identifier = new StringBuilder(); tokens.add(";"); couldSeePrimitive = true; inArray = false; @@ -360,7 +360,7 @@ public class GenericSignatureParser { case '^': if (identifier.length() > 0) tokens.add(identifier.toString()); - identifier = new StringBuffer(); + identifier = new StringBuilder(); tokens.add("^"); break; case '+': @@ -375,7 +375,7 @@ public class GenericSignatureParser { case '.': if (identifier.length() > 0) tokens.add(identifier.toString()); - identifier = new StringBuffer(); + identifier = new StringBuilder(); couldSeePrimitive = false; tokens.add("."); break; diff --git a/util/src/main/java/org/aspectj/util/LangUtil.java b/util/src/main/java/org/aspectj/util/LangUtil.java index cfe9a0bea..af1e21d29 100644 --- a/util/src/main/java/org/aspectj/util/LangUtil.java +++ b/util/src/main/java/org/aspectj/util/LangUtil.java @@ -805,7 +805,7 @@ public class LangUtil { if (LangUtil.isEmpty(in) || LangUtil.isEmpty(sought)) { return in; } - StringBuffer result = new StringBuffer(); + StringBuilder result = new StringBuilder(); final int len = sought.length(); int start = 0; int loc; @@ -1510,7 +1510,7 @@ public class LangUtil { @Override public String toString() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); append(sb, fromProcess, "process"); append(sb, fromOutPipe, " stdout"); append(sb, fromErrPipe, " stderr"); @@ -1522,7 +1522,7 @@ public class LangUtil { } } - private void append(StringBuffer sb, Throwable thrown, String label) { + private void append(StringBuilder sb, Throwable thrown, String label) { if (null != thrown) { sb.append("from " + label + ": "); sb.append(LangUtil.renderExceptionShort(thrown)); diff --git a/util/src/test/java/org/aspectj/util/FileUtilTest.java b/util/src/test/java/org/aspectj/util/FileUtilTest.java index 3bd1ef4e4..e6ab241cc 100644 --- a/util/src/test/java/org/aspectj/util/FileUtilTest.java +++ b/util/src/test/java/org/aspectj/util/FileUtilTest.java @@ -487,7 +487,7 @@ public class FileUtilTest extends TestCase { final String prefix = new File(tempDir, "testLineSeek").getPath(); // setup files 0..MAX with 2*MAX lines String[] sources = new String[MAX]; - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); for (int i = 0; i < sources.length; i++) { sources[i] = new File(prefix + i).getPath(); sb.append("not matched"); @@ -604,7 +604,7 @@ public class FileUtilTest extends TestCase { public void testPipe() { String str = "The quick brown fox jumped over the lazy dog"; - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); for (int i = 0; i < 4096; i++) { sb.append(str); } diff --git a/util/src/test/java/org/aspectj/util/GenericSignatureParserTest.java b/util/src/test/java/org/aspectj/util/GenericSignatureParserTest.java index e336392e3..bad45fe65 100644 --- a/util/src/test/java/org/aspectj/util/GenericSignatureParserTest.java +++ b/util/src/test/java/org/aspectj/util/GenericSignatureParserTest.java @@ -216,7 +216,7 @@ public class GenericSignatureParserTest extends TestCase { } private String tokensToString(String[] tokens) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(tokens[0]); for (int i = 1; i < tokens.length; i++) { sb.append(","); diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/AtAjAttributes.java b/weaver/src/main/java/org/aspectj/weaver/bcel/AtAjAttributes.java index 7fb18abcd..58af6d64f 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/AtAjAttributes.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/AtAjAttributes.java @@ -856,7 +856,7 @@ public class AtAjAttributes { * @return a nicely formatted method string, for example: int X.foo(java.lang.String) */ public static String getMethodForMessage(AjAttributeMethodStruct methodstructure) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("Method '"); sb.append(methodstructure.method.getReturnType().toString()); sb.append(" ").append(methodstructure.enclosingType).append(".").append(methodstructure.method.getName()); @@ -1533,7 +1533,7 @@ public class AtAjAttributes { * @return a readable representation of a method */ private static String methodToString(Method method) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(method.getName()); sb.append(method.getSignature()); return sb.toString(); @@ -1811,7 +1811,7 @@ public class AtAjAttributes { args.add(st.nextToken()); } if (args.size() != method.getArgumentTypes().length) { - StringBuffer shortString = new StringBuffer().append(lastbit(method.getReturnType().toString())).append(" ") + StringBuilder shortString = new StringBuilder().append(lastbit(method.getReturnType().toString())).append(" ") .append(method.getName()); if (method.getArgumentTypes().length > 0) { shortString.append("("); diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelAnnotation.java b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelAnnotation.java index 0db2ba905..3cce9afb5 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelAnnotation.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelAnnotation.java @@ -45,7 +45,7 @@ public class BcelAnnotation extends AbstractAnnotationAJ { } public String toString() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); List<NameValuePair> nvPairs = bcelAnnotation.getValues(); sb.append("Anno[" + getTypeSignature() + " " + (isRuntimeVisible() ? "rVis" : "rInvis")); if (nvPairs.size() > 0) { @@ -104,7 +104,7 @@ public class BcelAnnotation extends AbstractAnnotationAJ { */ @Override public String stringify() { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("@").append(type.getClassName()); List<NameValuePair> values = bcelAnnotation.getValues(); if (values != null && values.size() != 0) { diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelClassWeaver.java b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelClassWeaver.java index 4aa8d2485..3ffe74773 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelClassWeaver.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelClassWeaver.java @@ -856,7 +856,7 @@ class BcelClassWeaver implements IClassWeaver { checkForOverride(interfaceType, name, psig, rsig, bridgeToCandidate.getAccessFlags(), clazz.getPackageName(), bm, overriddenMethodsCollector); for (ResolvedMember overriddenMethod : overriddenMethodsCollector) { - String key = new StringBuffer().append(overriddenMethod.getName()).append(overriddenMethod.getSignatureErased()).toString(); // pr237419 + String key = new StringBuilder().append(overriddenMethod.getName()).append(overriddenMethod.getSignatureErased()).toString(); // pr237419 boolean alreadyHaveABridgeMethod = methodsSet.contains(key); if (!alreadyHaveABridgeMethod) { if (bridges== null) { @@ -1103,7 +1103,7 @@ class BcelClassWeaver implements IClassWeaver { private void reportMethodCtorWeavingMessage(LazyClassGen clazz, ResolvedMember member, DeclareAnnotation decaM, int memberLineNumber) { if (!getWorld().getMessageHandler().isIgnoring(IMessage.WEAVEINFO)) { - StringBuffer parmString = new StringBuffer("("); + StringBuilder parmString = new StringBuilder("("); UnresolvedType[] paramTypes = member.getParameterTypes(); for (int i = 0; i < paramTypes.length; i++) { UnresolvedType type = paramTypes[i]; @@ -1118,7 +1118,7 @@ class BcelClassWeaver implements IClassWeaver { } parmString.append(")"); String methodName = member.getName(); - StringBuffer sig = new StringBuffer(); + StringBuilder sig = new StringBuilder(); sig.append(org.aspectj.apache.bcel.classfile.Utility.accessToString(member.getModifiers())); sig.append(" "); sig.append(member.getReturnType().toString()); @@ -1128,7 +1128,7 @@ class BcelClassWeaver implements IClassWeaver { sig.append(methodName.equals("<init>") ? "new" : methodName); sig.append(parmString); - StringBuffer loc = new StringBuffer(); + StringBuilder loc = new StringBuilder(); if (clazz.getFileName() == null) { loc.append("no debug info available"); } else { diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelGenericSignatureToTypeXConverter.java b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelGenericSignatureToTypeXConverter.java index c5c7cfbd6..c78011405 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelGenericSignatureToTypeXConverter.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelGenericSignatureToTypeXConverter.java @@ -52,7 +52,7 @@ public class BcelGenericSignatureToTypeXConverter { // each type in the hierarchy may have type arguments // first build the 'raw type' signature - StringBuffer sig = new StringBuffer(); + StringBuilder sig = new StringBuilder(); sig.append(aClassTypeSignature.outerType.identifier.replace(';', ' ').trim()); for (int i = 0; i < aClassTypeSignature.nestedTypes.length; i++) { sig.append("$"); diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelShadow.java b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelShadow.java index c64ffde82..4d2e2bc88 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelShadow.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelShadow.java @@ -2403,7 +2403,7 @@ public class BcelShadow extends Shadow { // rather than fail. If a bug is raised reporting unknown as a local variable name // then investigate the joinpoint giving rise to the ResolvedMember and why it has // no parameter names specified - argumentName = new StringBuffer("unknown").append(argNumber).toString(); + argumentName = new StringBuilder("unknown").append(argNumber).toString(); } else { argumentName = parameterNames.get(argNumber); } diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelTypeMunger.java b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelTypeMunger.java index b8552dbb2..fc2a2451a 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelTypeMunger.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelTypeMunger.java @@ -616,7 +616,7 @@ public class BcelTypeMunger extends ConcreteTypeMunger { * Creates a nice signature for the ctor, something like "(int,Integer,String)" */ private String createReadableCtorSig(ResolvedType newParent, ConstantPool cpg, InvokeInstruction invokeSpecial) { - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); Type[] ctorArgs = invokeSpecial.getArgumentTypes(cpg); sb.append(newParent.getClassName()); sb.append("("); @@ -1338,7 +1338,7 @@ public class BcelTypeMunger extends ConcreteTypeMunger { // Unlike toString() on a member, this does not include the declaring type private String stringifyMember(ResolvedMember member) { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append(member.getReturnType().getName()); buf.append(' '); buf.append(member.getName()); diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelWeaver.java b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelWeaver.java index 12b8cb2c0..51f0a8c6c 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelWeaver.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelWeaver.java @@ -400,7 +400,7 @@ public class BcelWeaver { if (filename.endsWith(".class")) { ReferenceType type = this.addClassFile(classFile, false); - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(inFile.getAbsolutePath()); sb.append("!"); sb.append(entry.getName()); @@ -472,7 +472,7 @@ public class BcelWeaver { if (filename.endsWith(".class")) { // System.err.println( // "BCELWeaver: processing class from input directory "+classFile); - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append(inPathDir.getAbsolutePath()); sb.append("!"); sb.append(filename); diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelWorld.java b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelWorld.java index e7fdb4a10..7c4509e71 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/BcelWorld.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/BcelWorld.java @@ -229,7 +229,7 @@ public class BcelWorld extends World implements Repository { * Ensure we report a nice source location - particular in the case where the source info is missing (binary weave). */ private String beautifyLocation(ISourceLocation isl) { - StringBuffer nice = new StringBuffer(); + StringBuilder nice = new StringBuilder(); if (isl == null || isl.getSourceFile() == null || isl.getSourceFile().getName().contains("no debug info available")) { nice.append("no debug info available"); } else { @@ -464,7 +464,7 @@ public class BcelWorld extends World implements Repository { if (resolvedTypeFromTypeMap != null && !(resolvedTypeFromTypeMap instanceof ReferenceType)) { // what on earth is it then? See pr 112243 - StringBuffer exceptionText = new StringBuffer(); + StringBuilder exceptionText = new StringBuilder(); exceptionText.append("Found invalid (not a ReferenceType) entry in the type map. "); exceptionText.append("Signature=[" + signature + "] Found=[" + resolvedTypeFromTypeMap + "] Class=[" + resolvedTypeFromTypeMap.getClass() + "]"); throw new BCException(exceptionText.toString()); @@ -500,7 +500,7 @@ public class BcelWorld extends World implements Repository { if (resolvedTypeFromTypeMap != null && !(resolvedTypeFromTypeMap instanceof ReferenceType)) { // what on earth is it then? See pr 112243 - StringBuffer exceptionText = new StringBuffer(); + StringBuilder exceptionText = new StringBuilder(); exceptionText.append("Found invalid (not a ReferenceType) entry in the type map. "); exceptionText.append("Signature=[" + signature + "] Found=[" + resolvedTypeFromTypeMap + "] Class=[" + resolvedTypeFromTypeMap.getClass() + "]"); throw new BCException(exceptionText.toString()); @@ -686,7 +686,7 @@ public class BcelWorld extends World implements Repository { @Override public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); buf.append("BcelWorld("); // buf.append(shadowMungerMap); buf.append(")"); diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/ClassPathManager.java b/weaver/src/main/java/org/aspectj/weaver/bcel/ClassPathManager.java index a090e7189..c76e91956 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/ClassPathManager.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/ClassPathManager.java @@ -156,7 +156,7 @@ public class ClassPathManager { @Override public String toString() { - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); boolean start = true; for (Entry entry : entries) { if (start) { diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/LazyClassGen.java b/weaver/src/main/java/org/aspectj/weaver/bcel/LazyClassGen.java index 80eb20acf..4a0ed1358 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/LazyClassGen.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/LazyClassGen.java @@ -675,7 +675,7 @@ public final class LazyClassGen { } if (needAttribute) { - StringBuffer signature = new StringBuffer(); + StringBuilder signature = new StringBuilder(); // first, the type variables... if (myType != null) { TypeVariable[] tVars = myType.getTypeVariables(); diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/LazyMethodGen.java b/weaver/src/main/java/org/aspectj/weaver/bcel/LazyMethodGen.java index a6c8dd2ea..022345d40 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/LazyMethodGen.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/LazyMethodGen.java @@ -553,7 +553,7 @@ public final class LazyMethodGen implements Traceable { public String toShortString() { String access = org.aspectj.apache.bcel.classfile.Utility.accessToString(getAccessFlags()); - StringBuffer buf = new StringBuffer(); + StringBuilder buf = new StringBuilder(); if (!access.equals("")) { buf.append(access); diff --git a/weaver/src/main/java/org/aspectj/weaver/bcel/Utility.java b/weaver/src/main/java/org/aspectj/weaver/bcel/Utility.java index d9fc3396b..eea6c3d72 100644 --- a/weaver/src/main/java/org/aspectj/weaver/bcel/Utility.java +++ b/weaver/src/main/java/org/aspectj/weaver/bcel/Utility.java @@ -111,7 +111,7 @@ public class Utility { * Ensure we report a nice source location - particular in the case where the source info is missing (binary weave). */ public static String beautifyLocation(ISourceLocation isl) { - StringBuffer nice = new StringBuffer(); + StringBuilder nice = new StringBuilder(); if (isl == null || isl.getSourceFile() == null || isl.getSourceFile().getName().contains("no debug info available")) { nice.append("no debug info available"); } else { diff --git a/weaver/src/main/java/org/aspectj/weaver/loadtime/definition/LightXMLParser.java b/weaver/src/main/java/org/aspectj/weaver/loadtime/definition/LightXMLParser.java index 119ba8a51..3d3fba430 100644 --- a/weaver/src/main/java/org/aspectj/weaver/loadtime/definition/LightXMLParser.java +++ b/weaver/src/main/java/org/aspectj/weaver/loadtime/definition/LightXMLParser.java @@ -411,7 +411,7 @@ public class LightXMLParser { private void mapEntity(StringBuffer buf) throws Exception { char c = this.NULL_CHAR; - StringBuffer keyBuf = new StringBuffer(); + StringBuilder keyBuf = new StringBuilder(); while (true) { c = this.getNextChar(); if (c == ';') { diff --git a/weaver/src/main/java/org/aspectj/weaver/model/AsmRelationshipProvider.java b/weaver/src/main/java/org/aspectj/weaver/model/AsmRelationshipProvider.java index 0dbae4188..387844777 100644 --- a/weaver/src/main/java/org/aspectj/weaver/model/AsmRelationshipProvider.java +++ b/weaver/src/main/java/org/aspectj/weaver/model/AsmRelationshipProvider.java @@ -221,7 +221,7 @@ public class AsmRelationshipProvider { } else { IProgramElement programElement = model.getHierarchy().getRoot(); // =Foo/,<g(G.class[G - StringBuffer phantomHandle = new StringBuffer(); + StringBuilder phantomHandle = new StringBuilder(); // =Foo phantomHandle.append(programElement.getHandleIdentifier()); diff --git a/weaver/src/main/java/org/aspectj/weaver/model/AsmRelationshipUtils.java b/weaver/src/main/java/org/aspectj/weaver/model/AsmRelationshipUtils.java index 053a88abe..b21e7e2e0 100644 --- a/weaver/src/main/java/org/aspectj/weaver/model/AsmRelationshipUtils.java +++ b/weaver/src/main/java/org/aspectj/weaver/model/AsmRelationshipUtils.java @@ -52,7 +52,7 @@ public class AsmRelationshipUtils { * and a named pointcut called p() will return 'p()..' */ public static String genPointcutDetails(Pointcut pcd) { - StringBuffer details = new StringBuffer(); + StringBuilder details = new StringBuilder(); if (pcd instanceof ReferencePointcut) { ReferencePointcut rp = (ReferencePointcut) pcd; details.append(rp.name).append(DOUBLE_DOTS); diff --git a/weaver/src/test/java/fluffy/Aspect.java b/weaver/src/test/java/fluffy/Aspect.java index 401ce9ba8..d4b10dc32 100644 --- a/weaver/src/test/java/fluffy/Aspect.java +++ b/weaver/src/test/java/fluffy/Aspect.java @@ -4,20 +4,20 @@ import org.aspectj.runtime.internal.AroundClosure; public class Aspect { public static void ignoreMe() {} - + public static void before_method_call() { - System.out.println("before"); + System.out.println("before"); } - + public static void afterReturning_method_call() { - System.out.println("afterReturning"); + System.out.println("afterReturning"); } public static void afterThrowing_method_execution(Throwable t) { - System.out.println("afterThrowing " + t); + System.out.println("afterThrowing " + t); t.printStackTrace(); } - + public static Object aroundFun(AroundClosure c) { System.out.println("around"); try { diff --git a/weaver/src/test/java/fluffy/Base.java b/weaver/src/test/java/fluffy/Base.java index 4cdb1f772..fb794f742 100644 --- a/weaver/src/test/java/fluffy/Base.java +++ b/weaver/src/test/java/fluffy/Base.java @@ -4,15 +4,15 @@ public class Base { public static void onlyBase() {} public static void both() {} - + public void onlyBaseNonStatic() {} public void bothNonStatic() {} public int onlyBase; public int both; - + public Base() {} public Base(int i) {} - + public void m() throws CloneNotSupportedException {} } diff --git a/weaver/src/test/java/fluffy/Derived.java b/weaver/src/test/java/fluffy/Derived.java index ad0842c18..10f8f60f9 100644 --- a/weaver/src/test/java/fluffy/Derived.java +++ b/weaver/src/test/java/fluffy/Derived.java @@ -6,15 +6,15 @@ public class Derived extends Base { public static void onlyDerived() throws IOException, CloneNotSupportedException {} public static void both() {} - + public void onlyDerivedNonStatic() {} public void bothNonStatic() {} - + public int onlyDerived; public int both; - + public Derived() {} - + public void m() {} - + } diff --git a/weaver/src/test/java/org/aspectj/weaver/reflect/ReflectionBasedReferenceTypeDelegateTest.java b/weaver/src/test/java/org/aspectj/weaver/reflect/ReflectionBasedReferenceTypeDelegateTest.java index 91c3ead95..612e83e7d 100644 --- a/weaver/src/test/java/org/aspectj/weaver/reflect/ReflectionBasedReferenceTypeDelegateTest.java +++ b/weaver/src/test/java/org/aspectj/weaver/reflect/ReflectionBasedReferenceTypeDelegateTest.java @@ -255,7 +255,7 @@ public abstract class ReflectionBasedReferenceTypeDelegateTest extends TestCase ReferenceType rawReflectType = (ReferenceType) world.resolve(javaUtilHashMap); ResolvedMember[] rms1 = rawType.getDelegate().getDeclaredMethods(); ResolvedMember[] rms2 = rawReflectType.getDelegate().getDeclaredMethods(); - StringBuffer errors = new StringBuffer(); + StringBuilder errors = new StringBuilder(); Set one = new HashSet(); for (ResolvedMember item : rms1) { one.add(item.toString()); diff --git a/weaver/src/test/java/org/aspectj/weaver/tools/Java15PointcutExpressionTest.java b/weaver/src/test/java/org/aspectj/weaver/tools/Java15PointcutExpressionTest.java index 226f7bec0..a0029b044 100644 --- a/weaver/src/test/java/org/aspectj/weaver/tools/Java15PointcutExpressionTest.java +++ b/weaver/src/test/java/org/aspectj/weaver/tools/Java15PointcutExpressionTest.java @@ -295,7 +295,7 @@ public class Java15PointcutExpressionTest extends TestCase { expected.remove(nextToken); } if (expected.size()>0) { // we have excess ones! - StringBuffer excessTokens = new StringBuffer(); + StringBuilder excessTokens = new StringBuilder(); for (String string : expected) { excessTokens.append(string).append(" "); } @@ -313,7 +313,7 @@ public class Java15PointcutExpressionTest extends TestCase { expected.remove(nextToken); } if (expected.size()>0) { // we have excess ones! - StringBuffer excessTokens = new StringBuffer(); + StringBuilder excessTokens = new StringBuilder(); for (String string : expected) { excessTokens.append(string).append(" "); } |