DrJavaAtRice
diff --git a/‎drjava/src/edu/rice/cs/drjava/DrJava.java‎
Lines changed: 11 additions & 2 deletions b/‎drjava/src/edu/rice/cs/drjava/DrJava.java‎
Lines changed: 11 additions & 2 deletions
diff --git a/‎drjava/src/edu/rice/cs/drjava/DrJavaTestCase.java‎
Lines changed: 11 additions & 3 deletions b/‎drjava/src/edu/rice/cs/drjava/DrJavaTestCase.java‎
Lines changed: 11 additions & 3 deletions
@@ -378,7 +378,7 @@ static void displayUsage() {
     * accidentally used.
     */
   static void setPropertiesFile(String fileName) {
-    if (!fileName.endsWith(".java"))  _propertiesFile = new File(fileName);
+    if (! fileName.endsWith(".java"))  _propertiesFile = new File(fileName);
   }
 
   /** Initializes the configuration object with the current notion of the properties file.
@@ -457,5 +457,14 @@ protected static void _saveConfig() {
 //
 //    int result = JOptionPane.showConfirmDialog(null, text, "Locate 'tools.jar'?", JOptionPane.YES_NO_OPTION);
 //    return result == JOptionPane.YES_OPTION;
-//  }  
+//  } 
+  
+  /* Erase all non-final bindings created in this class.  Only used in testing. */
+  public static void cleanUp() {
+    _propertiesFile = null;
+    _filesToOpen.clear();
+    _jvmArgs.clear();
+    _config = null;
+  }
+     
 }
@@ -59,17 +59,25 @@ public class DrJavaTestCase extends TestCase {
     * @throws Exception
     */
   protected void setUp() throws Exception {
-    super.setUp();
+    super.setUp();  // declared to throw Exception, forcing throws clause on preceding line
     Utilities.TEST_MODE = true;
     final String newName = System.getProperty(TEST_DRJAVA_CONFIG_PROPERTY);
+    assert newName != null;
     if (newName != null) {
+//      Utilities.show("Setting '" + newName + "' as DrJava configuration file");
       DrJava.setPropertiesFile(newName);
+      Utilities.clearEventQueue();
       DrJava._initConfig();
+      Utilities.clearEventQueue();
     }
   }
 
-  /** Clean up for every test case.
+  /** Clean up for every test case.  Only used in unit tests.  Added because Windows would intermittently throw
+    * a java.util.concurrent.RejectedExecutionException during cleanup.
     * @throws Exception
     */
-  protected void tearDown() throws Exception { super.tearDown(); }
+  protected void tearDown() throws Exception { 
+    DrJava.cleanUp();  // clobbers _config
+    super.tearDown();
+  }
 }