From: Alexander Kriegisch <Alexander@Kriegisch.name>
Date: Mon, 18 Apr 2022 05:51:42 +0000 (+0700)
Subject: Make IStateListener.aboutToCompareClasspaths use typed lists
X-Git-Tag: V1_9_19~12
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ee9d532b1ad6bad267ce2d796f3979074e6122cd;p=aspectj.git

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 961c6cbde..281d336fb 100644
--- 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 1a822f44c..aacee632a 100644
--- 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 4ce172479..83a37d498 100644
--- 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 8fc389e5b..1daf26642 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
@@ -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) {