paring globals to those used, then using them consistently

3 files changed, 9 insertions, 9 deletions

diff --git a/testing/src/org/aspectj/testing/ajde/CompileCommand.java b/testing/src/org/aspectj/testing/ajde/CompileCommand.java
index 57c1c145a..024756804 100644
--- a/testing/src/org/aspectj/testing/ajde/CompileCommand.java
+++ b/testing/src/org/aspectj/testing/ajde/CompileCommand.java
@@ -17,6 +17,7 @@ import java.io.*;
 import java.lang.reflect.*;
 import java.util.*;
 
+import org.aspectj.testing.harness.bridge.Globals;
 import org.aspectj.ajde.*;
 import org.aspectj.ajde.ui.*;
 import org.aspectj.ajde.ui.internal.*;
@@ -367,7 +368,7 @@ class ProjectProperties implements ProjectPropertiesAdapter {
     public Set getSourceRoots() { return sourceRoots; }
     public void setAspectPath(Set path) { aspectPath = path; }        
     public Set getAspectPath() { return aspectPath; }
-    public String getClasspath() { return "../lib/test/aspectjrt.jar";  }
+    public String getClasspath() { return Globals.S_aspectjrt_jar;  }
     public String getBootClasspath() { return null; }
     public void setOutJar(String input){ outJar = input; }
     public String getOutJar() { return outJar; }
diff --git a/testing/src/org/aspectj/testing/harness/bridge/Globals.java b/testing/src/org/aspectj/testing/harness/bridge/Globals.java
index 8f5871a65..f838a5637 100644
--- a/testing/src/org/aspectj/testing/harness/bridge/Globals.java
+++ b/testing/src/org/aspectj/testing/harness/bridge/Globals.java
@@ -1,6 +1,7 @@
 /* *******************************************************************
  * Copyright (c) 1999-2001 Xerox Corporation, 
- *               2002 Palo Alto Research Center, Incorporated (PARC).
+ *               2002 Palo Alto Research Center, Incorporated (PARC)
+ *               2003 Contributors.
  * All rights reserved. 
  * This program and the accompanying materials are made available 
  * under the terms of the Common Public License v1.0 
@@ -9,10 +10,10 @@
  *  
  * Contributors: 
  *     Xerox/PARC     initial implementation 
+ *     Wes Isberg     removed unused globals.
  * ******************************************************************/
-
  
- package org.aspectj.testing.harness.bridge;
+package org.aspectj.testing.harness.bridge;
 
 import java.io.File;
 
@@ -32,16 +33,14 @@ public class Globals {
     public static final String LIBDIR = getSystemProperty(LIBDIR_NAME, "../lib/test");
 
     /** Path to J2SE_HOME */
-    public static final File J2SE14_RTJAR;
+    public static final File J2SE14_RTJAR; // XXX used only by 1.0 compiler tests - deprecate?
 
     /** array of parameter types for main(String[]) */
     public static final Class[] MAIN_PARM_TYPES = new Class[] {String[].class};    
     public static final String S_testingclient_jar  = LIBDIR + "/testing-client.jar";
     public static final String S_aspectjrt_jar      = LIBDIR + "/aspectjrt.jar";
-    public static final String S_bridge_jar         = LIBDIR + "/bridge.jar";
     public static final File F_testingclient_jar    = new File(S_testingclient_jar);
     public static final File F_aspectjrt_jar        = new File(S_aspectjrt_jar);
-    public static final File F_bridge_jar           = new File(S_bridge_jar);
     public static final boolean globalsValid;
     
     static {
@@ -58,7 +57,6 @@ public class Globals {
     	globalsValid = 
     		(FileUtil.canReadFile(F_testingclient_jar)
     		  && FileUtil.canReadFile(F_aspectjrt_jar)
-    		  && FileUtil.canReadFile(F_bridge_jar)
               && FileUtil.canReadFile(J2SE14_RTJAR)
             );
     }
diff --git a/testing/testsrc/org/aspectj/testing/taskdefs/AjcTaskCompileCommandTest.java b/testing/testsrc/org/aspectj/testing/taskdefs/AjcTaskCompileCommandTest.java
index d9b89b203..eb858da48 100644
--- a/testing/testsrc/org/aspectj/testing/taskdefs/AjcTaskCompileCommandTest.java
+++ b/testing/testsrc/org/aspectj/testing/taskdefs/AjcTaskCompileCommandTest.java
@@ -17,6 +17,7 @@ import java.util.ArrayList;
 
 import org.aspectj.bridge.*;
 import org.aspectj.bridge.MessageHandler;
+import org.aspectj.testing.harness.bridge.Globals;
 import org.aspectj.util.*;
 import org.aspectj.util.LangUtil;
 
@@ -42,7 +43,7 @@ public class AjcTaskCompileCommandTest extends TestCase {
         list.add("-d");
         list.add(getClassesDir().getAbsolutePath());
         list.add("-classpath");
-        list.add(new File("../lib/test/aspectjrt.jar").getAbsolutePath());
+        list.add(Globals.F_aspectjrt_jar.getAbsolutePath());
     }
 
     static boolean doWait(IMessageHolder holder, int seconds, int timeout) {