Imported GNU Classpath 0.92

2006-08-14  Mark Wielaard  <mark@klomp.org>

       Imported GNU Classpath 0.92
       * HACKING: Add more importing hints. Update automake version
       requirement.

       * configure.ac (gconf-peer): New enable AC argument.
       Add --disable-gconf-peer and --enable-default-preferences-peer
       to classpath configure when gconf is disabled.
       * scripts/makemake.tcl: Set gnu/java/util/prefs/gconf and
       gnu/java/awt/dnd/peer/gtk to bc. Classify
       gnu/java/security/Configuration.java as generated source file.

       * gnu/java/lang/management/VMGarbageCollectorMXBeanImpl.java,
       gnu/java/lang/management/VMMemoryPoolMXBeanImpl.java,
       gnu/java/lang/management/VMClassLoadingMXBeanImpl.java,
       gnu/java/lang/management/VMRuntimeMXBeanImpl.java,
       gnu/java/lang/management/VMMemoryManagerMXBeanImpl.java,
       gnu/java/lang/management/VMThreadMXBeanImpl.java,
       gnu/java/lang/management/VMMemoryMXBeanImpl.java,
       gnu/java/lang/management/VMCompilationMXBeanImpl.java: New VM stub
       classes.
       * java/lang/management/VMManagementFactory.java: Likewise.
       * java/net/VMURLConnection.java: Likewise.
       * gnu/java/nio/VMChannel.java: Likewise.

       * java/lang/Thread.java (getState): Add stub implementation.
       * java/lang/Class.java (isEnum): Likewise.
       * java/lang/Class.h (isEnum): Likewise.

       * gnu/awt/xlib/XToolkit.java (getClasspathTextLayoutPeer): Removed.

       * javax/naming/spi/NamingManager.java: New override for StackWalker
       functionality.

       * configure, sources.am, Makefile.in, gcj/Makefile.in,
       include/Makefile.in, testsuite/Makefile.in: Regenerated.

From-SVN: r116139

1 files changed, 25 insertions, 36 deletions

diff --git a/libjava/classpath/gnu/java/security/provider/X509CertificateFactory.java b/libjava/classpath/gnu/java/security/provider/X509CertificateFactory.java
index 1a415eabb05..7d61779f937 100644
--- a/libjava/classpath/gnu/java/security/provider/X509CertificateFactory.java
+++ b/libjava/classpath/gnu/java/security/provider/X509CertificateFactory.java
@@ -59,30 +59,24 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 
-public class X509CertificateFactory extends CertificateFactorySpi
+public class X509CertificateFactory
+    extends CertificateFactorySpi
 {
-
-  // Constants.
-  // ------------------------------------------------------------------------
-
   public static final String BEGIN_CERTIFICATE = "-----BEGIN CERTIFICATE-----";
+
   public static final String END_CERTIFICATE = "-----END CERTIFICATE-----";
+
   public static final String BEGIN_X509_CRL = "-----BEGIN X509 CRL-----";
-  public static final String END_X509_CRL = "-----END X509 CRL-----";
 
-  // Constructors.
-  // ------------------------------------------------------------------------
+  public static final String END_X509_CRL = "-----END X509 CRL-----";
 
   public X509CertificateFactory()
   {
     super();
   }
 
-  // Instance methods.
-  // ------------------------------------------------------------------------
-
   public Certificate engineGenerateCertificate(InputStream inStream)
-    throws CertificateException
+      throws CertificateException
   {
     try
       {
@@ -91,13 +85,13 @@ public class X509CertificateFactory extends CertificateFactorySpi
     catch (IOException ioe)
       {
         CertificateException ce = new CertificateException(ioe.getMessage());
-        ce.initCause (ioe);
+        ce.initCause(ioe);
         throw ce;
       }
   }
 
   public Collection engineGenerateCertificates(InputStream inStream)
-    throws CertificateException
+      throws CertificateException
   {
     LinkedList certs = new LinkedList();
     while (true)
@@ -113,7 +107,7 @@ public class X509CertificateFactory extends CertificateFactorySpi
         catch (IOException ioe)
           {
             CertificateException ce = new CertificateException(ioe.getMessage());
-            ce.initCause (ioe);
+            ce.initCause(ioe);
             throw ce;
           }
       }
@@ -129,13 +123,13 @@ public class X509CertificateFactory extends CertificateFactorySpi
     catch (IOException ioe)
       {
         CRLException crle = new CRLException(ioe.getMessage());
-        crle.initCause (ioe);
+        crle.initCause(ioe);
         throw crle;
       }
   }
 
   public Collection engineGenerateCRLs(InputStream inStream)
-    throws CRLException
+      throws CRLException
   {
     LinkedList crls = new LinkedList();
     while (true)
@@ -151,7 +145,7 @@ public class X509CertificateFactory extends CertificateFactorySpi
         catch (IOException ioe)
           {
             CRLException crle = new CRLException(ioe.getMessage());
-            crle.initCause (ioe);
+            crle.initCause(ioe);
             throw crle;
           }
       }
@@ -164,13 +158,13 @@ public class X509CertificateFactory extends CertificateFactorySpi
   }
 
   public CertPath engineGenerateCertPath(InputStream in)
