Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.2386.2.79
diff -u -3 -p -u -r1.2386.2.79 ChangeLog
--- ChangeLog	4 Feb 2005 09:44:43 -0000	1.2386.2.79
+++ ChangeLog	6 Feb 2005 02:20:50 -0000
@@ -1,3 +1,54 @@
+2005-02-05  C. Brian Jones  <address@hidden>
+
+	* gnu/java/rmi/registry/: added back to classpath again, used by core library
+	* gnu/java/rmi/registry/RegistryImpl.java: ditto
+	* gnu/java/rmi/registry/RegistryImpl_Skel.java: ditto
+	* gnu/java/rmi/registry/RegistryImpl_Stub.java: ditto
+
+2005-02-06  Mark Wielaard  <address@hidden>
+
+	* doc/api/Makefile.am (create_html): Remove gjdoc -public flag.
+
+2005-02-05  Sven de Marothy  <address@hidden>
+
+        * java/text/SimpleDateFormat.java
+        (parse): Tweak handling of 2-year dates
+        * java/util/Calendar.java
+        (clear): Clear fields to correct value.
+        * java/util/GregorianCalendar.java
+        (computeTime): Correct handling of time zones.
+        Correct field minimum values.
+
+2005-02-05  C. Brian Jones  <address@hidden>
+
+	* gnu/java/rmi/rmic/: added to cp-tools and removed from classpath
+	* gnu/java/rmi/rmic/Compile_gcj.java: ditto
+	* gnu/java/rmi/rmic/Compile_jikes.java: ditto
+	* gnu/java/rmi/rmic/Compile_kjc.java: ditto
+	* gnu/java/rmi/rmic/Compiler.java: ditto
+	* gnu/java/rmi/rmic/CompilerProcess.java: ditto
+	* gnu/java/rmi/rmic/RMICException.java: ditto
+	* gnu/java/rmi/rmic/RMIC.java: ditto
+	* gnu/java/rmi/rmic/TabbedWriter.java: ditto
+	* gnu/java/rmi/registry/: added to cp-tools and removed from classpath
+	* gnu/java/rmi/registry/RegistryImpl.java: ditto
+	* gnu/java/rmi/registry/RegistryImpl_Skel.java: ditto
+	* gnu/java/rmi/registry/RegistryImpl_Stub.java: ditto
+
+2005-02-05  Mark Wielaard  <address@hidden>
+
+	* doc/api/Makefile.am (classpathbox): Use class logo and target _top.
+
+2005-02-04  Chris Burdess  <address@hidden>
+
+	* gnu/xml/aelfred2/SAXDriver.java: Corrected implementation of
+	isDeclared methods. Improved performance of isSpecified methods.
+
+2005-02-04  Michael Koch  <address@hidden>
+
+	* javax/swing/SortingFocusTraversalPolicy.java
+	(getSortedCycle): Fixed initialization of set.
+
 2005-02-03  Robert Schuster  <address@hidden>
 
 	* gnu/java/nio/charset/ISO_8859_1.java,
Index: doc/api/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/doc/api/Makefile.am,v
retrieving revision 1.11.2.2
diff -u -3 -p -u -r1.11.2.2 Makefile.am
--- doc/api/Makefile.am	16 Jan 2005 15:14:52 -0000	1.11.2.2
+++ doc/api/Makefile.am	6 Feb 2005 02:20:50 -0000
@@ -4,7 +4,7 @@ endif
 
 sourcepath = $(top_builddir):$(top_srcdir):$(top_srcdir)/vm/reference:$(top_srcdir)/external/w3c_dom:$(top_srcdir)/external/sax
 
-classpathbox = "<span class='navbar item enabled'><a href='http://www.gnu.org/software/classpath'>GNU Classpath</a> ($(VERSION))"
+classpathbox = "<span class='logo'><a href='http://www.gnu.org/software/classpath' target='_top'>GNU Classpath</a> ($(VERSION))"
 
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/api
@@ -34,7 +34,8 @@ clean:
 
 create_html:
 	-$(MKDIR) html > /dev/null 2>&1
-	$(GJDOC) -public -use \
+	$(GJDOC) \
+	-use \
 	-sourcepath "$(sourcepath)" \
 	-encoding UTF-8 \
 	-breakiterator \
