Yes yes, I broke the build. The performance code had a 1.4 API in it (split()) which...

diff --git a/org.aspectj.ajdt.core/testsrc/RunWeaveTests.java b/org.aspectj.ajdt.core/testsrc/RunWeaveTests.java
index 9907e280e130d49c2282f81f53d10c95fc29f4f0..2ad653ddc34404cc898ff0903646303fb2b09ead 100644 (file)
--- a/org.aspectj.ajdt.core/testsrc/RunWeaveTests.java
+++ b/org.aspectj.ajdt.core/testsrc/RunWeaveTests.java
@@ -124,7 +124,7 @@ public class RunWeaveTests {
        }
        
        /* Compatibility with JDK 1.3.1 */
-       private static String[] split (String s) {
+       public static String[] split (String s) {
                List list = new ArrayList();
                StringTokenizer st = new StringTokenizer(s," ");
                while (st.hasMoreTokens()) {

diff --git a/org.aspectj.ajdt.core/testsrc/WeaveTests.java b/org.aspectj.ajdt.core/testsrc/WeaveTests.java
index d40c11c90221ac9aaf9d33fb16a89e4fb2b7f789..4c27fd26da39282b1892dbc35c610509e304ea53 100644 (file)
--- a/org.aspectj.ajdt.core/testsrc/WeaveTests.java
+++ b/org.aspectj.ajdt.core/testsrc/WeaveTests.java
@@ -485,7 +485,7 @@ public class WeaveTests {
                        "-argfile " + OUTPUT_PACKAGE + File.separatorChar + "build.lst";
 
                // split method creates a String array delimited on a space
-               String[] parsedArgs = ajcargs.split(" "); 
+               String[] parsedArgs = RunWeaveTests.split(ajcargs); 
 
                
                long start = System.currentTimeMillis();
@@ -497,6 +497,7 @@ public class WeaveTests {
                return stop - start;
        }
        
+       
        public static void weaveAspects(String adviceType) throws IOException {
 
                adviceType = adviceType.toLowerCase();
@@ -583,7 +584,7 @@ public class WeaveTests {
                        "-outjar " + OUTPUT_PACKAGE + File.separatorChar + adviceName + ".jar " + 
                        OUTPUT_PACKAGE + File.separatorChar + adviceName + ".aj";
                        
-               String[] parsedArgs = ajcargs.split(" ");
+               String[] parsedArgs = RunWeaveTests.split(ajcargs);
                
                long start = System.currentTimeMillis();