You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ni...@apache.org on 2015/02/28 18:49:18 UTC
svn commit: r1662979 -
/poi/trunk/src/java/org/apache/poi/poifs/crypt/EncryptionInfo.java
Author: nick
Date: Sat Feb 28 17:49:18 2015
New Revision: 1662979
URL: http://svn.apache.org/r1662979
Log:
Link to the replacement constructions for the deprecated ones, and a few extra bits of JavaDoc
Modified:
poi/trunk/src/java/org/apache/poi/poifs/crypt/EncryptionInfo.java
Modified: poi/trunk/src/java/org/apache/poi/poifs/crypt/EncryptionInfo.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/poifs/crypt/EncryptionInfo.java?rev=1662979&r1=1662978&r2=1662979&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/poifs/crypt/EncryptionInfo.java (original)
+++ poi/trunk/src/java/org/apache/poi/poifs/crypt/EncryptionInfo.java Sat Feb 28 17:49:18 2015
@@ -68,14 +68,21 @@ public class EncryptionInfo {
public static BitField flagAES = BitFieldFactory.getInstance(0x20);
+ /**
+ * Opens for decryption
+ */
public EncryptionInfo(POIFSFileSystem fs) throws IOException {
this(fs.getRoot());
}
-
+ /**
+ * Opens for decryption
+ */
public EncryptionInfo(NPOIFSFileSystem fs) throws IOException {
this(fs.getRoot());
}
-
+ /**
+ * Opens for decryption
+ */
public EncryptionInfo(DirectoryNode dir) throws IOException {
this(dir.createDocumentInputStream("EncryptionInfo"), false);
}
@@ -131,7 +138,7 @@ public class EncryptionInfo {
}
/**
- * @deprecated use constructor without fs parameter
+ * @deprecated Use {@link #EncryptionInfo(EncryptionMode)} (fs parameter no longer required)
*/
@Deprecated
public EncryptionInfo(POIFSFileSystem fs, EncryptionMode encryptionMode) {
@@ -139,7 +146,7 @@ public class EncryptionInfo {
}
/**
- * @deprecated use constructor without fs parameter
+ * @deprecated Use {@link #EncryptionInfo(EncryptionMode)} (fs parameter no longer required)
*/
@Deprecated
public EncryptionInfo(NPOIFSFileSystem fs, EncryptionMode encryptionMode) {
@@ -147,7 +154,7 @@ public class EncryptionInfo {
}
/**
- * @deprecated use constructor without dir parameter
+ * @deprecated Use {@link #EncryptionInfo(EncryptionMode)} (dir parameter no longer required)
*/
@Deprecated
public EncryptionInfo(DirectoryNode dir, EncryptionMode encryptionMode) {
@@ -155,7 +162,7 @@ public class EncryptionInfo {
}
/**
- * @deprecated use constructor without fs parameter
+ * @deprecated use {@link #EncryptionInfo(EncryptionMode, CipherAlgorithm, HashAlgorithm, int, int, ChainingMode)}
*/
@Deprecated
public EncryptionInfo(
@@ -171,7 +178,7 @@ public class EncryptionInfo {
}
/**
- * @deprecated use constructor without fs parameter
+ * @deprecated use {@link #EncryptionInfo(EncryptionMode, CipherAlgorithm, HashAlgorithm, int, int, ChainingMode)}
*/
@Deprecated
public EncryptionInfo(
@@ -187,7 +194,7 @@ public class EncryptionInfo {
}
/**
- * @deprecated use constructor without dir parameter
+ * @deprecated use {@link #EncryptionInfo(EncryptionMode, CipherAlgorithm, HashAlgorithm, int, int, ChainingMode)}
*/
@Deprecated
public EncryptionInfo(
@@ -202,6 +209,11 @@ public class EncryptionInfo {
this(encryptionMode, cipherAlgorithm, hashAlgorithm, keyBits, blockSize, chainingMode);
}
+ /**
+ * Prepares for encryption, using the given Encryption Mode, and
+ * all other parameters as default.
+ * @see #EncryptionInfo(EncryptionMode, CipherAlgorithm, HashAlgorithm, int, int, ChainingMode)
+ */
public EncryptionInfo(EncryptionMode encryptionMode) {
this(encryptionMode, null, null, -1, -1, null);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org