DrJavaAtRice
diff --git a/‎drjava/build.xml‎
Lines changed: 3 additions & 3 deletions b/‎drjava/build.xml‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎drjava/lib/platform.jar‎
11 Bytes b/‎drjava/lib/platform.jar‎
11 Bytes
diff --git a/‎drjava/src/edu/rice/cs/drjava/CommandLineTest.java‎
Lines changed: 8 additions & 8 deletions b/‎drjava/src/edu/rice/cs/drjava/CommandLineTest.java‎
Lines changed: 8 additions & 8 deletions
diff --git a/‎drjava/src/edu/rice/cs/drjava/ConfigFileTest.java‎
Lines changed: 4 additions & 4 deletions b/‎drjava/src/edu/rice/cs/drjava/ConfigFileTest.java‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎drjava/src/edu/rice/cs/drjava/DependenciesTest.java‎
Lines changed: 1 addition & 1 deletion b/‎drjava/src/edu/rice/cs/drjava/DependenciesTest.java‎
Lines changed: 1 addition & 1 deletion
@@ -11,7 +11,7 @@
   <property name="junit-jar-to-include" value="lib/buildlib/junit.jar" />
   <property name="md5-temp-name" value="classes/md5.properties" />
   <property name="md5-properties-path" value="edu/rice/cs/drjava/md5.properties" />
-  <property name="main-class" value="edu.rice.cs.drjava.DrJava" />
+  <property name="main-class" value="edu.rice.cs.drjava.DrScala" />
   <property name="svn-repository" value="https://drjava.svn.sourceforge.net/svnroot/drjava" />
 
   <!-- Properties loaded from a file -->
@@ -164,7 +164,7 @@
     <echo message="                 (default: 5)" />
     <echo message="benchmark-skip: Number of 'PREV' updates to perform between benchmark" />
     <echo message="                runs (default: 1)" />
-    <echo message="drjava.test.config: Location of the DrJava configuration file to use" />
+    <echo message="drjava.test.config: Location of the DrScala configuration file to use" />
     <echo message="                    in tests (default: testFiles/drjava.basic.config)" />
     <echo message="use-concjunit: Set to true to test ConcJUnit instead of JUnit." />
   </target>
@@ -1544,7 +1544,7 @@
       <format property="TODAY" pattern="MMMM dd yyyy" timezone="GMT" />
     </tstamp>
     <property name="version-tag"
-              value="${ant.project.name}${tag-append}-${DSTAMP}-r${svn-revision}" />
+              value="${ant.project.name}${tag-append}-${DSTAMP}-${TSTAMP}" />
   </target>  
 
   <!-- Sets is-modified if "svn status" has non-empty output. -->
 
@@ -54,7 +54,7 @@
  * Tests opening/creating files specified as command line arguments.
  * @version $Id: CommandLineTest.java 5594 2012-06-21 11:23:40Z rcartwright $
  */
