javadocs fixes (jdk8)

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1751106 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/ooxml/java/org/apache/poi/POIXMLTextExtractor.java b/src/ooxml/java/org/apache/poi/POIXMLTextExtractor.java
index 6001a705143e7b6ddc7684cff0eff8e2ef0d680b..954feb80efaadcfc28feb30d1ad5d7938e61657a 100644 (file)
--- a/src/ooxml/java/org/apache/poi/POIXMLTextExtractor.java
+++ b/src/ooxml/java/org/apache/poi/POIXMLTextExtractor.java
@@ -31,6 +31,8 @@ public abstract class POIXMLTextExtractor extends POITextExtractor {
 
        /**
         * Creates a new text extractor for the given document
+        * 
+        * @param document the document to extract from
         */
        public POIXMLTextExtractor(POIXMLDocument document) {
                _document = document;

diff --git a/src/ooxml/java/org/apache/poi/dev/OOXMLLister.java b/src/ooxml/java/org/apache/poi/dev/OOXMLLister.java
index ae418b3cdf4972246f9f267eb68204534c9d93c3..797aff188d2949cd77062dcb2d1b03a1e79dcfc8 100644 (file)
--- a/src/ooxml/java/org/apache/poi/dev/OOXMLLister.java
+++ b/src/ooxml/java/org/apache/poi/dev/OOXMLLister.java
@@ -22,6 +22,7 @@ import java.io.InputStream;
 import java.io.PrintStream;
 import java.util.ArrayList;
 
+import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.poi.openxml4j.opc.OPCPackage;
 import org.apache.poi.openxml4j.opc.PackageAccess;
 import org.apache.poi.openxml4j.opc.PackagePart;
@@ -47,28 +48,37 @@ public class OOXMLLister {
        
        /**
         * Figures out how big a given PackagePart is.
+        * 
+        * @param part the PackagePart
+        * @return the size of the PackagePart
         */
        public static long getSize(PackagePart part) throws IOException {
                InputStream in = part.getInputStream();
-               byte[] b = new byte[8192];
-               long size = 0;
-               int read = 0;
-               
-               while(read > -1) {
-                       read = in.read(b);
-                       if(read > 0) {
-                               size += read;
-                       }
+               try {
+               byte[] b = new byte[8192];
+               long size = 0;
+               int read = 0;
+               
+               while(read > -1) {
+                       read = in.read(b);
+                       if(read > 0) {
+                               size += read;
+                       }
+               }
+               
+               return size;
+               } finally {
+                   in.close();
                }
-               
-               return size;
        }
        
        /**
         * Displays information on all the different
         *  parts of the OOXML file container.
+        * @throws InvalidFormatException if the package relations are invalid
+        * @throws IOException if the package can't be read 
         */
-       public void displayParts() throws Exception {
+       public void displayParts() throws InvalidFormatException, IOException {
                ArrayList<PackagePart> parts = container.getParts();
                for (PackagePart part : parts) {
                        disp.println(part.getPartName());
@@ -91,7 +101,7 @@ public class OOXMLLister {
         *  relationships between different parts
         *  of the OOXML file container.
         */
-       public void displayRelations() throws Exception {
+       public void displayRelations() {
                PackageRelationshipCollection rels = 
                        container.getRelationships();
                for (PackageRelationship rel : rels) {