DrJavaAtRice
diff --git a/‎drjava/lib/dynamicjava-base-15.jar‎ ‎drjava/lib/dynamicjava-base.jar‎drjava/lib/dynamicjava-base-15.jar renamed to drjava/lib/dynamicjava-base.jar
784 KB b/‎drjava/lib/dynamicjava-base-15.jar‎ ‎drjava/lib/dynamicjava-base.jar‎drjava/lib/dynamicjava-base-15.jar renamed to drjava/lib/dynamicjava-base.jar
784 KB
diff --git a/‎drjava/lib/javalanglevels.jar‎ ‎drjava/lib/javalanglevels-base.jar‎drjava/lib/javalanglevels.jar renamed to drjava/lib/javalanglevels-base.jar
661 KB b/‎drjava/lib/javalanglevels.jar‎ ‎drjava/lib/javalanglevels-base.jar‎drjava/lib/javalanglevels.jar renamed to drjava/lib/javalanglevels-base.jar
661 KB
diff --git a/‎drjava/lib/plt.jar‎
54.5 KB b/‎drjava/lib/plt.jar‎
54.5 KB
diff --git a/‎drjava/lib/readme.txt‎
Lines changed: 4 additions & 4 deletions b/‎drjava/lib/readme.txt‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎drjava/src/edu/rice/cs/drjava/model/javadoc/DefaultJavadocModel.java‎
Lines changed: 11 additions & 16 deletions b/‎drjava/src/edu/rice/cs/drjava/model/javadoc/DefaultJavadocModel.java‎
Lines changed: 11 additions & 16 deletions
@@ -7,13 +7,13 @@ VERSIONS:
 
 asm-3.1.jar:              ASM 3.1 (http://asm.objectweb.org)
 docs.jar:                 docs-20060901-2010
-dynamicjava-base-15.jar:  dynamicjava-20080709
+dynamicjava-base.jar:     dynamicjava-20090115-r4705
 forms-1.0.7.jar:          JGoodies Forms
-javalanglevels.jar:       javalanglevels-20080709
+javalanglevels-base.jar:  javalanglevels-20090115-r4704
 junit.jar:                JUnit 4.4
 looks-2.1.4.jar:          JGoodies Looks
-platform.jar:             platform-20070213-2003
-plt.jar:                  plt-20080709-1847
+platform.jar:             platform-20090103-r4686
+plt.jar:                  plt-20090115-r4703
 
 buildlib/ant-contrib.jar:           ANT Contrib 1.0b3
 buildlib/cenquatasks.jar:           Distributed with Clover 1.3.9
 
@@ -46,6 +46,7 @@
 
 import edu.rice.cs.plt.lambda.Thunk;
 import edu.rice.cs.plt.io.IOUtil;
+import edu.rice.cs.plt.concurrent.JVMBuilder;
 import edu.rice.cs.plt.concurrent.ConcurrentUtil;
 import edu.rice.cs.plt.iter.IterUtil;
 import edu.rice.cs.plt.text.TextUtil;
@@ -79,26 +80,25 @@ public class DefaultJavadocModel implements JavadocModel {
 
   /**Manages listeners to this model. */
   private final JavadocEventNotifier _notifier = new JavadocEventNotifier();
-  
-  /** Location of the java command to use (if not the default in {@code java.home}) */
-  private final File _javaCommand;
-  
-  /** Location of the tools library containing the javadoc code (if not on the javaCommand's boot class path) */
-  private final Iterable<File> _toolsPath;
+
+  /** Launcher for javadoc process */
+  private final JVMBuilder _jvmBuilder;
 
   /** The error model containing all current Javadoc errors. */
   private CompilerErrorModel _javadocErrorModel;
 
   /** Main constructor.
     * @param model Source of documents for this JavadocModel
-    * @param javaCommand  Location of the java command to use (if not the default in {@code java.home})
-    * @param toolsPath  Location of the tools library containing the javadoc code (if not on the 
+    * @param javaCommand  Location of the java command to use ({@code null} means the default: {@code java.home})
+    * @param toolsPath  Location of the tools library containing the javadoc code ({@code null} means the default:
     *                   javaCommand's boot class path)
     */
   public DefaultJavadocModel(GlobalModel model, File javaCommand, Iterable<File> toolsPath) {
     _model = model;
-    _javaCommand = javaCommand;
-    _toolsPath = toolsPath;
+    JVMBuilder builder = JVMBuilder.DEFAULT;
+    if (javaCommand != null) { builder = builder.javaCommand(javaCommand); }
+    if (toolsPath != null) { builder = builder.classPath(toolsPath); }
+    _jvmBuilder = builder;
     _javadocErrorModel = new CompilerErrorModel();
   }
 
@@ -312,14 +312,9 @@ private void _runJavadoc(Iterable<String> files, File destDir, Iterable<String>
     args = IterUtil.compose(args, ArgumentTokenizer.tokenize(custom));
     args = IterUtil.compose(args, files);
 
-    File javaCommand = (_javaCommand == null) ? new File(System.getProperty("java.home", "")) : _javaCommand;
-    Iterable<File> jvmClassPath = (_toolsPath == null) ? IterUtil.<File>empty() : _toolsPath;
-    
     List<DJError> errors = new ArrayList<DJError>();
     try {
-      Process p = ConcurrentUtil.runJavaProcess(javaCommand, "com.sun.tools.javadoc.Main", args, 
-                                                jvmClassPath, new File(System.getProperty("user.dir", "")),
-                                                new Properties(), IterUtil.<String>empty());
+      Process p = _jvmBuilder.start("com.sun.tools.javadoc.Main", args);
       Thunk<String> outputString = ConcurrentUtil.processOutAsString(p);
       Thunk<String> errorString = ConcurrentUtil.processErrAsString(p);
       p.waitFor();