Imported GNU Classpath 0.19 + gcj-import-20051115.

       * sources.am: Regenerated.
       * Makefile.in: Likewise.
       * scripts/makemake.tcl: Use glob -nocomplain.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@107049 138bc75d-0d04-0410-961f-82ee72b054a4

3 files changed, 16 insertions, 14 deletions

diff --git a/libjava/classpath/javax/xml/transform/TransformerConfigurationException.java b/libjava/classpath/javax/xml/transform/TransformerConfigurationException.java
index b2153c2cbf9..81db3bed913 100644
--- a/libjava/classpath/javax/xml/transform/TransformerConfigurationException.java
+++ b/libjava/classpath/javax/xml/transform/TransformerConfigurationException.java
@@ -45,9 +45,8 @@ package javax.xml.transform;
 public class TransformerConfigurationException
   extends TransformerException
 {
+  private static final long serialVersionUID = 1285547467942875745L;
 
-  private SourceLocator locator;
-  
   /**
    * Constructor with no detail message.
    */
@@ -96,8 +95,7 @@ public class TransformerConfigurationException
                                            SourceLocator locator,
                                            Throwable e)
   {
-    super(message, e);
-    this.locator = locator;
+    super(message, locator, e);
   }  
 
 }
diff --git a/libjava/classpath/javax/xml/transform/TransformerException.java b/libjava/classpath/javax/xml/transform/TransformerException.java
index a72ee1c2f56..3d97eda1bbb 100644
--- a/libjava/classpath/javax/xml/transform/TransformerException.java
+++ b/libjava/classpath/javax/xml/transform/TransformerException.java
@@ -47,9 +47,11 @@ import java.io.PrintWriter;
 public class TransformerException
   extends Exception
 {
+  private static final long serialVersionUID = 975798773772956428L;
 
+  // Field names fixed by serialization spec.
   private SourceLocator  locator;
-  private Throwable  cause;
+  private Throwable  containedException;
 
   /**
    * Constructor with a detail message.
@@ -94,7 +96,7 @@ public class TransformerException
     if (cause != null)
       {
         initCause(cause);
-        this.cause = cause;
+        this.containedException = cause;
       }
   }
 
@@ -119,7 +121,7 @@ public class TransformerException
    */
   public Throwable getException()
   {
-    return cause;
+    return containedException;
   }
 
   /**
@@ -127,7 +129,7 @@ public class TransformerException
    */
   public Throwable getCause()
   {
-    return cause;
+    return containedException;
   }
 
   /**
@@ -143,7 +145,7 @@ public class TransformerException
    */
   public Throwable initCause(Throwable cause)
   {
-    if (this.cause != null)
+    if (this.containedException != null)
       {
         throw new IllegalStateException();
       }
@@ -151,7 +153,7 @@ public class TransformerException
       {
         throw new IllegalArgumentException();
       }
-    this.cause = cause;
+    this.containedException = cause;
     return this;
   }
 
@@ -221,20 +223,20 @@ public class TransformerException
   public void printStackTrace(PrintStream s)
   {
     super.printStackTrace(s);
-    if (cause != null)
+    if (containedException != null)
       {
         s.print("caused by ");
-        cause.printStackTrace(s);
+        containedException.printStackTrace(s);
       }
   }
 
   public void printStackTrace(PrintWriter s)
   {
     super.printStackTrace(s);
-    if (cause != null)
+    if (containedException != null)
       {
         s.print("caused by ");
-        cause.printStackTrace(s);
+        containedException.printStackTrace(s);
       }
   }
 
diff --git a/libjava/classpath/javax/xml/transform/TransformerFactoryConfigurationError.java b/libjava/classpath/javax/xml/transform/TransformerFactoryConfigurationError.java
index 9b16b2b2e4c..82afeeac750 100644
--- a/libjava/classpath/javax/xml/transform/TransformerFactoryConfigurationError.java
+++ b/libjava/classpath/javax/xml/transform/TransformerFactoryConfigurationError.java
@@ -44,7 +44,9 @@ package javax.xml.transform;
 public class TransformerFactoryConfigurationError
   extends Error
 {
+  private static final long serialVersionUID = -6527718720676281516L;
   
+  // Name is fixed by the serialization spec.
   private final Exception  exception;
 
   /**