Cleaned up unit testing and almost all issues with projects. The

ponderosaTX · ponderosaTX · commit bcbb9e0ffa5e · 2015-09-09T22:25:43.000-05:00
problem of successfully parsing a project file (saved as
&lt;name&gt;.drscala) may still be open.  Essentially nothing concerning
project files (except some simplification via reduced variants) is
different in DrScala from DrJava. So the problem should be easy to
fix.
The following files were modified or deleted:

	modified:   build.xml
	deleted:    lib/dynamicjava-base.jar
	deleted:    lib/javalanglevels-base.jar
	deleted:    lib/tools6.jar
	modified:   src/edu/rice/cs/drjava/DrScala.java
	modified:   src/edu/rice/cs/drjava/Version.orig
	modified:   src/edu/rice/cs/drjava/model/compiler/DefaultCompilerModel.java
	modified:   src/edu/rice/cs/drjava/project/ProjectFileParserFacade.java
	modified:   src/edu/rice/cs/drjava/project/XMLProjectFileParser.java
diff --git a/drjava/build.xml b/drjava/build.xml
@@ -1536,7 +1536,7 @@
     <!-- Get a timestamp based on GMT, rather than local time -->
     <tstamp>
       <format property="DSTAMP" pattern="yyyyMMdd" timezone="GMT" />
-      <format property="TSTAMP" pattern="HHmm" timezone="GMT" />
+      <format property="TSTAMP" pattern="HH:mm:ss" timezone="GMT" />
       <format property="TODAY" pattern="MMMM dd yyyy" timezone="GMT" />
     </tstamp>
     <property name="version-tag"
diff --git a/drjava/lib/dynamicjava-base.jar b/drjava/lib/dynamicjava-base.jar
diff --git a/drjava/lib/javalanglevels-base.jar b/drjava/lib/javalanglevels-base.jar
diff --git a/drjava/lib/tools6.jar b/drjava/lib/tools6.jar
diff --git a/drjava/src/edu/rice/cs/drjava/DrScala.java b/drjava/src/edu/rice/cs/drjava/DrScala.java
@@ -423,13 +423,6 @@ else if (arg.equals("-delete-after-restart")) {
         deleteAfterRestart.delete();
       }
       
-      else if (arg.equals("-jll")) {
-        String[] argsForJLL = new String[args.length-argIndex];
-        System.arraycopy(args, argIndex, argsForJLL, 0, argsForJLL.length);
-        edu.rice.cs.javalanglevels.LanguageLevelConverter.main(argsForJLL);
-        System.exit(0);
-      }
-      
       else if (arg.equals("-help") || arg.equals("-?")) {
         displayUsage();
         return false;
diff --git a/drjava/src/edu/rice/cs/drjava/Version.orig b/drjava/src/edu/rice/cs/drjava/Version.orig
@@ -54,7 +54,7 @@ public abstract class Version {
    * This string will be automatically expanded upon "ant commit".
    * Do not edit it by hand!
    */
-  private static final String VERSION_STRING = "drjava-@DATE@-r@REVISION@";
+  private static final String VERSION_STRING = "drscala-@DATE@-@TIME@";
 
   /**
    * This string will be automatically expanded upon "ant commit".
diff --git a/drjava/src/edu/rice/cs/drjava/model/compiler/DefaultCompilerModel.java b/drjava/src/edu/rice/cs/drjava/model/compiler/DefaultCompilerModel.java
@@ -57,12 +57,10 @@
 import edu.rice.cs.plt.io.IOUtil;
 import edu.rice.cs.plt.iter.IterUtil;
 import edu.rice.cs.plt.collect.CollectUtil;
+import edu.rice.cs.plt.tuple.Pair;
 import edu.rice.cs.util.FileOps;
 import edu.rice.cs.util.UnexpectedException;
 import edu.rice.cs.util.swing.Utilities;
-import edu.rice.cs.javalanglevels.*;
-import edu.rice.cs.javalanglevels.parser.*;
-import edu.rice.cs.javalanglevels.tree.*;
 import edu.rice.cs.util.swing.DirectoryChooser;
 import edu.rice.cs.util.swing.ScrollableListDialog;
 
@@ -324,25 +322,6 @@ private void _doCompile(List<OpenDefinitionsDocument> docs) throws IOException {
     }
   }
   
-  /** Converts errors thrown by the language level visitors to CompilerErrors. */
-  private LinkedList<DJError> _visitorErrors2CompilerErrors(LinkedList<Pair<String, JExpressionIF>> visitorErrors) {
-    final LinkedList<DJError> errors = new LinkedList<DJError>();
-    Iterator<Pair<String, JExpressionIF>> iter = visitorErrors.iterator();
-    while (iter.hasNext()) {
-      Pair<String, JExpressionIF> pair = iter.next();
-      String message = pair.getFirst();      
-//      System.out.println("Got error message: " + message);
-      JExpressionIF jexpr = pair.getSecond();
-      
-      SourceInfo si;
-      if (jexpr == null) si = SourceInfo.NO_INFO;
-      else si = pair.getSecond().getSourceInfo();
-      
-      errors.addLast(new DJError(si.getFile(), si.getStartLine()-1, si.getStartColumn()-1, message, false));
-    }
-    return errors;
-  }
-  
   /** Compile the given files and update the model with any errors that result.  Does not notify listeners.  
     * All public compile methods delegate to this method so this method is the only one that uses synchronization to 
     * prevent compiling and unit testing at the same time.
diff --git a/drjava/src/edu/rice/cs/drjava/project/ProjectFileParserFacade.java b/drjava/src/edu/rice/cs/drjava/project/ProjectFileParserFacade.java
@@ -50,7 +50,7 @@ protected ProjectFileParserFacade() { }
 //  protected boolean _xmlProjectFile;
   
   /** @param projFile the file to parse
-    *  @return the project file IR
+    * @return the project file IR
     */
   public ProjectFileIR parse(File projFile) throws IOException, FileNotFoundException, MalformedProjectFileException {
     FileReader fr = new FileReader(projFile);
diff --git a/drjava/src/edu/rice/cs/drjava/project/XMLProjectFileParser.java b/drjava/src/edu/rice/cs/drjava/project/XMLProjectFileParser.java
@@ -106,7 +106,7 @@ public ProjectFileIR parse(File projFile) throws IOException, FileNotFoundExcept
       XMLConfig xcParent = new XMLConfig(projFile);
       
       // create a sub-configuration so we don't have to prefix everything with "drjava/project/"
-      _xc = new XMLConfig(xcParent, xcParent.getNodes("drjava/project").get(0));
+      _xc = new XMLConfig(xcParent, xcParent.getNodes("drscala/project").get(0));
       LOG.log(_xc.toString());
       String s;
       
