no semantic change - avoiding warning about static members accessed via non-static...

diff --git a/testing/src/org/aspectj/testing/harness/bridge/CompilerRun.java b/testing/src/org/aspectj/testing/harness/bridge/CompilerRun.java
index d6fba5bb0c024a953c27b03e4ce50003090c1469..224ade65849f847491c3c52e0472ff1a585afa55 100644 (file)
--- a/testing/src/org/aspectj/testing/harness/bridge/CompilerRun.java
+++ b/testing/src/org/aspectj/testing/harness/bridge/CompilerRun.java
@@ -1073,8 +1073,8 @@ public class CompilerRun implements IAjcRun {
             if (!permitAnyCompiler
                 && (!(ReflectionFactory.ECLIPSE.equals(compilerName)
                     || ReflectionFactory.OLD_AJC.equals(compilerName)
-                    || CRSOPTIONS.AJDE_COMPILER.equals(compilerName)
-                    || CRSOPTIONS.AJCTASK_COMPILER.equals(compilerName)
+                    || CRSOptions.AJDE_COMPILER.equals(compilerName)
+                    || CRSOptions.AJCTASK_COMPILER.equals(compilerName)
                     || permitAnyCompiler 
                     ))) {
                     //|| BUILDER_COMPILER.equals(compilerName))

diff --git a/testing/src/org/aspectj/testing/taskdefs/AjcTaskCompileCommand.java b/testing/src/org/aspectj/testing/taskdefs/AjcTaskCompileCommand.java
index 6a10c07c5c0187c93b0c7efaabf6a2c8c463c684..9a8e9ab6093e2d1da57c4ef4297123945663e3b0 100644 (file)
--- a/testing/src/org/aspectj/testing/taskdefs/AjcTaskCompileCommand.java
+++ b/testing/src/org/aspectj/testing/taskdefs/AjcTaskCompileCommand.java
@@ -92,7 +92,7 @@ public class AjcTaskCompileCommand implements ICommand {
             long nextCheck = curTime + checkInterval;
             while (nextCheck > curTime) {
                 try {
-                    thread.sleep(nextCheck - curTime);
+                    Thread.sleep(nextCheck - curTime);
                 } catch (InterruptedException e) {
                     // ignore
                 }

diff --git a/testing/testsrc/org/aspectj/testing/taskdefs/AjcTaskCompileCommandTest.java b/testing/testsrc/org/aspectj/testing/taskdefs/AjcTaskCompileCommandTest.java
index eb858da48ee7664b7cd7b6a609df0c431da1269a..9f5d93bd2169d2d7a61a6e8cff088dfb459e2a2b 100644 (file)
--- a/testing/testsrc/org/aspectj/testing/taskdefs/AjcTaskCompileCommandTest.java
+++ b/testing/testsrc/org/aspectj/testing/taskdefs/AjcTaskCompileCommandTest.java
@@ -239,7 +239,7 @@ class MessageAdder implements Runnable {
             while (!stop && (curTime < timeout)
                 && (curTime < targetTime)) {
                 try {
-                    thread.sleep(targetTime - curTime);
+                    Thread.sleep(targetTime - curTime);
                 } catch (InterruptedException e) {
                     // ignore
                 }