-    throws CertificateEncodingException
+      throws CertificateEncodingException
   {
     return new X509CertPath(in);
   }
 
   public CertPath engineGenerateCertPath(InputStream in, String encoding)
-    throws CertificateEncodingException
+      throws CertificateEncodingException
   {
     return new X509CertPath(in, encoding);
   }
@@ -180,21 +174,17 @@ public class X509CertificateFactory extends CertificateFactorySpi
     return X509CertPath.ENCODINGS.iterator();
   }
 
-  // Own methods.
-  // ------------------------------------------------------------------------
-
   private X509Certificate generateCert(InputStream inStream)
-    throws IOException, CertificateException
+      throws IOException, CertificateException
   {
     if (inStream == null)
       throw new CertificateException("missing input stream");
-    if (!inStream.markSupported())
+    if (! inStream.markSupported())
       inStream = new BufferedInputStream(inStream, 8192);
     inStream.mark(20);
     int i = inStream.read();
     if (i == -1)
       throw new EOFException();
-
     // If the input is in binary DER format, the first byte MUST be
     // 0x30, which stands for the ASN.1 [UNIVERSAL 16], which is the
     // UNIVERSAL SEQUENCE, with the CONSTRUCTED bit (0x20) set.
@@ -217,9 +207,9 @@ public class X509CertificateFactory extends CertificateFactorySpi
               }
             while (i != '\n' && i != '\r');
           }
-        while (!line.toString().equals(BEGIN_CERTIFICATE));
+        while (! line.toString().equals(BEGIN_CERTIFICATE));
         X509Certificate ret = new X509Certificate(
-           new BufferedInputStream(new Base64InputStream(inStream), 8192));
+            new BufferedInputStream(new Base64InputStream(inStream), 8192));
         line.setLength(0);
         line.append('-'); // Base64InputStream will eat this.
         do
@@ -232,7 +222,7 @@ public class X509CertificateFactory extends CertificateFactorySpi
           }
         while (i != '\n' && i != '\r');
         // XXX ???
-        if (!line.toString().equals(END_CERTIFICATE))
+        if (! line.toString().equals(END_CERTIFICATE))
           throw new CertificateException("no end-of-certificate marker");
         return ret;
       }
@@ -243,18 +233,17 @@ public class X509CertificateFactory extends CertificateFactorySpi
       }
   }
 
-  private X509CRL generateCRL(InputStream inStream)
-    throws IOException, CRLException
+  private X509CRL generateCRL(InputStream inStream) throws IOException,
+      CRLException
   {
     if (inStream == null)
       throw new CRLException("missing input stream");
-    if (!inStream.markSupported())
+    if (! inStream.markSupported())
       inStream = new BufferedInputStream(inStream, 8192);
     inStream.mark(20);
     int i = inStream.read();
     if (i == -1)
       throw new EOFException();
-
     // If the input is in binary DER format, the first byte MUST be
     // 0x30, which stands for the ASN.1 [UNIVERSAL 16], which is the
     // UNIVERSAL SEQUENCE, with the CONSTRUCTED bit (0x20) set.
@@ -277,9 +266,9 @@ public class X509CertificateFactory extends CertificateFactorySpi
               }
             while (i != '\n' && i != '\r');
           }
-        while (!line.toString().startsWith(BEGIN_X509_CRL));
+        while (! line.toString().startsWith(BEGIN_X509_CRL));
         X509CRL ret = new X509CRL(
-           new BufferedInputStream(new Base64InputStream(inStream), 8192));
+            new BufferedInputStream(new Base64InputStream(inStream), 8192));
         line.setLength(0);
         line.append('-'); // Base64InputStream will eat this.
         do
@@ -292,7 +281,7 @@ public class X509CertificateFactory extends CertificateFactorySpi
           }
         while (i != '\n' && i != '\r');
         // XXX ???
-        if (!line.toString().startsWith(END_X509_CRL))
+        if (! line.toString().startsWith(END_X509_CRL))
           throw new CRLException("no end-of-CRL marker");
         return ret;
       }