ASM 5.0.1 plus polish/formatting

build/usedForMavenUpload_milestone/aspectjrt.pom

@@ -5,7 +5,7 @@
   <groupId>org.aspectj</groupId>
   <artifactId>aspectjrt</artifactId>
   <packaging>jar</packaging>
-  <version>1.8.0.M1</version>
+  <version>1.8.0.RC2</version>
   <name>AspectJ runtime</name>
   <description>The runtime needed to execute a program using AspectJ</description>
   <url>http://www.aspectj.org</url>

build/usedForMavenUpload_milestone/aspectjtools.pom

@@ -5,7 +5,7 @@
   <groupId>org.aspectj</groupId>
   <artifactId>aspectjtools</artifactId>
   <packaging>jar</packaging>
-  <version>1.8.0.M1</version>
+  <version>1.8.0.RC2</version>
   <name>AspectJ tools</name>
   <description>Tools from the AspectJ project</description>
   <url>http://www.aspectj.org</url>

build/usedForMavenUpload_milestone/aspectjweaver.pom

@@ -5,7 +5,7 @@
   <groupId>org.aspectj</groupId>
   <artifactId>aspectjweaver</artifactId>
   <packaging>jar</packaging>
-  <version>1.8.0.M1</version>
+  <version>1.8.0.RC2</version>
   <name>AspectJ weaver</name>
   <description>The AspectJ weaver introduces advices to java classes</description>
   <url>http://www.aspectj.org</url>

lib/asm/build.xml

@@ -3,9 +3,9 @@
 	<!-- if you need this defining, use the jarjar-1.0.jar in this project -->
     <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask"/>
 
-	<target name="package" description="Jarjar asm-5.0_ALPHA.jar and prefix package name with aj">
-	        <jarjar destfile="asm-5.0_ALPHA.renamed.jar">
-	          <zipfileset src="asm-5.0_ALPHA.jar"/>
+	<target name="package" description="Jarjar asm-5.0.1.jar and prefix package name with aj">
+	        <jarjar destfile="asm-5.0.1.renamed.jar">
+	          <zipfileset src="asm-5.0.1.jar"/>
 	          <rule pattern="org.objectweb.asm.**" result="aj.org.objectweb.asm.@1"/>
 	        </jarjar>
 	</target> 

org.aspectj.matcher/src/org/aspectj/weaver/UnresolvedType.java

@@ -259,7 +259,6 @@ public class UnresolvedType implements Traceable, TypeVariableDeclaringElement {
 	}
 
 	public static UnresolvedType forGenericType(String name, TypeVariable[] tvbs, String genericSig) {
-		// TODO asc generics needs a declared sig
 		String sig = nameToSignature(name);
 		UnresolvedType ret = UnresolvedType.forSignature(sig);
 		ret.typeKind = TypeKind.GENERIC;
@@ -921,8 +920,9 @@ public class UnresolvedType implements Traceable, TypeVariableDeclaringElement {
 	public String getPackageName() {
 		if (packageName == null) {
 			String name = getName();
-			if (name.indexOf("<") != -1) {
-				name = name.substring(0, name.indexOf("<"));
+			int angly = name.indexOf('<');
+			if (angly != -1) {
+				name = name.substring(0, angly);
 			}
 			int index = name.lastIndexOf('.');
 			if (index == -1) {
@@ -934,8 +934,6 @@ public class UnresolvedType implements Traceable, TypeVariableDeclaringElement {
 		return packageName;
 	}
 
-	// TODO these move to a TypeUtils class
-
 	public static void writeArray(UnresolvedType[] types, CompressingDataOutputStream stream) throws IOException {
 		int len = types.length;
 		stream.writeShort(len);

taskdefs/src/org/aspectj/tools/ant/taskdefs/AjcTask.java

@@ -253,9 +253,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" };
-	static final String[] SOURCE_INPUTS = new String[] { "1.3", "1.4", "1.5", "1.6", "1.7" };
-	static final String[] COMPLIANCE_INPUTS = new String[] { "-1.3", "-1.4", "-1.5", "-1.6", "-1.7" };
+	static final String[] TARGET_INPUTS = new String[] { "1.1", "1.2", "1.3", "1.4", "1.5", "1.6", "1.7", "1.8" };
+	static final String[] SOURCE_INPUTS = new String[] { "1.3", "1.4", "1.5", "1.6", "1.7", "1.8" };
+	static final String[] COMPLIANCE_INPUTS = new String[] { "-1.3", "-1.4", "-1.5", "-1.6", "-1.7", "-1.8" };
 
 	private static final ICommandEditor COMMAND_EDITOR;
 

weaver/.classpath

@@ -13,6 +13,6 @@
 	<classpathentry kind="lib" path="/lib/bcel/bcel.jar" sourcepath="/lib/bcel/bcel-src.zip"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.aspectj.matcher"/>
-	<classpathentry kind="lib" path="/lib/asm/asm-5.0_ALPHA.renamed.jar"/>
+	<classpathentry kind="lib" path="/lib/asm/asm-5.0.1.renamed.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java

@@ -162,8 +162,7 @@ public class BcelWeaver {
 			String fixedName = aspectName;
 			int hasDot = fixedName.lastIndexOf('.');
 			while (hasDot > 0) {
-				// System.out.println("BcelWeaver.addLibraryAspect " +
-				// fixedName);
+				// System.out.println("BcelWeaver.addLibraryAspect " + fixedName);
 				char[] fixedNameChars = fixedName.toCharArray();
 				fixedNameChars[hasDot] = '$';
 				fixedName = new String(fixedNameChars);
@@ -179,7 +178,6 @@ public class BcelWeaver {
 
 		// System.out.println("type: " + type + " for " + aspectName);
 		if (type.isAspect()) {
-
 			// Bug 119657 ensure we use the unwoven aspect
 			WeaverStateInfo wsi = type.getWeaverState();
 			if (wsi != null && wsi.isReweavable()) {