You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by fa...@apache.org on 2017/09/15 12:29:35 UTC
svn commit: r1808455 - in /poi/trunk/src: java/org/apache/poi/poifs/crypt/
java/org/apache/poi/ss/formula/atp/ ooxml/java/org/apache/poi/xwpf/model/
ooxml/testcases/org/apache/poi/xwpf/
scratchpad/src/org/apache/poi/hslf/usermodel/ testcases/org/apache...
Author: fanningpj
Date: Fri Sep 15 12:29:35 2017
New Revision: 1808455
URL: http://svn.apache.org/viewvc?rev=1808455&view=rev
Log:
remove some deprecated code slated for removal in 3.18
Removed:
poi/trunk/src/ooxml/java/org/apache/poi/xwpf/model/XMLParagraph.java
Modified:
poi/trunk/src/java/org/apache/poi/poifs/crypt/EncryptionHeader.java
poi/trunk/src/java/org/apache/poi/ss/formula/atp/WorkdayCalculator.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFBugs.java
poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestWorkdayCalculator.java
Modified: poi/trunk/src/java/org/apache/poi/poifs/crypt/EncryptionHeader.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/poifs/crypt/EncryptionHeader.java?rev=1808455&r1=1808454&r2=1808455&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/poifs/crypt/EncryptionHeader.java (original)
+++ poi/trunk/src/java/org/apache/poi/poifs/crypt/EncryptionHeader.java Fri Sep 15 12:29:35 2017
@@ -17,7 +17,6 @@
package org.apache.poi.poifs.crypt;
import org.apache.poi.EncryptedDocumentException;
-import org.apache.poi.util.Removal;
/**
* Reads and processes OOXML Encryption Headers
@@ -93,15 +92,7 @@ public abstract class EncryptionHeader i
public HashAlgorithm getHashAlgorithm() {
return hashAlgorithm;
}
-
- /**
- * @deprecated POI 3.16 beta 1. use {@link #getHashAlgorithm()}
- */
- @Removal(version="3.18")
- public HashAlgorithm getHashAlgorithmEx() {
- return hashAlgorithm;
- }
-
+
protected void setHashAlgorithm(HashAlgorithm hashAlgorithm) {
this.hashAlgorithm = hashAlgorithm;
}
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/atp/WorkdayCalculator.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/atp/WorkdayCalculator.java?rev=1808455&r1=1808454&r2=1808455&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/atp/WorkdayCalculator.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/atp/WorkdayCalculator.java Fri Sep 15 12:29:35 2017
@@ -147,18 +147,6 @@ public class WorkdayCalculator {
}
/**
- * @param aDate a given date.
- * @param holidays an array of holidays.
- * @return <code>1</code> is not a workday, <code>0</code> otherwise.
- *
- * @deprecated POI 3.16 - will be removed, not used in POI itself
- */
- @Removal(version="3.18")
- protected int isNonWorkday(double aDate, double[] holidays) {
- return isWeekend(aDate) || isHoliday(aDate, holidays) ? 1 : 0;
- }
-
- /**
* @param start start date.
* @param end end date.
* @param aDate a date to be analyzed.
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFBugs.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFBugs.java?rev=1808455&r1=1808454&r2=1808455&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFBugs.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFBugs.java Fri Sep 15 12:29:35 2017
@@ -56,7 +56,7 @@ public class TestXWPFBugs {
EncryptionInfo info = new EncryptionInfo(filesystem);
assertEquals(128, info.getHeader().getKeySize());
assertEquals(CipherAlgorithm.aes128, info.getHeader().getCipherAlgorithm());
- assertEquals(HashAlgorithm.sha1, info.getHeader().getHashAlgorithmEx());
+ assertEquals(HashAlgorithm.sha1, info.getHeader().getHashAlgorithm());
// Check it can be decoded
Decryptor d = Decryptor.getInstance(info);
@@ -92,7 +92,7 @@ public class TestXWPFBugs {
assertEquals(16, info.getHeader().getBlockSize());
assertEquals(256, info.getHeader().getKeySize());
assertEquals(CipherAlgorithm.aes256, info.getHeader().getCipherAlgorithm());
- assertEquals(HashAlgorithm.sha1, info.getHeader().getHashAlgorithmEx());
+ assertEquals(HashAlgorithm.sha1, info.getHeader().getHashAlgorithm());
// Check it can be decoded
Decryptor d = Decryptor.getInstance(info);
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java?rev=1808455&r1=1808454&r2=1808455&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/usermodel/HSLFSlideShowImpl.java Fri Sep 15 12:29:35 2017
@@ -57,7 +57,6 @@ import org.apache.poi.util.LittleEndian;
import org.apache.poi.util.LittleEndianConsts;
import org.apache.poi.util.POILogFactory;
import org.apache.poi.util.POILogger;
-import org.apache.poi.util.Removal;
/**
* This class contains the main functionality for the Powerpoint file
@@ -85,18 +84,6 @@ public final class HSLFSlideShowImpl ext
private HSLFObjectData[] _objects;
/**
- * Returns the directory in the underlying POIFSFileSystem for the
- * document that is open.
- *
- * @deprecated POI 3.16 beta 1. use {@link POIDocument#getDirectory()} instead
- */
- @Deprecated
- @Removal(version="3.18")
- protected DirectoryNode getPOIFSDirectory() {
- return getDirectory();
- }
-
- /**
* Constructs a Powerpoint document from fileName. Parses the document
* and places all the important stuff into data structures.
*
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestWorkdayCalculator.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestWorkdayCalculator.java?rev=1808455&r1=1808454&r2=1808455&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestWorkdayCalculator.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/atp/TestWorkdayCalculator.java Fri Sep 15 12:29:35 2017
@@ -153,15 +153,4 @@ public class TestWorkdayCalculator {
assertEquals("Expected 1 non-weekend-holiday for " + start + " to " + end + " and " + holiday1 + " and " + holiday2,
1, count);
}
-
- @SuppressWarnings("deprecation")
- @Test
- public void testIsNonWorkday() throws Exception {
- final double weekend = DateUtil.getExcelDate(d(2016, 12, 25));
- final double holiday = DateUtil.getExcelDate(d(2016, 12, 26));
- final double workday = DateUtil.getExcelDate(d(2016, 12, 27));
- assertEquals(1, WorkdayCalculator.instance.isNonWorkday(weekend, new double[]{holiday}));
- assertEquals(1, WorkdayCalculator.instance.isNonWorkday(holiday, new double[]{holiday}));
- assertEquals(0, WorkdayCalculator.instance.isNonWorkday(workday, new double[]{holiday}));
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org