This revision consists of a simplified build.xml file and an expanded

ponderosaTX · ponderosaTX · commit 046954c0a351 · 2017-11-21T08:01:09.000-06:00
lib library (adding asm-6.0.jar) which updated asm library (which should
have been checked in to the repository many commits ago).  The build file
not longer refers to ConcJUnit (which is not maintained anymore).
The source code also contains a few ancillary slight revsions including
additional debugging code and some minor reformatting.

The following files were modified, addeded or deleted:

	modified:   build.xml
	new file:   lib/.gitignore
	new file:   lib/asm-6.0.jar
	modified:   src/edu/rice/cs/drjava/model/junit/DefaultJUnitModel.java
diff --git a/drjava/build.xml b/drjava/build.xml
@@ -10,6 +10,7 @@
   <property name="src-working-dir" value="src/edu/rice/cs/drjava" />
   <property name="md5-temp-name" value="classes/md5.properties" />
   <property name="md5-properties-path" value="edu/rice/cs/drjava/md5.properties" />
+  <property name="junit-jar-to-include" value="lib/junit.jar" />
   <property name="main-class" value="edu.rice.cs.drjava.DrJava" />
 
   <!-- Properties loaded from a file -->
diff --git a/drjava/lib/.gitignore b/drjava/lib/.gitignore
@@ -0,0 +1,2 @@
+buildlib
+arch
diff --git a/drjava/lib/asm-6.0.jar b/drjava/lib/asm-6.0.jar
diff --git a/drjava/src/edu/rice/cs/drjava/model/junit/DefaultJUnitModel.java b/drjava/src/edu/rice/cs/drjava/model/junit/DefaultJUnitModel.java
@@ -44,6 +44,7 @@
 import java.util.List;
 import java.util.LinkedList;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Set;
@@ -326,7 +327,7 @@ private void _rawJUnitOpenDefDocs(List<OpenDefinitionsDocument> lod, final boole
     for (OpenDefinitionsDocument doc: lod) /* for all nonEmpty documents in lod */ {
       if (doc.isSourceFile())  { // excludes Untitled documents and open non-source files
         try {
-//          System.err.println("Processing " + doc);
+          _log.log("Processing " + doc);
           File sourceRoot = doc.getSourceRoot(); // may throw an InvalidPackageException
           
           // doc has valid package name; add it to list of open java source doc files
@@ -346,20 +347,19 @@ private void _rawJUnitOpenDefDocs(List<OpenDefinitionsDocument> lod, final boole
           
           if (! classDirsAndRoots.containsKey(classFileDir)) {
             classDirsAndRoots.put(classFileDir, sourceDir);
-//            System.err.println("Adding " + classFileDir + " with source root " + sourceRoot + 
-//            " to list of class directories");
+            _log.log("Adding " + classFileDir + " with source root " + sourceRoot + " to list of class directories");
           }
         }
         catch (InvalidPackageException e) { /* Skip the file, since it doesn't have a valid package */ }
       }
     }
 
-//    System.err.println("classDirs = " + classDirsAndRoots.keySet());
+    _log.log("classDirs = " + classDirsAndRoots.keySet());
     
     /** set of dirs potentially containing test classes */
     Set<File> classDirs = classDirsAndRoots.keySet();
     
-    //System.err.println("openDocFiles = " + openDocFiles);
+    _log.log("openDocFiles = " + openDocFiles);
 
     /* Names of test classes. */
     final ArrayList<String> classNames = new ArrayList<String>();
@@ -375,11 +375,11 @@ private void _rawJUnitOpenDefDocs(List<OpenDefinitionsDocument> lod, final boole
     
     try {
       for (File dir: classDirs) { // foreach class file directory
-//        System.err.println("Examining directory " + dir);
+        _log.log("Examining directory " + dir);
         
         File[] listing = dir.listFiles();
         
-//        System.err.println("Directory contains the files: " + Arrays.asList(listing));
+        _log.log("Directory contains the files: " + Arrays.asList(listing));
         
         if (listing != null) { // listFiles may return null if there's an IO error
           for (File entry : listing) { /* for each class file in the build directory */        
