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, 15 insertions, 33 deletions

diff --git a/libjava/classpath/gnu/javax/crypto/key/GnuSecretKey.java b/libjava/classpath/gnu/javax/crypto/key/GnuSecretKey.java
index 93b21a67cc3..3063fe406d1 100644
--- a/libjava/classpath/gnu/javax/crypto/key/GnuSecretKey.java
+++ b/libjava/classpath/gnu/javax/crypto/key/GnuSecretKey.java
@@ -42,27 +42,20 @@ import gnu.java.security.util.Util;
 import java.security.Key;
 
 /**
- * A secret key composed of a sequence of raw, unformatted octets. This class
- * is analogous to the {@link javax.crypto.spec.SecretKeySpec} class, but is
+ * A secret key composed of a sequence of raw, unformatted octets. This class is
+ * analogous to the {@link javax.crypto.spec.SecretKeySpec} class, but is
  * provided for platforms that do not or cannot contain that class.
  */
-public class GnuSecretKey implements Key
+public class GnuSecretKey
+    implements Key
 {
-
-  // Field.
-  // ------------------------------------------------------------------------
-
   private final byte[] key;
-
   private final String algorithm;
 
-  // Constructors.
-  // ------------------------------------------------------------------------
-
   /**
    * Creates a new secret key. The supplied byte array is copied by this
    * constructor.
-   *
+   * 
    * @param key The raw, secret key.
    * @param algorithm The algorithm name, which can be null or empty.
    */
@@ -73,7 +66,7 @@ public class GnuSecretKey implements Key
 
   /**
    * Creates a new secret key from a portion of a byte array.
-   *
+   * 
    * @param key The raw, secret key.
    * @param offset The offset at which the key begins.
    * @param length The number of bytes that comprise the key.
@@ -86,12 +79,9 @@ public class GnuSecretKey implements Key
     this.algorithm = algorithm;
   }
 
-  // Instance methods.
-  // ------------------------------------------------------------------------
-
   /**
    * Returns the algorithm name, if any.
-   *
+   * 
    * @return The algorithm name.
    */
   public String getAlgorithm()
@@ -103,7 +93,7 @@ public class GnuSecretKey implements Key
    * Returns the encoded key, which is merely the byte array this class was
    * created with. A reference to the internal byte array is returned, so the
    * caller can delete this key from memory by modifying the returned array.
-   *
+   * 
    * @return The raw key.
    */
   public byte[] getEncoded()
@@ -113,7 +103,7 @@ public class GnuSecretKey implements Key
 
   /**
    * Returns the string "RAW".
-   *
+   * 
    * @return The string "RAW".
    */
   public String getFormat()
@@ -123,22 +113,14 @@ public class GnuSecretKey implements Key
 
   public boolean equals(Object o)
   {
-    if (!(o instanceof GnuSecretKey))
-      {
-        return false;
-      }
+    if (! (o instanceof GnuSecretKey))
+      return false;
     if (key.length != ((GnuSecretKey) o).key.length)
-      {
-        return false;
-      }
+      return false;
     byte[] key2 = ((GnuSecretKey) o).key;
     for (int i = 0; i < key.length; i++)
-      {
-        if (key[i] != key2[i])
-          {
-            return false;
-          }
-      }
+      if (key[i] != key2[i])
+        return false;
     return true;
   }
 
@@ -146,4 +128,4 @@ public class GnuSecretKey implements Key
   {
     return "GnuSecretKey [ " + algorithm + " " + Util.toString(key) + " ]";
   }
-}
\ No newline at end of file
+}