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.


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

1 files changed, 5 insertions, 26 deletions

diff --git a/libjava/classpath/gnu/javax/crypto/keyring/CertPathEntry.java b/libjava/classpath/gnu/javax/crypto/keyring/CertPathEntry.java
index ef62347ec9d..32b86084f31 100644
--- a/libjava/classpath/gnu/javax/crypto/keyring/CertPathEntry.java
+++ b/libjava/classpath/gnu/javax/crypto/keyring/CertPathEntry.java
@@ -40,40 +40,28 @@ package gnu.javax.crypto.keyring;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataInputStream;
-import java.io.DataOutputStream;
 import java.io.IOException;
-
 import java.security.cert.Certificate;
 import java.security.cert.CertificateEncodingException;
 import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
-
 import java.util.Date;
 
 /**
  * A primitive entry that contains a path of X.509 certificates.
  */
-public final class CertPathEntry extends PrimitiveEntry
+public final class CertPathEntry
+    extends PrimitiveEntry
 {
-
-  // Constants and fields.
-  // ------------------------------------------------------------------------
-
   public static final int TYPE = 8;
-
   private Certificate[] path;
 
-  // Constructor.
-  // ------------------------------------------------------------------------
-
   public CertPathEntry(Certificate[] path, Date creationDate,
                        Properties properties)
   {
     super(TYPE, creationDate, properties);
     if (path == null || path.length == 0)
-      {
-        throw new IllegalArgumentException("no certificate path");
-      }
+      throw new IllegalArgumentException("no certificate path");
     this.path = (Certificate[]) path.clone();
   }
 
@@ -82,9 +70,6 @@ public final class CertPathEntry extends PrimitiveEntry
     super(TYPE);
   }
 
-  // Class method.
-  // ------------------------------------------------------------------------
-
   public static CertPathEntry decode(DataInputStream in) throws IOException
   {
     CertPathEntry entry = new CertPathEntry();
@@ -95,8 +80,7 @@ public final class CertPathEntry extends PrimitiveEntry
     try
       {
         CertificateFactory fact = CertificateFactory.getInstance("X.509");
-        entry.path = (Certificate[]) fact.generateCertificates(in2).toArray(
-                                                                            new Certificate[0]);
+        entry.path = (Certificate[]) fact.generateCertificates(in2).toArray(new Certificate[0]);
       }
     catch (CertificateException ce)
       {
@@ -105,9 +89,6 @@ public final class CertPathEntry extends PrimitiveEntry
     return entry;
   }
 
-  // Instance methods.
-  // ------------------------------------------------------------------------
-
   public Certificate[] getCertPath()
   {
     return path;
@@ -120,9 +101,7 @@ public final class CertPathEntry extends PrimitiveEntry
     try
       {
         for (int i = 0; i < path.length; i++)
-          {
-            bout.write(path[i].getEncoded());
-          }
+          bout.write(path[i].getEncoded());
       }
     catch (CertificateEncodingException cee)
       {