This commit pathces the tools library classes so that they correctly find the Java 7 compiler in the Oracle JDK 7 for the Mac. These changes depend on supporting changes to the JavaVersion class in the plt code base.

rcartwright · rcartwright · commit 022699e767ab · 2013-08-29T15:53:50.000Z
The following files were modified:

M    lib/plt.jar
M    src/edu/rice/cs/drjava/model/JarJDKToolsLibrary.java
M    src/edu/rice/cs/drjava/model/JDKToolsLibrary.java
M    src/edu/rice/cs/util/text/SwingDocumentTest.java


git-svn-id: file:///tmp/test-svn/trunk@5753 fe72c1cf-3628-48e9-8b72-1c46755d3cff
diff --git a/drjava/lib/plt.jar b/drjava/lib/plt.jar
diff --git a/drjava/src/edu/rice/cs/drjava/model/JDKToolsLibrary.java b/drjava/src/edu/rice/cs/drjava/model/JDKToolsLibrary.java
@@ -71,6 +71,8 @@ public class JDKToolsLibrary {
   private final JavadocModel _javadoc;
   private final JDKDescriptor _jdkDescriptor; // JDKDescriptor.NONE if none
   
+  /* package private */ static edu.rice.cs.util.Log _log = new edu.rice.cs.util.Log("JDKToolsLibrary.txt", true);
+  
   protected JDKToolsLibrary(FullVersion version, JDKDescriptor jdkDescriptor, CompilerInterface compiler, 
                             Debugger debugger, JavadocModel javadoc) {
     assert jdkDescriptor != null;
@@ -194,7 +196,7 @@ public static Iterable<JDKToolsLibrary> makeFromRuntime(GlobalModel model) {
   public static final java.io.StringWriter LOG_STRINGWRITER = new java.io.StringWriter();
 //  protected static final java.io.PrintWriter LOG_PW = new java.io.PrintWriter(LOG_STRINGWRITER);
   
-  public static void msg(String s) {   
+  public static void msg(String s) {  _log.log(s);   
 //    try {   
 //      java.io.PrintWriter pw = new java.io.PrintWriter(new java.io.FileWriter(new File(new File(System.getProperty("user.home")),   
 //                                                                                       "FindCompilers.txt").getAbsolutePath(),true));   
diff --git a/drjava/src/edu/rice/cs/drjava/model/JarJDKToolsLibrary.java b/drjava/src/edu/rice/cs/drjava/model/JarJDKToolsLibrary.java
@@ -1,4 +1,4 @@
-/*BEGIN_COPYRIGHT_BLOCK
+/* BEGIN_COPYRIGHT_BLOCK
  *
  * Copyright (c) 2001-2010, JavaPLT group at Rice University (drjava@rice.edu)
  * All rights reserved.
@@ -215,8 +215,8 @@ else if (f.getName().equals("tools.jar")) {
         try {
           Class<?>[] sig = { FullVersion.class, String.class, List.class };
           Object[] args = { version, f.toString(), bootClassPath };
-          // JDKToolsLibrary._log.log("classpath for compiler: "+IterUtil.multilineToString(path));
-          // JDKToolsLibrary._log.log("boot classpath for compiler: "+IterUtil.multilineToString(bootClassPath));                
+          // JDKToolsLibrary._log.log("classpath for compiler: " + IterUtil.multilineToString(path));
+          // JDKToolsLibrary._log.log("boot classpath for compiler: " + IterUtil.multilineToString(bootClassPath));                
           CompilerInterface attempt = (CompilerInterface) ReflectUtil.loadLibraryAdapter(loader, path, compilerAdapter, 
                                                                                          sig, args);
           if (attempt.isAvailable()) { compiler = attempt; }
@@ -288,6 +288,7 @@ public static FullVersion guessVersion(File f, JDKDescriptor desc) {
       else if (name.startsWith("jdk")) {
         parsedVersion = name.substring(3); 
         result = JavaVersion.parseFullVersion(parsedVersion, vendor, vendor, f);
+        JDKToolsLibrary.msg("For name starting with 'jdk', parsedVersion = '" + parsedVersion + "' result = '" + result + "'");
       }
       else if (name.startsWith("j2sdk") || name.startsWith("java-")) {
         parsedVersion = name.substring(5);
@@ -442,7 +443,7 @@ protected static LinkedHashMap<File,Set<JDKDescriptor>> getDefaultSearchRoots()
     /* Entries for Mac OS X */
     addIfDir(new File("/System/Library/Java/JavaVirtualMachines"), roots);
     addIfDir(new File("/Library/Java/JavaVirtualMachines"), roots);
-    addIfDir(new File("/System/Library/Java/JavaVirtualMachines"), roots);
+//    addIfDir(new File("/System/Library/Java/JavaVirtualMachines"), roots);
 
     addIfDir(new File("/usr/java"), roots);
     addIfDir(new File("/usr/j2se"), roots);
diff --git a/drjava/src/edu/rice/cs/util/text/SwingDocumentTest.java b/drjava/src/edu/rice/cs/util/text/SwingDocumentTest.java
@@ -1,4 +1,4 @@
-/*BEGIN_COPYRIGHT_BLOCK
+/* BEGIN_COPYRIGHT_BLOCK
  *
  * Copyright (c) 2001-2010, JavaPLT group at Rice University (drjava@rice.edu)
  * All rights reserved.

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/*BEGIN_COPYRIGHT_BLOCK`
	`1`	`+/* BEGIN_COPYRIGHT_BLOCK`
`2`	`2`	`*`
`3`	`3`	`* Copyright (c) 2001-2010, JavaPLT group at Rice University (drjava@rice.edu)`
`4`	`4`	`* All rights reserved.`