1 files changed, 43 insertions, 66 deletions
diff --git a/java/security/Key.java b/java/security/Key.java
index 496c67d32..bec79a326 100644
--- a/java/security/Key.java
+++ b/java/security/Key.java
@@ -7,7 +7,7 @@ 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
@@ -24,75 +24,52 @@ resulting executable to be covered by the GNU General Public License.
 This exception does not however invalidate any other reasons why the
 executable file might be covered by the GNU General Public License. */
 
-
 package java.security;
 
 import java.io.Serializable;
 
 /**
-  * This interfaces models the base characteristics that all keys must
-  * have.  These are:  a key algorithm, an encoded form, and a format used
-  * to encode the key.  Specific key types inherit from this interface.
-  * <p>
-  * Note that since this interface extends <code>Serializable</code>, all
-  * keys may be serialized.
-  *
-  * @version 0.0
-  *
-  * @author Aaron M. Renn (arenn@urbanophile.com)
-  */
+ * This interfaces models the base characteristics that all keys must
+ * have.  These are:  a key algorithm, an encoded form, and a format used
+ * to encode the key.  Specific key types inherit from this interface.
+ * <p>
+ * Note that since this interface extends <code>Serializable</code>, all
+ * keys may be serialized.
+ *
+ * @version 0.0
+ *
+ * @author Aaron M. Renn (arenn@urbanophile.com)
+ */
 public interface Key extends Serializable
 {
-
-/*************************************************************************/
-
-/*
- * Interface Variables
- */
-
-/**
-  * The verion identifier used for serialization.
-  */
-public static final long serialVersionUID = 6603384152749567654L;
-
-/*************************************************************************/
-
-/*
- * Instance Methods
- */
-
-/**
-  * This method returns the name of the algorithm for this key.  This is a
-  * <code>String</code> such as "RSA".
-  *
-  * @return The name of the algorithm in use
-  */
-public abstract String
-getAlgorithm();
-
-/*************************************************************************/
-
-/**
-  * This method returns the name of the encoding format for this key.  This
-  * is the name of the ASN.1 data format used for this key, such as
-  * "X.509" or "PKCS#8".  This method returns <code>null</code> if this key
-  * does not have an encoding format.
-  *
-  * @return The name of the encoding format for this key, or <code>null</code> if there is no such format.
-  */
-public abstract String
-getFormat();
-
-/*************************************************************************/
-
-/**
-  * This method returns the encoded form of the key.  If this key does not
-  * support encoding, this method returns <code>null</code>
-  *
-  * @return The encoded form of the key, or <code>null</code> if no encoded form is available.
-  */
-public abstract byte[]
-getEncoded();
-
-} // interface Key
-
+ /**
+   * The verion identifier used for serialization.
+   */
+  public static final long serialVersionUID = 6603384152749567654L;
+
+  /**
+   * This method returns the name of the algorithm for this key.  This is a
+   * <code>String</code> such as "RSA".
+   *
+   * @return The name of the algorithm in use
+   */
+  public abstract String getAlgorithm();
+
+  /**
+   * This method returns the name of the encoding format for this key.  This
+   * is the name of the ASN.1 data format used for this key, such as
+   * "X.509" or "PKCS#8".  This method returns <code>null</code> if this key
+   * does not have an encoding format.
+   *
+   * @return The name of the encoding format for this key, or <code>null</code> if there is no such format.
+   */
+  public abstract String getFormat();
+
+  /**
+   * This method returns the encoded form of the key.  If this key does not
+   * support encoding, this method returns <code>null</code>
+   *
+   * @return The encoded form of the key, or <code>null</code> if no encoded form is available.
+   */
+  public abstract byte[] getEncoded();
+}