From 66afa6d09b73274996f548debaba3391c714cb7d Mon Sep 17 00:00:00 2001 From: Nick Burch Date: Tue, 24 Feb 2015 18:20:02 +0000 Subject: [PATCH] Update Javadocs to refer to the fact that WorkbookFactory.create will throw a EncryptedDocumentException if the file is password protected git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1662074 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/poi/ss/usermodel/WorkbookFactory.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/ooxml/java/org/apache/poi/ss/usermodel/WorkbookFactory.java b/src/ooxml/java/org/apache/poi/ss/usermodel/WorkbookFactory.java index de847fd19..747d88c26 100644 --- a/src/ooxml/java/org/apache/poi/ss/usermodel/WorkbookFactory.java +++ b/src/ooxml/java/org/apache/poi/ss/usermodel/WorkbookFactory.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.PushbackInputStream; +import org.apache.poi.EncryptedDocumentException; import org.apache.poi.POIXMLDocument; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.openxml4j.exceptions.InvalidFormatException; @@ -73,8 +74,9 @@ public class WorkbookFactory { * than using a {@link File}.

*

Note that in order to properly release resources the * Workbook should be closed after use. + * @throws EncryptedDocumentException If the workbook given is password protected */ - public static Workbook create(InputStream inp) throws IOException, InvalidFormatException { + public static Workbook create(InputStream inp) throws IOException, InvalidFormatException, EncryptedDocumentException { // If clearly doesn't do mark/reset, wrap up if (! inp.markSupported()) { inp = new PushbackInputStream(inp, 8); @@ -94,8 +96,9 @@ public class WorkbookFactory { * the given File, which must exist and be readable. *

Note that in order to properly release resources the * Workbook should be closed after use. + * @throws EncryptedDocumentException If the workbook given is password protected */ - public static Workbook create(File file) throws IOException, InvalidFormatException { + public static Workbook create(File file) throws IOException, InvalidFormatException, EncryptedDocumentException { if (! file.exists()) { throw new FileNotFoundException(file.toString()); }