Author: fanningpj
Date: Thu Sep 14 22:19:16 2017
New Revision: 1808400
URL: http://svn.apache.org/viewvc?rev=1808400&view=rev
Log:
remove some deprecated code slated for removal in 3.18
Removed:
poi/trunk/src/ooxml/java/org/apache/poi/xssf/util/EvilUnclosedBRFixingInputStream.java
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataFormat.java
poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/MAPIMessage.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestOutlook30FileRead.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestSimpleFileRead.java
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataFormat.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataFormat.java?rev=1808400&r1=1808399&r2=1808400&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataFormat.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFDataFormat.java
Thu Sep 14 22:19:16 2017
@@ -18,7 +18,6 @@ package org.apache.poi.xssf.usermodel;
import org.apache.poi.ss.usermodel.BuiltinFormats;
import org.apache.poi.ss.usermodel.DataFormat;
-import org.apache.poi.util.Removal;
import org.apache.poi.xssf.model.StylesTable;
/**
@@ -71,17 +70,6 @@ public class XSSFDataFormat implements D
if(fmt == null) fmt = BuiltinFormats.getBuiltinFormat(index);
return fmt;
}
- /**
- * get the format string that matches the given format index
- * @param index of a format
- * @return string represented at index of format or <code>null</code> if
there is not a format at that index
- *
- * @deprecated POI 3.16 beta 1 - use {@link #getFormat(short)} instead
- */
- @Removal(version="3.18")
- public String getFormat(int index) {
- return getFormat((short)index);
- }
/**
* Add a number format with a specific ID into the number format style
table.
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/MAPIMessage.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/MAPIMessage.java?rev=1808400&r1=1808399&r2=1808400&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/MAPIMessage.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/MAPIMessage.java Thu Sep
14 22:19:16 2017
@@ -52,7 +52,6 @@ import org.apache.poi.poifs.filesystem.N
import org.apache.poi.util.CodePageUtil;
import org.apache.poi.util.POILogFactory;
import org.apache.poi.util.POILogger;
-import org.apache.poi.util.Removal;
/**
* Reads an Outlook MSG File in and provides hooks into its data structure.
@@ -537,21 +536,6 @@ public class MAPIMessage extends POIRead
}
/**
- * Gets the message class of the parsed Outlook Message.
- * (Yes, you can use this to determine if a message is a calendar
- * item, note, or actual outlook Message)
- * For emails the class will be IPM.Note
- *
- * @throws ChunkNotFoundException
- * @deprecated 3.16 beta 3. Use {@link #getMessageClassEnum()} instead.
- */
- @Deprecated
- @Removal(version="3.18")
- public String getMessageClass() throws ChunkNotFoundException {
- return getStringFromChunk(mainChunks.getMessageClass());
- }
-
- /**
* Gets the message class of the parsed Outlook Message.
* (Yes, you can use this to determine if a message is a calendar
* item, note, or actual outlook Message)
Modified:
poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestOutlook30FileRead.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestOutlook30FileRead.java?rev=1808400&r1=1808399&r2=1808400&view=diff
==============================================================================
---
poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestOutlook30FileRead.java
(original)
+++
poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestOutlook30FileRead.java
Thu Sep 14 22:19:16 2017
@@ -126,8 +126,8 @@ public final class TestOutlook30FileRead
* @throws Exception
*/
public void testReadMessageClass() throws Exception {
- String obtained = mapiMessage.getMessageClass();
- TestCase.assertEquals("IPM.Note", obtained);
+ MAPIMessage.MESSAGE_CLASS obtained = mapiMessage.getMessageClassEnum();
+ TestCase.assertEquals(MAPIMessage.MESSAGE_CLASS.NOTE, obtained);
}
/**
Modified:
poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestSimpleFileRead.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestSimpleFileRead.java?rev=1808400&r1=1808399&r2=1808400&view=diff
==============================================================================
---
poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestSimpleFileRead.java
(original)
+++
poi/trunk/src/scratchpad/testcases/org/apache/poi/hsmf/TestSimpleFileRead.java
Thu Sep 14 22:19:16 2017
@@ -130,8 +130,8 @@ public final class TestSimpleFileRead ex
* @throws Exception
*/
public void testReadMessageClass() throws Exception {
- String obtained = mapiMessage.getMessageClass();
- TestCase.assertEquals("IPM.Note", obtained);
+ MAPIMessage.MESSAGE_CLASS obtained = mapiMessage.getMessageClassEnum();
+ TestCase.assertEquals(MAPIMessage.MESSAGE_CLASS.NOTE, obtained);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org
For additional commands, e-mail: commits-h...@poi.apache.org
