Java Language Level Converter command line interface.

mgricken · mgricken · commit f5dd2dee51c1 · 2010-03-08T20:23:23.000Z
git-svn-id: file:///tmp/test-svn/trunk@5187 fe72c1cf-3628-48e9-8b72-1c46755d3cff
diff --git a/drjava/lib/javalanglevels-base.jar b/drjava/lib/javalanglevels-base.jar
diff --git a/drjava/src/edu/rice/cs/drjava/DrJava.java b/drjava/src/edu/rice/cs/drjava/DrJava.java
@@ -145,7 +145,7 @@ public class DrJava {
   private static volatile File _propertiesFile = DEFAULT_PROPERTIES_FILE;
   
   /** Configuration object with all customized and default values.  Initialized from _propertiesFile.  */
-  private static volatile FileConfiguration _config = _initConfig();
+  private static volatile FileConfiguration _config;
   
   /** Returns the properties file used by the configuration object. */
   public static File getPropertiesFile() { return _propertiesFile; }
@@ -403,7 +403,6 @@ static boolean handleCommandLineArgs(String[] args) {
         }
         // arg.length > i+1 implying args list incudes config file name and perhaps files to open
         setPropertiesFile(args[argIndex++]);
-        _config = _initConfig();  // read specified .djrava file into _config
       }
       
       else if (arg.startsWith("-X") || arg.startsWith("-D")) {
@@ -420,6 +419,13 @@ 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;
@@ -431,6 +437,8 @@ else if (arg.equals("-help") || arg.equals("-?")) {
       }
     }
     
+    _config = _initConfig();  // read specified .djrava file into _config
+    
     if ((!("".equals(getConfig().getSetting(MASTER_JVM_XMX)))) &&
         (!(edu.rice.cs.drjava.config.OptionConstants.heapSizeChoices.get(0).equals(getConfig().getSetting(MASTER_JVM_XMX))))) { 
       _jvmArgs.add("-Xmx" + getConfig().getSetting(MASTER_JVM_XMX).trim() + "M");
@@ -472,6 +480,7 @@ static void displayUsage() {
     System.out.println("  -help | -?            print this help message");
     System.out.println("  -X<jvmOption>         specify a JVM configuration option for the master DrJava JVM");      
     System.out.println("  -D<name>[=<value>]    set a Java property for the master DrJava JVM");
+    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 source files aren't 
diff --git a/javalanglevels/src/edu/rice/cs/javalanglevels/LanguageLevelConverter.java b/javalanglevels/src/edu/rice/cs/javalanglevels/LanguageLevelConverter.java
@@ -45,6 +45,7 @@
 import java.io.*;
 import edu.rice.cs.plt.reflect.JavaVersion;
 import edu.rice.cs.plt.iter.IterUtil;
+import edu.rice.cs.plt.io.IOUtil;
 
 /** This class represents the mechanism by which we convert a language level file to a .java file of the same name by
   * first visiting the file to error-check it, and then augment the file.  This class is tested at the top level in the
@@ -444,13 +445,23 @@ public static boolean versionIs15(JavaVersion version) {
   /**Do a conversion from the command line, to allow quick testing*/
   public static void main(String[] args) {
     LanguageLevelConverter llc = new LanguageLevelConverter();
+    
+    if (args.length==0) {
+      System.out.println("Java Language Level Converter");
+      System.out.println("Please pass file names (*.dj0, *.dj1, *.dj2) as arguments.");
+      System.out.println("Note: The converter will use Java's classpath to resolve classes.");
+      System.out.println("      If classes are not found, use java -cp <classpath> to set the classpath.");
+      return;
+    }
+    
     File[] files = new File[args.length];
     for (int i = 0; i < args.length; i++) {
       files[i] = new File(args[i]);
     }
     
     Pair<LinkedList<JExprParseException>, LinkedList<Pair<String, JExpressionIF>>> result = 
-      llc.convert(files, new Options(JavaVersion.JAVA_5, IterUtil.<File>empty()));
+      llc.convert(files, new Options(JavaVersion.JAVA_5,
+                                     IOUtil.parsePath(System.getProperty("java.class.path", ""))));
     System.out.println(result.getFirst().size() + result.getSecond().size() + " errors.");
     for(JExprParseException p : result.getFirst()) {
       System.out.println(p);
