From d36d917467e2407497bfafd93cefa79282be4e50 Mon Sep 17 00:00:00 2001 From: Nick Burch Date: Thu, 24 Apr 2014 15:07:20 +0000 Subject: [PATCH] Fix some Eclipse identified warnings git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1589765 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/poi/extractor/ExtractorFactory.java | 1 - .../extractor/XSLFPowerPointExtractor.java | 1 + .../java/org/apache/poi/xssf/dev/XSSFDump.java | 18 +++++++++++------- .../ReadOnlySharedStringsTable.java | 1 - 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.java b/src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.java index 685d92c84..6c28beb82 100644 --- a/src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.java +++ b/src/ooxml/java/org/apache/poi/extractor/ExtractorFactory.java @@ -200,7 +200,6 @@ public class ExtractorFactory { * @deprecated Use {@link #createExtractor(DirectoryNode)} instead */ @Deprecated - @SuppressWarnings("unused") public static POITextExtractor createExtractor(DirectoryNode poifsDir, POIFSFileSystem fs) throws IOException, InvalidFormatException, OpenXML4JException, XmlException { diff --git a/src/ooxml/java/org/apache/poi/xslf/extractor/XSLFPowerPointExtractor.java b/src/ooxml/java/org/apache/poi/xslf/extractor/XSLFPowerPointExtractor.java index 0f9a26fe2..4c3693d3e 100644 --- a/src/ooxml/java/org/apache/poi/xslf/extractor/XSLFPowerPointExtractor.java +++ b/src/ooxml/java/org/apache/poi/xslf/extractor/XSLFPowerPointExtractor.java @@ -71,6 +71,7 @@ public class XSLFPowerPointExtractor extends POIXMLTextExtractor { new XSLFPowerPointExtractor( new XSLFSlideShow(args[0])); System.out.println(extractor.getText()); + extractor.close(); } /** diff --git a/src/ooxml/java/org/apache/poi/xssf/dev/XSSFDump.java b/src/ooxml/java/org/apache/poi/xssf/dev/XSSFDump.java index d1e8ef49b..7e449dad3 100644 --- a/src/ooxml/java/org/apache/poi/xssf/dev/XSSFDump.java +++ b/src/ooxml/java/org/apache/poi/xssf/dev/XSSFDump.java @@ -17,14 +17,18 @@ package org.apache.poi.xssf.dev; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.Enumeration; +import java.util.zip.ZipEntry; +import java.util.zip.ZipFile; + import org.apache.xmlbeans.XmlObject; import org.apache.xmlbeans.XmlOptions; -import java.io.*; -import java.util.zip.ZipFile; -import java.util.zip.ZipEntry; -import java.util.Enumeration; - /** * Utility class which dumps the contents of a *.xlsx file into file system. * @@ -46,9 +50,9 @@ public final class XSSFDump { File root = new File(zipname.substring(0, sep)); root.mkdir(); - Enumeration en = zip.entries(); + Enumeration en = zip.entries(); while(en.hasMoreElements()){ - ZipEntry entry = (ZipEntry)en.nextElement(); + ZipEntry entry = en.nextElement(); String name = entry.getName(); int idx = name.lastIndexOf('/'); if(idx != -1){ diff --git a/src/ooxml/java/org/apache/poi/xssf/eventusermodel/ReadOnlySharedStringsTable.java b/src/ooxml/java/org/apache/poi/xssf/eventusermodel/ReadOnlySharedStringsTable.java index 8a4b139ff..a8973dd32 100644 --- a/src/ooxml/java/org/apache/poi/xssf/eventusermodel/ReadOnlySharedStringsTable.java +++ b/src/ooxml/java/org/apache/poi/xssf/eventusermodel/ReadOnlySharedStringsTable.java @@ -29,7 +29,6 @@ import org.apache.poi.openxml4j.opc.OPCPackage; import org.apache.poi.openxml4j.opc.PackagePart; import org.apache.poi.openxml4j.opc.PackageRelationship; import org.apache.poi.xssf.usermodel.XSSFRelation; -import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTRst; import org.xml.sax.Attributes; import org.xml.sax.InputSource; import org.xml.sax.SAXException;