-public final class CommandLineTest extends DrJavaTestCase {
+public final class CommandLineTest extends DrScalaTestCase {
   /** File separator, i.e. '/' or '\\'. */
   private static final char FS = File.separatorChar;
 
@@ -212,7 +212,7 @@ public void tearDown() throws Exception {
 
   /** Tests DrScala with no command line arguments. Should open a new, untitled document. */
   public void testNone() {
-    DrJavaRoot.openCommandLineFiles(_mf, new String[0],false);
+    DrScalaRoot.openCommandLineFiles(_mf, new String[0],false);
     // ListModel<DefinitionsDocument> docs =
     // Wouldn't that be nice?
     List<OpenDefinitionsDocument> docs = _mf.getModel().getOpenDefinitionsDocuments();
@@ -227,7 +227,7 @@ public void testNone() {
   public void testOpenOne() throws BadLocationException {
     String[] list = new String[1];
     list[0] = f1_name;
-    DrJavaRoot.openCommandLineFiles(_mf, list,false);
+    DrScalaRoot.openCommandLineFiles(_mf, list,false);
 //    _log.log("openCommandLineFiles completed");
     List<OpenDefinitionsDocument> docs = _mf.getModel().getOpenDefinitionsDocuments();
 //    Utilities.showDebug(docs.toString());
@@ -245,7 +245,7 @@ public void testOpenOne() throws BadLocationException {
   public void testNE() {
     String[] list = new String[1];
     list[0] = nof1_name;
-    DrJavaRoot.openCommandLineFiles(_mf, list, false);
+    DrScalaRoot.openCommandLineFiles(_mf, list, false);
 //    _log.log("openCommandLineFiles completed");
     List<OpenDefinitionsDocument> docs = _mf.getModel().getOpenDefinitionsDocuments();
     assertEquals("Exactly one document?", 1, docs.size());
@@ -260,7 +260,7 @@ public void testOpenMany() throws BadLocationException {
     list[0] = f1_name;
     list[1] = f2_name;
     list[2] = f3_name;
-    DrJavaRoot.openCommandLineFiles(_mf, list, false);
+    DrScalaRoot.openCommandLineFiles(_mf, list, false);
 //    _log.log("openCommandLineFiles completed");
     List<OpenDefinitionsDocument> docs = _mf.getModel().getOpenDefinitionsDocuments();
     assertEquals("Exactly three documents?", 3, docs.size());
@@ -289,7 +289,7 @@ public void testMixed() throws BadLocationException {
     list[3] = f5_name;
     list[4] = f6_name;
     list[5] = nof3_name;
-    DrJavaRoot.openCommandLineFiles(_mf, list, false);
+    DrScalaRoot.openCommandLineFiles(_mf, list, false);
 //    _log.log("openCommandLineFiles completed");
     List<OpenDefinitionsDocument> docs = _mf.getModel().getOpenDefinitionsDocuments();
     assertEquals("Exactly three documents?", 3, docs.size());
@@ -318,7 +318,7 @@ public void testDups() throws BadLocationException {
     list[3] = f8_name;
     list[4] = f8_name;
     list[5] = f7_name;
-    DrJavaRoot.openCommandLineFiles(_mf, list, false);
+    DrScalaRoot.openCommandLineFiles(_mf, list, false);
 //    _log.log("openCommandLineFiles in testDups completed");
 
     List<OpenDefinitionsDocument> docs = _mf.getModel().getOpenDefinitionsDocuments();
@@ -394,7 +394,7 @@ private void checkFile(File relativeFile, String funnyName) throws IOException,
     assertTrue("file exists", relativeFile.exists());
 
     String path = relativeFile.getCanonicalPath();
-    DrJavaRoot.openCommandLineFiles(_mf, new String[] { path }, false);
+    DrScalaRoot.openCommandLineFiles(_mf, new String[] { path }, false);
 
     List<OpenDefinitionsDocument> docs = _mf.getModel().getOpenDefinitionsDocuments();
     assertEquals("Number of open documents", 1, docs.size());
 
@@ -49,7 +49,7 @@
  * Tests that a custom config file can be specified.
  * @version $Id: ConfigFileTest.java 5594 2012-06-21 11:23:40Z rcartwright $
  */
-public final class ConfigFileTest extends DrJavaTestCase {
+public final class ConfigFileTest extends DrScalaTestCase {
   private static final String CUSTOM_PROPS =
     "indent.level = 5\n" +
     "history.max.size = 1\n" +
@@ -65,14 +65,14 @@ public void testCustomConfigFile() throws IOException {
     IOUtil.writeStringToFile(propsFile, CUSTOM_PROPS);
     Utilities.invokeAndWait(new Runnable() { 
       public void run() { 
-        DrJava.setPropertiesFile(propsFile.getAbsolutePath());
-        DrJava._initConfig(); 
+        DrScala.setPropertiesFile(propsFile.getAbsolutePath());
+        DrScala._initConfig(); 
       } 
     });
 //    Utilities.clearEventQueue();
 //    Utilities.clearEventQueue();
 
-    FileConfiguration config = DrJava.getConfig();
+    FileConfiguration config = DrScala.getConfig();
     assertEquals("custom indent level", 5, config.getSetting(OptionConstants.INDENT_INC).intValue());
     assertEquals("custom history size", 1, config.getSetting(OptionConstants.HISTORY_MAX_SIZE).intValue());
     //Tests if a user can put a default value in the .drjava file
 
@@ -41,7 +41,7 @@
 /** Test that ensures all external dependencies are met!
  *  @version $Id: DependenciesTest.java 5594 2012-06-21 11:23:40Z rcartwright $
  */
-public final class DependenciesTest extends DrJavaTestCase {
+public final class DependenciesTest extends DrScalaTestCase {
   public static final String REQUIRED_UTIL_VERSION = "20040521-1616";
 
   /** Constructor.