Fix some deprecated Java and JUnit warnings by using newer API calls

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

2 files changed, 2 insertions, 2 deletions

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 e576ee0d3..eb6bb92da 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
@@ -229,7 +229,7 @@ public class AjPipeliningCompilerAdapter extends AbstractCompilerAdapter {
 			if (pipelineOutput == null) {
 				pipelineOutput = new Hashtable();
 			}
-			pipelineOutput.put("filesContainingAspects", new Integer(toWaitFor).toString());
+			pipelineOutput.put("filesContainingAspects", Integer.toString(toWaitFor));
 			StringBuffer order = new StringBuffer();
 			order.append("[");
 			for (int i = 0; i < units.length; 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 a8c3f5a44..c326c0a69 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
@@ -898,7 +898,7 @@ public abstract class AjcTestCase extends TestCase {
 		URL[] urls = new URL[strTok.countTokens()];
 		try {
 			for (int i = 0; i < urls.length; i++) {
-				urls[i] = new File(strTok.nextToken()).getCanonicalFile().toURL();
+				urls[i] = new File(strTok.nextToken()).getCanonicalFile().toURI().toURL();
 			}
 		} catch (Exception malEx) {
 			fail("Bad classpath specification: " + classpath);