Make IStateListener.aboutToCompareClasspaths use typed lists

Before, the signature was:

void aboutToCompareClasspaths(
  List oldClasspath, List newClasspath);

Now it is:

void aboutToCompareClasspaths(
  List<String> oldClasspath, List<String> newClasspath);

AJDT will also use the typed version after generics refactoring.

Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>

diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AbstractStateListener.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AbstractStateListener.java
index 961c6cbde452a2934ee17fff2ef6f2893a34cdd4..281d336fbab5f6a7b044fe692250c02f92507f6a 100644 (file)
--- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AbstractStateListener.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/AbstractStateListener.java
@@ -24,7 +24,7 @@ public abstract class AbstractStateListener implements IStateListener {
 
        public void detectedClassChangeInThisDir(File f) {      }
 
-       public void aboutToCompareClasspaths(List oldClasspath, List newClasspath) {    }
+       public void aboutToCompareClasspaths(List<String> oldClasspath, List<String> newClasspath) {    }
 
        public void pathChangeDetected() {      }
 

diff --git a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/IStateListener.java b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/IStateListener.java
index 1a822f44ceec62382e3b05dacedaf4cac8e54e2c..aacee632a044a556afe938c4279ce7e5aa07926a 100644 (file)
--- a/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/IStateListener.java
+++ b/org.aspectj.ajdt.core/src/main/java/org/aspectj/ajdt/internal/core/builder/IStateListener.java
@@ -29,7 +29,7 @@ public interface IStateListener {
 
        void detectedClassChangeInThisDir(File f);
 
-       void aboutToCompareClasspaths(List oldClasspath, List newClasspath);
+       void aboutToCompareClasspaths(List<String> oldClasspath, List<String> newClasspath);
 
        void pathChangeDetected();
 

diff --git a/tests/src/test/java/org/aspectj/systemtest/incremental/IncrementalTests.java b/tests/src/test/java/org/aspectj/systemtest/incremental/IncrementalTests.java
index 4ce1724796cb0646c0eab7e1f525a55bbdede8c7..83a37d498bfed4d90046aea9409c074b8c0e973d 100644 (file)
--- a/tests/src/test/java/org/aspectj/systemtest/incremental/IncrementalTests.java
+++ b/tests/src/test/java/org/aspectj/systemtest/incremental/IncrementalTests.java
@@ -124,7 +124,7 @@ public class IncrementalTests extends org.aspectj.testing.XMLBasedAjcTestCase {
          class MyStateListener extends AbstractStateListener {
            public boolean pathChange = false;
                public void pathChangeDetected() {pathChange = true;}
-               public void aboutToCompareClasspaths(List oldClasspath, List newClasspath) {}
+               public void aboutToCompareClasspaths(List<String> oldClasspath, List<String> newClasspath) {}
                public void detectedClassChangeInThisDir(File f) {}
                public void buildSuccessful(boolean wasFullBuild) {}
          };
@@ -302,4 +302,3 @@ public class IncrementalTests extends org.aspectj.testing.XMLBasedAjcTestCase {
                          after.getStdOut().startsWith("Fred and Harry"));
   }
 }
-

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 8fc389e5bb76b96c33490f3609386dfc87e8be47..1daf26642e09ee17ac1ed98d3f15743f524e69ad 100644 (file)
--- a/tests/src/test/java/org/aspectj/systemtest/incremental/tools/AjdeInteractionTestbed.java
+++ b/tests/src/test/java/org/aspectj/systemtest/incremental/tools/AjdeInteractionTestbed.java
@@ -527,7 +527,7 @@ public class AjdeInteractionTestbed extends TestCase {
                        pathChange = true;
                }
 
-               public void aboutToCompareClasspaths(List oldClasspath, List newClasspath) {
+               public void aboutToCompareClasspaths(List<String> oldClasspath, List<String> newClasspath) {
                }
 
                public void detectedClassChangeInThisDir(File f) {