Index: gnu/java/rmi/rmic/Compile_gcj.java
===================================================================
RCS file: gnu/java/rmi/rmic/Compile_gcj.java
diff -N gnu/java/rmi/rmic/Compile_gcj.java
--- gnu/java/rmi/rmic/Compile_gcj.java	29 Aug 2003 21:32:31 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,55 +0,0 @@
-/*
-  Copyright (c) 2001, 2003 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
- 
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-package gnu.java.rmi.rmic;
-
-/** Subclass of Compiler that can be used to invoke gcj.  */
-public class Compile_gcj extends CompilerProcess
-{
-  private static final String [] COMPILER_ARGS = 
-  {
-    "gcj",
-    "-C"
-  };
-
-  public String[] computeArguments (String filename)
-  {
-    return computeTypicalArguments(COMPILER_ARGS,
-				   getDestination(),
-				   filename);
-  }
-}
Index: gnu/java/rmi/rmic/Compile_jikes.java
===================================================================
RCS file: gnu/java/rmi/rmic/Compile_jikes.java
diff -N gnu/java/rmi/rmic/Compile_jikes.java
--- gnu/java/rmi/rmic/Compile_jikes.java	29 Aug 2003 21:32:31 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,56 +0,0 @@
-/*
-  Copyright (c) 2003 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
- 
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-package gnu.java.rmi.rmic;
-
-/** Subclass of Compiler that can be used to invoke jikes.  */
-public class Compile_jikes extends CompilerProcess
-{
-  /** Compiler arguments to invoke jikes */
-  private static final String [] COMPILER_ARGS = 
-  {
-    "jikes"
-  };
-
-  /** Compute the command line for the process.  */
-  public String[] computeArguments (String filename)
-  {
-    return computeTypicalArguments(COMPILER_ARGS,
-				   getDestination(),
-				   filename);
-  }
-}
Index: gnu/java/rmi/rmic/Compile_kjc.java
===================================================================
RCS file: gnu/java/rmi/rmic/Compile_kjc.java
diff -N gnu/java/rmi/rmic/Compile_kjc.java
--- gnu/java/rmi/rmic/Compile_kjc.java	29 Aug 2003 21:32:31 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,56 +0,0 @@
-/*
-  Copyright (c) 2003 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
- 
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-package gnu.java.rmi.rmic;
-
-/** Subclass of Compiler that can be used to invoke kjc.  */
-public class Compile_kjc extends CompilerProcess
-{
-  /** Compiler arguments to invoke kjc */
-  private static final String [] COMPILER_ARGS = 
-  {
-    "kjc"
-  };
-
-  /** Compute the command line for the process.  */
-  public String[] computeArguments (String filename)
-  {
-    return computeTypicalArguments(COMPILER_ARGS,
-				   getDestination(),
-				   filename);
-  }
-}
Index: gnu/java/rmi/rmic/Compiler.java
===================================================================
RCS file: gnu/java/rmi/rmic/Compiler.java
diff -N gnu/java/rmi/rmic/Compiler.java
--- gnu/java/rmi/rmic/Compiler.java	29 Aug 2003 21:32:31 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,93 +0,0 @@
-/*
-  Copyright (c) 2001, 2003 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
- 
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-package gnu.java.rmi.rmic;
-
-/**
- * A Compiler object can be used to compile a .java file into a
- * .class file.  This is an abstract class; the
- * <code>getInstance()</code> method is used to obtain the actual
- * compiler object.
- */
-public abstract class Compiler
-{
-  // Can't directly instantiate.
-  protected Compiler ()
-  {
-  }
-
-  /** Create a new compiler instance.  */
-  public static Compiler getInstance ()
-  {
-    return getInstance (System.getProperty ("classpath.compiler", "gcj"));
-  }
-
-  /** Create a new compiler instance given the name of the compiler.  */
-  public static Compiler getInstance (String name)
-  {
-    try
-      {
-	Class k = Class.forName (classPrefix + name);
-	return (Compiler) k.newInstance ();
-      }
-    catch (Throwable _)
-      {
-      }
-    return null;
-  }
-
-   /** Get the directory where output files will be put.  */
-   public String getDestination ()
-   {
-     return dest;
-   }
-
-  /** Set the directory where output files will be put.  */
-  public void setDestination (String dest)
-  {
-    this.dest = dest;
-  }
-
-  /** Compile the given file.  Throws exception on error.  */
-  public abstract void compile (String name) throws Exception;
-
-  /** The destination directory, or null if none set.  */
-  protected String dest;
-
-  /** Class prefix used when trying to find instance.  */
-  private static final String classPrefix = "gnu.java.rmi.rmic.Compile_";
-}
Index: gnu/java/rmi/rmic/CompilerProcess.java
===================================================================
RCS file: gnu/java/rmi/rmic/CompilerProcess.java
diff -N gnu/java/rmi/rmic/CompilerProcess.java
--- gnu/java/rmi/rmic/CompilerProcess.java	7 May 2004 15:33:09 -0000	1.4
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,124 +0,0 @@
-/*
-  Copyright (c) 2001, 2003 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
- 
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-package gnu.java.rmi.rmic;
-
-import java.io.InputStream;
-
-/**
- * Subclass of Compiler that can be subclassed to invoke a process to
- * do its work.
- */
-public abstract class CompilerProcess extends Compiler
-{
-  /** This is used to compute the command line for the process.  */
-  public abstract String[] computeArguments (String filename);
-
-   /**
-    * This is used to compute the command line for the process.
-    * Most compilers typically arrange their arguments as in
-    * &lt;compiler name and arguments&gt; &lt;optional destination&gt; &lt;filename&gt;.
-    * This method builds an argument array out that. It should be used
-    * to define computeArguments for those compilers that follow the
-    * argument convention described above.
-    */
-   public static String[] computeTypicalArguments(String[] compilerArgs,
-	String destination, String filename)
-   {
-     /* length of compiler specific arguments */
-     final int len = compilerArgs.length;
-
-     /* length of returned array of arguments */
-     final int arglen = len + (destination == null ? 0 : 2) + 1;
-
-     /* Allocate String array for computed arguments. */
-     String [] args = new String[arglen];
-
-     /* Fill in compiler arguments. */
-     System.arraycopy(compilerArgs, 0, args, 0, len);
-
-     /* Fill in destination argument if necessary. */
-     if (destination != null)
-      {
-	args[len] = "-d";
-	args[len + 1] = destination;
-      }
-
-     /* Fill in filename */
-     args[arglen - 1] = filename;
-
-     return args;
-   }
-
-  public void compile (String name) throws Exception
-  {
-    String[] args = computeArguments (name);
-    Process p = Runtime.getRuntime ().exec (args);
-
-    /* Print compiler output to System.out. */
-    InputStream procin = p.getInputStream();
-    for (int ch = procin.read(); ch != -1; ch = procin.read())
-      System.out.print((char) ch);
-
-    /* Collect compiler error output in a buffer.
-     * If compilation fails, it will be used for an error message.
-     */
-    StringBuffer stderr = new StringBuffer();
-    InputStream procerr = p.getErrorStream();
-    for (int ch = procerr.read(); ch != -1; ch = procerr.read())
-      stderr.append((char) ch);
-
-    int result;
-    while (true)
-      {
-	try
-	  {
-	    result = p.waitFor ();
-	    break;
-	  }
-	catch (InterruptedException _)
-	  {
-	  }
-      }
-    if (result != 0)
-      {
-	// FIXME: wrong exception class.
-	throw new Exception ("compiler exited with status: " + result,
-			     new RMICException(stderr.toString()));
-      }
-  }
-}
Index: gnu/java/rmi/rmic/RMIC.java
===================================================================
RCS file: gnu/java/rmi/rmic/RMIC.java
diff -N gnu/java/rmi/rmic/RMIC.java
--- gnu/java/rmi/rmic/RMIC.java	15 Jan 2005 17:01:43 -0000	1.10.2.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,1078 +0,0 @@
-/* RMIC.java --
-   Copyright (c) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004
-   Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-
-package gnu.java.rmi.rmic;
-
-import gnu.java.rmi.server.RMIHashes;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.lang.reflect.Method;
-import java.rmi.RemoteException;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-
-public class RMIC
-{
-  private String[] args;
-  private int next;
-  private Exception exception;
-  private boolean keep = false;
-  private boolean need11Stubs = true;
-  private boolean need12Stubs = true;
-  private boolean compile = true;
-  private boolean verbose;
-  private String destination;
-  private PrintWriter out;
-  private TabbedWriter ctrl;
-  private Class clazz;
-  private String classname;
-  private String fullclassname;
-  private MethodRef[] remotemethods;
-  private String stubname;
-  private String skelname;
-  private int errorCount = 0;
-  private Class mRemoteInterface;
-
-  public RMIC(String[] a)
-  {
-    args = a;
-  }
-
-  public static void main(String[] args)
-  {
-    RMIC r = new RMIC(args);
-    if (r.run() == false)
-      {
-	Exception e = r.getException();
-	if (e != null)
-	  e.printStackTrace();
-	else
-	  System.exit(1);
-      }
-  }
-
-  public boolean run()
-  {
-    parseOptions();
-    if (next >= args.length)
-      error("no class names found");
-    for (int i = next; i < args.length; i++)
-      {
-	try
-	  {
-	    if (verbose)
-	      System.out.println("[Processing class " + args[i] + ".class]");
-	    processClass(args[i].replace(File.separatorChar, '.'));
-	  }
-	catch (Exception e)
-	  {
-	    exception = e;
-	    return (false);
-	  }
-      }
-    return (true);
-  }
-
-  private boolean processClass(String classname) throws Exception
-  {
-    errorCount = 0;
-    analyzeClass(classname);
-    if (errorCount > 0)
-      System.exit(1);
-    generateStub();
-    if (need11Stubs)
-      generateSkel();
-    if (compile)
-      {
-	compile(stubname.replace('.', File.separatorChar) + ".java");
-	if (need11Stubs)
-	  compile(skelname.replace('.', File.separatorChar) + ".java");
-      }
-    if (! keep)
-      {
-	(new File(stubname.replace('.', File.separatorChar) + ".java")).delete();
-	if (need11Stubs)
-	  (new File(skelname.replace('.', File.separatorChar) + ".java"))
-	  .delete();
-      }
-    return (true);
-  }
-
-  private void analyzeClass(String cname) throws Exception
-  {
-    if (verbose)
-      System.out.println("[analyze class " + cname + "]");
-    int p = cname.lastIndexOf('.');
-    if (p != -1)
-      classname = cname.substring(p + 1);
-    else
-      classname = cname;
-    fullclassname = cname;
-
-    HashSet rmeths = new HashSet();
-    findClass();
-
-    // get the remote interface
-    mRemoteInterface = getRemoteInterface(clazz);
-    if (mRemoteInterface == null)
-      return;
-    if (verbose)
-      System.out.println("[implements " + mRemoteInterface.getName() + "]");
-
-    // check if the methods of the remote interface declare RemoteExceptions
-    Method[] meths = mRemoteInterface.getDeclaredMethods();
-    for (int i = 0; i < meths.length; i++)
-      {
-	Class[] exceptions = meths[i].getExceptionTypes();
-	int index = 0;
-	for (; index < exceptions.length; index++)
-	  {
-	    if (exceptions[index].equals(RemoteException.class))
-	      break;
-	  }
-	if (index < exceptions.length)
-	  rmeths.add(meths[i]);
-	else
-	  logError("Method " + meths[i]
-	           + " does not throw a java.rmi.RemoteException");
-      }
-
-    // Convert into a MethodRef array and sort them
-    remotemethods = new MethodRef[rmeths.size()];
-    int c = 0;
-    for (Iterator i = rmeths.iterator(); i.hasNext();)
-      remotemethods[c++] = new MethodRef((Method) i.next());
-    Arrays.sort(remotemethods);
-  }
-
-  public Exception getException()
-  {
-    return (exception);
-  }
-
-  private void findClass() throws ClassNotFoundException
-  {
-    clazz =
-      Class.forName(fullclassname, true, ClassLoader.getSystemClassLoader());
-  }
-
-  private void generateStub() throws IOException
-  {
-    stubname = fullclassname + "_Stub";
-    String stubclassname = classname + "_Stub";
-    ctrl =
-      new TabbedWriter(new FileWriter((destination == null ? ""
-                                                           : destination
-                                                           + File.separator)
-                                      + stubname.replace('.',
-                                                         File.separatorChar)
-                                      + ".java"));
-    out = new PrintWriter(ctrl);
-
-    if (verbose)
-      System.out.println("[Generating class " + stubname + ".java]");
-
-    out.println("// Stub class generated by rmic - DO NOT EDIT!");
-    out.println();
-    if (fullclassname != classname)
-      {
-	String pname =
-	  fullclassname.substring(0, fullclassname.lastIndexOf('.'));
-	out.println("package " + pname + ";");
-	out.println();
-      }
-
-    out.print("public final class " + stubclassname);
-    ctrl.indent();
-    out.println("extends java.rmi.server.RemoteStub");
-
-    // Output interfaces we implement
-    out.print("implements ");
-    /* Scan implemented interfaces, and only print remote interfaces. */
-    Class[] ifaces = clazz.getInterfaces();
-    Set remoteIfaces = new HashSet();
-    for (int i = 0; i < ifaces.length; i++)
-      {
-	Class iface = ifaces[i];
-	if (java.rmi.Remote.class.isAssignableFrom(iface))
-	  remoteIfaces.add(iface);
-      }
-    Iterator iter = remoteIfaces.iterator();
-    while (iter.hasNext())
-      {
-	/* Print remote interface. */
-	Class iface = (Class) iter.next();
-	out.print(iface.getName());
-
-	/* Print ", " if more remote interfaces follow. */
-	if (iter.hasNext())
-	  out.print(", ");
-      }
-    ctrl.unindent();
-    out.print("{");
-    ctrl.indent();
-
-    // UID
-    if (need12Stubs)
-      {
-	out.println("private static final long serialVersionUID = 2L;");
-	out.println();
-      }
-
-    // InterfaceHash - don't know how to calculate this - XXX
-    if (need11Stubs)
-      {
-	out.println("private static final long interfaceHash = "
-	            + RMIHashes.getInterfaceHash(clazz) + "L;");
-	out.println();
-	if (need12Stubs)
-	  {
-	    out.println("private static boolean useNewInvoke;");
-	    out.println();
-	  }
-
-	// Operation table
-	out.print("private static final java.rmi.server.Operation[] operations = {");
-
-	ctrl.indent();
-	for (int i = 0; i < remotemethods.length; i++)
-	  {
-	    Method m = remotemethods[i].meth;
-	    out.print("new java.rmi.server.Operation(\"");
-	    out.print(getPrettyName(m.getReturnType()) + " ");
-	    out.print(m.getName() + "(");
-	    // Output signature
-	    Class[] sig = m.getParameterTypes();
-	    for (int j = 0; j < sig.length; j++)
-	      {
-		out.print(getPrettyName(sig[j]));
-		if (j + 1 < sig.length)
-		  out.print(", ");
-	      }
-	    out.print(")\")");
-	    if (i + 1 < remotemethods.length)
-	      out.println(",");
-	  }
-	ctrl.unindent();
-	out.println("};");
-	out.println();
-      }
-
-    // Set of method references.
-    if (need12Stubs)
-      {
-	for (int i = 0; i < remotemethods.length; i++)
-	  {
-	    Method m = remotemethods[i].meth;
-	    out.println("private static java.lang.reflect.Method $method_"
-	                + m.getName() + "_" + i + ";");
-	  }
-
-	// Initialize the methods references.
-	out.println();
-	out.print("static {");
-	ctrl.indent();
-
-	out.print("try {");
-	ctrl.indent();
-
-	if (need11Stubs)
-	  {
-	    out.println("java.rmi.server.RemoteRef.class.getMethod(\"invoke\", new java.lang.Class[] { java.rmi.Remote.class, java.lang.reflect.Method.class, java.lang.Object[].class, long.class });");
-	    out.println("useNewInvoke = true;");
-	  }
-
-	for (int i = 0; i < remotemethods.length; i++)
-	  {
-	    Method m = remotemethods[i].meth;
-	    out.print("$method_" + m.getName() + "_" + i + " = ");
-	    out.print(mRemoteInterface.getName() + ".class.getMethod(\""
-	              + m.getName() + "\"");
-	    out.print(", new java.lang.Class[] {");
-	    // Output signature
-	    Class[] sig = m.getParameterTypes();
-	    for (int j = 0; j < sig.length; j++)
-	      {
-		out.print(getPrettyName(sig[j]) + ".class");
-		if (j + 1 < sig.length)
-		  out.print(", ");
-	      }
-	    out.println("});");
-	  }
-	ctrl.unindent();
-	out.println("}");
-	out.print("catch (java.lang.NoSuchMethodException e) {");
-	ctrl.indent();
-	if (need11Stubs)
-	  out.print("useNewInvoke = false;");
-	else
-	  out.print("throw new java.lang.NoSuchMethodError(\"stub class initialization failed\");");
-
-	ctrl.unindent();
-	out.print("}");
-
-	ctrl.unindent();
-	out.println("}");
-	out.println();
-      }
-
-    // Constructors
-    if (need11Stubs)
-      {
-	out.print("public " + stubclassname + "() {");
-	ctrl.indent();
-	out.print("super();");
-	ctrl.unindent();
-	out.println("}");
-      }
-
-    if (need12Stubs)
-      {
-	out.print("public " + stubclassname
-	          + "(java.rmi.server.RemoteRef ref) {");
-	ctrl.indent();
-	out.print("super(ref);");
-	ctrl.unindent();
-	out.println("}");
-      }
-
-    // Method implementations
-    for (int i = 0; i < remotemethods.length; i++)
-      {
-	Method m = remotemethods[i].meth;
-	Class[] sig = m.getParameterTypes();
-	Class returntype = m.getReturnType();
-	Class[] except = sortExceptions(m.getExceptionTypes());
-
-	out.println();
-	out.print("public " + getPrettyName(returntype) + " " + m.getName()
-	          + "(");
-	for (int j = 0; j < sig.length; j++)
-	  {
-	    out.print(getPrettyName(sig[j]));
-	    out.print(" $param_" + j);
-	    if (j + 1 < sig.length)
-	      out.print(", ");
-	  }
-	out.print(") ");
-	out.print("throws ");
-	for (int j = 0; j < except.length; j++)
-	  {
-	    out.print(getPrettyName(except[j]));
-	    if (j + 1 < except.length)
-	      out.print(", ");
-	  }
-	out.print(" {");
-	ctrl.indent();
-
-	out.print("try {");
-	ctrl.indent();
-
-	if (need12Stubs)
-	  {
-	    if (need11Stubs)
-	      {
-		out.print("if (useNewInvoke) {");
-		ctrl.indent();
-	      }
-	    if (returntype != Void.TYPE)
-	      out.print("java.lang.Object $result = ");
-	    out.print("ref.invoke(this, $method_" + m.getName() + "_" + i
-	              + ", ");
-	    if (sig.length == 0)
-	      out.print("null, ");
-	    else
-	      {
-		out.print("new java.lang.Object[] {");
-		for (int j = 0; j < sig.length; j++)
-		  {
-		    if (sig[j] == Boolean.TYPE)
-		      out.print("new java.lang.Boolean($param_" + j + ")");
-		    else if (sig[j] == Byte.TYPE)
-		      out.print("new java.lang.Byte($param_" + j + ")");
-		    else if (sig[j] == Character.TYPE)
-		      out.print("new java.lang.Character($param_" + j + ")");
-		    else if (sig[j] == Short.TYPE)
-		      out.print("new java.lang.Short($param_" + j + ")");
-		    else if (sig[j] == Integer.TYPE)
-		      out.print("new java.lang.Integer($param_" + j + ")");
-		    else if (sig[j] == Long.TYPE)
-		      out.print("new java.lang.Long($param_" + j + ")");
-		    else if (sig[j] == Float.TYPE)
-		      out.print("new java.lang.Float($param_" + j + ")");
-		    else if (sig[j] == Double.TYPE)
-		      out.print("new java.lang.Double($param_" + j + ")");
-		    else
-		      out.print("$param_" + j);
-		    if (j + 1 < sig.length)
-		      out.print(", ");
-		  }
-		out.print("}, ");
-	      }
-	    out.print(Long.toString(remotemethods[i].hash) + "L");
-	    out.print(");");
-
-	    if (returntype != Void.TYPE)
-	      {
-		out.println();
-		out.print("return (");
-		if (returntype == Boolean.TYPE)
-		  out.print("((java.lang.Boolean)$result).booleanValue()");
-		else if (returntype == Byte.TYPE)
-		  out.print("((java.lang.Byte)$result).byteValue()");
-		else if (returntype == Character.TYPE)
-		  out.print("((java.lang.Character)$result).charValue()");
-		else if (returntype == Short.TYPE)
-		  out.print("((java.lang.Short)$result).shortValue()");
-		else if (returntype == Integer.TYPE)
-		  out.print("((java.lang.Integer)$result).intValue()");
-		else if (returntype == Long.TYPE)
-		  out.print("((java.lang.Long)$result).longValue()");
-		else if (returntype == Float.TYPE)
-		  out.print("((java.lang.Float)$result).floatValue()");
-		else if (returntype == Double.TYPE)
-		  out.print("((java.lang.Double)$result).doubleValue()");
-		else
-		  out.print("(" + getPrettyName(returntype) + ")$result");
-		out.print(");");
-	      }
-
-	    if (need11Stubs)
-	      {
-		ctrl.unindent();
-		out.println("}");
-		out.print("else {");
-		ctrl.indent();
-	      }
-	  }
-
-	if (need11Stubs)
-	  {
-	    out.println("java.rmi.server.RemoteCall call = ref.newCall((java.rmi.server.RemoteObject)this, operations, "
-	                + i + ", interfaceHash);");
-	    out.print("try {");
-	    ctrl.indent();
-	    out.print("java.io.ObjectOutput out = call.getOutputStream();");
-	    for (int j = 0; j < sig.length; j++)
-	      {
-		out.println();
-		if (sig[j] == Boolean.TYPE)
-		  out.print("out.writeBoolean(");
-		else if (sig[j] == Byte.TYPE)
-		  out.print("out.writeByte(");
-		else if (sig[j] == Character.TYPE)
-		  out.print("out.writeChar(");
-		else if (sig[j] == Short.TYPE)
-		  out.print("out.writeShort(");
-		else if (sig[j] == Integer.TYPE)
-		  out.print("out.writeInt(");
-		else if (sig[j] == Long.TYPE)
-		  out.print("out.writeLong(");
-		else if (sig[j] == Float.TYPE)
-		  out.print("out.writeFloat(");
-		else if (sig[j] == Double.TYPE)
-		  out.print("out.writeDouble(");
-		else
-		  out.print("out.writeObject(");
-		out.print("$param_" + j + ");");
-	      }
-	    ctrl.unindent();
-	    out.println("}");
-	    out.print("catch (java.io.IOException e) {");
-	    ctrl.indent();
-	    out.print("throw new java.rmi.MarshalException(\"error marshalling arguments\", e);");
-	    ctrl.unindent();
-	    out.println("}");
-	    out.println("ref.invoke(call);");
-	    if (returntype != Void.TYPE)
-	      out.println(getPrettyName(returntype) + " $result;");
-	    out.print("try {");
-	    ctrl.indent();
-	    out.print("java.io.ObjectInput in = call.getInputStream();");
-	    boolean needcastcheck = false;
-	    if (returntype != Void.TYPE)
-	      {
-		out.println();
-		out.print("$result = ");
-		if (returntype == Boolean.TYPE)
-		  out.print("in.readBoolean();");
-		else if (returntype == Byte.TYPE)
-		  out.print("in.readByte();");
-		else if (returntype == Character.TYPE)
-		  out.print("in.readChar();");
-		else if (returntype == Short.TYPE)
-		  out.print("in.readShort();");
-		else if (returntype == Integer.TYPE)
-		  out.print("in.readInt();");
-		else if (returntype == Long.TYPE)
-		  out.print("in.readLong();");
-		else if (returntype == Float.TYPE)
-		  out.print("in.readFloat();");
-		else if (returntype == Double.TYPE)
-		  out.print("in.readDouble();");
-		else
-		  {
-		    if (returntype != Object.class)
-		      out.print("(" + getPrettyName(returntype) + ")");
-		    else
-		      needcastcheck = true;
-		    out.print("in.readObject();");
-		  }
-		out.println();
-		out.print("return ($result);");
-	      }
-	    ctrl.unindent();
-	    out.println("}");
-	    out.print("catch (java.io.IOException e) {");
-	    ctrl.indent();
-	    out.print("throw new java.rmi.UnmarshalException(\"error unmarshalling return\", e);");
-	    ctrl.unindent();
-	    out.println("}");
-	    if (needcastcheck)
-	      {
-		out.print("catch (java.lang.ClassNotFoundException e) {");
-		ctrl.indent();
-		out.print("throw new java.rmi.UnmarshalException(\"error unmarshalling return\", e);");
-		ctrl.unindent();
-		out.println("}");
-	      }
-	    out.print("finally {");
-	    ctrl.indent();
-	    out.print("ref.done(call);");
-	    ctrl.unindent();
-	    out.print("}");
-
-	    if (need12Stubs && need11Stubs)
-	      {
-		ctrl.unindent();
-		out.print("}");
-	      }
-	  }
-
-	ctrl.unindent();
-	out.print("}");
-
-	boolean needgeneral = true;
-	for (int j = 0; j < except.length; j++)
-	  {
-	    out.println();
-	    out.print("catch (" + getPrettyName(except[j]) + " e) {");
-	    ctrl.indent();
-	    out.print("throw e;");
-	    ctrl.unindent();
-	    out.print("}");
-	    if (except[j] == Exception.class)
-	      needgeneral = false;
-	  }
-	if (needgeneral)
-	  {
-	    out.println();
-	    out.print("catch (java.lang.Exception e) {");
-	    ctrl.indent();
-	    out.print("throw new java.rmi.UnexpectedException(\"undeclared checked exception\", e);");
-	    ctrl.unindent();
-	    out.print("}");
-	  }
-
-	ctrl.unindent();
-	out.print("}");
-	out.println();
-      }
-
-    ctrl.unindent();
-    out.println("}");
-
-    out.close();
-  }
-
-  private void generateSkel() throws IOException
-  {
-    skelname = fullclassname + "_Skel";
-    String skelclassname = classname + "_Skel";
-    ctrl =
-      new TabbedWriter(new FileWriter((destination == null ? ""
-                                                           : destination
-                                                           + File.separator)
-                                      + skelname.replace('.',
-                                                         File.separatorChar)
-                                      + ".java"));
-    out = new PrintWriter(ctrl);
-
-    if (verbose)
-      System.out.println("[Generating class " + skelname + ".java]");
-
-    out.println("// Skel class generated by rmic - DO NOT EDIT!");
-    out.println();
-    if (fullclassname != classname)
-      {
-	String pname =
-	  fullclassname.substring(0, fullclassname.lastIndexOf('.'));
-	out.println("package " + pname + ";");
-	out.println();
-      }
-
-    out.print("public final class " + skelclassname);
-    ctrl.indent();
-
-    // Output interfaces we implement
-    out.print("implements java.rmi.server.Skeleton");
-
-    ctrl.unindent();
-    out.print("{");
-    ctrl.indent();
-
-    // Interface hash - don't know how to calculate this - XXX
-    out.println("private static final long interfaceHash = "
-                + RMIHashes.getInterfaceHash(clazz) + "L;");
-    out.println();
-
-    // Operation table
-    out.print("private static final java.rmi.server.Operation[] operations = {");
-
-    ctrl.indent();
-    for (int i = 0; i < remotemethods.length; i++)
-      {
-	Method m = remotemethods[i].meth;
-	out.print("new java.rmi.server.Operation(\"");
-	out.print(getPrettyName(m.getReturnType()) + " ");
-	out.print(m.getName() + "(");
-	// Output signature
-	Class[] sig = m.getParameterTypes();
-	for (int j = 0; j < sig.length; j++)
-	  {
-	    out.print(getPrettyName(sig[j]));
-	    if (j + 1 < sig.length)
-	      out.print(", ");
-	  }
-	out.print("\")");
-	if (i + 1 < remotemethods.length)
-	  out.println(",");
-      }
-    ctrl.unindent();
-    out.println("};");
-
-    out.println();
-
-    // getOperations method
-    out.print("public java.rmi.server.Operation[] getOperations() {");
-    ctrl.indent();
-    out.print("return ((java.rmi.server.Operation[]) operations.clone());");
-    ctrl.unindent();
-    out.println("}");
-
-    out.println();
-
-    // Dispatch method
-    out.print("public void dispatch(java.rmi.Remote obj, java.rmi.server.RemoteCall call, int opnum, long hash) throws java.lang.Exception {");
-    ctrl.indent();
-
-    out.print("if (opnum < 0) {");
-    ctrl.indent();
-
-    for (int i = 0; i < remotemethods.length; i++)
-      {
-	out.print("if (hash == " + Long.toString(remotemethods[i].hash)
-	          + "L) {");
-	ctrl.indent();
-	out.print("opnum = " + i + ";");
-	ctrl.unindent();
-	out.println("}");
-	out.print("else ");
-      }
-    out.print("{");
-    ctrl.indent();
-    out.print("throw new java.rmi.server.SkeletonMismatchException(\"interface hash mismatch\");");
-    ctrl.unindent();
-    out.print("}");
-
-    ctrl.unindent();
-    out.println("}");
-    out.print("else if (hash != interfaceHash) {");
-    ctrl.indent();
-    out.print("throw new java.rmi.server.SkeletonMismatchException(\"interface hash mismatch\");");
-    ctrl.unindent();
-    out.println("}");
-
-    out.println();
-
-    out.println(fullclassname + " server = (" + fullclassname + ")obj;");
-    out.println("switch (opnum) {");
-
-    // Method dispatch
-    for (int i = 0; i < remotemethods.length; i++)
-      {
-	Method m = remotemethods[i].meth;
-	out.println("case " + i + ":");
-	out.print("{");
-	ctrl.indent();
-
-	Class[] sig = m.getParameterTypes();
-	for (int j = 0; j < sig.length; j++)
-	  {
-	    out.print(getPrettyName(sig[j]));
-	    out.println(" $param_" + j + ";");
-	  }
-
-	out.print("try {");
-	boolean needcastcheck = false;
-	ctrl.indent();
-	out.println("java.io.ObjectInput in = call.getInputStream();");
-	for (int j = 0; j < sig.length; j++)
-	  {
-	    out.print("$param_" + j + " = ");
-	    if (sig[j] == Boolean.TYPE)
-	      out.print("in.readBoolean();");
-	    else if (sig[j] == Byte.TYPE)
-	      out.print("in.readByte();");
-	    else if (sig[j] == Character.TYPE)
-	      out.print("in.readChar();");
-	    else if (sig[j] == Short.TYPE)
-	      out.print("in.readShort();");
-	    else if (sig[j] == Integer.TYPE)
-	      out.print("in.readInt();");
-	    else if (sig[j] == Long.TYPE)
-	      out.print("in.readLong();");
-	    else if (sig[j] == Float.TYPE)
-	      out.print("in.readFloat();");
-	    else if (sig[j] == Double.TYPE)
-	      out.print("in.readDouble();");
-	    else
-	      {
-		if (sig[j] != Object.class)
-		  {
-		    out.print("(" + getPrettyName(sig[j]) + ")");
-		    needcastcheck = true;
-		  }
-		out.print("in.readObject();");
-	      }
-	    out.println();
-	  }
-	ctrl.unindent();
-	out.println("}");
-	out.print("catch (java.io.IOException e) {");
-	ctrl.indent();
-	out.print("throw new java.rmi.UnmarshalException(\"error unmarshalling arguments\", e);");
-	ctrl.unindent();
-	out.println("}");
-	if (needcastcheck)
-	  {
-	    out.print("catch (java.lang.ClassCastException e) {");
-	    ctrl.indent();
-	    out.print("throw new java.rmi.UnmarshalException(\"error unmarshalling arguments\", e);");
-	    ctrl.unindent();
-	    out.println("}");
-	  }
-	out.print("finally {");
-	ctrl.indent();
-	out.print("call.releaseInputStream();");
-	ctrl.unindent();
-	out.println("}");
-
-	Class returntype = m.getReturnType();
-	if (returntype != Void.TYPE)
-	  out.print(getPrettyName(returntype) + " $result = ");
-	out.print("server." + m.getName() + "(");
-	for (int j = 0; j < sig.length; j++)
-	  {
-	    out.print("$param_" + j);
-	    if (j + 1 < sig.length)
-	      out.print(", ");
-	  }
-	out.println(");");
-
-	out.print("try {");
-	ctrl.indent();
-	out.print("java.io.ObjectOutput out = call.getResultStream(true);");
-	if (returntype != Void.TYPE)
-	  {
-	    out.println();
-	    if (returntype == Boolean.TYPE)
-	      out.print("out.writeBoolean($result);");
-	    else if (returntype == Byte.TYPE)
-	      out.print("out.writeByte($result);");
-	    else if (returntype == Character.TYPE)
-	      out.print("out.writeChar($result);");
-	    else if (returntype == Short.TYPE)
-	      out.print("out.writeShort($result);");
-	    else if (returntype == Integer.TYPE)
-	      out.print("out.writeInt($result);");
-	    else if (returntype == Long.TYPE)
-	      out.print("out.writeLong($result);");
-	    else if (returntype == Float.TYPE)
-	      out.print("out.writeFloat($result);");
-	    else if (returntype == Double.TYPE)
-	      out.print("out.writeDouble($result);");
-	    else
-	      out.print("out.writeObject($result);");
-	  }
-	ctrl.unindent();
-	out.println("}");
-	out.print("catch (java.io.IOException e) {");
-	ctrl.indent();
-	out.print("throw new java.rmi.MarshalException(\"error marshalling return\", e);");
-	ctrl.unindent();
-	out.println("}");
-	out.print("break;");
-
-	ctrl.unindent();
-	out.println("}");
-	out.println();
-      }
-
-    out.print("default:");
-    ctrl.indent();
-    out.print("throw new java.rmi.UnmarshalException(\"invalid method number\");");
-    ctrl.unindent();
-    out.print("}");
-
-    ctrl.unindent();
-    out.print("}");
-
-    ctrl.unindent();
-    out.println("}");
-
-    out.close();
-  }
-
-  private void compile(String name) throws Exception
-  {
-    Compiler comp = Compiler.getInstance();
-    if (verbose)
-      System.out.println("[Compiling class " + name + "]");
-    comp.setDestination(destination);
-    comp.compile(name);
-  }
-
-  private static String getPrettyName(Class cls)
-  {
-    StringBuffer str = new StringBuffer();
-    for (int count = 0;; count++)
-      {
-	if (! cls.isArray())
-	  {
-	    str.append(cls.getName());
-	    for (; count > 0; count--)
-	      str.append("[]");
-	    return (str.toString());
-	  }
-	cls = cls.getComponentType();
-      }
-  }
-
-/**
- * Sort exceptions so the most general go last.
- */
-  private Class[] sortExceptions(Class[] except)
-  {
-    for (int i = 0; i < except.length; i++)
-      {
-	for (int j = i + 1; j < except.length; j++)
-	  {
-	    if (except[i].isAssignableFrom(except[j]))
-	      {
-		Class tmp = except[i];
-		except[i] = except[j];
-		except[j] = tmp;
-	      }
-	  }
-      }
-    return (except);
-  }
-
-/**
- * Process the options until we find the first argument.
- */
-  private void parseOptions()
-  {
-    for (;;)
-      {
-	if (next >= args.length || args[next].charAt(0) != '-')
-	  break;
-	String arg = args[next];
-	next++;
-
-	// Accept `--' options if they look long enough.
-	if (arg.length() > 3 && arg.charAt(0) == '-' && arg.charAt(1) == '-')
-	  arg = arg.substring(1);
-
-	if (arg.equals("-keep"))
-	  keep = true;
-	else if (arg.equals("-keepgenerated"))
-	  keep = true;
-	else if (arg.equals("-v1.1"))
-	  {
-	    need11Stubs = true;
-	    need12Stubs = false;
-	  }
-	else if (arg.equals("-vcompat"))
-	  {
-	    need11Stubs = true;
-	    need12Stubs = true;
-	  }
-	else if (arg.equals("-v1.2"))
-	  {
-	    need11Stubs = false;
-	    need12Stubs = true;
-	  }
-	else if (arg.equals("-g"))
-	  {
-	  }
-	else if (arg.equals("-depend"))
-	  {
-	  }
-	else if (arg.equals("-nowarn"))
-	  {
-	  }
-	else if (arg.equals("-verbose"))
-	  verbose = true;
-	else if (arg.equals("-nocompile"))
-	  compile = false;
-	else if (arg.equals("-classpath"))
-	  next++;
-	else if (arg.equals("-help"))
-	  usage();
-	else if (arg.equals("-version"))
-	  {
-	    System.out.println("rmic (" + System.getProperty("java.vm.name")
-	                       + ") " + System.getProperty("java.vm.version"));
-	    System.out.println();
-	    System.out.println("Copyright 2002 Free Software Foundation, Inc.");
-	    System.out.println("This is free software; see the source for copying conditions.  There is NO");
-	    System.out.println("warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.");
-	    System.exit(0);
-	  }
-	else if (arg.equals("-d"))
-	  {
-	    destination = args[next];
-	    next++;
-	  }
-	else if (arg.charAt(1) == 'J')
-	  {
-	  }
-	else
-	  error("unrecognized option `" + arg + "'");
-      }
-  }
-
-/**
- * Looks for the java.rmi.Remote interface that that is implemented by theClazz.
- * @param theClazz the class to look in
- * @return the Remote interface of theClazz or null if theClazz does not implement a Remote interface
- */
-  private Class getRemoteInterface(Class theClazz)
-  {
-    Class[] interfaces = theClazz.getInterfaces();
-    for (int i = 0; i < interfaces.length; i++)
-      {
-	if (java.rmi.Remote.class.isAssignableFrom(interfaces[i]))
-	  return interfaces[i];
-      }
-    logError("Class " + theClazz.getName()
-             + " is not a remote object. It does not implement an interface that is a java.rmi.Remote-interface.");
-    return null;
-  }
-
-/**
- * Prints an error to System.err and increases the error count.
- * @param theError
- */
-  private void logError(String theError)
-  {
-    errorCount++;
-    System.err.println("error:" + theError);
-  }
-
-  private static void error(String message)
-  {
-    System.err.println("rmic: " + message);
-    System.err.println("Try `rmic --help' for more information.");
-    System.exit(1);
-  }
-
-  private static void usage()
-  {
-    System.out.println("Usage: rmic [OPTION]... CLASS...\n" + "\n"
-                       + "	-keep 			Don't delete any intermediate files\n"
-                       + "	-keepgenerated 		Same as -keep\n"
-                       + "	-v1.1			Java 1.1 style stubs only\n"
-                       + "	-vcompat		Java 1.1 & Java 1.2 stubs\n"
-                       + "	-v1.2			Java 1.2 style stubs only\n"
-                       + "	-g *			Generated debugging information\n"
-                       + "	-depend *		Recompile out-of-date files\n"
-                       + "	-nowarn	*		Suppress warning messages\n"
-                       + "	-nocompile		Don't compile the generated files\n"
-                       + "	-verbose 		Output what's going on\n"
-                       + "	-classpath <path> *	Use given path as classpath\n"
-                       + "	-d <directory> 		Specify where to place generated classes\n"
-                       + "	-J<flag> *		Pass flag to Java\n"
-                       + "	-help			Print this help, then exit\n"
-                       + "	-version		Print version number, then exit\n" + "\n"
-                       + "  * Option currently ignored\n"
-                       + "Long options can be used with `--option' form as well.");
-    System.exit(0);
-  }
-
-  static class MethodRef
-    implements Comparable
-  {
-    Method meth;
-    String sig;
-    long hash;
-
-    MethodRef(Method m)
-    {
-      meth = m;
-      // We match on the name - but what about overloading? - XXX
-      sig = m.getName();
-      hash = RMIHashes.getMethodHash(m);
-    }
-
-    public int compareTo(Object obj)
-    {
-      MethodRef that = (MethodRef) obj;
-      return (this.sig.compareTo(that.sig));
-    }
-  }
-}
Index: gnu/java/rmi/rmic/RMICException.java
===================================================================
RCS file: gnu/java/rmi/rmic/RMICException.java
diff -N gnu/java/rmi/rmic/RMICException.java
--- gnu/java/rmi/rmic/RMICException.java	29 Aug 2003 21:32:31 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,66 +0,0 @@
-/*
-  Copyright (c) 2003 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
- 
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-package gnu.java.rmi.rmic;
-
-/**
- * Thrown by the underlying compiler used by RMIC when it fails to compile a file.
- *
- * @author Dalibor Topic <address@hidden>
- */
-
-public class RMICException extends Exception {
-	/**
-	 * Create an exception with a message. The cause remains uninitialized.
-	 *
-	 * @param s the message string
-	 * @see #initCause(Throwable)
-	 */
-	public RMICException(String message) {
-		super(message);
-	}
-
-	/**
-	 * Create an exception with a message and a cause.
-	 *
-	 * @param s the message string
-	 * @param cause the cause of this exception
-	 */
-	public RMICException(String message, Throwable cause) {
-		super(message, cause);
-	}
-}
Index: gnu/java/rmi/rmic/TabbedWriter.java
===================================================================
RCS file: gnu/java/rmi/rmic/TabbedWriter.java
diff -N gnu/java/rmi/rmic/TabbedWriter.java
--- gnu/java/rmi/rmic/TabbedWriter.java	22 Jan 2002 22:26:57 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,100 +0,0 @@
-/*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
- 
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-package gnu.java.rmi.rmic;
-
-import java.io.FilterWriter;
-import java.io.Writer;
-import java.io.IOException;
-
-public class TabbedWriter
-	extends FilterWriter {
-
-private static final String defaultTabstring = "    ";
-private char[] tabstring; 
-private int tabs;
-
-public TabbedWriter(Writer o) {
-	this(o, defaultTabstring);
-}
-
-public TabbedWriter(Writer o, String str) {
-	super(o);
-	tabs = 0;
-	tabstring = str.toCharArray();
-}
-
-public void write(int c) throws IOException {
-	out.write(c);
-	if (c == '\n') {
-		for (int i = 0; i < tabs; i++) {
-			out.write(tabstring, 0, tabstring.length);
-		}
-	}
-}
-
-public void write(char cbuf[], int off, int len) throws IOException {
-	for (int i = 0; i < len; i++) {
-		write((int)cbuf[i+off]);
-	}
-}
-
-public void write(String str, int off, int len) throws IOException {
-	write(str.toCharArray(), off, len);
-}
-
-public void unindent() throws IOException {
-	unindent(1);
-}
-
-public void unindent(int nr) throws IOException {
-	indent(-nr);
-}
-
-public void indent() throws IOException {
-	indent(1);
-}
-
-public void indent(int nr) throws IOException {
-	tabs += nr;
-	if (tabs < 0) {
-		tabs = 0;
-	}
-	write((int)'\n');
-}
-
-}
Index: gnu/xml/aelfred2/SAXDriver.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/xml/aelfred2/SAXDriver.java,v
retrieving revision 1.1.2.1
diff -u -3 -p -u -r1.1.2.1 SAXDriver.java
--- gnu/xml/aelfred2/SAXDriver.java	16 Jan 2005 15:15:09 -0000	1.1.2.1
+++ gnu/xml/aelfred2/SAXDriver.java	6 Feb 2005 02:20:51 -0000
@@ -150,10 +150,7 @@ final public class SAXDriver
     private Stack			entityStack;
 
     // one vector (of object/struct): faster, smaller
-    private List			attributesList = Collections.synchronizedList(new ArrayList());
-  
-    private boolean			attributeSpecified [] = new boolean[10];
-    private boolean			attributeDeclared [] = new boolean[10];
+    private List			attributesList;
 
     private boolean			namespaces = true;
     private boolean			xmlNames = false;
@@ -183,8 +180,6 @@ final public class SAXDriver
       elementName = null;
       entityStack = new Stack ();
       attributesList = Collections.synchronizedList(new ArrayList());
-      attributeSpecified = new boolean[10];
-      attributeDeclared = new boolean[10];
       attributeCount = 0;
       attributes = false;
       nsTemp = new String[3];
@@ -849,17 +844,10 @@ final public class SAXDriver
   }
 	// remember this attribute ...
 
-	if (attributeCount == attributeSpecified.length) { 	// grow array?
-	    boolean temp [] = new boolean [attributeSpecified.length + 5];
-	    System.arraycopy (attributeSpecified, 0, temp, 0, attributeCount);
-	    attributeSpecified = temp;
-	}
-	attributeSpecified [attributeCount] = isSpecified;
-
 	attributeCount++;
 	
 	// attribute type comes from querying parser's DTD records
-	attributesList.add(new Attribute(qname, value));
+	attributesList.add(new Attribute(qname, value, isSpecified));
 
     }
 
@@ -1212,31 +1200,31 @@ final public class SAXDriver
     {
 	if (index < 0 || index >= attributeCount) 
 	    throw new ArrayIndexOutOfBoundsException ();
-	return attributeDeclared [index];
+        String type = parser.getAttributeType(elementName, getQName(index));
+        return (type != null);
     }
 
     /** @return false unless the attribute was declared in the DTD.
      * @throws java.lang.IllegalArgumentException
      *   When the supplied names do not identify an attribute.
      */
