From 5df80fe7ac8851033f13e32250c7497527f71e28 Mon Sep 17 00:00:00 2001 From: Nick Burch Date: Thu, 14 Apr 2011 14:32:49 +0000 Subject: [PATCH] Rename/Move xssf.model.Table to xssf.usermodel.XSSFTable as it now has usermodel-like features git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1092286 13f79535-47bb-0310-9956-ffa450edef68 --- src/documentation/content/xdocs/status.xml | 1 + .../poi/xssf/extractor/XSSFExportToXml.java | 10 +++++----- .../poi/xssf/extractor/XSSFImportFromXML.java | 6 +++--- .../org/apache/poi/xssf/usermodel/XSSFMap.java | 7 +++---- .../apache/poi/xssf/usermodel/XSSFRelation.java | 3 +-- .../apache/poi/xssf/usermodel/XSSFSheet.java | 17 ++++++++--------- .../Table.java => usermodel/XSSFTable.java} | 9 ++++----- .../xssf/usermodel/helpers/XSSFXmlColumnPr.java | 6 +++--- .../apache/poi/xssf/usermodel/TestXSSFBugs.java | 3 +-- .../poi/xssf/usermodel/TestXSSFSheet.java | 5 ++--- 10 files changed, 31 insertions(+), 36 deletions(-) rename src/ooxml/java/org/apache/poi/xssf/{model/Table.java => usermodel/XSSFTable.java} (97%) diff --git a/src/documentation/content/xdocs/status.xml b/src/documentation/content/xdocs/status.xml index b01bf5e98..1c398d0b9 100644 --- a/src/documentation/content/xdocs/status.xml +++ b/src/documentation/content/xdocs/status.xml @@ -34,6 +34,7 @@ + Rename/Move xssf.model.Table to xssf.usermodel.XSSFTable as it now has usermodel-like features 51061 - Correct target URI for new XSSF Tables Initial support for XSSF Charts. Provides easy access to the underlying CTChart object via the Sheet Drawing, but no high level interface onto the chart contents as yet. 50884 - XSSF and HSSF freeze panes now behave the same diff --git a/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExportToXml.java b/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExportToXml.java index b5b4a6ba6..2e6b90242 100644 --- a/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExportToXml.java +++ b/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFExportToXml.java @@ -41,7 +41,7 @@ import javax.xml.validation.SchemaFactory; import javax.xml.validation.Validator; import org.apache.poi.openxml4j.exceptions.InvalidFormatException; -import org.apache.poi.xssf.model.Table; +import org.apache.poi.xssf.usermodel.XSSFTable; import org.apache.poi.xssf.usermodel.XSSFCell; import org.apache.poi.xssf.usermodel.XSSFMap; import org.apache.poi.xssf.usermodel.XSSFRow; @@ -123,7 +123,7 @@ public class XSSFExportToXml implements Comparator{ */ public void exportToXML(OutputStream os, String encoding, boolean validate) throws SAXException, ParserConfigurationException, TransformerException{ List singleXMLCells = map.getRelatedSingleXMLCell(); - List tables = map.getRelatedTables(); + List tables = map.getRelatedTables(); String rootElement = map.getCtMap().getRootElement(); @@ -141,13 +141,13 @@ public class XSSFExportToXml implements Comparator{ List xpaths = new Vector(); Map singleXmlCellsMappings = new HashMap(); - Map tableMappings = new HashMap(); + Map tableMappings = new HashMap(); for(XSSFSingleXmlCell simpleXmlCell : singleXMLCells) { xpaths.add(simpleXmlCell.getXpath()); singleXmlCellsMappings.put(simpleXmlCell.getXpath(), simpleXmlCell); } - for(Table table : tables) { + for(XSSFTable table : tables) { String commonXPath = table.getCommonXpath(); xpaths.add(commonXPath); tableMappings.put(commonXPath, table); @@ -159,7 +159,7 @@ public class XSSFExportToXml implements Comparator{ for(String xpath : xpaths) { XSSFSingleXmlCell simpleXmlCell = singleXmlCellsMappings.get(xpath); - Table table = tableMappings.get(xpath); + XSSFTable table = tableMappings.get(xpath); if (!xpath.matches(".*\\[.*")) { diff --git a/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFImportFromXML.java b/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFImportFromXML.java index 854dc305b..e87a0333b 100644 --- a/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFImportFromXML.java +++ b/src/ooxml/java/org/apache/poi/xssf/extractor/XSSFImportFromXML.java @@ -33,7 +33,7 @@ import javax.xml.xpath.XPathFactory; import org.apache.poi.util.POILogFactory; import org.apache.poi.util.POILogger; -import org.apache.poi.xssf.model.Table; +import org.apache.poi.xssf.usermodel.XSSFTable; import org.apache.poi.xssf.usermodel.XSSFCell; import org.apache.poi.xssf.usermodel.XSSFMap; import org.apache.poi.xssf.usermodel.XSSFRow; @@ -85,7 +85,7 @@ public class XSSFImportFromXML { List singleXmlCells = _map.getRelatedSingleXMLCell(); - List
tables = _map.getRelatedTables(); + List tables = _map.getRelatedTables(); XPathFactory xpathFactory = XPathFactory.newInstance(); XPath xpath = xpathFactory.newXPath(); @@ -107,7 +107,7 @@ public class XSSFImportFromXML { cell.setCellValue(textContent); } - for (Table table : tables) { + for (XSSFTable table : tables) { String commonXPath = table.getCommonXpath(); NodeList result = (NodeList) xpath.evaluate(commonXPath, doc, XPathConstants.NODESET); diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFMap.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFMap.java index 6d40b686a..6ddda437d 100644 --- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFMap.java +++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFMap.java @@ -24,7 +24,6 @@ import org.apache.poi.POIXMLDocumentPart; import org.apache.poi.util.Internal; import org.apache.poi.xssf.model.MapInfo; import org.apache.poi.xssf.model.SingleXmlCells; -import org.apache.poi.xssf.model.Table; import org.apache.poi.xssf.usermodel.helpers.XSSFSingleXmlCell; import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTMap; import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTSchema; @@ -101,16 +100,16 @@ public class XSSFMap { /** * @return the list of all Tables that provide a map rule to this mapping */ - public List
getRelatedTables() { + public List getRelatedTables() { - List
tables = new Vector
(); + List tables = new Vector(); int sheetNumber = mapInfo.getWorkbook().getNumberOfSheets(); for (int i = 0; i < sheetNumber; i++) { XSSFSheet sheet = mapInfo.getWorkbook().getSheetAt(i); for (POIXMLDocumentPart p : sheet.getRelations()) { if (p.getPackageRelationship().getRelationshipType().equals(XSSFRelation.TABLE.getRelation())) { - Table table = (Table) p; + XSSFTable table = (XSSFTable) p; if (table.mapsTo(ctMap.getID())) { tables.add(table); } diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRelation.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRelation.java index b49d6c2d3..f0b9a9b71 100644 --- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRelation.java +++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRelation.java @@ -39,7 +39,6 @@ import org.apache.poi.xssf.model.MapInfo; import org.apache.poi.xssf.model.SharedStringsTable; import org.apache.poi.xssf.model.SingleXmlCells; import org.apache.poi.xssf.model.StylesTable; -import org.apache.poi.xssf.model.Table; import org.apache.poi.xssf.model.ThemesTable; /** @@ -146,7 +145,7 @@ public final class XSSFRelation extends POIXMLRelation { "application/vnd.openxmlformats-officedocument.spreadsheetml.table+xml", "http://schemas.openxmlformats.org/officeDocument/2006/relationships/table", "/xl/tables/table#.xml", - Table.class + XSSFTable.class ); public static final XSSFRelation IMAGES = new XSSFRelation( diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java index 163da4d26..3d72c82f8 100644 --- a/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java +++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFSheet.java @@ -59,7 +59,6 @@ import org.apache.poi.util.Internal; import org.apache.poi.util.POILogFactory; import org.apache.poi.util.POILogger; import org.apache.poi.xssf.model.CommentsTable; -import org.apache.poi.xssf.model.Table; import org.apache.poi.xssf.usermodel.helpers.ColumnHelper; import org.apache.poi.xssf.usermodel.helpers.XSSFRowShifter; import org.apache.xmlbeans.XmlException; @@ -130,7 +129,7 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet { * Master shared formula is the first formula in a group of shared formulas is saved in the f element. */ private Map sharedFormulas; - private TreeMap tables; + private TreeMap tables; private List arrayFormulas; private XSSFDataValidationHelper dataValidationHelper; @@ -194,8 +193,8 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet { sheetComments = (CommentsTable)p; break; } - if(p instanceof Table) { - tables.put( p.getPackageRelationship().getId(), (Table)p ); + if(p instanceof XSSFTable) { + tables.put( p.getPackageRelationship().getId(), (XSSFTable)p ); } } @@ -217,7 +216,7 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet { @SuppressWarnings("deprecation") //YK: getXYZArray() array accessors are deprecated in xmlbeans with JDK 1.5 support private void initRows(CTWorksheet worksheet) { _rows = new TreeMap(); - tables = new TreeMap(); + tables = new TreeMap(); sharedFormulas = new HashMap(); arrayFormulas = new ArrayList(); for (CTRow row : worksheet.getSheetData().getRowArray()) { @@ -3022,7 +3021,7 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet { /** * Creates a new Table, and associates it with this Sheet */ - public Table createTable() { + public XSSFTable createTable() { if(! worksheet.isSetTableParts()) { worksheet.addNewTableParts(); } @@ -3033,7 +3032,7 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet { // Table numbers need to be unique in the file, not just // unique within the sheet. Find the next one int tableNumber = getPackagePart().getPackage().getPartsByContentType(XSSFRelation.TABLE.getContentType()).size() + 1; - Table table = (Table)createRelationship(XSSFRelation.TABLE, XSSFFactory.getInstance(), tableNumber); + XSSFTable table = (XSSFTable)createRelationship(XSSFRelation.TABLE, XSSFFactory.getInstance(), tableNumber); tbl.setId(table.getPackageRelationship().getId()); tables.put(tbl.getId(), table); @@ -3044,8 +3043,8 @@ public class XSSFSheet extends POIXMLDocumentPart implements Sheet { /** * Returns any tables associated with this Sheet */ - public List
getTables() { - List
tableList = new ArrayList
( + public List getTables() { + List tableList = new ArrayList( tables.values() ); return tableList; diff --git a/src/ooxml/java/org/apache/poi/xssf/model/Table.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTable.java similarity index 97% rename from src/ooxml/java/org/apache/poi/xssf/model/Table.java rename to src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTable.java index ee887214f..851aeaa3a 100644 --- a/src/ooxml/java/org/apache/poi/xssf/model/Table.java +++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFTable.java @@ -15,7 +15,7 @@ limitations under the License. ==================================================================== */ -package org.apache.poi.xssf.model; +package org.apache.poi.xssf.usermodel; import java.io.IOException; import java.io.InputStream; @@ -28,7 +28,6 @@ import org.apache.poi.POIXMLDocumentPart; import org.apache.poi.openxml4j.opc.PackagePart; import org.apache.poi.openxml4j.opc.PackageRelationship; import org.apache.poi.ss.util.CellReference; -import org.apache.poi.xssf.usermodel.XSSFSheet; import org.apache.poi.xssf.usermodel.helpers.XSSFXmlColumnPr; import org.apache.xmlbeans.XmlException; import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTTable; @@ -47,7 +46,7 @@ import org.openxmlformats.schemas.spreadsheetml.x2006.main.TableDocument; * * @author Roberto Manicardi */ -public class Table extends POIXMLDocumentPart { +public class XSSFTable extends POIXMLDocumentPart { private CTTable ctTable; private List xmlColumnPr; @@ -56,13 +55,13 @@ public class Table extends POIXMLDocumentPart { private String commonXPath; - public Table() { + public XSSFTable() { super(); ctTable = CTTable.Factory.newInstance(); } - public Table(PackagePart part, PackageRelationship rel) + public XSSFTable(PackagePart part, PackageRelationship rel) throws IOException { super(part, rel); readFrom(part.getInputStream()); diff --git a/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFXmlColumnPr.java b/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFXmlColumnPr.java index 42b67471b..f5d29d372 100644 --- a/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFXmlColumnPr.java +++ b/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFXmlColumnPr.java @@ -17,7 +17,7 @@ package org.apache.poi.xssf.usermodel.helpers; -import org.apache.poi.xssf.model.Table; +import org.apache.poi.xssf.usermodel.XSSFTable; import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTTableColumn; import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTXmlColumnPr; import org.openxmlformats.schemas.spreadsheetml.x2006.main.STXmlDataType.Enum; @@ -33,11 +33,11 @@ import org.openxmlformats.schemas.spreadsheetml.x2006.main.STXmlDataType.Enum; */ public class XSSFXmlColumnPr { - private Table table; + private XSSFTable table; private CTTableColumn ctTableColumn; private CTXmlColumnPr ctXmlColumnPr; - public XSSFXmlColumnPr(Table table ,CTTableColumn ctTableColum,CTXmlColumnPr ctXmlColumnPr){ + public XSSFXmlColumnPr(XSSFTable table ,CTTableColumn ctTableColum,CTXmlColumnPr ctXmlColumnPr){ this.table = table; this.ctTableColumn = ctTableColum; this.ctXmlColumnPr = ctXmlColumnPr; diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java index d716cea47..54c5b1632 100644 --- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java +++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java @@ -43,7 +43,6 @@ import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.xssf.XSSFITestDataProvider; import org.apache.poi.xssf.XSSFTestDataSamples; import org.apache.poi.xssf.model.CalculationChain; -import org.apache.poi.xssf.model.Table; import org.apache.poi.xssf.usermodel.extensions.XSSFCellFill; import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTWorksheet; @@ -852,7 +851,7 @@ public final class TestXSSFBugs extends BaseTestBugzillaIssues { assertEquals(0, s2.getTables().size()); assertEquals(0, s3.getTables().size()); - Table t = s1.getTables().get(0); + XSSFTable t = s1.getTables().get(0); assertEquals("Tabella1", t.getName()); assertEquals("Tabella1", t.getDisplayName()); assertEquals("A1:C3", t.getCTTable().getRef()); diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java index 410ab61eb..1f5edc57e 100644 --- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java +++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFSheet.java @@ -26,7 +26,6 @@ import org.apache.poi.xssf.XSSFTestDataSamples; import org.apache.poi.xssf.model.CommentsTable; import org.apache.poi.xssf.model.StylesTable; import org.apache.poi.xssf.model.CalculationChain; -import org.apache.poi.xssf.model.Table; import org.apache.poi.xssf.usermodel.helpers.ColumnHelper; import org.apache.poi.util.HexDump; import org.apache.poi.hssf.record.PasswordRecord; @@ -1050,11 +1049,11 @@ public final class TestXSSFSheet extends BaseTestSheet { assertEquals("a", s1.getRow(0).getCell(0).getRichStringCellValue().toString()); assertEquals(1.0, s1.getRow(1).getCell(0).getNumericCellValue()); - List
tables = s1.getTables(); + List tables = s1.getTables(); assertNotNull(tables); assertEquals(1, tables.size()); - Table table = tables.get(0); + XSSFTable table = tables.get(0); assertEquals("Tabella1", table.getName()); assertEquals("Tabella1", table.getDisplayName());