Ensure the indenting is consistent within the file, and then make some minor updates to the JavaDocs (language, clarity etc)

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1496952 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Nick Burch 2013-06-26 14:57:36 +00:00
parent 1ae9e8eba6
commit 4c4d512d4a

View File

@ -33,62 +33,69 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
/** /**
* Factory for creating the appropriate kind of Workbook * Factory for creating the appropriate kind of Workbook
* (be it HSSFWorkbook or XSSFWorkbook), from the given input * (be it {@link HSSFWorkbook} or {@link XSSFWorkbook}),
* by auto-detecting from the supplied input.
*/ */
public class WorkbookFactory { public class WorkbookFactory {
/** /**
* Creates an HSSFWorkbook from the given POIFSFileSystem * Creates a HSSFWorkbook from the given POIFSFileSystem
*/ */
public static Workbook create(POIFSFileSystem fs) throws IOException { public static Workbook create(POIFSFileSystem fs) throws IOException {
return new HSSFWorkbook(fs); return new HSSFWorkbook(fs);
} }
/**
* Creates an HSSFWorkbook from the given NPOIFSFileSystem /**
*/ * Creates a HSSFWorkbook from the given NPOIFSFileSystem
public static Workbook create(NPOIFSFileSystem fs) throws IOException { */
return new HSSFWorkbook(fs.getRoot(), true); public static Workbook create(NPOIFSFileSystem fs) throws IOException {
} return new HSSFWorkbook(fs.getRoot(), true);
/** }
* Creates an XSSFWorkbook from the given OOXML Package
*/ /**
public static Workbook create(OPCPackage pkg) throws IOException { * Creates a XSSFWorkbook from the given OOXML Package
return new XSSFWorkbook(pkg); */
} public static Workbook create(OPCPackage pkg) throws IOException {
/** return new XSSFWorkbook(pkg);
* Creates the appropriate HSSFWorkbook / XSSFWorkbook from }
* the given InputStream.
* Your input stream MUST either support mark/reset, or /**
* be wrapped as a {@link PushbackInputStream}! * Creates the appropriate HSSFWorkbook / XSSFWorkbook from
*/ * the given InputStream.
public static Workbook create(InputStream inp) throws IOException, InvalidFormatException { * <p>Your input stream MUST either support mark/reset, or
// If clearly doesn't do mark/reset, wrap up * be wrapped as a {@link PushbackInputStream}! Note that
if(! inp.markSupported()) { * using an {@link InputStream} has a higher memory footprint
inp = new PushbackInputStream(inp, 8); * than using a {@link File}.</p>
} */
public static Workbook create(InputStream inp) throws IOException, InvalidFormatException {
if(POIFSFileSystem.hasPOIFSHeader(inp)) { // If clearly doesn't do mark/reset, wrap up
return new HSSFWorkbook(inp); if (! inp.markSupported()) {
} inp = new PushbackInputStream(inp, 8);
if(POIXMLDocument.hasOOXMLHeader(inp)) { }
return new XSSFWorkbook(OPCPackage.open(inp));
} if (POIFSFileSystem.hasPOIFSHeader(inp)) {
throw new IllegalArgumentException("Your InputStream was neither an OLE2 stream, nor an OOXML stream"); return new HSSFWorkbook(inp);
} }
/** if (POIXMLDocument.hasOOXMLHeader(inp)) {
* Creates the appropriate HSSFWorkbook / XSSFWorkbook from return new XSSFWorkbook(OPCPackage.open(inp));
* the given File, which must exist and be readable. }
*/ throw new IllegalArgumentException("Your InputStream was neither an OLE2 stream, nor an OOXML stream");
public static Workbook create(File file) throws IOException, InvalidFormatException { }
if(! file.exists()) {
throw new FileNotFoundException(file.toString()); /**
} * Creates the appropriate HSSFWorkbook / XSSFWorkbook from
* the given File, which must exist and be readable.
try { */
NPOIFSFileSystem fs = new NPOIFSFileSystem(file); public static Workbook create(File file) throws IOException, InvalidFormatException {
return new HSSFWorkbook(fs.getRoot(), true); if (! file.exists()) {
} catch(OfficeXmlFileException e) { throw new FileNotFoundException(file.toString());
OPCPackage pkg = OPCPackage.open(file); }
return new XSSFWorkbook(pkg);
} try {
} NPOIFSFileSystem fs = new NPOIFSFileSystem(file);
return new HSSFWorkbook(fs.getRoot(), true);
} catch(OfficeXmlFileException e) {
OPCPackage pkg = OPCPackage.open(file);
return new XSSFWorkbook(pkg);
}
}
} }