You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ni...@apache.org on 2010/07/02 23:16:40 UTC
svn commit: r960106 - in
/poi/trunk/src/ooxml/java/org/apache/poi/xssf/model: CalculationChain.java
MapInfo.java SharedStringsTable.java SingleXmlCells.java StylesTable.java
Table.java
Author: nick
Date: Fri Jul 2 21:16:40 2010
New Revision: 960106
URL: http://svn.apache.org/viewvc?rev=960106&view=rev
Log:
Fix deprecated warnings
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/CalculationChain.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/MapInfo.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/SharedStringsTable.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/SingleXmlCells.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/StylesTable.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/Table.java
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/CalculationChain.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/CalculationChain.java?rev=960106&r1=960105&r2=960106&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/CalculationChain.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/CalculationChain.java Fri Jul 2 21:16:40 2010
@@ -81,7 +81,9 @@ public class CalculationChain extends PO
public void removeItem(int sheetId, String ref){
//sheet Id of a sheet the cell belongs to
int id = -1;
- CTCalcCell[] c = chain.getCArray();
+ CTCalcCell[] c = new CTCalcCell[chain.getCList().size()];
+ chain.getCList().toArray(c);
+
for (int i = 0; i < c.length; i++){
//If sheet Id is omitted, it is assumed to be the same as the value of the previous cell.
if(c[i].isSetI()) id = c[i].getI();
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/MapInfo.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/MapInfo.java?rev=960106&r1=960105&r2=960106&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/MapInfo.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/MapInfo.java Fri Jul 2 21:16:40 2010
@@ -72,7 +72,7 @@ public class MapInfo extends POIXMLDocum
mapInfo = doc.getMapInfo();
maps= new HashMap<Integer, XSSFMap>();
- for(CTMap map :mapInfo.getMapArray()){
+ for(CTMap map :mapInfo.getMapList()){
maps.put((int)map.getID(), new XSSFMap(map,this));
}
@@ -107,8 +107,7 @@ public class MapInfo extends POIXMLDocum
public CTSchema getCTSchemaById(String schemaId){
CTSchema xmlSchema = null;
- CTSchema[] schemas = mapInfo.getSchemaArray();
- for(CTSchema schema: schemas){
+ for(CTSchema schema: mapInfo.getSchemaList()){
if(schema.getID().equals(schemaId)){
xmlSchema = schema;
break;
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/SharedStringsTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/SharedStringsTable.java?rev=960106&r1=960105&r2=960106&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/SharedStringsTable.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/SharedStringsTable.java Fri Jul 2 21:16:40 2010
@@ -110,7 +110,7 @@ public class SharedStringsTable extends
CTSst sst = _sstDoc.getSst();
count = (int)sst.getCount();
uniqueCount = (int)sst.getUniqueCount();
- for (CTRst st : sst.getSiArray()) {
+ for (CTRst st : sst.getSiList()) {
stmap.put(st.toString(), cnt);
strings.add(st);
cnt++;
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/SingleXmlCells.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/SingleXmlCells.java?rev=960106&r1=960105&r2=960106&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/SingleXmlCells.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/SingleXmlCells.java Fri Jul 2 21:16:40 2010
@@ -96,9 +96,8 @@ public class SingleXmlCells extends POIX
*/
public List<XSSFSingleXmlCell> getAllSimpleXmlCell(){
List<XSSFSingleXmlCell> list = new Vector<XSSFSingleXmlCell>();
- CTSingleXmlCell[] singleXMLCellArray = singleXMLCells.getSingleXmlCellArray();
- for(CTSingleXmlCell singleXmlCell: singleXMLCellArray){
+ for(CTSingleXmlCell singleXmlCell: singleXMLCells.getSingleXmlCellList()){
list.add(new XSSFSingleXmlCell(singleXmlCell,this));
}
return list;
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/StylesTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/StylesTable.java?rev=960106&r1=960105&r2=960106&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/StylesTable.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/StylesTable.java Fri Jul 2 21:16:40 2010
@@ -111,33 +111,33 @@ public class StylesTable extends POIXMLD
doc = StyleSheetDocument.Factory.parse(is);
// Grab all the different bits we care about
if(doc.getStyleSheet().getNumFmts() != null)
- for (CTNumFmt nfmt : doc.getStyleSheet().getNumFmts().getNumFmtArray()) {
+ for (CTNumFmt nfmt : doc.getStyleSheet().getNumFmts().getNumFmtList()) {
numberFormats.put((int)nfmt.getNumFmtId(), nfmt.getFormatCode());
}
if(doc.getStyleSheet().getFonts() != null){
int idx = 0;
- for (CTFont font : doc.getStyleSheet().getFonts().getFontArray()) {
+ for (CTFont font : doc.getStyleSheet().getFonts().getFontList()) {
XSSFFont f = new XSSFFont(font, idx);
fonts.add(f);
idx++;
}
}
if(doc.getStyleSheet().getFills() != null)
- for (CTFill fill : doc.getStyleSheet().getFills().getFillArray()) {
+ for (CTFill fill : doc.getStyleSheet().getFills().getFillList()) {
fills.add(new XSSFCellFill(fill));
}
if(doc.getStyleSheet().getBorders() != null)
- for (CTBorder border : doc.getStyleSheet().getBorders().getBorderArray()) {
+ for (CTBorder border : doc.getStyleSheet().getBorders().getBorderList()) {
borders.add(new XSSFCellBorder(border));
}
CTCellXfs cellXfs = doc.getStyleSheet().getCellXfs();
- if(cellXfs != null) xfs.addAll(Arrays.asList(cellXfs.getXfArray()));
+ if(cellXfs != null) xfs.addAll(cellXfs.getXfList());
CTCellStyleXfs cellStyleXfs = doc.getStyleSheet().getCellStyleXfs();
- if(cellStyleXfs != null) styleXfs.addAll(Arrays.asList(cellStyleXfs.getXfArray()));
+ if(cellStyleXfs != null) styleXfs.addAll(cellStyleXfs.getXfList());
CTDxfs styleDxfs = doc.getStyleSheet().getDxfs();
- if(styleDxfs != null) dxfs.addAll(Arrays.asList(styleDxfs.getDxfArray()));
+ if(styleDxfs != null) dxfs.addAll(styleDxfs.getDxfList());
} catch (XmlException e) {
throw new IOException(e.getLocalizedMessage());
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/Table.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/Table.java?rev=960106&r1=960105&r2=960106&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/Table.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/model/Table.java Fri Jul 2 21:16:40 2010
@@ -133,7 +133,7 @@ public class Table extends POIXMLDocumen
String[] commonTokens ={};
- for(CTTableColumn column :ctTable.getTableColumns().getTableColumnArray()){
+ for(CTTableColumn column :ctTable.getTableColumns().getTableColumnList()){
if(column.getXmlColumnPr()!=null){
String xpath = column.getXmlColumnPr().getXpath();
String[] tokens = xpath.split("/");
@@ -176,7 +176,7 @@ public class Table extends POIXMLDocumen
if(xmlColumnPr==null){
xmlColumnPr = new Vector<XSSFXmlColumnPr>();
- for(CTTableColumn column:ctTable.getTableColumns().getTableColumnArray()){
+ for(CTTableColumn column:ctTable.getTableColumns().getTableColumnList()){
if(column.getXmlColumnPr()!=null){
XSSFXmlColumnPr columnPr = new XSSFXmlColumnPr(this,column,column.getXmlColumnPr());
xmlColumnPr.add(columnPr);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org