This small update includes patches to unit tests that perform compilation to accommodate changes to javac (!!) since Java 6.

ponderosaTX · ponderosaTX · commit 458e0a225ad4 · 2025-03-24T12:15:03.000-05:00
It also makes the java 8 compiler in the installed java 8 JDK distro the preferred compiler instead of the javax.tools compiler.
The imports to JPDADebugger were changed to accommodate changes to the API in the Java libraries since Java 6 (!!).
 Changes to be committed:
	modified:   ../config/OptionConstants.java
	modified:   ../model/DefaultGlobalModel.java
	modified:   ../model/GlobalEventNotifier.java
	modified:   ../model/GlobalModelOtherTest.java
	modified:   ../model/compiler/DefaultCompilerModel.java
	modified:   ../model/debug/jpda/JPDADebugger.java
	modified:   MainFrame.java
diff --git a/drjava/src/edu/rice/cs/drjava/config/OptionConstants.java b/drjava/src/edu/rice/cs/drjava/config/OptionConstants.java
@@ -129,7 +129,7 @@ public interface OptionConstants {
   
   /** Whether to display all versions of the compilers (even if they have the same major version). */
   public static final BooleanOption DISPLAY_ALL_COMPILER_VERSIONS = 
-    new BooleanOption("all.compiler.versions", Boolean.FALSE);
+    new BooleanOption("all.compiler.versions", Boolean.TRUE);
   
   
   /* ---------- Color Options ---------- */
diff --git a/drjava/src/edu/rice/cs/drjava/model/DefaultGlobalModel.java b/drjava/src/edu/rice/cs/drjava/model/DefaultGlobalModel.java
@@ -179,13 +179,9 @@ public void activeCompilerChanged() {
   /* CONSTRUCTORS */
   /** Constructs a new GlobalModel. Creates a new MainJVM and starts its Interpreter JVM. */
   public DefaultGlobalModel() {
-    Iterable<? extends JDKToolsLibrary> tools = findLibraries();  // findLibraries should be called findTools
+    Iterable<? extends JDKToolsLibrary> tools = findTools();  // findTools should be called findTools
     LinkedList<CompilerInterface> compilers = new LinkedList<CompilerInterface>();
 
-    // TODO: should this be done a different way?
-    JavaxToolsCompiler javaxCompiler = new JavaxToolsCompiler();
-    compilers.add(javaxCompiler);
-
     /* Note: the only debugger used in DrJava is JPDADebugger in the DrJava code base which relies
      * on machinery provided by the tools.jar library included in every Java JDK (up through JDK 8).  A copy of the
      * tools.jar library from Java 8 Open JDK is included in the drjava.jar file.
@@ -322,7 +318,7 @@ private LibraryKey getLibraryKey(int priority, JDKToolsLibrary lib) {
   }
   
   /** Fills the results Map with available tools.jar files located within found JDK distributions. */
-  private Iterable<JDKToolsLibrary> findLibraries() {
+  private Iterable<JDKToolsLibrary> findTools() {
     // Order to return: config setting, runtime (if different version), from search (if different versions)
     
     // map is sorted by version, lowest-to-highest
@@ -372,7 +368,7 @@ private Iterable<JDKToolsLibrary> findLibraries() {
     JDKToolsLibrary.msg("Adding default library: " + defaultLibrary);
     
     Iterable<JDKToolsLibrary> libraries = IterUtil.reverse(results.values());
-    JDKToolsLibrary.msg("findLibraries() returning libraries: " + libraries);
+    JDKToolsLibrary.msg("findTools() returning libraries: " + libraries);
     return libraries;
   }
   
diff --git a/drjava/src/edu/rice/cs/drjava/model/GlobalEventNotifier.java b/drjava/src/edu/rice/cs/drjava/model/GlobalEventNotifier.java
@@ -477,14 +477,14 @@ public void compileBeforeJUnit(final CompilerListener cl, List<OpenDefinitionsDo
     finally { _lock.endRead(); }
   }
   
-  /** Called after JUnit is started by the GlobalModel. */
+  /** Called after JUnit is started by the GlobalModel. Propogates the call to all GlobalModelListeners. */
   public void junitStarted() {
     _lock.startRead();
     try { for (GlobalModelListener l : _listeners) { l.junitStarted(); } }
     finally { _lock.endRead(); }
   }
   
-  /** Called when testing specific list of classes. */
+  /** Called when testing specific list of classes. Propogates the call to all GlobalModelListeners. */
   public void junitClassesStarted() {
     _lock.startRead();
     try { for (GlobalModelListener l : _listeners) { l.junitClassesStarted(); } }
diff --git a/drjava/src/edu/rice/cs/drjava/model/GlobalModelOtherTest.java b/drjava/src/edu/rice/cs/drjava/model/GlobalModelOtherTest.java
@@ -52,7 +52,7 @@
 public final class GlobalModelOtherTest extends GlobalModelTestCase implements OptionConstants {
   
   //  _log can be inherited from GlobalModelTestCase
-  Log _log = new Log("GlobalModelOtherTest.txt", false);
+  Log _log = new Log("GlobalModelOtherTest.txt", true);
   
   private static final String FOO_CLASS =
     "package bar;\n" +
diff --git a/drjava/src/edu/rice/cs/drjava/model/compiler/DefaultCompilerModel.java b/drjava/src/edu/rice/cs/drjava/model/compiler/DefaultCompilerModel.java
@@ -67,7 +67,7 @@
 public class DefaultCompilerModel implements CompilerModel {
   
   /** for logging debug info */
-  private static final Log _log = new edu.rice.cs.util.Log("DefaultCompilerModel.txt", false);
+  private static final Log _log = new edu.rice.cs.util.Log("DefaultCompilerModel.txt", true);
   
   /** The available compilers */
   private final List<CompilerInterface> _compilers;
@@ -103,10 +103,16 @@ public DefaultCompilerModel(GlobalModel m, Iterable<? extends CompilerInterface>
     
     for (CompilerInterface i : compilers) { _compilers.add(i); compilerNames.add(i.getName());}
     
+    // TODO: should this be done a different way?
+    JavaxToolsCompiler javaxCompiler = new JavaxToolsCompiler();
+    _compilers.add(javaxCompiler);
+    
     OptionConstants.COMPILER_PREFERENCE_CONTROL.setList(compilerNames); // populates the compiler list for preference panel
     
     String dCompName = DrJava.getConfig().getSetting(OptionConstants.DEFAULT_COMPILER_PREFERENCE);
     
+//    Utilities.show("dCompName = " + dCompName);
+    
     if (_compilers.size() > 0) {
       if (! dCompName.equals(OptionConstants.COMPILER_PREFERENCE_CONTROL.NO_PREFERENCE) &&
            compilerNames.contains(dCompName)) 
diff --git a/drjava/src/edu/rice/cs/drjava/model/debug/jpda/JPDADebugger.java b/drjava/src/edu/rice/cs/drjava/model/debug/jpda/JPDADebugger.java
@@ -496,9 +496,9 @@ public static boolean isJavaIdentifier(String s) {
   }
   
   /** Adds a watch on the given field or variable.
-   * @param field the name of the field we will watch
-   * @throws DebugException if something goes wrong
-   */
+    * @param field the name of the field we will watch
+    * @throws DebugException if something goes wrong
+    */
   public /* synchronized */ void addWatch(String field) throws DebugException {
     // _ensureReady();
     assert EventQueue.isDispatchThread();
diff --git a/drjava/src/edu/rice/cs/drjava/ui/MainFrame.java b/drjava/src/edu/rice/cs/drjava/ui/MainFrame.java
@@ -1874,7 +1874,7 @@ public Set<JavaAPIListEntry> getJavaAPISet() {
   private void generateJavaAPISet() {
     // should NOT be called in the event thread
     // otherwise the processing frame will not work correctly and the event thread will block
-    // assert (!EventQueue.isDispatchThread());  // Why is this commented out???
+    assert (!EventQueue.isDispatchThread()); 
     if (_javaAPISet.size() == 0) {
       final ProcessingDialog pd =
         new ProcessingDialog(this, "Java API Classes", "Loading, please wait.", false);
