Author: ndbeyer
Date: Mon Jul  3 13:29:39 2006
New Revision: 418841

URL: http://svn.apache.org/viewvc?rev=418841&view=rev
Log:
Update dependencies and javac to use the final 3.2 release of ecj.jar.

Modified:
    incubator/harmony/enhanced/classlib/trunk/depends/jars/   (props changed)
    incubator/harmony/enhanced/classlib/trunk/make/depends.properties
    incubator/harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/javac/Compiler.java

Propchange: incubator/harmony/enhanced/classlib/trunk/depends/jars/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Jul  3 13:29:39 2006
@@ -10,3 +10,4 @@
 xalan-j_2.6.0
 xerces_2.6.2
 ecj_3.2MAINT
+ecj_3.2

Modified: incubator/harmony/enhanced/classlib/trunk/make/depends.properties
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/depends.properties?rev=418841&r1=418840&r2=418841&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/depends.properties (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/depends.properties Mon Jul  3 13:29:39 2006
@@ -60,10 +60,10 @@
 icu4j.url=http://www.ibiblio.org/maven2/com/ibm/icu/icu4j/3.4.4/icu4j-3.4.4.jar
 icu4j.md5=92422a9465ccc608bc7a8ae9cf594509
 
-ecj.dir=${depends.jars}/ecj_3.2MAINT
-ecj.jar=${ecj.dir}/ecj_3.2MAINT.jar
-ecj.url=http://download.eclipse.org/eclipse/downloads/drops/M20060609-1217/ecj.jar
-ecj.md5=d72629440a9f6cd281f7e58fcaee1ecb
+ecj.dir=${depends.jars}/ecj_3.2
+ecj.jar=${ecj.dir}/ecj_3.2.jar
+ecj.url=http://download.eclipse.org/eclipse/downloads/drops/R-3.2-200606291905/ecj.jar
+ecj.md5=633e14a4dc14ca578b5548c3c088172f
 
 mx4j.dir=${depends.jars}/mx4j_3.0.1
 mx4j.jar=${mx4j.dir}/mx4j.jar

Modified: incubator/harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/javac/Compiler.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/javac/Compiler.java?rev=418841&r1=418840&r2=418841&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/javac/Compiler.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/tools/src/main/java/org/apache/harmony/tools/javac/Compiler.java Mon Jul  3 13:29:39 2006
@@ -36,14 +36,14 @@
             "ISO8859_1");
 
     /* FIXME: Hard-coded for now, the name of the ECJ JAR file */
-    static final String ECJ_JAR_FILE = "ecj_3.2MAINT.jar";
+    static final String ECJ_JAR_FILE = "ecj_3.2.jar";
 
     /* The name of the ECJ compiler class */
     static final String MAIN_CLASS_NAME = "org.eclipse.jdt.internal.compiler.batch.Main";
 
     /*
      * Invokes the compiler with the given command-line arguments. The supported
-     * arguments can be determined form the usage mesage.
+     * arguments can be determined form the usage message.
      */
     public static void main(String[] args) {
         Compiler myself = new Compiler();
@@ -62,7 +62,7 @@
     }
 
     // Reference to ECJ 'Main' compiler class.
-    Class ecjCompilerClass;
+    Class<?> ecjCompilerClass;
 
     // An instance of the ECJ compiler
     Object mainInst;
@@ -122,7 +122,7 @@
         PrintWriter errWriter = new PrintWriter(esw);
 
         // Create a new instance of the compiler
-        Constructor ctor = ecjCompilerClass.getConstructor(new Class[] {
+        Constructor<?> ctor = ecjCompilerClass.getConstructor(new Class[] {
                 PrintWriter.class, PrintWriter.class, Boolean.TYPE });
 
         mainInst = ctor.newInstance(new Object[] { outWriter, errWriter,