harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r769463 [1/9] - in /harmony/enhanced/classlib/trunk/modules/security/src/main/java/common: java/security/ java/security/acl/ java/security/cert/ java/security/interfaces/ java/security/spec/ javax/security/cert/
Date Tue, 28 Apr 2009 17:01:47 GMT
Author: tellison
Date: Tue Apr 28 17:01:41 2009
New Revision: 769463

URL: http://svn.apache.org/viewvc?rev=769463&view=rev
Log:
Apply slightly modified patch for HARMONY-6185 (Javadocs for java.security.* and javax.security.cert.*)

Modified:
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/AccessControlException.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/AlgorithmParameterGenerator.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/AlgorithmParameterGeneratorSpi.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/AlgorithmParameters.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/AlgorithmParametersSpi.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/AllPermission.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/AllPermissionCollection.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/AuthProvider.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/BasicPermission.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/BasicPermissionCollection.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/Certificate.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/CodeSigner.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/CodeSource.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/DigestException.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/DigestInputStream.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/DigestOutputStream.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/DomainCombiner.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/GeneralSecurityException.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/Guard.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/GuardedObject.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/Identity.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/IdentityScope.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/InvalidAlgorithmParameterException.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/InvalidKeyException.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/InvalidParameterException.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/Key.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/KeyException.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/KeyFactory.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/KeyFactorySpi.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/KeyManagementException.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/KeyPair.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/KeyPairGenerator.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/KeyPairGeneratorSpi.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/KeyRep.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/KeyStore.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/KeyStoreException.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/KeyStoreSpi.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/MessageDigest.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/MessageDigestSpi.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/NoSuchAlgorithmException.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/NoSuchProviderException.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/Permission.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/PermissionCollection.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/Permissions.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/PermissionsHash.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/Policy.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/Principal.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/PrivateKey.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/PrivilegedAction.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/PrivilegedActionException.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/PrivilegedExceptionAction.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/ProtectionDomain.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/Provider.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/ProviderException.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/PublicKey.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/SecureClassLoader.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/SecureRandom.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/SecureRandomSpi.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/Security.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/SecurityPermission.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/Signature.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/SignatureException.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/SignatureSpi.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/SignedObject.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/Signer.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/Timestamp.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/UnrecoverableEntryException.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/UnrecoverableKeyException.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/UnresolvedPermission.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/UnresolvedPermissionCollection.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/acl/Acl.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/acl/AclEntry.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/acl/AclNotFoundException.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/acl/Group.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/acl/LastOwnerException.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/acl/NotOwnerException.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/acl/Owner.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/acl/Permission.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CRL.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CRLException.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CRLSelector.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CertPath.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CertPathBuilder.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CertPathBuilderException.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CertPathBuilderResult.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CertPathBuilderSpi.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CertPathParameters.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CertPathValidator.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CertPathValidatorException.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CertPathValidatorResult.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CertPathValidatorSpi.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CertSelector.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CertStore.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CertStoreException.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CertStoreParameters.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CertStoreSpi.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/Certificate.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CertificateEncodingException.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CertificateException.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CertificateExpiredException.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CertificateFactory.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CertificateFactorySpi.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CertificateNotYetValidException.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CertificateParsingException.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/CollectionCertStoreParameters.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/LDAPCertStoreParameters.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/PKIXBuilderParameters.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/PKIXCertPathBuilderResult.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/PKIXCertPathChecker.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/PKIXCertPathValidatorResult.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/PKIXParameters.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/PolicyNode.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/PolicyQualifierInfo.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/TrustAnchor.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/X509CRL.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/X509CRLEntry.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/X509CRLSelector.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/X509CertSelector.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/X509Certificate.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/cert/X509Extension.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/interfaces/DSAKey.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/interfaces/DSAKeyPairGenerator.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/interfaces/DSAParams.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/interfaces/DSAPrivateKey.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/interfaces/DSAPublicKey.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/interfaces/ECKey.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/interfaces/ECPrivateKey.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/interfaces/ECPublicKey.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/interfaces/RSAKey.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/interfaces/RSAMultiPrimePrivateCrtKey.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/interfaces/RSAPrivateCrtKey.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/interfaces/RSAPrivateKey.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/interfaces/RSAPublicKey.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/spec/AlgorithmParameterSpec.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/spec/DSAParameterSpec.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/spec/DSAPrivateKeySpec.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/spec/DSAPublicKeySpec.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/spec/ECField.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/spec/ECFieldF2m.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/spec/ECFieldFp.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/spec/ECGenParameterSpec.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/spec/ECParameterSpec.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/spec/ECPoint.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/spec/ECPrivateKeySpec.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/spec/ECPublicKeySpec.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/spec/EllipticCurve.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/spec/EncodedKeySpec.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/spec/InvalidKeySpecException.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/spec/InvalidParameterSpecException.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/spec/KeySpec.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/spec/MGF1ParameterSpec.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/spec/PKCS8EncodedKeySpec.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/spec/PSSParameterSpec.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/spec/RSAKeyGenParameterSpec.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/spec/RSAMultiPrimePrivateCrtKeySpec.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/spec/RSAOtherPrimeInfo.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/spec/RSAPrivateCrtKeySpec.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/spec/RSAPrivateKeySpec.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/spec/RSAPublicKeySpec.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/spec/X509EncodedKeySpec.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/javax/security/cert/Certificate.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/javax/security/cert/CertificateEncodingException.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/javax/security/cert/CertificateException.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/javax/security/cert/CertificateExpiredException.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/javax/security/cert/CertificateNotYetValidException.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/javax/security/cert/CertificateParsingException.java
    harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/javax/security/cert/X509Certificate.java

Modified: harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/AccessControlException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/AccessControlException.java?rev=769463&r1=769462&r2=769463&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/AccessControlException.java (original)
+++ harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/AccessControlException.java Tue Apr 28 17:01:41 2009
@@ -15,60 +15,49 @@
  *  limitations under the License.
  */
 
