DrJavaAtRice
diff --git a/‎.gitignore‎
Lines changed: 2 additions & 1 deletion b/‎.gitignore‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎drjava/build.xml‎
Lines changed: 1 addition & 1 deletion b/‎drjava/build.xml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎drjava/src/edu/rice/cs/drjava/CommandLineTest.java‎
Lines changed: 9 additions & 18 deletions b/‎drjava/src/edu/rice/cs/drjava/CommandLineTest.java‎
Lines changed: 9 additions & 18 deletions
diff --git a/‎drjava/src/edu/rice/cs/drjava/ConfigFileTest.java‎
Lines changed: 3 additions & 6 deletions b/‎drjava/src/edu/rice/cs/drjava/ConfigFileTest.java‎
Lines changed: 3 additions & 6 deletions
diff --git a/‎drjava/src/edu/rice/cs/drjava/DrJava.java‎
Lines changed: 5 additions & 10 deletions b/‎drjava/src/edu/rice/cs/drjava/DrJava.java‎
Lines changed: 5 additions & 10 deletions
diff --git a/‎drjava/src/edu/rice/cs/drjava/DrJavaRestart.java‎
Lines changed: 1 addition & 2 deletions b/‎drjava/src/edu/rice/cs/drjava/DrJavaRestart.java‎
Lines changed: 1 addition & 2 deletions
diff --git a/‎drjava/src/edu/rice/cs/drjava/DrJavaRoot.java‎
Lines changed: 5 additions & 10 deletions b/‎drjava/src/edu/rice/cs/drjava/DrJavaRoot.java‎
Lines changed: 5 additions & 10 deletions
diff --git a/‎drjava/src/edu/rice/cs/drjava/DrJavaTestCase.java‎
Lines changed: 1 addition & 2 deletions b/‎drjava/src/edu/rice/cs/drjava/DrJavaTestCase.java‎
Lines changed: 1 addition & 2 deletions
diff --git a/‎drjava/src/edu/rice/cs/drjava/RemoteControlClient.java‎
Lines changed: 3 additions & 6 deletions b/‎drjava/src/edu/rice/cs/drjava/RemoteControlClient.java‎
Lines changed: 3 additions & 6 deletions
diff --git a/‎drjava/src/edu/rice/cs/drjava/RemoteControlServer.java‎
Lines changed: 5 additions & 10 deletions b/‎drjava/src/edu/rice/cs/drjava/RemoteControlServer.java‎
Lines changed: 5 additions & 10 deletions
@@ -3,4 +3,5 @@
 *.new
 *.drjava
 *~
-drjava/classes
+drjava/classes
+drjava/drjava.jar
@@ -694,7 +694,7 @@
       <fileset dir="classes/lib" excludes="about.html"/>
       <fileset dir="classes/base" />
       <!-- Include the specified version of JUnit and rename it to junit.jar -->
-      <zipfileset dir="." includes="${junit-jar-to-include}" fullpath="junit.jar" />
+<!--     <zipfileset dir="." includes="${junit-jar-to-include}" fullpath="junit.jar" /> -->
       <zipfileset dir="." includes="${md5-temp-name}"
 		  fullpath="${md5-properties-path}" />
     </jar>
 
@@ -50,8 +50,7 @@
 import edu.rice.cs.util.StringOps;
 import edu.rice.cs.util.swing.Utilities;
 
