From f52e5b1fd5324d855c74df08726895adce3d6f1c Mon Sep 17 00:00:00 2001 From: Nick Burch Date: Tue, 14 Sep 2010 16:39:34 +0000 Subject: [PATCH] Fix up imports to remove un-used ones git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@996980 13f79535-47bb-0310-9956-ffa450edef68 --- .../poi/xwpf/extractor/XWPFWordExtractor.java | 4 +--- .../poi/xwpf/model/XWPFHyperlinkDecorator.java | 4 ++-- .../apache/poi/xwpf/usermodel/XWPFParagraph.java | 3 --- .../org/apache/poi/xwpf/AllXWPFTests.java | 1 - .../apache/poi/xwpf/TestDocumentProtection.java | 3 --- .../xwpf/TestPackageCorePropertiesGetKeywords.java | 14 -------------- .../org/apache/poi/xwpf/TestXWPFDocument.java | 4 ---- .../org/apache/poi/xwpf/XWPFTestDataSamples.java | 9 ++++++--- .../apache/poi/xwpf/usermodel/TestXWPFHeader.java | 1 - .../poi/xwpf/usermodel/TestXWPFPictureData.java | 7 ++----- .../apache/poi/xwpf/usermodel/TestXWPFStyles.java | 4 ++-- .../poi/xwpf/usermodel/TestXWPFTableRow.java | 4 ++-- 12 files changed, 15 insertions(+), 43 deletions(-) diff --git a/src/ooxml/java/org/apache/poi/xwpf/extractor/XWPFWordExtractor.java b/src/ooxml/java/org/apache/poi/xwpf/extractor/XWPFWordExtractor.java index d11511757a..bc0c914f7d 100644 --- a/src/ooxml/java/org/apache/poi/xwpf/extractor/XWPFWordExtractor.java +++ b/src/ooxml/java/org/apache/poi/xwpf/extractor/XWPFWordExtractor.java @@ -20,14 +20,12 @@ import java.io.IOException; import java.util.Iterator; import org.apache.poi.POIXMLDocument; -import org.apache.poi.POIXMLTextExtractor; import org.apache.poi.POIXMLException; +import org.apache.poi.POIXMLTextExtractor; import org.apache.poi.openxml4j.exceptions.OpenXML4JException; import org.apache.poi.openxml4j.opc.OPCPackage; import org.apache.poi.xwpf.model.XWPFCommentsDecorator; import org.apache.poi.xwpf.model.XWPFHeaderFooterPolicy; -import org.apache.poi.xwpf.model.XWPFHyperlinkDecorator; -import org.apache.poi.xwpf.model.XWPFParagraphDecorator; import org.apache.poi.xwpf.usermodel.XWPFDocument; import org.apache.poi.xwpf.usermodel.XWPFHyperlink; import org.apache.poi.xwpf.usermodel.XWPFHyperlinkRun; diff --git a/src/ooxml/java/org/apache/poi/xwpf/model/XWPFHyperlinkDecorator.java b/src/ooxml/java/org/apache/poi/xwpf/model/XWPFHyperlinkDecorator.java index fb7d6ba930..628ff37c94 100644 --- a/src/ooxml/java/org/apache/poi/xwpf/model/XWPFHyperlinkDecorator.java +++ b/src/ooxml/java/org/apache/poi/xwpf/model/XWPFHyperlinkDecorator.java @@ -16,11 +16,11 @@ ==================================================================== */ package org.apache.poi.xwpf.model; +import org.apache.poi.xwpf.usermodel.XWPFHyperlinkRun; +import org.apache.poi.xwpf.usermodel.XWPFParagraph; import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTHyperlink; import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTR; import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTText; -import org.apache.poi.xwpf.usermodel.XWPFHyperlinkRun; -import org.apache.poi.xwpf.usermodel.XWPFParagraph; /** * Decorator class for XWPFParagraph allowing to add hyperlinks diff --git a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java index dccdc44073..4c762e52c4 100644 --- a/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java +++ b/src/ooxml/java/org/apache/poi/xwpf/usermodel/XWPFParagraph.java @@ -33,7 +33,6 @@ import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTOnOff; import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTP; import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTPBdr; import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTPPr; -import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTPicture; import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTProofErr; import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTR; import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTRPr; @@ -50,8 +49,6 @@ import org.openxmlformats.schemas.wordprocessingml.x2006.main.STJc; import org.openxmlformats.schemas.wordprocessingml.x2006.main.STLineSpacingRule; import org.openxmlformats.schemas.wordprocessingml.x2006.main.STOnOff; import org.openxmlformats.schemas.wordprocessingml.x2006.main.STTextAlignment; -import org.w3c.dom.NodeList; -import org.w3c.dom.Text; /** diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/AllXWPFTests.java b/src/ooxml/testcases/org/apache/poi/xwpf/AllXWPFTests.java index f8c4e116b0..b0d9513be6 100644 --- a/src/ooxml/testcases/org/apache/poi/xwpf/AllXWPFTests.java +++ b/src/ooxml/testcases/org/apache/poi/xwpf/AllXWPFTests.java @@ -30,7 +30,6 @@ import org.apache.poi.xwpf.usermodel.TestXWPFPictureData; import org.apache.poi.xwpf.usermodel.TestXWPFRun; import org.apache.poi.xwpf.usermodel.TestXWPFStyles; import org.apache.poi.xwpf.usermodel.TestXWPFTable; -import org.apache.poi.xwpf.usermodel.TestXWPFTableRow; /** * Collects all tests for org.apache.poi.xwpf and sub-packages. diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/TestDocumentProtection.java b/src/ooxml/testcases/org/apache/poi/xwpf/TestDocumentProtection.java index 4a06622912..3e3d93f339 100644 --- a/src/ooxml/testcases/org/apache/poi/xwpf/TestDocumentProtection.java +++ b/src/ooxml/testcases/org/apache/poi/xwpf/TestDocumentProtection.java @@ -16,12 +16,9 @@ ==================================================================== */ package org.apache.poi.xwpf; -import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.FileOutputStream; -import java.io.IOException; import junit.framework.TestCase; diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/TestPackageCorePropertiesGetKeywords.java b/src/ooxml/testcases/org/apache/poi/xwpf/TestPackageCorePropertiesGetKeywords.java index f741b0b102..5c150bdf1d 100644 --- a/src/ooxml/testcases/org/apache/poi/xwpf/TestPackageCorePropertiesGetKeywords.java +++ b/src/ooxml/testcases/org/apache/poi/xwpf/TestPackageCorePropertiesGetKeywords.java @@ -17,24 +17,10 @@ package org.apache.poi.xwpf; -import java.io.File; -import java.io.IOException; -import java.text.ParsePosition; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.TimeZone; - import junit.framework.TestCase; import org.apache.poi.POIXMLProperties.CoreProperties; -import org.apache.poi.openxml4j.OpenXML4JTestDataSamples; -import org.apache.poi.openxml4j.exceptions.InvalidFormatException; -import org.apache.poi.openxml4j.exceptions.OpenXML4JException; -import org.apache.poi.openxml4j.opc.OPCPackage; import org.apache.poi.openxml4j.opc.PackageProperties; -import org.apache.poi.openxml4j.util.Nullable; -import org.apache.poi.util.POILogger; -import org.apache.poi.util.POILogFactory; import org.apache.poi.xwpf.usermodel.XWPFDocument; /** diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFDocument.java b/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFDocument.java index 88d0823741..27aa41d9cd 100644 --- a/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFDocument.java +++ b/src/ooxml/testcases/org/apache/poi/xwpf/TestXWPFDocument.java @@ -20,15 +20,11 @@ package org.apache.poi.xwpf; import junit.framework.TestCase; import org.apache.poi.POIXMLProperties; -import org.apache.poi.hssf.record.formula.AddPtg; import org.apache.poi.openxml4j.exceptions.InvalidFormatException; import org.apache.poi.openxml4j.opc.OPCPackage; import org.apache.poi.openxml4j.opc.PackagePart; import org.apache.poi.xwpf.usermodel.XWPFDocument; -import org.apache.poi.xwpf.usermodel.XWPFParagraph; import org.apache.poi.xwpf.usermodel.XWPFRelation; -import org.apache.xmlbeans.XmlCursor; -import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTP; public final class TestXWPFDocument extends TestCase { diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/XWPFTestDataSamples.java b/src/ooxml/testcases/org/apache/poi/xwpf/XWPFTestDataSamples.java index ac382ab82c..d88c029cdb 100644 --- a/src/ooxml/testcases/org/apache/poi/xwpf/XWPFTestDataSamples.java +++ b/src/ooxml/testcases/org/apache/poi/xwpf/XWPFTestDataSamples.java @@ -16,10 +16,13 @@ ==================================================================== */ package org.apache.poi.xwpf; -import org.apache.poi.xwpf.usermodel.XWPFDocument; -import org.apache.poi.POIDataSamples; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; -import java.io.*; +import org.apache.poi.POIDataSamples; +import org.apache.poi.xwpf.usermodel.XWPFDocument; /** * @author Yegor Kozlov diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFHeader.java b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFHeader.java index 4747910c7a..8526a2005b 100644 --- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFHeader.java +++ b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFHeader.java @@ -18,7 +18,6 @@ package org.apache.poi.xwpf.usermodel; import java.io.IOException; -import java.util.Arrays; import junit.framework.TestCase; diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFPictureData.java b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFPictureData.java index 87be3b2c8d..49452989f3 100644 --- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFPictureData.java +++ b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFPictureData.java @@ -20,15 +20,12 @@ package org.apache.poi.xwpf.usermodel; import java.util.Arrays; import java.util.List; -import org.apache.poi.hslf.usermodel.PictureData; -import org.apache.poi.hssf.record.formula.AddPtg; +import junit.framework.TestCase; + import org.apache.poi.openxml4j.exceptions.InvalidFormatException; import org.apache.poi.openxml4j.opc.PackageRelationship; import org.apache.poi.xwpf.XWPFTestDataSamples; - -import junit.framework.TestCase; - public class TestXWPFPictureData extends TestCase { public void testRead(){ XWPFDocument sampleDoc = XWPFTestDataSamples.openSampleDocument("VariousPictures.docx"); diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFStyles.java b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFStyles.java index 6c4a722035..646103f905 100644 --- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFStyles.java +++ b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFStyles.java @@ -20,10 +20,10 @@ package org.apache.poi.xwpf.usermodel; import java.util.ArrayList; import java.util.List; -import org.apache.poi.xwpf.XWPFTestDataSamples; - import junit.framework.TestCase; +import org.apache.poi.xwpf.XWPFTestDataSamples; + public class TestXWPFStyles extends TestCase { // protected void setUp() throws Exception { diff --git a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTableRow.java b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTableRow.java index 0844b507ba..c2b751ad2e 100644 --- a/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTableRow.java +++ b/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFTableRow.java @@ -17,10 +17,10 @@ package org.apache.poi.xwpf.usermodel; -import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTRow; - import junit.framework.TestCase; +import org.openxmlformats.schemas.wordprocessingml.x2006.main.CTRow; + public class TestXWPFTableRow extends TestCase { -- 2.39.5