Disabling ConcJUnit with the "enable/disable" checkbox didn't work.

mgricken · mgricken · commit 8d3cdbacfda7 · 2009-09-30T21:59:29.000Z
M    src/edu/rice/cs/drjava/DrJava.java


git-svn-id: file:///tmp/test-svn/trunk@5100 fe72c1cf-3628-48e9-8b72-1c46755d3cff
diff --git a/drjava/src/edu/rice/cs/drjava/DrJava.java b/drjava/src/edu/rice/cs/drjava/DrJava.java
@@ -180,7 +180,7 @@ public static void configureAndLoadDrJavaRoot(String[] args) {
         }
         boolean restart = (getConfig().getSetting(MASTER_JVM_ARGS).length() > 0)
           || (!"".equals(masterMemory) && !OptionConstants.heapSizeChoices.get(0).equals(masterMemory))
-          || junitLocationConfigured;
+          || (DrJava.getConfig().getSetting(OptionConstants.RT_CONCJUNIT_LOCATION_ENABLED) && junitLocationConfigured);
         _log.log("restart: "+restart);
         
         LinkedList<String> classArgs = new LinkedList<String>();
@@ -205,7 +205,8 @@ public static void configureAndLoadDrJavaRoot(String[] args) {
             // extend classpath if JUnit/ConcJUnit location specified
             _log.log("JVMBuilder: classPath = "+jvmb.classPath());
             ArrayList<File> extendedClassPath = new ArrayList<File>();
-            if (junitLocationConfigured) {
+            if (DrJava.getConfig().getSetting(OptionConstants.RT_CONCJUNIT_LOCATION_ENABLED) &&
+                junitLocationConfigured) {
               extendedClassPath.add(junitLocation);
             }
             for(File f: jvmb.classPath()) { extendedClassPath.add(f); }