-    public boolean isDeclared (java.lang.String qName)
+    public boolean isDeclared (String qName)
     {
 	int index = getIndex (qName);
 	if (index < 0)
 	    throw new IllegalArgumentException ();
-	return attributeDeclared [index];
+        String type = parser.getAttributeType(elementName, qName);
+        return (type != null);
     }
 
     /** @return false unless the attribute was declared in the DTD.
      * @throws java.lang.IllegalArgumentException
      *   When the supplied names do not identify an attribute.
      */
-    public boolean isDeclared (java.lang.String uri, java.lang.String localName)
+    public boolean isDeclared (String uri, String localName)
     {
 	int index = getIndex (uri, localName);
-	if (index < 0)
-	    throw new IllegalArgumentException ();
-	return attributeDeclared [index];
+        return isDeclared(index);
     }
 
 
@@ -1245,9 +1233,7 @@ final public class SAXDriver
      */
     public boolean isSpecified (int index)
     {
-	if (index < 0 || index >= attributeCount) 
-	    throw new ArrayIndexOutOfBoundsException ();
-	return attributeSpecified [index];
+	return ((Attribute) attributesList.get(index)).specified;
     }
 
     /**
@@ -1256,10 +1242,7 @@ final public class SAXDriver
     public boolean isSpecified (String uri, String local)
     {
 	int index = getIndex (uri, local);
-
-	if (index < 0)
-	    throw new IllegalArgumentException ();
-	return attributeSpecified [index];
+        return isSpecified(index);
     }
 
     /**
@@ -1268,10 +1251,7 @@ final public class SAXDriver
     public boolean isSpecified (String xmlName)
     {
 	int index = getIndex (xmlName);
-
-	if (index < 0)
-	    throw new IllegalArgumentException ();
-	return attributeSpecified [index];
+        return isSpecified(index);
     }
 
 
@@ -1374,12 +1354,14 @@ class Attribute
     String value;
     String nameSpace;
     String localName;
+    boolean specified;
 
-    Attribute(String name, String value)
+    Attribute(String name, String value, boolean specified)
     {
         this.name = name;
         this.value = value;
         this.nameSpace = "";
+        this.specified = specified;
     }
 }
 
Index: java/text/SimpleDateFormat.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/text/SimpleDateFormat.java,v
retrieving revision 1.28.2.7
diff -u -3 -p -u -r1.28.2.7 SimpleDateFormat.java
--- java/text/SimpleDateFormat.java	2 Feb 2005 01:56:01 -0000	1.28.2.7
+++ java/text/SimpleDateFormat.java	6 Feb 2005 02:20:54 -0000
@@ -1096,7 +1096,10 @@ public class SimpleDateFormat extends Da
 		// exactly 2 digits.
 		int digit_count = pos.getIndex() - index;
 		if (digit_count == 2)
-		  is2DigitYear = true;
+		  {
+		    is2DigitYear = true;
+		    value += defaultCentury;
+		  }
 	      }
 	    
 	    // Assign the value and move on.
@@ -1107,8 +1110,7 @@ public class SimpleDateFormat extends Da
 	  {
 	    // Apply the 80-20 heuristic to dermine the full year based on 
 	    // defaultCenturyStart. 
-	    int year = defaultCentury + calendar.get(Calendar.YEAR);
-	    calendar.set(Calendar.YEAR, year);
+	    int year = calendar.get(Calendar.YEAR);
 	    if (calendar.getTime().compareTo(defaultCenturyStart) < 0)
 	      calendar.set(Calendar.YEAR, year + 100);      
 	  }
Index: java/util/Calendar.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/Calendar.java,v
retrieving revision 1.25.2.9
diff -u -3 -p -u -r1.25.2.9 Calendar.java
--- java/util/Calendar.java	3 Feb 2005 00:55:47 -0000	1.25.2.9
+++ java/util/Calendar.java	6 Feb 2005 02:20:54 -0000
@@ -684,7 +684,7 @@ public abstract class Calendar
     fields[field] = value;
     isSet[field] = true;
 
-    // The five valid date patterns, in order of validity
+    // The five valid date patterns, in order of priority
     // 1  YEAR + MONTH + DAY_OF_MONTH
     // 2  YEAR + MONTH + WEEK_OF_MONTH + DAY_OF_WEEK
     // 3  YEAR + MONTH + DAY_OF_WEEK_IN_MONTH + DAY_OF_WEEK
@@ -828,23 +828,21 @@ public abstract class Calendar
   {
     isTimeSet = false;
     areFieldsSet = false;
+    int zoneOffs = zone.getRawOffset();
 
-    int hour = fields[ZONE_OFFSET] / (60 * 60 * 1000);
-    int minute = (fields[ZONE_OFFSET] - 60 * 60 * 1000 * hour) / (60 * 1000);
-    int seconds = (fields[ZONE_OFFSET] - 60 * 60 * 1000 * hour
-                  - 60 * 1000 * minute) / 1000;
-    int millis = fields[ZONE_OFFSET] - 60 * 60 * 1000 * hour
-                 - 60 * 1000 * minute - seconds * 1000;
+    int hour = zoneOffs / (60 * 60 * 1000);
+    int minute = (zoneOffs - 60 * 60 * 1000 * hour) / (60 * 1000);
+    int seconds = (zoneOffs - 60 * 60 * 1000 * hour - 60 * 1000 * minute) / 1000;
+    int millis = zoneOffs - 60 * 60 * 1000 * hour - 60 * 1000 * minute
+                 - seconds * 1000;
     int[] tempFields = 
                        {
                          1, 1970, JANUARY, 1, 1, 1, 1, THURSDAY, 1, AM, hour,
-                         hour, minute, seconds, millis, fields[ZONE_OFFSET],
-                         fields[DST_OFFSET]
+                         hour, minute, seconds, millis, zoneOffs, 0
                        };
     fields = tempFields;
-    for (int i = 0; i < FIELD_COUNT - 2; i++)
+    for (int i = 0; i < FIELD_COUNT; i++)
       isSet[i] = false;
-    isSet[ZONE_OFFSET] = isSet[DST_OFFSET] = true;
   }
 
   /**
@@ -856,10 +854,15 @@ public abstract class Calendar
    */
   public final void clear(int field)
   {
+    int[] tempFields = 
+                       {
+                         1, 1970, JANUARY, 1, 1, 1, 1, THURSDAY, 1, AM, 0, 0, 0,
+                         0, 0, zone.getRawOffset(), 0
+                       };
     isTimeSet = false;
     areFieldsSet = false;
     isSet[field] = false;
-    fields[field] = 0;
+    fields[field] = tempFields[field];
   }
 
   /**
Index: java/util/GregorianCalendar.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/GregorianCalendar.java,v
retrieving revision 1.26.2.7
diff -u -3 -p -u -r1.26.2.7 GregorianCalendar.java
--- java/util/GregorianCalendar.java	2 Feb 2005 01:56:01 -0000	1.26.2.7
+++ java/util/GregorianCalendar.java	6 Feb 2005 02:20:55 -0000
@@ -562,18 +562,18 @@ public class GregorianCalendar extends C
     // rest of code assumes day/month/year set
     // should negative BC years be AD?
     // get the hour (but no check for validity)
-    if (isSet[HOUR_OF_DAY])
-      hour = fields[HOUR_OF_DAY];
-    else if (isSet[HOUR])
+    if (isSet[HOUR])
       {
 	hour = fields[HOUR];
-	if (isSet[AM_PM] && fields[AM_PM] == PM)
+	if (fields[AM_PM] == PM)
 	  if (hour != 12) /* not Noon */
 	    hour += 12;
 	/* Fix the problem of the status of 12:00 AM (midnight). */