-/**
- * Tests opening/creating files specified as command line arguments.
+/** * Tests opening/creating files specified as command line arguments.
  * @version $Id$
  */
 public final class CommandLineTest extends DrJavaTestCase {
@@ -223,8 +222,7 @@ public void testNone() {
 
   }
 
-  /** 
-   * Open one file on the command line.  Should (obviously) open that file. 
+  /** Open one file on the command line.  Should (obviously) open that file. 
    * @throws BadLocationException if an invalid location within the document model is referenced
    */
   public void testOpenOne() throws BadLocationException {
@@ -257,8 +255,7 @@ public void testNE() {
     _log.log("testNE completed");
   }
 
-  /** 
-   * Many files on the command line. 
+  /** Many files on the command line. 
    * Should open all of them, displaying the last one. 
    * @throws BadLocationException if an invalid location within the document model is referenced
    */
@@ -287,8 +284,7 @@ public void testOpenMany() throws BadLocationException {
     _log.log("testOpenMany completed");
   }
 
-  /** 
-   * Supplying both valid and invalid filenames on the command line. 
+  /** Supplying both valid and invalid filenames on the command line. 
    * Should open only the valid ones. 
    * @throws BadLocationException if an invalid location within the document model is referenced
    */
@@ -320,8 +316,7 @@ public void testMixed() throws BadLocationException {
     _log.log("testMixed completed");
   }
 
-  /** 
-   * Test duplicate files.
+  /** Test duplicate files.
    * @throws BadLocationException if an invalid location within the document model is referenced
    */
   public void testDups() throws BadLocationException {
@@ -350,8 +345,7 @@ public void testDups() throws BadLocationException {
 //    _log.log("testDups completed");
   }
 
-  /** 
-   * A regression test for bug #542747, which related to opening a file via the command line using a relative path.
+  /** A regression test for bug #542747, which related to opening a file via the command line using a relative path.
    * The problem was that getSourceRoot() would fail on the document, because the filename was not absolute. (The
    * fix will be to absolutize file paths when opening files.)
    * @throws IOException if an IO operation fails
@@ -370,8 +364,7 @@ public void testRelativePath() throws IOException, InvalidPackageException {
     _log.log("testRelativePath completed");
   }
 
-  /** 
-   * Tests paths with "." and ".." in them.  Windows will blow up if you use one in a JFileChooser without
+  /** Tests paths with "." and ".." in them.  Windows will blow up if you use one in a JFileChooser without
    * converting it to a canonical filename.
    */
   public void testDotPaths() {
@@ -394,8 +387,7 @@ public void testDotPaths() {
     _log.log("testDotPaths completed");
   }
 
-  /** 
-   * Helper for testRelativeFile and testDotPaths. 
+  /** Helper for testRelativeFile and testDotPaths. 
    * @param funnyName the name of the directory to create
    * @return the newly-created directory
    */
@@ -410,8 +402,7 @@ private File mkTempDir(String funnyName) {
     return newDirectory;
   }
 
-  /** 
-   * Helper for testRelativeFile and testDotPaths. 
+  /** Helper for testRelativeFile and testDotPaths. 
    * @param relativeFile file to write to
    * @param funnyName name of package to write to file
    * @throws IOException if an IO operation fails
 
@@ -45,8 +45,7 @@
 import java.io.File;
 import java.io.IOException;
 
-/**
- * Tests that a custom config file can be specified.
+/** * Tests that a custom config file can be specified.
  * @version $Id$
  */
 public final class ConfigFileTest extends DrJavaTestCase {
@@ -56,14 +55,12 @@ public final class ConfigFileTest extends DrJavaTestCase {
     "definitions.keyword.color = #0000ff\n";
 
 
-  /** 
-   * Constructor. 
+  /** Constructor. 
    * @param name name of the test case
    */
   public ConfigFileTest(String name) { super(name); }
 
-  /** 
-   * Creates a custom properties file, tells DrJava to use it, and checks 
+  /** Creates a custom properties file, tells DrJava to use it, and checks 
    * that it is being used. 
    * @throws IOException if an IO operation fails
    */
 
@@ -165,8 +165,7 @@ public static synchronized FileConfiguration getConfig() {
   /** @return an array of the files that were passed on the command line. */
   public static synchronized String[] getFilesToOpen() { return _filesToOpen.toArray(new String[0]); }
 
-  /** 
-   * Add a file to the list of files to open. 
+  /** Add a file to the list of files to open. 
    * @param s name of the file to be added to the list of files to open
    */
   public static synchronized void addFileToOpen(String s) {
@@ -393,8 +392,7 @@ public static void configureAndLoadDrJavaRoot(String[] args) {
     }
   }
 
-  /** 
-   * Handles any command line arguments that have been specified.
+  /** Handles any command line arguments that have been specified.
    * @param args command-line arguments
    * @return true if DrJava should load, false if not
    */
@@ -498,17 +496,15 @@ static void displayUsage() {
     System.out.println("  -jll [ARGS]           invoke the Java Language Level converter, specify files in ARGS");
   }
 
-  /** 
-   * Switches the config object to use a custom config file. Ensures that Java 
+  /** Switches the config object to use a custom config file. Ensures that Java 
    * source files aren't accidentally used.
    * @param fileName path to the new properties file
    */
   static void setPropertiesFile(String fileName) {
     if (!DrJavaFileUtils.isSourceFile(fileName))  _propertiesFile = new File(fileName);
   }
 
-  /** 
-   * Initializes the configuration object with the current notion of the properties file.
+  /** Initializes the configuration object with the current notion of the properties file.
    * @return the configuration object
    * @throws IllegalStateException if config has already been assigned
    */
@@ -600,8 +596,7 @@ public static void cleanUp() {
     // Do not set _config or _propertiesFile to null because THEY ARE static
   }
 
-  /** 
-   * Warn if this system is Linux with Compiz. 
+  /** Warn if this system is Linux with Compiz. 
    * @return true if is Linux with Compiz; false otherwise
    */
   public static boolean warnIfLinuxWithCompiz() {
 
@@ -47,8 +47,7 @@
   * @version $Id$
   */
 public class DrJavaRestart {
-  /**
-   * Number of attempts to delete or rename files. This is necessary since an OS,
+  /** Number of attempts to delete or rename files. This is necessary since an OS,
    * particularly Windows, may still have a write lock on a file.
    * Currently, we pause up to 5*1000 ms per operation. */
   public static final int ATTEMPTS = 5;
 
@@ -202,8 +202,7 @@ public void run(){
     }
   }
 
-  /** 
-   * Handle the list of files specified on the command line.  Feature request #509701.
+  /** Handle the list of files specified on the command line.  Feature request #509701.
    * If file exists, open it in DrJava.  Otherwise, ignore it.
    * Is there a better way to handle nonexistent files?  Dialog box, maybe?
    *
@@ -215,8 +214,7 @@ static void openCommandLineFiles(final MainFrame mf, final String[] filesToOpen,
     openCommandLineFiles(mf, filesToOpen, filesToOpen.length, jump);
   }
 
-  /** 
-   * Handle the list of files specified on the command line.  Feature request #509701. 
+  /** Handle the list of files specified on the command line.  Feature request #509701. 
    * If the final element in filesToOpen is a pathSeparator, it opens the 
    * debug console. If file exists, open it in DrJava.  Otherwise, ignore
    * it.  Is there a better way to handle nonexistent files?  Dialog box, maybe?
@@ -231,8 +229,7 @@ static void openCommandLineFiles(final MainFrame mf, final String[] filesToOpen,
     Utilities.invokeAndWait(new Runnable() { public void run() { _openCommandLineFiles(mf, filesToOpen, len, jump); }});
   }
 
-  /** 
-   * Handle the list of files specified on the command line.  Feature request #509701. 
+  /** Handle the list of files specified on the command line.  Feature request #509701. 
    *
    * @param mf main frame in which to open files
    * @param filesToOpen files to open
@@ -336,16 +333,14 @@ protected void close() {
     */
   public static PrintStream consoleOut() { return  _consoleOut; }
 
-  /** 
-   * User dragged something into the component. 
+  /** User dragged something into the component. 
    * @param dropTargetDragEvent drag event
    */
   public static void dragEnter(DropTargetDragEvent dropTargetDragEvent) {
     _mainFrame.dragEnter(dropTargetDragEvent);
   }
 
-  /** 
-   * User dropped something on the component. Only runs in the event thread. 
+  /** User dropped something on the component. Only runs in the event thread. 
    * @param dropTargetDropEvent drop event
    */
   public static void drop(DropTargetDropEvent dropTargetDropEvent) {
 
@@ -96,8 +96,7 @@ protected <T> void setConfigSetting(final Option<T> op, final T value) {
     Utilities.invokeAndWait(new Runnable() { public void run() { DrJava.getConfig().setSetting(op, value); } });
   }
 
-  /** 
-   * Clears the text of the _doc field and sets it to the given string. 
+  /** Clears the text of the _doc field and sets it to the given string. 
    * @param doc the document whose text should be set to "text"
    * @param text the text to set
    */
 
@@ -40,8 +40,7 @@
 import java.net.*;
 import edu.rice.cs.drjava.config.OptionConstants;
 
-/**
- * Client class to remote control an already running instance of DrJava.
+/** * Client class to remote control an already running instance of DrJava.
  */
 public class RemoteControlClient {
   /** true if a DrJava remote control server is running.
@@ -70,8 +69,7 @@ public static synchronized boolean isServerRunning() {
     */
   public static String getServerUser() { return _serverUser; }
 
-  /** 
-   * Tell the existing DrJava instance to open a file.
+  /** Tell the existing DrJava instance to open a file.
    * @param f file, or null to just test if a server is running.
    * @return true if file could be opened
    * @throws IOException if an IO operation fails
@@ -118,8 +116,7 @@ public static synchronized boolean openFile(File f) throws IOException {
     }
   }
 
-  /** 
-   * Main method for test purposes.
+  /** Main method for test purposes.
    * @param args command-line args
    */
   public static void main(String[] args) {
 
@@ -68,8 +68,7 @@ public final class RemoteControlServer {
   /** Prefix of a legitimate response by this server, including the user name. */
   public static final String RESPONSE_PREFIX_WITH_USER = RESPONSE_PREFIX+System.getProperty("user.name") + "!";
 
-  /** 
-   * Create a new remote control server, running in its own daemon thread.
+  /** Create a new remote control server, running in its own daemon thread.
    * @param frame main frame
    * @throws IOException if an IO operation fails
    */
@@ -87,17 +86,15 @@ public static class RCServerThread extends Thread {
     /** Socket used. */
     protected DatagramSocket socket = null;
 
-    /** 
-     * Create a new server thread.
+    /** Create a new server thread.
      * @param frame main frame
      * @throws IOException if an IO operation fails
      */
     public RCServerThread(MainFrame frame) throws IOException {
       this("RCServerThread", frame);
     }
 
-    /**
-     * Create a new server thread with a specified name.
+    /** Create a new server thread with a specified name.
      * @param name thread name
      * @param frame main frame
      * @throws IOException if an IO operation fails
@@ -108,8 +105,7 @@ public RCServerThread(String name, MainFrame frame) throws IOException {
       socket = new DatagramSocket(DrJava.getConfig().getSetting(OptionConstants.REMOTE_CONTROL_PORT));
     }
 
-    /**
-     * Main method of the thread. It loops indefinitely, waiting for queries.
+    /** Main method of the thread. It loops indefinitely, waiting for queries.
      * Since this is a daemon thread, it will get shut down at the end.
      */
     public void run() {
@@ -175,8 +171,7 @@ public void run() {
     protected void finalize() { if (socket != null) socket.close(); }
   }
 
-  /** 
-   * Main method for test purposes. 
+  /** Main method for test purposes. 
    * @param args command-line args
    */
   public static void main(String[] args) {
Original file line number	Diff line number	Diff line change
`@@ -96,8 +96,7 @@ protected <T> void setConfigSetting(final Option<T> op, final T value) {`
`96`	`96`	`Utilities.invokeAndWait(new Runnable() { public void run() { DrJava.getConfig().setSetting(op, value); } });`
`97`	`97`	`}`
`98`	`98`
`99`		`- /**`
`100`		`- * Clears the text of the _doc field and sets it to the given string.`
	`99`	`+ /** Clears the text of the _doc field and sets it to the given string.`
`101`	`100`	`* @param doc the document whose text should be set to "text"`
`102`	`101`	`* @param text the text to set`
`103`	`102`	`*/`