Improved the tools.jar search. Fixed FileOps.getCanonicalFile() to correctly handle files that don't exist.

dlsmith · dlsmith · commit dd87e87bd750 · 2006-04-17T19:32:14.000Z
git-svn-id: file:///tmp/test-svn/trunk@3794 fe72c1cf-3628-48e9-8b72-1c46755d3cff
diff --git a/drjava/src/edu/rice/cs/util/FileOps.java b/drjava/src/edu/rice/cs/util/FileOps.java
@@ -176,7 +176,7 @@ private static void getFilesInDir(File d, List<File> acc, boolean recur, FileFil
    *  exception when the file path syntax is incorrect.  It returns the absolute File intead. */
   public static File getCanonicalFile(File f) {
     if (f == null) return f;
-    try { if (f.exists()) return f.getCanonicalFile(); }
+    try { return f.getCanonicalFile(); }
     catch(IOException e) { /* fall through */ }
     return f.getAbsoluteFile();
   }
diff --git a/drjava/src/edu/rice/cs/util/classloader/ToolsJarClassLoader.java b/drjava/src/edu/rice/cs/util/classloader/ToolsJarClassLoader.java
@@ -35,8 +35,10 @@
 
 import java.net.*;
 import java.io.File;
+import java.io.FileFilter;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.LinkedHashSet;
 
 import edu.rice.cs.util.FileOps;
 import edu.rice.cs.util.swing.Utilities;
@@ -54,32 +56,47 @@ public class ToolsJarClassLoader extends URLClassLoader {
 
   /** Returns an array of possible Files for the tools.jar file. */
   public static File[] getToolsJarFiles(File toolsJar) {
-    String javaHome = System.getProperty("java.home");
-    File home = new File(javaHome);
-    ArrayList<File> files = new ArrayList<File>();
+    File javaHome = FileOps.getCanonicalFile(new File(System.getProperty("java.home")));
     
-    // Check JAVAC_LOCATION
-    if (toolsJar.exists()) files.add(toolsJar);
-
-    // Check $JAVA_HOME/lib/tools.jar
-    File libDir = new File(home, "lib");
-    File jar1 = new File(libDir, "tools.jar");
-    if (jar1.exists()) files.add(jar1);
-
-    // Check $JAVA_HOME/../lib/tools.jar
-    File libDir2 = new File(home.getParentFile(), "lib");
-    File jar2 = new File(libDir2, "tools.jar");
-    if (jar2.exists()) files.add(jar2);
-
-    if (javaHome.toLowerCase().indexOf("program files") != -1) {
-      // Windows: JavaHome is JRE; guess where SDK is
-      File jar3 = new File(getWindowsToolsJar(javaHome));
-      if (jar3.exists()) files.add(jar3);
+    // We must maintain insertion order, so that the first entries have priority;
+    // at the same time, we want to eliminate duplicates so that the same tools.jar file
+    // doesn't show up multiple times.
+    LinkedHashSet<File> javaHomeParents = new LinkedHashSet<File>();
+    javaHomeParents.add(FileOps.getCanonicalFile(new File(javaHome, "..")));
+    javaHomeParents.add(FileOps.getCanonicalFile(new File(javaHome, "../..")));
+    javaHomeParents.add(FileOps.getCanonicalFile(new File("/C:/Program Files/Java/")));
+    javaHomeParents.add(FileOps.getCanonicalFile(new File("/C:/Program Files/")));
+    javaHomeParents.add(FileOps.getCanonicalFile(new File("/C:/Java/")));
+    javaHomeParents.add(FileOps.getCanonicalFile(new File("/C:/")));
+    javaHomeParents.add(FileOps.getCanonicalFile(new File("/usr/")));
+    javaHomeParents.add(FileOps.getCanonicalFile(new File("/usr/java/")));
+    javaHomeParents.add(FileOps.getCanonicalFile(new File("/usr/j2se/")));
+    javaHomeParents.add(FileOps.getCanonicalFile(new File("/usr/local/")));
+    javaHomeParents.add(FileOps.getCanonicalFile(new File("/usr/local/java/")));
+    javaHomeParents.add(FileOps.getCanonicalFile(new File("/usr/local/j2se/")));
+    
+    LinkedHashSet<File> javaHomes = new LinkedHashSet<File>();
+    javaHomes.add(javaHome);
+    String version = System.getProperty("java.specification.version");
+    final String prefix1 = "j2sdk" + version;
+    final String prefix2 = "jdk" + version;
+    for (File parent : javaHomeParents) {
+      javaHomes.addAll(FileOps.getFilesInDir(parent, false, new FileFilter() {
+        public boolean accept(File f) {
+          String name = f.getName();
+          return name.startsWith(prefix1) || name.startsWith(prefix2);
+        }
+      }));
+    }
+    
+    LinkedHashSet<File> result = new LinkedHashSet<File>();
+    if (toolsJar.exists()) result.add(FileOps.getCanonicalFile(toolsJar));
+    for (File home : javaHomes) {
+      File tools = new File(home, "lib/tools.jar");
+      if (tools.exists()) { result.add(FileOps.getCanonicalFile(toolsJar)); }
     }
 
-    File[] fileArray = new File[files.size()];
-    files.toArray(fileArray);
-    return fileArray;
+    return result.toArray(new File[0]);
   }
   
   /** Returns an array of possible URLs for the tools.jar file. */
@@ -116,33 +133,6 @@ public static String getToolsJarClassPath(File toolsJar) {
     return classPath.toString();
   }
 
-  /** Returns a guess for the location of tools.jar based on the default
-   *  installation directory for the Windows Java SDK.  In Windows,
-   *  JAVA_HOME is set to the JRE directory in "Program Files", but tools.jar
-   *  is located in the SDK directory.  Guess is simplistic: only looks on C:.
-   *
-   *  PRECONDITION: javaHome contains "Program Files"
-   *
-   * @param javaHome The current JAVA_HOME System property
-   */
-  public static String getWindowsToolsJar(String javaHome) {
-    if (javaHome.indexOf("Program Files") == -1) return "";
-
-    String prefix = "C:\\j2sdk";
-    String suffix = "\\lib\\tools.jar";
-    int versionIndex;
-
-    if (javaHome.indexOf("JavaSoft") != -1) {
-      prefix = "C:\\jdk";
-      versionIndex = javaHome.indexOf("JRE\\") + 4;
-    }
-    else { versionIndex = javaHome.indexOf("j2re") + 4; }
-    
-    String version = javaHome.substring(versionIndex);
-
-    return prefix + version + suffix;
-  }
-
   /** Gets the requested resource, bypassing the parent classloader. */
   public URL getResource(String name) { return findResource(name); }
 }
diff --git a/drjava/src/edu/rice/cs/util/classloader/ToolsJarClassLoaderTest.java b/drjava/src/edu/rice/cs/util/classloader/ToolsJarClassLoaderTest.java

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ private static void getFilesInDir(File d, List<File> acc, boolean recur, FileFil`
`176`	`176`	`* exception when the file path syntax is incorrect. It returns the absolute File intead. */`
`177`	`177`	`public static File getCanonicalFile(File f) {`
`178`	`178`	`if (f == null) return f;`
`179`		`- try { if (f.exists()) return f.getCanonicalFile(); }`
	`179`	`+ try { return f.getCanonicalFile(); }`
`180`	`180`	`catch(IOException e) { /* fall through */ }`
`181`	`181`	`return f.getAbsoluteFile();`
`182`	`182`	`}`