Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestHxxFEncryption.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestHxxFEncryption.java?rev=1832360&r1=1832359&r2=1832360&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestHxxFEncryption.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestHxxFEncryption.java Sun May 27 22:13:31 2018 @@ -34,16 +34,14 @@ import java.util.Collection; import org.apache.poi.POIDataSamples; import org.apache.poi.POIDocument; -import org.apache.poi.POIOLE2TextExtractor; -import org.apache.poi.POITextExtractor; -import org.apache.poi.extractor.ExtractorFactory; +import org.apache.poi.extractor.POITextExtractor; +import org.apache.poi.ooxml.extractor.ExtractorFactory; import org.apache.poi.hslf.usermodel.HSLFSlideShowImpl; import org.apache.poi.hssf.record.crypto.Biff8EncryptionKey; import org.apache.poi.openxml4j.exceptions.OpenXML4JException; import org.apache.poi.poifs.crypt.cryptoapi.CryptoAPIEncryptionHeader; import org.apache.poi.poifs.storage.RawDataUtil; import org.apache.xmlbeans.XmlException; -import org.junit.AfterClass; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized;
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestSignatureInfo.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestSignatureInfo.java?rev=1832360&r1=1832359&r2=1832360&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestSignatureInfo.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestSignatureInfo.java Sun May 27 22:13:31 2018 @@ -77,7 +77,7 @@ import org.apache.poi.poifs.crypt.dsig.s import org.apache.poi.poifs.crypt.dsig.services.TimeStampServiceValidator; import org.apache.poi.poifs.storage.RawDataUtil; import org.apache.poi.ss.usermodel.WorkbookFactory; -import org.apache.poi.util.DocumentHelper; +import org.apache.poi.ooxml.util.DocumentHelper; import org.apache.poi.util.IOUtils; import org.apache.poi.util.LocaleUtil; import org.apache.poi.util.POILogFactory; Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/util/TestIdentifierManager.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/util/TestIdentifierManager.java?rev=1832360&r1=1832359&r2=1832360&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/util/TestIdentifierManager.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/util/TestIdentifierManager.java Sun May 27 22:13:31 2018 @@ -17,6 +17,7 @@ package org.apache.poi.util; import junit.framework.TestCase; +import org.apache.poi.ooxml.util.IdentifierManager; public class TestIdentifierManager extends TestCase { Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChart.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChart.java?rev=1832360&r1=1832359&r2=1832360&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChart.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xddf/usermodel/chart/TestXDDFChart.java Sun May 27 22:13:31 2018 @@ -18,8 +18,8 @@ */ package org.apache.poi.xddf.usermodel.chart; -import org.apache.poi.POIXMLFactory; -import org.apache.poi.POIXMLRelation; +import org.apache.poi.ooxml.POIXMLFactory; +import org.apache.poi.ooxml.POIXMLRelation; import org.junit.Test; import static org.junit.Assert.assertNotNull; Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xdgf/extractor/TestXDGFVisioExtractor.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xdgf/extractor/TestXDGFVisioExtractor.java?rev=1832360&r1=1832359&r2=1832360&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xdgf/extractor/TestXDGFVisioExtractor.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xdgf/extractor/TestXDGFVisioExtractor.java Sun May 27 22:13:31 2018 @@ -79,7 +79,7 @@ public class TestXDGFVisioExtractor { /** * Some confusion on PolylineTo vs PolyLineTo, both should be handled. * Previously failed with: - * org.apache.poi.POIXMLException: Invalid 'Row_Type' name 'PolylineTo' + * org.apache.poi.ooxml.POIXMLException: Invalid 'Row_Type' name 'PolylineTo' * at org.apache.poi.xdgf.util.ObjectFactory.load * at org.apache.poi.xdgf.usermodel.section.geometry.GeometryRowFactory.load */ Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFBugs.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFBugs.java?rev=1832360&r1=1832359&r2=1832360&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFBugs.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFBugs.java Sun May 27 22:13:31 2018 @@ -46,8 +46,8 @@ import java.util.stream.Collectors; import javax.imageio.ImageIO; import org.apache.poi.POIDataSamples; -import org.apache.poi.POIXMLDocumentPart; -import org.apache.poi.POIXMLDocumentPart.RelationPart; +import org.apache.poi.ooxml.POIXMLDocumentPart; +import org.apache.poi.ooxml.POIXMLDocumentPart.RelationPart; import org.apache.poi.openxml4j.exceptions.InvalidFormatException; import org.apache.poi.openxml4j.opc.OPCPackage; import org.apache.poi.openxml4j.opc.PackagePartName; Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFSlideShow.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFSlideShow.java?rev=1832360&r1=1832359&r2=1832360&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFSlideShow.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFSlideShow.java Sun May 27 22:13:31 2018 @@ -27,7 +27,7 @@ import java.awt.geom.Rectangle2D; import java.io.IOException; import org.apache.poi.POIDataSamples; -import org.apache.poi.POIXMLProperties.CoreProperties; +import org.apache.poi.ooxml.POIXMLProperties.CoreProperties; import org.apache.poi.openxml4j.exceptions.OpenXML4JException; import org.apache.poi.openxml4j.opc.OPCPackage; import org.apache.poi.openxml4j.opc.PackagePart; Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/extractor/TestXSLFPowerPointExtractor.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/extractor/TestXSLFPowerPointExtractor.java?rev=1832360&r1=1832359&r2=1832360&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/extractor/TestXSLFPowerPointExtractor.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/extractor/TestXSLFPowerPointExtractor.java Sun May 27 22:13:31 2018 @@ -29,12 +29,11 @@ import java.io.IOException; import java.io.InputStream; import org.apache.poi.POIDataSamples; -import org.apache.poi.extractor.ExtractorFactory; +import org.apache.poi.ooxml.extractor.ExtractorFactory; import org.apache.poi.openxml4j.exceptions.OpenXML4JException; import org.apache.poi.sl.extractor.SlideShowExtractor; import org.apache.poi.xslf.usermodel.XMLSlideShow; import org.apache.xmlbeans.XmlException; -import org.junit.Ignore; import org.junit.Test; /** Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFChart.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFChart.java?rev=1832360&r1=1832359&r2=1832360&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFChart.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFChart.java Sun May 27 22:13:31 2018 @@ -26,7 +26,7 @@ import static org.junit.Assert.assertTru import java.io.IOException; import java.util.List; -import org.apache.poi.POIXMLDocumentPart; +import org.apache.poi.ooxml.POIXMLDocumentPart; import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.xddf.usermodel.chart.AxisCrossBetween; import org.apache.poi.xddf.usermodel.chart.AxisCrosses; Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlideShow.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlideShow.java?rev=1832360&r1=1832359&r2=1832360&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlideShow.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlideShow.java Sun May 27 22:13:31 2018 @@ -24,7 +24,7 @@ import java.awt.Dimension; import java.io.IOException; import java.util.List; -import org.apache.poi.POIXMLDocumentPart; +import org.apache.poi.ooxml.POIXMLDocumentPart; import org.apache.poi.xslf.XSLFTestDataSamples; import org.junit.Test; Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestXSSFReader.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestXSSFReader.java?rev=1832360&r1=1832359&r2=1832360&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestXSSFReader.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/eventusermodel/TestXSSFReader.java Sun May 27 22:13:31 2018 @@ -28,7 +28,7 @@ import java.util.Set; import java.util.HashSet; import org.apache.poi.POIDataSamples; -import org.apache.poi.POIXMLException; +import org.apache.poi.ooxml.POIXMLException; import org.apache.poi.openxml4j.opc.OPCPackage; import org.apache.poi.ss.usermodel.Name; import org.apache.poi.ss.usermodel.Workbook; Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractor.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractor.java?rev=1832360&r1=1832359&r2=1832360&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractor.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractor.java Sun May 27 22:13:31 2018 @@ -28,8 +28,8 @@ import static org.junit.Assert.assertTru import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.poi.POITextExtractor; -import org.apache.poi.POIXMLTextExtractor; +import org.apache.poi.extractor.POITextExtractor; +import org.apache.poi.ooxml.extractor.POIXMLTextExtractor; import org.apache.poi.hssf.HSSFTestDataSamples; import org.apache.poi.hssf.extractor.ExcelExtractor; import org.apache.poi.xssf.XSSFTestDataSamples; Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractorUsingFactory.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractorUsingFactory.java?rev=1832360&r1=1832359&r2=1832360&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractorUsingFactory.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractorUsingFactory.java Sun May 27 22:13:31 2018 @@ -16,7 +16,7 @@ ==================================================================== */ package org.apache.poi.xssf.extractor; -import org.apache.poi.extractor.ExtractorFactory; +import org.apache.poi.ooxml.extractor.ExtractorFactory; import org.apache.poi.hssf.HSSFTestDataSamples; import org.junit.After; Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExcelExtractor.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExcelExtractor.java?rev=1832360&r1=1832359&r2=1832360&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExcelExtractor.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExcelExtractor.java Sun May 27 22:13:31 2018 @@ -30,7 +30,7 @@ import java.util.Map.Entry; import java.util.HashMap; import junit.framework.TestCase; -import org.apache.poi.POITextExtractor; +import org.apache.poi.extractor.POITextExtractor; import org.apache.poi.hssf.HSSFTestDataSamples; import org.apache.poi.hssf.extractor.ExcelExtractor; import org.apache.poi.xssf.XSSFTestDataSamples; Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExcelExtractorUsingFactory.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExcelExtractorUsingFactory.java?rev=1832360&r1=1832359&r2=1832360&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExcelExtractorUsingFactory.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExcelExtractorUsingFactory.java Sun May 27 22:13:31 2018 @@ -17,7 +17,7 @@ package org.apache.poi.xssf.extractor; -import org.apache.poi.extractor.ExtractorFactory; +import org.apache.poi.ooxml.extractor.ExtractorFactory; import org.apache.poi.hssf.HSSFTestDataSamples; /** Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java?rev=1832360&r1=1832359&r2=1832360&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/extractor/TestXSSFExportToXML.java Sun May 27 22:13:31 2018 @@ -34,12 +34,12 @@ import javax.xml.parsers.DocumentBuilder import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; -import org.apache.poi.POIXMLDocumentPart; +import org.apache.poi.ooxml.POIXMLDocumentPart; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.CellType; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Sheet; -import org.apache.poi.util.DocumentHelper; +import org.apache.poi.ooxml.util.DocumentHelper; import org.apache.poi.util.XMLHelper; import org.apache.poi.xssf.XSSFTestDataSamples; import org.apache.poi.xssf.model.MapInfo; Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestMapInfo.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestMapInfo.java?rev=1832360&r1=1832359&r2=1832360&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestMapInfo.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/model/TestMapInfo.java Sun May 27 22:13:31 2018 @@ -18,7 +18,7 @@ package org.apache.poi.xssf.model; import junit.framework.TestCase; -import org.apache.poi.POIXMLDocumentPart; +import org.apache.poi.ooxml.POIXMLDocumentPart; import org.apache.poi.xssf.XSSFTestDataSamples; import org.apache.poi.xssf.usermodel.XSSFMap; import org.apache.poi.xssf.usermodel.XSSFSheet; Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDrawing.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDrawing.java?rev=1832360&r1=1832359&r2=1832360&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDrawing.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFDrawing.java Sun May 27 22:13:31 2018 @@ -16,8 +16,8 @@ ==================================================================== */ package org.apache.poi.xssf.usermodel; -import org.apache.poi.POIXMLDocumentPart; -import org.apache.poi.POIXMLDocumentPart.RelationPart; +import org.apache.poi.ooxml.POIXMLDocumentPart; +import org.apache.poi.ooxml.POIXMLDocumentPart.RelationPart; import org.apache.poi.hssf.HSSFTestDataSamples; import org.apache.poi.openxml4j.opc.OPCPackage; import org.apache.poi.ss.usermodel.ClientAnchor; Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFont.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFont.java?rev=1832360&r1=1832359&r2=1832360&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFont.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFont.java Sun May 27 22:13:31 2018 @@ -19,7 +19,7 @@ package org.apache.poi.xssf.usermodel; import java.io.IOException; -import org.apache.poi.POIXMLException; +import org.apache.poi.ooxml.POIXMLException; import org.apache.poi.ss.usermodel.BaseTestFont; import org.apache.poi.ss.usermodel.Font; import org.apache.poi.ss.usermodel.FontCharset; Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java?rev=1832360&r1=1832359&r2=1832360&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java Sun May 27 22:13:31 2018 @@ -36,7 +36,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.poi.POIXMLException; +import org.apache.poi.ooxml.POIXMLException; import org.apache.poi.hssf.HSSFTestDataSamples; import org.apache.poi.poifs.crypt.CryptoFunctions; import org.apache.poi.poifs.crypt.HashAlgorithm; Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java?rev=1832360&r1=1832359&r2=1832360&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java Sun May 27 22:13:31 2018 @@ -39,7 +39,7 @@ import java.util.List; import java.util.zip.CRC32; import org.apache.poi.POIDataSamples; -import org.apache.poi.POIXMLProperties; +import org.apache.poi.ooxml.POIXMLProperties; import org.apache.poi.hssf.HSSFTestDataSamples; import org.apache.poi.openxml4j.exceptions.InvalidFormatException; import org.apache.poi.openxml4j.opc.ContentTypes; Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestAllExtendedProperties.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestAllExtendedProperties.java?rev=1832360&r1=1832359&r2=1832360&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestAllExtendedProperties.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestAllExtendedProperties.java Sun May 27 22:13:31 2018 @@ -20,7 +20,7 @@ package org.apache.poi.xwpf; import java.io.IOException; import junit.framework.TestCase; -import org.apache.poi.POIXMLProperties.CoreProperties; +import org.apache.poi.ooxml.POIXMLProperties.CoreProperties; import org.apache.poi.openxml4j.opc.PackageProperties; import org.apache.poi.xwpf.usermodel.XWPFDocument; import org.openxmlformats.schemas.officeDocument.x2006.extendedProperties.CTDigSigBlob; Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestPackageCorePropertiesGetKeywords.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestPackageCorePropertiesGetKeywords.java?rev=1832360&r1=1832359&r2=1832360&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestPackageCorePropertiesGetKeywords.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/TestPackageCorePropertiesGetKeywords.java Sun May 27 22:13:31 2018 @@ -20,7 +20,7 @@ package org.apache.poi.xwpf; import java.io.IOException; import junit.framework.TestCase; -import org.apache.poi.POIXMLProperties.CoreProperties; +import org.apache.poi.ooxml.POIXMLProperties.CoreProperties; import org.apache.poi.openxml4j.opc.PackageProperties; import org.apache.poi.xwpf.usermodel.XWPFDocument; Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFDocument.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFDocument.java?rev=1832360&r1=1832359&r2=1832360&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFDocument.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xwpf/usermodel/TestXWPFDocument.java Sun May 27 22:13:31 2018 @@ -30,8 +30,8 @@ import java.util.Arrays; import java.util.List; import org.apache.poi.POIDataSamples; -import org.apache.poi.POIXMLDocumentPart; -import org.apache.poi.POIXMLProperties; +import org.apache.poi.ooxml.POIXMLDocumentPart; +import org.apache.poi.ooxml.POIXMLProperties; import org.apache.poi.openxml4j.exceptions.InvalidFormatException; import org.apache.poi.openxml4j.opc.OPCPackage; import org.apache.poi.openxml4j.opc.PackageAccess; Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/extractor/VisioTextExtractor.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/extractor/VisioTextExtractor.java?rev=1832360&r1=1832359&r2=1832360&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/extractor/VisioTextExtractor.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hdgf/extractor/VisioTextExtractor.java Sun May 27 22:13:31 2018 @@ -23,7 +23,7 @@ import java.io.InputStream; import java.util.ArrayList; import java.util.List; -import org.apache.poi.POIOLE2TextExtractor; +import org.apache.poi.extractor.POIOLE2TextExtractor; import org.apache.poi.hdgf.HDGFDiagram; import org.apache.poi.hdgf.chunks.Chunk; import org.apache.poi.hdgf.chunks.Chunk.Command; Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hpbf/extractor/PublisherTextExtractor.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hpbf/extractor/PublisherTextExtractor.java?rev=1832360&r1=1832359&r2=1832360&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hpbf/extractor/PublisherTextExtractor.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hpbf/extractor/PublisherTextExtractor.java Sun May 27 22:13:31 2018 @@ -21,7 +21,7 @@ import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; -import org.apache.poi.POIOLE2TextExtractor; +import org.apache.poi.extractor.POIOLE2TextExtractor; import org.apache.poi.hpbf.HPBFDocument; import org.apache.poi.hpbf.model.qcbits.QCBit; import org.apache.poi.hpbf.model.qcbits.QCTextBit; Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java?rev=1832360&r1=1832359&r2=1832360&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hslf/extractor/PowerPointExtractor.java Sun May 27 22:13:31 2018 @@ -22,7 +22,7 @@ import java.io.IOException; import java.io.InputStream; import java.util.List; -import org.apache.poi.POIOLE2TextExtractor; +import org.apache.poi.extractor.POIOLE2TextExtractor; import org.apache.poi.hslf.usermodel.HSLFObjectShape; import org.apache.poi.hslf.usermodel.HSLFShape; import org.apache.poi.hslf.usermodel.HSLFSlideShow; Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/extractor/OutlookTextExtactor.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/extractor/OutlookTextExtactor.java?rev=1832360&r1=1832359&r2=1832360&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/extractor/OutlookTextExtactor.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hsmf/extractor/OutlookTextExtactor.java Sun May 27 22:13:31 2018 @@ -24,14 +24,13 @@ import java.io.InputStream; import java.text.SimpleDateFormat; import java.util.Locale; -import org.apache.poi.POIOLE2TextExtractor; +import org.apache.poi.extractor.POIOLE2TextExtractor; import org.apache.poi.hsmf.MAPIMessage; import org.apache.poi.hsmf.datatypes.AttachmentChunks; import org.apache.poi.hsmf.datatypes.StringChunk; import org.apache.poi.hsmf.exceptions.ChunkNotFoundException; import org.apache.poi.poifs.filesystem.DirectoryNode; import org.apache.poi.poifs.filesystem.NPOIFSFileSystem; -import org.apache.poi.poifs.filesystem.POIFSFileSystem; import org.apache.poi.util.LocaleUtil; import org.apache.poi.util.StringUtil.StringsIterator; Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToFoConverter.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToFoConverter.java?rev=1832360&r1=1832359&r2=1832360&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToFoConverter.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hssf/converter/ExcelToFoConverter.java Sun May 27 22:13:31 2018 @@ -110,7 +110,7 @@ public class ExcelToFoConverter extends */ public static Document process( File xlsFile ) throws Exception { - final HSSFWorkbook workbook = ExcelToFoUtils.loadXls( xlsFile ); + final HSSFWorkbook workbook = AbstractExcelUtils.loadXls( xlsFile ); try { ExcelToFoConverter excelToHtmlConverter = new ExcelToFoConverter( XMLHelper.getDocumentBuilderFactory().newDocumentBuilder() @@ -336,8 +336,8 @@ public class ExcelToFoConverter extends { blockTarget.setAttribute( "white-space-collapse", "false" ); { - String textAlign = ExcelToFoUtils.getAlign( cellStyle.getAlignment() ); - if ( ExcelToFoUtils.isNotEmpty( textAlign ) ) + String textAlign = AbstractExcelUtils.getAlign( cellStyle.getAlignment() ); + if ( AbstractExcelUtils.isNotEmpty( textAlign ) ) blockTarget.setAttribute( "text-align", textAlign ); } @@ -351,7 +351,7 @@ public class ExcelToFoConverter extends .getFillForegroundColorColor(); if ( foregroundColor != null ) cellTarget.setAttribute( "background-color", - ExcelToFoUtils.getColor( foregroundColor ) ); + AbstractExcelUtils.getColor( foregroundColor ) ); } else { @@ -501,16 +501,16 @@ public class ExcelToFoConverter extends protected void processDocumentInformation( SummaryInformation summaryInformation ) { - if ( ExcelToFoUtils.isNotEmpty( summaryInformation.getTitle() ) ) + if ( AbstractExcelUtils.isNotEmpty( summaryInformation.getTitle() ) ) foDocumentFacade.setTitle( summaryInformation.getTitle() ); - if ( ExcelToFoUtils.isNotEmpty( summaryInformation.getAuthor() ) ) + if ( AbstractExcelUtils.isNotEmpty( summaryInformation.getAuthor() ) ) foDocumentFacade.setCreator( summaryInformation.getAuthor() ); - if ( ExcelToFoUtils.isNotEmpty( summaryInformation.getKeywords() ) ) + if ( AbstractExcelUtils.isNotEmpty( summaryInformation.getKeywords() ) ) foDocumentFacade.setKeywords( summaryInformation.getKeywords() ); - if ( ExcelToFoUtils.isNotEmpty( summaryInformation.getComments() ) ) + if ( AbstractExcelUtils.isNotEmpty( summaryInformation.getComments() ) ) foDocumentFacade.setDescription( summaryInformation.getComments() ); } @@ -793,7 +793,7 @@ public class ExcelToFoConverter extends if ( triplet.italic ) textBlock.setAttribute( "font-style", "italic" ); - if ( ExcelToFoUtils.isNotEmpty( triplet.fontName ) ) + if ( AbstractExcelUtils.isNotEmpty( triplet.fontName ) ) textBlock.setAttribute( "font-family", triplet.fontName ); } Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java?rev=1832360&r1=1832359&r2=1832360&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/AbstractWordConverter.java Sun May 27 22:13:31 2018 @@ -188,7 +188,7 @@ public abstract class AbstractWordConver // by default no such actions needed } - protected Triplet getCharacterRunTriplet( CharacterRun characterRun ) + protected Triplet getCharacterRunTriplet(CharacterRun characterRun ) { Triplet original = new Triplet(); original.bold = characterRun.isBold(); Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToFoConverter.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToFoConverter.java?rev=1832360&r1=1832359&r2=1832360&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToFoConverter.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToFoConverter.java Sun May 27 22:13:31 2018 @@ -373,7 +373,7 @@ public class WordToFoConverter extends A boolean inlined, Picture picture ) { // no default implementation -- skip - currentBlock.appendChild( foDocumentFacade.document + currentBlock.appendChild( foDocumentFacade.getDocument() .createComment( "Image link to '" + picture.suggestFullFileName() + "' can be here" ) ); } Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlConverter.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlConverter.java?rev=1832360&r1=1832359&r2=1832360&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlConverter.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/converter/WordToHtmlConverter.java Sun May 27 22:13:31 2018 @@ -191,7 +191,7 @@ public class WordToHtmlConverter extends protected void outputCharacters( Element pElement, CharacterRun characterRun, String text ) { - Element span = htmlDocumentFacade.document.createElement( "span" ); + Element span = htmlDocumentFacade.getDocument().createElement( "span" ); pElement.appendChild( span ); StringBuilder style = new StringBuilder(); @@ -416,7 +416,7 @@ public class WordToHtmlConverter extends boolean inlined, Picture picture ) { // no default implementation -- skip - currentBlock.appendChild( htmlDocumentFacade.document + currentBlock.appendChild( htmlDocumentFacade.getDocument() .createComment( "Image link to '" + picture.suggestFullFileName() + "' can be here" ) ); } @@ -598,7 +598,7 @@ public class WordToHtmlConverter extends { Element div = htmlDocumentFacade.createBlock(); htmlDocumentFacade.addStyleClass( div, "d", getSectionStyle( section ) ); - htmlDocumentFacade.body.appendChild( div ); + htmlDocumentFacade.getBody().appendChild( div ); processParagraphes( wordDocument, div, section, Integer.MIN_VALUE ); } @@ -607,10 +607,10 @@ public class WordToHtmlConverter extends protected void processSingleSection( HWPFDocumentCore wordDocument, Section section ) { - htmlDocumentFacade.addStyleClass( htmlDocumentFacade.body, "b", + htmlDocumentFacade.addStyleClass( htmlDocumentFacade.getBody(), "b", getSectionStyle( section ) ); - processParagraphes( wordDocument, htmlDocumentFacade.body, section, + processParagraphes( wordDocument, htmlDocumentFacade.getBody(), section, Integer.MIN_VALUE ); } Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/extractor/Word6Extractor.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/extractor/Word6Extractor.java?rev=1832360&r1=1832359&r2=1832360&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/extractor/Word6Extractor.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/extractor/Word6Extractor.java Sun May 27 22:13:31 2018 @@ -22,7 +22,7 @@ import java.io.InputStream; import org.apache.poi.hwpf.converter.WordToTextConverter; -import org.apache.poi.POIOLE2TextExtractor; +import org.apache.poi.extractor.POIOLE2TextExtractor; import org.apache.poi.hwpf.HWPFOldDocument; import org.apache.poi.hwpf.usermodel.Range; import org.apache.poi.poifs.filesystem.DirectoryNode; Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/extractor/WordExtractor.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/extractor/WordExtractor.java?rev=1832360&r1=1832359&r2=1832360&view=diff ============================================================================== --- poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/extractor/WordExtractor.java (original) +++ poi/trunk/src/scratchpad/src/org/apache/poi/hwpf/extractor/WordExtractor.java Sun May 27 22:13:31 2018 @@ -21,7 +21,7 @@ import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; -import org.apache.poi.POIOLE2TextExtractor; +import org.apache.poi.extractor.POIOLE2TextExtractor; import org.apache.poi.hwpf.HWPFDocument; import org.apache.poi.hwpf.converter.WordToTextConverter; import org.apache.poi.hwpf.usermodel.HeaderStories; Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractor.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractor.java?rev=1832360&r1=1832359&r2=1832360&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractor.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractor.java Sun May 27 22:13:31 2018 @@ -29,7 +29,7 @@ import java.io.IOException; import java.io.InputStream; import org.apache.poi.POIDataSamples; -import org.apache.poi.POITextExtractor; +import org.apache.poi.extractor.POITextExtractor; import org.apache.poi.hwpf.HWPFDocument; import org.apache.poi.hwpf.HWPFTestDataSamples; import org.apache.poi.hwpf.OldWordFileFormatException; Modified: poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractorBugs.java URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractorBugs.java?rev=1832360&r1=1832359&r2=1832360&view=diff ============================================================================== --- poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractorBugs.java (original) +++ poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractorBugs.java Sun May 27 22:13:31 2018 @@ -18,7 +18,7 @@ package org.apache.poi.hwpf.extractor; import org.apache.poi.POIDataSamples; -import org.apache.poi.POITextExtractor; +import org.apache.poi.extractor.POITextExtractor; import org.apache.poi.extractor.OLE2ExtractorFactory; import org.apache.poi.poifs.filesystem.NPOIFSFileSystem; import org.junit.Test; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