-	if (isSet[AM_PM] && fields[AM_PM] == AM && hour == 12)
+	if (fields[AM_PM] == AM && hour == 12)
 	  hour = 0;
       }
+    else
+      hour = fields[HOUR_OF_DAY];
 
     // Read the era,year,month,day fields and convert as appropriate.
     // Calculate number of milliseconds into the day
@@ -644,12 +644,20 @@ public class GregorianCalendar extends C
       weekday += 7;
     fields[DAY_OF_WEEK] = weekday;
 
+    // Time zone corrections.
     TimeZone zone = getTimeZone();
-    int rawOffset = zone.getRawOffset();
-    int dstOffset = zone.getOffset((year < 1) ? BC : AD,
-                                   (year < 1) ? 1 - year : year, month, day,
-                                   weekday, millisInDay) - zone.getRawOffset();
-    time -= (rawOffset + dstOffset);
+    int rawOffset = isSet[ZONE_OFFSET] ? fields[ZONE_OFFSET]
+                                       : zone.getRawOffset();
+
+    int dstOffset = isSet[DST_OFFSET] ? fields[DST_OFFSET]
+                                      : (zone.getOffset((year < 0) ? BC : AD,
+                                                        (year < 0) ? 1 - year
+                                                                   : year,
+                                                        month, day, weekday,
+                                                        millisInDay)
+                                      - zone.getRawOffset());
+
+    time -= rawOffset + dstOffset;
 
     isTimeSet = true;
   }
@@ -1101,7 +1109,7 @@ public class GregorianCalendar extends C
   private static final int[] minimums = 
                                         {
                                           BC, 1, 0, 0, 1, 1, 1, SUNDAY, 1, AM,
-                                          1, 0, 1, 1, 1, -(12 * 60 * 60 * 1000),
+                                          1, 0, 0, 0, 0, -(12 * 60 * 60 * 1000),
                                           0
                                         };
 
Index: javax/swing/SortingFocusTraversalPolicy.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/SortingFocusTraversalPolicy.java,v
retrieving revision 1.1.2.1
diff -u -3 -p -u -r1.1.2.1 SortingFocusTraversalPolicy.java
--- javax/swing/SortingFocusTraversalPolicy.java	31 Jan 2005 03:10:46 -0000	1.1.2.1
+++ javax/swing/SortingFocusTraversalPolicy.java	6 Feb 2005 02:20:55 -0000
@@ -141,8 +141,8 @@ public class SortingFocusTraversalPolicy
   {
     if (set == null)
       set = (getComparator() == null 
-             ? new TreeSet(getComparator())  
-             : new TreeSet());
+             ? new TreeSet()
+             : new TreeSet(getComparator()));
     
     if (root != null) 
       {