Author: fanningpj
Date: Fri Sep 15 20:17:21 2017
New Revision: 1808483
URL: http://svn.apache.org/viewvc?rev=1808483&view=rev
Log:
remove some deprecated code slated for removal in 3.18
Modified:
poi/trunk/src/java/org/apache/poi/ddf/EscherContainerRecord.java
poi/trunk/src/java/org/apache/poi/hpsf/VariantSupport.java
poi/trunk/src/java/org/apache/poi/poifs/crypt/EncryptionVerifier.java
Modified: poi/trunk/src/java/org/apache/poi/ddf/EscherContainerRecord.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ddf/EscherContainerRecord.java?rev=1808483&r1=1808482&r2=1808483&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ddf/EscherContainerRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/ddf/EscherContainerRecord.java Fri Sep 15
20:17:21 2017
@@ -27,7 +27,6 @@ import org.apache.poi.util.HexDump;
import org.apache.poi.util.LittleEndian;
import org.apache.poi.util.POILogFactory;
import org.apache.poi.util.POILogger;
-import org.apache.poi.util.Removal;
/**
* Escher container records store other escher records as children.
@@ -153,17 +152,6 @@ public final class EscherContainerRecord
}
/**
- * @return an iterator over the child records
- * @deprecated POI 3.16 beta 1. use iterator() or loop over the container
record instead,
- * e.g. "for (EscherRecord r : container) ..."
- */
- @Removal(version="3.18")
- @Deprecated
- public Iterator<EscherRecord> getChildIterator() {
- return iterator();
- }
-
- /**
* @return an iterator over the child records
*/
@Override
Modified: poi/trunk/src/java/org/apache/poi/hpsf/VariantSupport.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hpsf/VariantSupport.java?rev=1808483&r1=1808482&r2=1808483&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hpsf/VariantSupport.java (original)
+++ poi/trunk/src/java/org/apache/poi/hpsf/VariantSupport.java Fri Sep 15
20:17:21 2017
@@ -25,13 +25,11 @@ import java.util.Date;
import java.util.LinkedList;
import java.util.List;
-import org.apache.poi.util.CodePageUtil;
import org.apache.poi.util.LittleEndian;
import org.apache.poi.util.LittleEndianByteArrayInputStream;
import org.apache.poi.util.LittleEndianConsts;
import org.apache.poi.util.POILogFactory;
import org.apache.poi.util.POILogger;
-import org.apache.poi.util.Removal;
/**
* Supports reading and writing of variant data.<p>
@@ -257,31 +255,6 @@ public class VariantSupport extends Vari
}
/**
- * Turns a codepage number into the equivalent character encoding's
- * name.
- *
- * @param codepage The codepage number
- *
- * @return The character encoding's name. If the codepage number is 65001,
- * the encoding name is "UTF-8". All other positive numbers are mapped to
- * "cp" followed by the number, e.g. if the codepage number is 1252 the
- * returned character encoding name will be "cp1252".
- *
- * @exception UnsupportedEncodingException if the specified codepage is
- * less than zero.
- *
- * @deprecated POI 3.16 - use {@link CodePageUtil#codepageToEncoding(int)}
- */
- @Deprecated
- @Removal(version="3.18")
- public static String codepageToEncoding(final int codepage)
- throws UnsupportedEncodingException
- {
- return CodePageUtil.codepageToEncoding(codepage);
- }
-
-
- /**
* Writes a variant value to an output stream. This method ensures that
* always a multiple of 4 bytes is written.<p>
*
Modified: poi/trunk/src/java/org/apache/poi/poifs/crypt/EncryptionVerifier.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/poifs/crypt/EncryptionVerifier.java?rev=1808483&r1=1808482&r2=1808483&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/poifs/crypt/EncryptionVerifier.java
(original)
+++ poi/trunk/src/java/org/apache/poi/poifs/crypt/EncryptionVerifier.java Fri
Sep 15 20:17:21 2017
@@ -16,8 +16,6 @@
==================================================================== */
package org.apache.poi.poifs.crypt;
-import org.apache.poi.util.Removal;
-
/**
* Used when checking if a key is valid for a document
*/
@@ -50,21 +48,6 @@ public abstract class EncryptionVerifier
return spinCount;
}
- /**
- * @deprecated POI 3.16 beta 1. use {@link #getChainingMode()}
- */
- @Removal(version="3.18")
- public int getCipherMode() {
- return chainingMode.ecmaId;
- }
-
- /**
- * @deprecated POI 3.16 beta 1. use {@link #getCipherAlgorithm()}
- */
- public int getAlgorithm() {
- return cipherAlgorithm.ecmaId;
- }
-
public byte[] getEncryptedKey() {
return encryptedKey;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
