git commit: ACCUMULO-998 remove malformed javadoc tag

[ct...@apache.org]

Updated Branches:
  refs/heads/master e6d6fab04 -> c3698b094


ACCUMULO-998 remove malformed javadoc tag


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c3698b09
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c3698b09
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c3698b09

Branch: refs/heads/master
Commit: c3698b094127ee21a3558a3b499cfc0680416773
Parents: e6d6fab
Author: Christopher Tubbs <ct...@apache.org>
Authored: Wed Jul 17 12:09:02 2013 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Wed Jul 17 12:09:02 2013 -0400

----------------------------------------------------------------------
 .../core/security/crypto/CryptoModuleParameters.java    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/c3698b09/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModuleParameters.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModuleParameters.java b/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModuleParameters.java
index 7027496..d9d48fe 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModuleParameters.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModuleParameters.java
@@ -17,6 +17,7 @@
 
 package org.apache.accumulo.core.security.crypto;
 
+import java.io.FilterOutputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.security.SecureRandom;
@@ -297,7 +298,6 @@ public class CryptoModuleParameters {
    * Gets the opaque ID associated with the encrypted version of the plaintext key.
    * 
    * @see CryptoModuleParameters#setOpaqueKeyEncryptionKeyID(String)
-   * @return
    */
   public String getOpaqueKeyEncryptionKeyID() {
     return opaqueKeyEncryptionKeyID;
@@ -340,9 +340,9 @@ public class CryptoModuleParameters {
    * 
    * <p>
    * 
-   * If this is set to <i>true</i>, then the stream passed to {@link CryptoModule#getEncryptingOutputStream(CryptoModuleParameters)} will be <i>written to by the module</i> before it
-   * is returned to the caller. There are situations where it is easier to let the crypto module do this writing on behalf of the caller, and other times where
-   * it is not appropriate (if the format of the underlying stream must be carefully maintained, for instance).
+   * If this is set to <i>true</i>, then the stream passed to {@link CryptoModule#getEncryptingOutputStream(CryptoModuleParameters)} will be <i>written to by
+   * the module</i> before it is returned to the caller. There are situations where it is easier to let the crypto module do this writing on behalf of the
+   * caller, and other times where it is not appropriate (if the format of the underlying stream must be carefully maintained, for instance).
    * 
    * @param recordParametersToStream
    *          whether or not to require the module to record its parameters to the stream by itself
@@ -456,13 +456,13 @@ public class CryptoModuleParameters {
     this.encryptedOutputStream = encryptedOutputStream;
   }
   
-
   /**
    * Gets the plaintext input stream, which is nearly always a wrapped version of the output from {@link CryptoModuleParameters#getEncryptedInputStream()}.
    * 
    * <p>
    * 
-   * Generally this method is used by {@link CryptoModule} classes as an <i>out</i> parameter from calling {@link CryptoModule#getDecryptingInputStream(CryptoModuleParameters)}.
+   * Generally this method is used by {@link CryptoModule} classes as an <i>out</i> parameter from calling
+   * {@link CryptoModule#getDecryptingInputStream(CryptoModuleParameters)}.
    * 
    * 
    * @see CryptoModuleParameters#setPlaintextInputStream(InputStream)