-/**
-* @author Alexander V. Astapchuk
-* @version $Revision$
-*/
-
 package java.security;
 
 /**
- * This runtime exception is thrown when an access control check indicates that
- * access should not be granted.
- * 
+ * {@code AccessControlException} is thrown if the access control infrastructure
+ * denies protected access due to missing permissions.
  */
 public class AccessControlException extends SecurityException {
 
     private static final long serialVersionUID = 5138225684096988535L;
 
-    /**
-     * @com.intel.drl.spec_ref 
-     */
     private Permission perm; // Named as demanded by Serialized Form.
 
-	/**
-	 * Constructs a new instance of this class with its walkback and message
-	 * filled in.
-	 * 
-	 * 
-	 * @param message
-	 *            String The detail message for the exception.
-	 */
+    /**
+     * Constructs a new instance of {@code AccessControlException} with the
+     * given message.
+     *
+     * @param message
+     *            the detail message for this exception.
+     */
     public AccessControlException(String message) {
         super(message);
     }
 
-	/**
-	 * Constructs a new instance of this class with its walkback, message and
-	 * associated permission all filled in.
-	 * 
-	 * 
-	 * @param message
-	 *            String The detail message for the exception.
-	 * @param perm
-	 *            Permission The failed permission.
-	 */
+    /**
+     * Constructs a new instance of {@code AccessControlException} with the
+     * given message and the requested {@code Permission} which was not granted.
+     *
+     * @param message
+     *            the detail message for the exception.
+     * @param perm
+     *            the requested {@code Permission} which was not granted.
+     */
     public AccessControlException(String message, Permission perm) {
         super(message);
         this.perm = perm;
     }
 
-	/**
-	 * Answers the receiver's permission.
-	 * 
-	 * 
-	 * @return Permission the receiver's permission
-	 */
+    /**
+     * Returns the requested permission that caused this Exception or {@code
+     * null} if there is no corresponding {@code Permission}.
+     *
+     * @return the requested permission that caused this Exception, maybe {@code null}.
+     */
     public Permission getPermission() {
         return perm;
     }

Modified: harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/AlgorithmParameterGenerator.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/AlgorithmParameterGenerator.java?rev=769463&r1=769462&r2=769463&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/AlgorithmParameterGenerator.java (original)
+++ harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/AlgorithmParameterGenerator.java Tue Apr 28 17:01:41 2009
@@ -15,11 +15,6 @@
  *  limitations under the License.
  */
 
-/**
-* @author Vera Y. Petrashkova
-* @version $Revision$
-*/
-
 package java.security;
 
 import java.security.spec.AlgorithmParameterSpec;
@@ -27,12 +22,10 @@
 import org.apache.harmony.security.fortress.Engine;
 import org.apache.harmony.security.internal.nls.Messages;
 
-
 /**
- * @com.intel.drl.spec_ref
- * 
+ * {@code AlgorithmParameterGenerator} is an engine class which is capable of
+ * generating parameters for the algorithm it was initialized with.
  */
-
 public class AlgorithmParameterGenerator {
 
     // Store spi service name
@@ -54,8 +47,15 @@
     private final String algorithm;
 
     /**
-     * @com.intel.drl.spec_ref
-     *  
+     * Constructs a new instance of {@code AlgorithmParameterGenerator} with the
+     * given arguments.
+     *
+     * @param paramGenSpi
+     *            a concrete implementation, this engine instance delegates to.
+     * @param provider
+     *            the provider.
+     * @param algorithm
+     *            the name of the algorithm.
      */
     protected AlgorithmParameterGenerator(
             AlgorithmParameterGeneratorSpi paramGenSpi, Provider provider,
@@ -66,17 +66,26 @@
     }
 
     /**
-     * @com.intel.drl.spec_ref
-     *  
+     * Returns the name of the algorithm.
+     *
+     * @return the name of the algorithm.
      */
     public final String getAlgorithm() {
         return algorithm;
     }
 
     /**
-     * @com.intel.drl.spec_ref
+     * Returns a new instance of {@code AlgorithmParameterGenerator} for the
+     * specified algorithm.
      * 
-     * throws NullPointerException when algorithm is null
+     * @param algorithm
+     *            the name of the algorithm to use.
+     * @return a new instance of {@code AlgorithmParameterGenerator} for the
+     *         specified algorithm.
+     * @throws NoSuchAlgorithmException
+     *             if the specified algorithm is not available.
+     * @throws NullPointerException
+     *             if {@code algorithm} is {@code null}.
      */
     public static AlgorithmParameterGenerator getInstance(String algorithm)
             throws NoSuchAlgorithmException {
@@ -92,10 +101,22 @@
     }
 
     /**
-     * @com.intel.drl.spec_ref
+     * Returns a new instance of {@code AlgorithmParameterGenerator} from the
+     * specified provider for the specified algorithm.
      * 
-     * throws NullPointerException if algorithm is null (instead of
-     * NoSuchAlgorithmException) as in 1.4 release
+     * @param algorithm
+     *            the name of the algorithm to use.
+     * @param provider
+     *            name of the provider of the {@code
+     *            AlgorithmParameterGenerator}.
+     * @return a new instance of {@code AlgorithmParameterGenerator} for the
+     *         specified algorithm.
+     * @throws NoSuchAlgorithmException
+     *             if the specified algorithm is not available.
+     * @throws NoSuchProviderException
+     *             if the specified provider is not available.
+     * @throws NullPointerException
+     *             if {@code algorithm} is {@code null}.
      */
     public static AlgorithmParameterGenerator getInstance(String algorithm,
             String provider) throws NoSuchAlgorithmException,
@@ -112,10 +133,19 @@
     }
 
     /**
-     * @com.intel.drl.spec_ref
+     * Returns a new instance of {@code AlgorithmParameterGenerator} from the
+     * specified provider for the specified algorithm.
      * 
-     * throws NullPointerException if algorithm is null (instead of
-     * NoSuchAlgorithmException) as in 1.4 release
+     * @param algorithm
+     *            the name of the algorithm to use.
+     * @param provider
+     *            the provider of the {@code AlgorithmParameterGenerator}.
+     * @return a new instance of {@code AlgorithmParameterGenerator} for the
+     *         specified algorithm.
+     * @throws NoSuchAlgorithmException
+     *             if the specified algorithm is not available.
+     * @throws NullPointerException
+     *             if {@code algorithm} is {@code null}.
      */
     public static AlgorithmParameterGenerator getInstance(String algorithm,
             Provider provider) throws NoSuchAlgorithmException {
@@ -134,32 +164,51 @@
     }
 
     /**
-     * @com.intel.drl.spec_ref
-     *  
+     * Returns the provider associated with this {@code
+     * AlgorithmParameterGenerator}.
+     *
+     * @return the provider associated with this {@code
+     *         AlgorithmParameterGenerator}.
      */
     public final Provider getProvider() {
         return provider;
     }
 
     /**
-     * @com.intel.drl.spec_ref
-     *  
+     * Initializes this {@code AlgorithmParameterGenerator} with the given size.
+     * The default parameter set and a default {@code SecureRandom} instance
+     * will be used.
+     *
+     * @param size
+     *            the size (in number of bits).
      */
     public final void init(int size) {
         spiImpl.engineInit(size, randm);
     }
 
     /**
-     * @com.intel.drl.spec_ref
-     *  
+     * Initializes this {@code AlgorithmParameterGenerator} with the given size
+     * and the given {@code SecureRandom}. The default parameter set will be
+     * used.
+     *
+     * @param size
+     *            the size (in number of bits).
+     * @param random
+     *            the source of randomness.
      */
     public final void init(int size, SecureRandom random) {
         spiImpl.engineInit(size, random);
     }
 
     /**
-     * @com.intel.drl.spec_ref
-     *  
+     * Initializes this {@code AlgorithmParameterGenerator} with the given {@code
+     * AlgorithmParameterSpec}. A default {@code SecureRandom} instance will be
+     * used.
+     *
+     * @param genParamSpec
+     *            the parameters to use.
+     * @throws InvalidAlgorithmParameterException
+     *             if the specified parameters are not supported.
      */
     public final void init(AlgorithmParameterSpec genParamSpec)
             throws InvalidAlgorithmParameterException {
@@ -167,8 +216,15 @@
     }
 
     /**
-     * @com.intel.drl.spec_ref
-     *  
+     * Initializes this {@code AlgorithmParameterGenerator} with the given
+     * {@code AlgorithmParameterSpec} and the given {@code SecureRandom}.
+     *
+     * @param genParamSpec
+     *            the parameters to use.
+     * @param random
+     *            the source of randomness.
+     * @throws InvalidAlgorithmParameterException
+     *             if the specified parameters are not supported.
      */
     public final void init(AlgorithmParameterSpec genParamSpec,
             SecureRandom random) throws InvalidAlgorithmParameterException {
@@ -176,8 +232,10 @@
     }
 
     /**
-     * @com.intel.drl.spec_ref
-     *  
+     * Computes and returns {@code AlgorithmParameters} for this generator's
+     * algorithm.
+     *
+     * @return {@code AlgorithmParameters} for this generator's algorithm.
      */
     public final AlgorithmParameters generateParameters() {
         return spiImpl.engineGenerateParameters();

Modified: harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/AlgorithmParameterGeneratorSpi.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/AlgorithmParameterGeneratorSpi.java?rev=769463&r1=769462&r2=769463&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/AlgorithmParameterGeneratorSpi.java (original)
+++ harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/AlgorithmParameterGeneratorSpi.java Tue Apr 28 17:01:41 2009
@@ -15,44 +15,55 @@
  *  limitations under the License.
  */
 
-/**
-* @author Vera Y. Petrashkova
-* @version $Revision$
-*/
-
 package java.security;
 
 import java.security.spec.AlgorithmParameterSpec;
 
 /**
- * @com.intel.drl.spec_ref
+ * {@code AlgorithmParameterGeneratorSpi} is the Service Provider Interface
+ * (SPI) definition for {@code AlgorithmParameterGenerator}.
  * 
+ * @see AlgorithmParameterGenerator
  */
 public abstract class AlgorithmParameterGeneratorSpi {
 
     /**
-     * @com.intel.drl.spec_ref
-     *  
+     * Constructs a new instance of {@code AlgorithmParameterGeneratorSpi} .
      */
     public AlgorithmParameterGeneratorSpi() {
     }
 
     /**
-     * @com.intel.drl.spec_ref
-     *  
+     * Initializes this {@code AlgorithmParameterGeneratorSpi} with the given
+     * size and the given {@code SecureRandom}. The default parameter set
+     * will be used.
+     *
+     * @param size
+     *            the size (in number of bits).
+     * @param random
+     *            the source of randomness.
      */
     protected abstract void engineInit(int size, SecureRandom random);
 
     /**
-     * @com.intel.drl.spec_ref
-     *  
+     * Initializes this {@code AlgorithmParameterGeneratorSpi} with the given
+     * {@code AlgorithmParameterSpec} and the given {@code SecureRandom}.
+     *
+     * @param genParamSpec
+     *            the parameters to use.
+     * @param random
+     *            the source of randomness.
+     * @throws InvalidAlgorithmParameterException
+     *             if the specified parameters are not supported.
      */
     protected abstract void engineInit(AlgorithmParameterSpec genParamSpec,
             SecureRandom random) throws InvalidAlgorithmParameterException;
 
     /**
-     * @com.intel.drl.spec_ref
-     *  
+     * Computes and returns {@code AlgorithmParameters} for this generator's
+     * algorithm.
+     *
+     * @return {@code AlgorithmParameters} for this generator's algorithm.
      */
     protected abstract AlgorithmParameters engineGenerateParameters();
 }
\ No newline at end of file

Modified: harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/AlgorithmParameters.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/AlgorithmParameters.java?rev=769463&r1=769462&r2=769463&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/AlgorithmParameters.java (original)
+++ harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/AlgorithmParameters.java Tue Apr 28 17:01:41 2009
@@ -15,11 +15,6 @@
  *  limitations under the License.
  */
 
-/**
-* @author Boris V. Kuznetsov
-* @version $Revision$
-*/
-
 package java.security;
 
 import java.io.IOException;
@@ -31,10 +26,9 @@
 
 
 /**
- * @com.intel.drl.spec_ref
- * 
+ * {@code AlgorithmParameters} is an engine class which provides algorithm
+ * parameters.
  */
-
 public class AlgorithmParameters {
     /**
      * The service name.
@@ -42,12 +36,12 @@
     private static final String SEVICE = "AlgorithmParameters"; //$NON-NLS-1$
 
     /**
-     * Used to access common engine functionality
+     * Used to access common engine functionality.
      */
     private static Engine engine = new Engine(SEVICE);
 
     /**
-     * The provider
+     * The security provider.
      */
     private Provider provider;
 
@@ -57,29 +51,45 @@
     private AlgorithmParametersSpi spiImpl;
 
     /**
-     * The algorithm.
+     * The security algorithm.
      */
     private String algorithm;
 
     /**
-     * The initialization state
+     * The initialization state.
      */
     private boolean initialized; // = false;
 
     /**
-     * @com.intel.drl.spec_ref
-     *  
+     * Constructs a new instance of {@code AlgorithmParameters} with the given
+     * arguments.
+     *
+     * @param algPramSpi
+     *            the concrete implementation.
+     * @param provider
+     *            the security provider.
+     * @param algorithm
+     *            the name of the algorithm.
      */
-    protected AlgorithmParameters(AlgorithmParametersSpi keyFacSpi,
+    protected AlgorithmParameters(AlgorithmParametersSpi algPramSpi,
             Provider provider, String algorithm) {
         this.provider = provider;
         this.algorithm = algorithm;
-        this.spiImpl = keyFacSpi;
+        this.spiImpl = algPramSpi;
     }
 
     /**
-     * @com.intel.drl.spec_ref
-     *  
+     * Returns a new instance of {@code AlgorithmParameters} for the specified
+     * algorithm.
+     *
+     * @param algorithm
+     *            the name of the algorithm to use.
+     * @return a new instance of {@code AlgorithmParameters} for the specified
+     *         algorithm.
+     * @throws NoSuchAlgorithmException
+     *             if the specified algorithm is not available.
+     * @throws NullPointerException
+     *             if {@code algorithm} is {@code null}.
      */
     public static AlgorithmParameters getInstance(String algorithm)
             throws NoSuchAlgorithmException {
@@ -94,8 +104,23 @@
     }
 
     /**
-     * @com.intel.drl.spec_ref
-     *  
+     * Returns a new instance of {@code AlgorithmParameters} from the specified
+     * provider for the specified algorithm.
+     *
+     * @param algorithm
+     *            the name of the algorithm to use.
+     * @param provider
+     *            name of the provider of the {@code AlgorithmParameters}.
+     * @return a new instance of {@code AlgorithmParameters} for the specified
+     *         algorithm.
+     * @throws NoSuchAlgorithmException
+     *             if the specified algorithm is not available.
+     * @throws NoSuchProviderException
+     *             if the specified provider is not available.
+     * @throws IllegalArgumentException
+     *             if {@code provider} is {@code null} or of length zero.
+     * @throws NullPointerException
+     *             if {@code algorithm} is {@code null}.
      */
     public static AlgorithmParameters getInstance(String algorithm,
             String provider) throws NoSuchAlgorithmException,
@@ -112,8 +137,21 @@
     }
 
     /**
-     * @com.intel.drl.spec_ref
-     *  
+     * Returns a new instance of {@code AlgorithmParameters} from the specified
+     * provider for the specified algorithm.
+     *
+     * @param algorithm
+     *            the name of the algorithm to use.
+     * @param provider
+     *            the provider of the {@code AlgorithmParameters}.
+     * @return a new instance of {@code AlgorithmParameters} for the specified
+     *         algorithm.
+     * @throws NoSuchAlgorithmException
+     *             if the specified algorithm is not available.
+     * @throws NullPointerException
+     *             if {@code algorithm} is {@code null}.
+     * @throws IllegalArgumentException
+     *             if {@code provider} is {@code null}.
      */
     public static AlgorithmParameters getInstance(String algorithm,
             Provider provider) throws NoSuchAlgorithmException {
@@ -131,24 +169,33 @@
     }
 
     /**
-     * @com.intel.drl.spec_ref
-     *  
+     * Returns the provider associated with this {@code AlgorithmParameters}.
+     *
+     * @return the provider associated with this {@code AlgorithmParameters}.
      */
     public final Provider getProvider() {
         return provider;
     }
 
     /**
-     * @com.intel.drl.spec_ref
-     *  
+     * Returns the name of the algorithm.
+     *
+     * @return the name of the algorithm.
      */
     public final String getAlgorithm() {
         return algorithm;
     }
 
     /**
-     * @com.intel.drl.spec_ref
-     *  
+     * Initializes this {@code AlgorithmParameters} with the specified {@code
+     * AlgorithmParameterSpec}.
+     *
+     * @param paramSpec
+     *            the parameter specification.
+     * @throws InvalidParameterSpecException
+     *             if this {@code AlgorithmParameters} has already been
+     *             initialized or the given {@code paramSpec} is not appropriate
+     *             for initializing this {@code AlgorithmParameters}.
      */
     public final void init(AlgorithmParameterSpec paramSpec)
             throws InvalidParameterSpecException {
@@ -161,8 +208,15 @@
     }
 
     /**
-     * @com.intel.drl.spec_ref
-     *  
+     * Initializes this {@code AlgorithmParameters} with the specified {@code
+     * byte[]} using the default decoding format for parameters. The default
+     * encoding format is ASN.1.
+     *
+     * @param params
+     *            the encoded parameters.
+     * @throws IOException
+     *             if this {@code AlgorithmParameters} has already been
+     *             initialized, or the parameter could not be encoded.
      */
     public final void init(byte[] params) throws IOException {
         if (initialized) {
@@ -173,8 +227,16 @@
     }
 
     /**
-     * @com.intel.drl.spec_ref
-     *  
+     * Initializes this {@code AlgorithmParameters} with the specified {@code
+     * byte[]} using the specified decoding format.
+     *
+     * @param params
+     *            the encoded parameters.
+     * @param format
+     *            the name of the decoding format.
+     * @throws IOException
+     *             if this {@code AlgorithmParameters} has already been
+     *             initialized, or the parameter could not be encoded.
      */
     public final void init(byte[] params, String format) throws IOException {
         if (initialized) {
@@ -185,8 +247,18 @@
     }
 
     /**
-     * @com.intel.drl.spec_ref
-     *  
+     * Returns the {@code AlgorithmParameterSpec} for this {@code
+     * AlgorithmParameters}.
+     *
+     * @param paramSpec
+     *            the type of the parameter specification in which this
+     *            parameters should be converted.
+     * @return the {@code AlgorithmParameterSpec} for this {@code
+     *         AlgorithmParameters}.
+     * @throws InvalidParameterSpecException
+     *             if this {@code AlgorithmParameters} has already been
+     *             initialized, or if this parameters could not be converted to
+     *             the specified class.
      */
     public final <T extends AlgorithmParameterSpec> T getParameterSpec(Class<T> paramSpec)
             throws InvalidParameterSpecException {
@@ -198,8 +270,13 @@
     }
 
     /**
-     * @com.intel.drl.spec_ref
-     *  
+     * Returns this {@code AlgorithmParameters} in their default encoding
+     * format. The default encoding format is ASN.1.
+     *
+     * @return the encoded parameters.
+     * @throws IOException
+     *             if this {@code AlgorithmParameters} has already been
+     *             initialized, or if this parameters could not be encoded.
      */
     public final byte[] getEncoded() throws IOException {
         if (!initialized) {
@@ -209,8 +286,15 @@
     }
 
     /**
-     * @com.intel.drl.spec_ref
-     *  
+     * Returns this {@code AlgorithmParameters} in the specified encoding
+     * format.
+     *
+     * @param format
+     *            the name of the encoding format.
+     * @return the encoded parameters.
+     * @throws IOException
+     *             if this {@code AlgorithmParameters} has already been
+     *             initialized, or if this parameters could not be encoded.
      */
     public final byte[] getEncoded(String format) throws IOException {
         if (!initialized) {
@@ -220,8 +304,10 @@
     }
 
     /**
-     * @com.intel.drl.spec_ref
-     *  
+     * Returns a string containing a concise, human-readable description of this
+     * {@code AlgorithmParameters}.
+     *
+     * @return a printable representation for this {@code AlgorithmParameters}.
      */
     public final String toString() {
         if (!initialized) {

Modified: harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/AlgorithmParametersSpi.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/AlgorithmParametersSpi.java?rev=769463&r1=769462&r2=769463&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/AlgorithmParametersSpi.java (original)
+++ harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/AlgorithmParametersSpi.java Tue Apr 28 17:01:41 2009
@@ -15,11 +15,6 @@
  *  limitations under the License.
  */
 
-/**
-* @author Boris V. Kuznetsov
-* @version $Revision$
-*/
-
 package java.security;
 
 import java.io.IOException;
@@ -27,55 +22,102 @@
 import java.security.spec.InvalidParameterSpecException;
 
 /**
- * @com.intel.drl.spec_ref
+ * {@code AlgorithmParametersSpi} is the Service Provider Interface (SPI)
+ * definition for {@code AlgorithmParameters}.
  * 
+ * @see AlgorithmParameters
  */
-
 public abstract class AlgorithmParametersSpi {
 
     /**
-     * @com.intel.drl.spec_ref
-     *  
+     * Initializes this {@code AlgorithmParametersSpi} with the specified
+     * {@code AlgorithmParameterSpec}.
+     *
+     * @param paramSpec
+     *            the parameter specification.
+     * @throws InvalidParameterSpecException
+     *             if this {@code AlgorithmParametersSpi} has already been
+     *             initialized or the given {@code paramSpec} is not appropriate
+     *             for initializing this {@code AlgorithmParametersSpi}.
      */
     protected abstract void engineInit(AlgorithmParameterSpec paramSpec)
             throws InvalidParameterSpecException;
 
     /**
-     * @com.intel.drl.spec_ref
-     *  
+     * Initializes this {@code AlgorithmParametersSpi} with the specified
+     * {@code byte[]} using the default decoding format for parameters. The
+     * default encoding format is ASN.1.
+     *
+     * @param params
+     *            the encoded parameters.
+     * @throws IOException
+     *             if this {@code AlgorithmParametersSpi} has already been
+     *             initialized, or the parameter could not be encoded.
      */
     protected abstract void engineInit(byte[] params) throws IOException;
 
     /**
-     * @com.intel.drl.spec_ref
-     *  
+     * Initializes this {@code AlgorithmParametersSpi} with the specified
+     * {@code byte[]} using the specified decoding format.
+     *
+     * @param params
+     *            the encoded parameters.
+     * @param format
+     *            the name of the decoding format.
+     * @throws IOException
+     *             if this {@code AlgorithmParametersSpi} has already been
+     *             initialized, or the parameter could not be encoded.
      */
     protected abstract void engineInit(byte[] params, String format)
             throws IOException;
 
     /**
-     * @com.intel.drl.spec_ref
-     *  
+     * Returns the {@code AlgorithmParameterSpec} for this {@code
+     * AlgorithmParametersSpi}.
+     *
+     * @param paramSpec
+     *            the type of the parameter specification in which this
+     *            parameters should be converted.
+     * @return the {@code AlgorithmParameterSpec} for this {@code
+     *         AlgorithmParametersSpi}.
+     * @throws InvalidParameterSpecException
+     *             if this {@code AlgorithmParametersSpi} has already been
+     *             initialized, or if this parameters could not be converted to
+     *             the specified class.
      */
     protected abstract <T extends AlgorithmParameterSpec> T engineGetParameterSpec(
             Class<T> paramSpec) throws InvalidParameterSpecException;
 
     /**
-     * @com.intel.drl.spec_ref
-     *  
+     * Returns the parameters in their default encoding format. The default
+     * encoding format is ASN.1.
+     *
+     * @return the encoded parameters.
+     * @throws IOException
+     *             if this {@code AlgorithmParametersSpi} has already been
+     *             initialized, or if this parameters could not be encoded.
      */
     protected abstract byte[] engineGetEncoded() throws IOException;
 
     /**
-     * @com.intel.drl.spec_ref
-     *  
+     * Returns the parameters in the specified encoding format.
+     *
+     * @param format
+     *            the name of the encoding format.
+     * @return the encoded parameters.
+     * @throws IOException
+     *             if this {@code AlgorithmParametersSpi} has already been
+     *             initialized, or if this parameters could not be encoded.
      */
     protected abstract byte[] engineGetEncoded(String format)
             throws IOException;
 
     /**
-     * @com.intel.drl.spec_ref
-     *  
+     * Returns a string containing a concise, human-readable description of this
+     * {@code AlgorithmParametersSpi}.
+     *
+     * @return a printable representation for this {@code
+     *         AlgorithmParametersSpi}.
      */
     protected abstract String engineToString();
 

Modified: harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/AllPermission.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/AllPermission.java?rev=769463&r1=769462&r2=769463&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/AllPermission.java (original)
+++ harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/AllPermission.java Tue Apr 28 17:01:41 2009
@@ -19,9 +19,9 @@
 
 
 /**
- * Subclass of Permission whose instances imply all other permissions. Granting
- * this permission is equivalent to disabling security.
- * 
+ * {@code AllPermission} represents the permission to perform any operation.
+ * Since its {@link #implies(Permission)} method always returns {@code true},
+ * granting this permission is equivalent to disabling security.
  */
 public final class AllPermission extends Permission {
 
@@ -36,87 +36,87 @@
     // Actions name
     private static final String ALL_ACTIONS = "<all actions>"; //$NON-NLS-1$
 
-	/**
-	 * Constructs a new instance of this class. The two argument version is
-	 * provided for class <code>Policy</code> so that it has a consistent call
-	 * pattern across all Permissions. The name and action list are both
-	 * ignored.
-	 * 
-	 * @param name
-	 *            java.lang.String ignored.
-	 * @param actions
-	 *            java.lang.String ignored.
-	 */
+    /**
+     * Constructs a new instance of {@code AllPermission}. The two argument
+     * version is provided for class {@code Policy} so that it has a consistent
+     * call pattern across all permissions. The name and action list are both
+     * ignored.
+     *
+     * @param name
+     *            ignored.
+     * @param actions
+     *            ignored.
+     */
     public AllPermission(String name, String actions) {
         super(ALL_PERMISSIONS);
     }
 
-	/**
-	 * Constructs a new instance of this class.
-	 */
+    /**
+     * Constructs a new instance of {@code AllPermission}.
+     */
     public AllPermission() {
         super(ALL_PERMISSIONS);
     }
 
-	/**
-	 * Compares the argument to the receiver, and answers true if they represent
-	 * the <em>same</em> object using a class specific comparison. All
-	 * AllPermissions are equal to each other.
-	 * 
-	 * @param obj
-	 *            the object to compare with this object
-	 * @return <code>true</code> if the object is the same as this object
-	 *         <code>false</code> if it is different from this object
-	 * @see #hashCode
-	 */
+    /**
+     * Compares the specified object with this {@code AllPermission} for
+     * equality and returns {@code true} if the specified object is equal,
+     * {@code false} otherwise. To be equal, the given object needs to be an
+     * instance of {@code AllPermission}.
+     *
+     * @param obj
+     *            object to be compared for equality with this {@code
+     *            AllPermission}.
+     * @return {@code true} if the specified object is equal to this {@code
+     *         AllPermission}, otherwise {@code false}.
+     * @see #hashCode
+     */
     public boolean equals(Object obj) {
         return (obj instanceof AllPermission);
     }
 
-	/**
-	 * Answers an integer hash code for the receiver. Any two objects which
-	 * answer <code>true</code> when passed to <code>equals</code> must
-	 * answer the same value for this method.
-	 * 
-	 * @return the receiver's hash
-	 * 
-	 * @see #equals
-	 */
+    /**
+     * Returns the hash code value for this {@code AllPermission}. Returns the
+     * same hash code for {@code AllPermission}s that are equal to each other as
+     * required by the general contract of {@link Object#hashCode}.
+     *
+     * @return the hash code value for this {@code AllPermission}.
+     * @see Object#equals(Object)
+     * @see AllPermission#equals(Object)
+     */
     public int hashCode() {
         return 1;
     }
 
-	/**
-	 * Answers the actions associated with the receiver. Since AllPermission
-	 * objects allow all actions, answer with the string "<all actions>".
-	 * 
-	 * @return String the actions associated with the receiver.
-	 */
+    /**
+     * Returns the actions associated with this {@code AllPermission}. Since
+     * {@code AllPermission} objects allow all actions, this method returns
+     * always the string "&lt;all actions&gt;".
+     *
+     * @return the actions associated with this {@code AllPermission}.
+     */
     public String getActions() {
         return ALL_ACTIONS;
     }
 
-	/**
-	 * Indicates whether the argument permission is implied by the receiver.
-	 * AllPermission objects imply all other permissions.
-	 * 
-	 * @return boolean <code>true</code> if the argument permission is implied
-	 *         by the receiver, and <code>false</code> if it is not.
-	 * @param permission
-	 *            java.security.Permission the permission to check
-	 */
+    /**
+     * Indicates whether the given permission is implied by this permission.
+     * {@code AllPermission} objects imply all other permissions.
+     *
+     * @return always {@code true}.
+     * @param permission
+     *            the permission to check.
+     */
     public boolean implies(Permission permission) {
         return true;
     }
 
-	/**
-	 * Answers a new PermissionCollection for holding permissions of this class.
-	 * Answer null if any permission collection can be used.
-	 * 
-	 * @return a new PermissionCollection or null
-	 * 
-	 * @see java.security.BasicPermissionCollection
-	 */
+    /**
+     * Returns a new {@code PermissionCollection} for holding permissions of
+     * this class.
+     *
+     * @return a new {@code PermissionCollection}.
+     */
     public PermissionCollection newPermissionCollection() {
         return new AllPermissionCollection();
     }

Modified: harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/AllPermissionCollection.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/AllPermissionCollection.java?rev=769463&r1=769462&r2=769463&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/AllPermissionCollection.java (original)
+++ harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/AllPermissionCollection.java Tue Apr 28 17:01:41 2009
@@ -27,10 +27,11 @@
 import org.apache.harmony.security.internal.nls.Messages;
 
 /**
- * Specific PermissionCollection for storing AllPermissions. All instances of
- * AllPermission are equivalent, so it is enough to store a single added
- * instance.
+ * Specific {@code PermissionCollection} for storing {@code AllPermission}s. All
+ * instances of {@code AllPermission} are equivalent, so it is enough to store a
+ * single added instance.
  * 
+ * @see AllPermission
  */
 final class AllPermissionCollection extends PermissionCollection {
 
@@ -46,7 +47,7 @@
     private transient Permission all;
 
     /**
-     * Adds an AllPermission to the collection.
+     * Adds an {@code AllPermission} to the collection.
      */
     public void add(Permission permission) {
         if (isReadOnly()) {
@@ -60,7 +61,7 @@
     }
 
     /**
-     * Returns enumeration of the collection.
+     * Returns the enumeration of the collection.
      */
     public Enumeration<Permission> elements() {
         return new SingletonEnumeration<Permission>(all);
@@ -103,23 +104,21 @@
 
     /**
      * Indicates whether the argument permission is implied by the receiver.
-     * AllPermission objects imply all other permissions.
+     * {@code AllPermission} objects imply all other permissions.
      * 
-     * @return boolean <code>true</code> if the argument permission is implied
-     *         by the receiver, and <code>false</code> if it is not.
+     * @return boolean {@code true} if the argument permission is implied by the
+     *         receiver, and {@code false} if it is not.
      * @param permission
-     *            java.security.Permission the permission to check
+     *            the permission to check.
      */
     public boolean implies(Permission permission) {
         return all != null;
     }
 
     /**
-     * Writes accordingly to expected format:
-     * <dl>
-     * <dt>boolean all_allowed
-     * <dd>This is set to true if this collection is not empty
-     * </dl>
+     * Writes the fields according to expected format, adding the boolean field
+     * {@code all_allowed} which is {@code true} if this collection is not
+     * empty.
      */
     private void writeObject(java.io.ObjectOutputStream out) throws IOException {
         ObjectOutputStream.PutField fields = out.putFields();

Modified: harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/AuthProvider.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/AuthProvider.java?rev=769463&r1=769462&r2=769463&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/AuthProvider.java (original)
+++ harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/AuthProvider.java Tue Apr 28 17:01:41 2009
@@ -15,11 +15,6 @@
  *  limitations under the License.
  */
 
-/**
-* @author Boris V. Kuznetsov
-* @version $Revision$
-*/
-
 package java.security;
 
 import javax.security.auth.Subject;
@@ -27,10 +22,9 @@
 import javax.security.auth.login.LoginException;
 
 /**
- * @com.intel.drl.spec_ref
- * 
+ * {@code AuthProvider} is an abstract superclass for Java Security {@code
+ * Provider} which provide login and logout.
  */
-
 public abstract class AuthProvider extends Provider {
 
     /**
@@ -39,28 +33,78 @@
     private static final long serialVersionUID = 4197859053084546461L;
 
     /**
-     * @com.intel.drl.spec_ref
+     * Constructs a new instance of {@code AuthProvider} with its name, version
+     * and description.
      * 
+     * @param name
+     *            the name of the provider.
+     * @param version
+     *            the version of the provider.
+     * @param info
+     *            a description of the provider.
      */
     protected AuthProvider(String name, double version, String info) {
         super(name, version, info); 
     }
     
     /**
-     * @com.intel.drl.spec_ref
+     * Performs a login into this {@code AuthProvider}. The specified {@code
+     * CallbackHandler} is used to obtain information from the caller.
+     * <p>
+     * If a {@code SecurityManager} is installed, code calling this method needs
+     * the {@code SecurityPermission} {@code authProvider.NAME} (where NAME is
+     * the provider name) to be granted, otherwise a {@code SecurityException}
+     * will be thrown.
      * 
+     * @param subject
+     *            the subject that is used to login.
+     * @param handler
+     *            the handler to obtain authentication information from the
+     *            caller.
+     * @throws LoginException
+     *             if the login fails.
+     * @throws SecurityException
+     *             if a {@code SecurityManager} is installed and the caller does
+     *             not have permission to invoke this method.
      */
     public abstract void login(Subject subject, CallbackHandler handler) throws LoginException;
     
     /**
-     * @com.intel.drl.spec_ref
-     * 
+     * Performs a logout from this {@code AuthProvider}.
+     * <p>
+     * If a {@code SecurityManager} is installed, code calling this method needs
+     * the {@code SecurityPermission} {@code authProvider.NAME} (where NAME is
+     * the provider name) to be granted, otherwise a {@code SecurityException}
+     * will be thrown.
+     *
+     * @throws LoginException
+     *             if the logout fails.
+     * @throws SecurityException
+     *             if a {@code SecurityManager} is installed and the caller does
+     *             not have permission to invoke this method.
      */
     public abstract void logout() throws LoginException;
     
     /**
-     * @com.intel.drl.spec_ref
-     * 
+     * Sets the {@code CallbackHandler} to this {@code AuthProvider}. If no
+     * handler is passed to the {@link #login(Subject, CallbackHandler)} method,
+     * this {@code AuthProvider} is using the specified {@code CallbackHandler}.
+     * <p>
+     * If no handler is set, this {@code AuthProvider} uses the {@code
+     * CallbackHandler} specified by the {@code
+     * auth.login.defaultCallbackHandler} security property.
+     * <p>
+     * If a {@code SecurityManager} is installed, code calling this method needs
+     * the {@code SecurityPermission} {@code authProvider.NAME} (where NAME is
+     * the provider name) to be granted, otherwise a {@code SecurityException}
+     * will be thrown.
+     *
+     * @param handler
+     *            the handler to obtain authentication information from the
+     *            caller.
+     * @throws SecurityException
+     *             if a {@code SecurityManager} is installed and the caller does
+     *             not have permission to invoke this method.
      */
     public abstract void setCallbackHandler(CallbackHandler handler);
 }
\ No newline at end of file

Modified: harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/BasicPermission.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/BasicPermission.java?rev=769463&r1=769462&r2=769463&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/BasicPermission.java (original)
+++ harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/BasicPermission.java Tue Apr 28 17:01:41 2009
@@ -15,11 +15,6 @@
  *  limitations under the License.
  */
 
-/**
-* @author Alexey V. Varlamov
-* @version $Revision$
-*/
-
 package java.security;
 
 import java.io.IOException;
@@ -28,35 +23,56 @@
 import org.apache.harmony.security.internal.nls.Messages;
 
 /**
- * Superclass of permissions which have names but no action lists.
+ * {@code BasicPermission} is the common base class of all permissions which
+ * have a name but no action lists. A {@code BasicPermission} is granted or it
+ * is not.
+ * <p>
+ * Names of a BasicPermission follow the dot separated, hierarchical property
+ * naming convention. Asterisk '*' can be used as wildcards. Either by itself,
+ * matching anything, or at the end of the name, immediately preceded by a '.'.
+ * For example:
  * 
+ * <pre>
+ * java.io.*  grants all permissions under the java.io permission hierarchy
+ * *          grants all permissions
+ * </pre>
+ * <p>
+ * While this class ignores the action list in the
+ * {@link #BasicPermission(String, String)} constructor, subclasses may
+ * implement actions on top of this class.
  */
-
 public abstract class BasicPermission extends Permission implements
     Serializable {
 
     private static final long serialVersionUID = 6279438298436773498L;
 
-	/**
-	 * Creates an instance of this class with the given name and action list.
-	 * 
-	 * @param name
-	 *            String the name of the new permission.
-	 */
+    /**
+     * Constructs a new instance of {@code BasicPermission} with the specified
+     * name.
+     *
+     * @param name
+     *            the name of the permission.
+     * @throws NullPointerException if {@code name} is {@code null}.
+     * @throws IllegalArgumentException if {@code name.length() == 0}.
+     */
     public BasicPermission(String name) {
         super(name);
         checkName(name);
     }
 
-	/**
-	 * Creates an instance of this class with the given name and action list.
-	 * The action list is ignored.
-	 * 
-	 * @param name
-	 *            String the name of the new permission.
-	 * @param action
-	 *            String ignored.
-	 */
+    /**
+     * Constructs a new instance of {@code BasicPermission} with the specified
+     * name. The {@code action} parameter is ignored.
+     *
+     * @param name
+     *            the name of the permission.
+     * @param action
+     *            is ignored.
+     * @throws NullPointerException
+     *             if {@code name} is {@code null}.
+     * @throws IllegalArgumentException
+     *             if {@code name.length() == 0}.
+     */
     public BasicPermission(String name, String action) {
         super(name);
         checkName(name);
@@ -74,17 +90,20 @@
         }
     }
 
-	/**
-	 * Compares the argument to the receiver, and answers true if they represent
-	 * the <em>same</em> object using a class specific comparison. In this
-	 * case, the receiver and the object must have the same class and name.
-	 * 
-	 * @param obj
-	 *            the object to compare with this object
-	 * @return <code>true</code> if the object is the same as this object
-	 *         <code>false</code> if it is different from this object
-	 * @see #hashCode
-	 */
+    /**
+     * Compares the specified object with this {@code BasicPermission} for
+     * equality. Returns {@code true} if the specified object has the same class
+     * and the two {@code Permissions}s have the same name.
+     * <p>
+     * The {@link #implies(Permission)} method should be used for making access
+     * control checks.
+     *
+     * @param obj
+     *            object to be compared for equality with this {@code
+     *            BasicPermission}.
+     * @return {@code true} if the specified object is equal to this {@code
+     *         BasicPermission}, otherwise {@code false}.
+     */
     public boolean equals(Object obj) {
         if (obj == this) {
             return true;
@@ -96,37 +115,37 @@
         return false;
     }
 
-	/**
-	 * Answers an integer hash code for the receiver. Any two objects which
-	 * answer <code>true</code> when passed to <code>equals</code> must
-	 * answer the same value for this method.
-	 * 
-	 * @return int the receiver's hash
-	 * 
-	 * @see #equals
-	 */
+    /**
+     * Returns the hash code value for this {@code BasicPermission}. Returns the
+     * same hash code for {@code BasicPermission}s that are equal to each other
+     * as required by the general contract of {@link Object#hashCode}.
+     *
+     * @return the hash code value for this {@code BasicPermission}.
+     * @see Object#equals(Object)
+     * @see BasicPermission#equals(Object)
+     */
     public int hashCode() {
         return getName().hashCode();
     }
 
-	/**
-	 * Answers the actions associated with the receiver. BasicPermission objects
-	 * have no actions, so answer the empty string.
-	 * 
-	 * @return String the actions associated with the receiver.
-	 */
+    /**
+     * Returns the actions associated with this permission. Since {@code
+     * BasicPermission} instances have no actions, an empty string is returned.
+     *
+     * @return an empty string.
+     */
     public String getActions() {
         return ""; //$NON-NLS-1$
     }
 
-	/**
-	 * Indicates whether the argument permission is implied by the receiver.
-	 * 
-	 * @return boolean <code>true</code> if the argument permission is implied
-	 *         by the receiver, and <code>false</code> if it is not.
-	 * @param permission
-	 *            java.security.Permission the permission to check
-	 */
+    /**
+     * Indicates whether the specified permission is implied by this permission.
+     *
+     * @param permission
+     *            the permission to check against this permission.
+     * @return {@code true} if the specified permission is implied by this
+     *         permission, {@code false} otherwise.
+     */
     public boolean implies(Permission permission) {
         if (permission != null && permission.getClass() == this.getClass()) {
             return nameImplies(getName(), permission.getName());
@@ -135,9 +154,9 @@
     }
 
     /**
-     * Checks if <code>thisName</code> implies <code>thatName</code>,
+     * Checks if {@code thisName} implies {@code thatName},
      * accordingly to hierarchical property naming convention.
-     * It is assumed that names cannot be null or empty.
+     * It is assumed that names cannot be {@code null} or empty.
      */
     static boolean nameImplies(String thisName, String thatName) {
         if (thisName == thatName) {
@@ -163,21 +182,19 @@
         return true;
     }
 
-	/**
-	 * Answers a new PermissionCollection for holding permissions of this class.
-	 * Answer null if any permission collection can be used.
-	 * <p>
-	 * Note: For BasicPermission (and subclasses which do not override this
-	 * method), the collection which is returned does <em>not</em> invoke the
-	 * .implies method of the permissions which are stored in it when checking
-	 * if the collection implies a permission. Instead, it assumes that if the
-	 * type of the permission is correct, and the name of the permission is
-	 * correct, there is a match.
-	 * 
-	 * @return a new PermissionCollection or null
-	 * 
-	 * @see java.security.BasicPermissionCollection
-	 */
+    /**
+     * Returns an empty {@link PermissionCollection} for holding permissions.
+     * <p>
+     * For {@code PermissionCollection} (and subclasses which do not override
+     * this method), the collection which is returned does <em>not</em> invoke
+     * the {@link #implies(Permission)} method of the permissions which are
+     * stored in it when checking if the collection implies a permission.
+     * Instead, it assumes that if the type of the permission is correct, and
+     * the name of the permission is correct, there is a match.
+     *
+     * @return an empty {@link PermissionCollection} for holding permissions.
+     * @see BasicPermissionCollection
+     */
     public PermissionCollection newPermissionCollection() {
         return new BasicPermissionCollection();
     }

Modified: harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/BasicPermissionCollection.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/BasicPermissionCollection.java?rev=769463&r1=769462&r2=769463&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/BasicPermissionCollection.java (original)
+++ harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/BasicPermissionCollection.java Tue Apr 28 17:01:41 2009
@@ -32,10 +32,12 @@
 import org.apache.harmony.security.internal.nls.Messages;
 
 /**
- * Specific PermissionCollection for storing BasicPermissions of arbitrary type.
+ * Specific {@code PermissionCollection} for storing {@code BasicPermissions} of
+ * arbitrary type.
  * 
+ * @see BasicPermission
+ * @see PermissionCollection
  */
-
 final class BasicPermissionCollection extends PermissionCollection {
 
     private static final long serialVersionUID = 739301742472979399L;
@@ -103,10 +105,11 @@
     /**
      * Indicates whether the argument permission is implied by the receiver.
      * 
-     * @return boolean <code>true</code> if the argument permission is implied
-     *         by the receiver, and <code>false</code> if it is not.
+     * @return boolean {@code true} if the argument permission is implied by the
+     *         receiver, and {@code false} if it is not.
      * @param permission
-     *            java.security.Permission the permission to check
+     *            the permission to check.
+     * @see Permission
      */
     public boolean implies(Permission permission) {
         if (permission == null || permission.getClass() != permClass) {
@@ -146,17 +149,20 @@
     }
 
     /**
-     * Writes the object to the given stream for serialization.
-     * 
-     * The following fields are stored via an ObjectOutputStream.PutField,
-     * obtained by calling putFields() on the given output stream, in order to
-     * comply with the serialized form specification for this class:
-     * 
-     * <code>boolean all_allowed</code>, set to <code>allEnabled</code>
-     * <code>Hashtable permissions</code>,
-     * set to <code>items</code>
-     * <code>Class permClass</code>, set to
-     * <code>permClass</code>
+     * Expected format is the following:
+     * <dl>
+     * <dt>boolean all_allowed
+     * <dd>This is set to true if this BasicPermissionCollection contains a
+     * {@code BasicPermission} with '*' as its permission name.
+     * <dt>Class&lt;T&gt; permClass
+     * <dd>The class to which all {@code BasicPermission}s in this
+     * BasicPermissionCollection belongs.
+     * <dt>Hashtable&lt;K,V&gt; permissions
+     * <dd>The {@code BasicPermission}s in this collection. All {@code
+     * BasicPermission}s in the collection must belong to the same class. The
+     * Hashtable is indexed by the {@code BasicPermission} name; the value of
+     * the Hashtable entry is the permission.
+     * </dl>
      */
     private void writeObject(java.io.ObjectOutputStream out) throws IOException {
         ObjectOutputStream.PutField fields = out.putFields();

Modified: harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/Certificate.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/Certificate.java?rev=769463&r1=769462&r2=769463&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/Certificate.java (original)
+++ harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/Certificate.java Tue Apr 28 17:01:41 2009
@@ -15,11 +15,6 @@
  *  limitations under the License.
  */
 
-/**
-* @author Vera Y. Petrashkova
-* @version $Revision$
-*/
-
 package java.security;
 
 import java.io.IOException;
@@ -27,51 +22,91 @@
 import java.io.OutputStream;
 
 /**
- * @com.intel.drl.spec_ref
+ * {@code Certificate} represents an identity certificate, such as X.509 or PGP.
+ * Note: A {@code Certificate} instances does not make any statement about the
+ * validity of itself. It's in the responsibility of the application to verify
+ * the validity of its certificates.
  * 
- * @deprecated Replaced by behavior in
- *             {@link javax.security.cert javax.security.cert}
+ * @deprecated Replaced by behavior in {@link javax.security.cert}
+ * @see java.security.cert.Certificate
  */
 @Deprecated
 public interface Certificate {
 
     /**
-     * @com.intel.drl.spec_ref
+     * Decodes a certificate from the given {@code InputStream}. The format of
+     * the data to encode must be that identified by {@link #getFormat()} and
+     * encoded by {@link #encode(OutputStream)}.
+     *
+     * @param stream
+     *            the {@code InputStream} to read from.
+     * @throws KeyException
+     *             if certificate information is incomplete or incorrect.
+     * @throws IOException
+     *             if an exception is thrown by accessing the provided stream.
+     * @see #encode(OutputStream)
+     * @see #getFormat()
      */
     public void decode(InputStream stream) throws KeyException, IOException;
 
     /**
-     * @com.intel.drl.spec_ref
+     * Encodes this certificate to an output stream. The
+     * {@link #decode(InputStream)} method must be able to decode the format
+     * written by this method.
+     *
+     * @param stream
+     *            the {@code OutputStream} to encode this certificate to.
+     * @throws KeyException
+     *             if certificate information is incomplete or incorrect.
+     * @throws IOException
+     *             if an exception is thrown by accessing the provided stream.
+     * @see #decode(InputStream)
      */
     public void encode(OutputStream stream) throws KeyException, IOException;
 
     /**
-     * @com.intel.drl.spec_ref
-     *  
+     * Returns a string identifying the format of this certificate.
+     *
+     * @return a string identifying the format of this certificate.
      */
     public String getFormat();
 
     /**
-     * @com.intel.drl.spec_ref
-     *  
+     * Returns the guarantor of this certificate. That guarantor guarantees,
+     * that the public key of this certificate is from the principal returned by
+     * {@link #getPrincipal()}.
+     *
+     * @return the guarantor of this certificate.
+     * @see #getPrincipal()
      */
     public Principal getGuarantor();
 
     /**
-     * @com.intel.drl.spec_ref
-     *  
+     * Returns the principal of this certificate. The principal is guaranteed by
+     * the guarantor returned by {@link #getGuarantor()}.
+     *
+     * @return the principal of this certificate.
+     * @see #getGuarantor()
      */
     public Principal getPrincipal();
 
     /**
-     * @com.intel.drl.spec_ref
-     *  
+     * Returns the public key of this certificate. The public key is guaranteed
+     * by the guarantor to belong to the principal.
+     *
+     * @return the public key of this certificate.
+     * @see #getGuarantor()
+     * @see Certificate#getPrincipal()
      */
     public PublicKey getPublicKey();
 
     /**
-     * @com.intel.drl.spec_ref
-     *  
+     * Returns a string containing a concise, human-readable description of the
+     * this {@code Certificate}.
+     *
+     * @param detailed
+     *            whether or not this method should return detailed information.
+     * @return a string representation of this certificate.
      */
     public String toString(boolean detailed);
 }
\ No newline at end of file

Modified: harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/CodeSigner.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/CodeSigner.java?rev=769463&r1=769462&r2=769463&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/CodeSigner.java (original)
+++ harmony/enhanced/classlib/trunk/modules/security/src/main/java/common/java/security/CodeSigner.java Tue Apr 28 17:01:41 2009
@@ -15,11 +15,6 @@
  *  limitations under the License.
  */
 
-/**
-* @author Alexander V. Astapchuk
-* @version $Revision$
-*/
-
 package java.security;
 
 import java.io.Serializable;
@@ -28,31 +23,29 @@
 import org.apache.harmony.security.internal.nls.Messages;
 
 /**
- * @com.intel.drl.spec_ref 
+ * {@code CodeSigner} represents a signer of code. Instances are immutable.
  */
-
 public final class CodeSigner implements Serializable {
 
-    /**
-     * @com.intel.drl.spec_ref 
-     */
     private static final long serialVersionUID = 6819288105193937581L;
 
-    /**
-     * @com.intel.drl.spec_ref 
-     */
     private CertPath signerCertPath;
 
-    /**
-     * @com.intel.drl.spec_ref 
-     */
     private Timestamp timestamp;
 
     // Cached hash code value
     private transient int hash;
 
     /**
-     * @com.intel.drl.spec_ref 
+     * Constructs a new instance of {@code CodeSigner}.
+     *
+     * @param signerCertPath
+     *            the certificate path associated with this code signer.
+     * @param timestamp
+     *            the time stamp associated with this code signer, maybe {@code
+     *            null}.
+     * @throws NullPointerException
+     *             if {@code signerCertPath} is {@code null}.
      */
     public CodeSigner(CertPath signerCertPath, Timestamp timestamp) {
         if (signerCertPath == null) {
@@ -63,7 +56,16 @@
     }
 
     /**
-     * @com.intel.drl.spec_ref 
+     * Compares the specified object with this {@code CodeSigner} for equality.
+     * Returns {@code true} if the specified object is also an instance of
+     * {@code CodeSigner}, the two {@code CodeSigner} encapsulate the same
+     * certificate path and the same time stamp, if present in both.
+     *
+     * @param obj
+     *            object to be compared for equality with this {@code
+     *            CodeSigner}.
+     * @return {@code true} if the specified object is equal to this {@code
+     *         CodeSigner}, otherwise {@code false}.
      */
     public boolean equals(Object obj) {
         if (obj == this) {
@@ -81,21 +83,32 @@
     }
 
     /**
-     * @com.intel.drl.spec_ref 
+     * Returns the certificate path associated with this {@code CodeSigner}.
+     *
+     * @return the certificate path associated with this {@code CodeSigner}.
      */
     public CertPath getSignerCertPath() {
         return signerCertPath;
     }
 
     /**
-     * @com.intel.drl.spec_ref 
+     * Returns the time stamp associated with this {@code CodeSigner}.
+     *
+     * @return the time stamp associated with this {@code CodeSigner}, maybe
+     *         {@code null}.
      */
     public Timestamp getTimestamp() {
         return timestamp;
     }
 
     /**
-     * @com.intel.drl.spec_ref 
+     * Returns the hash code value for this {@code CodeSigner}. Returns the same
+     * hash code for {@code CodeSigner}s that are equal to each other as
+     * required by the general contract of {@link Object#hashCode}.
+     *
+     * @return the hash code value for this {@code CodeSigner}.
+     * @see Object#equals(Object)
+     * @see CodeSigner#equals(Object)
      */
     public int hashCode() {
         if (hash == 0) {
@@ -106,7 +119,11 @@
     }
 
     /**
-     * @com.intel.drl.spec_ref 
+     * Returns a string containing a concise, human-readable description of the
+     * this {@code CodeSigner} including its first certificate and its time
+     * stamp, if present.
+     *
+     * @return a printable representation for this {@code CodeSigner}.
      */
     public String toString() {
         // There is no any special reason for '256' here, it's taken abruptly



Mime
View raw message