You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by pa...@apache.org on 2008/03/25 18:55:32 UTC
svn commit: r640915 - in /poi/branches/ooxml/src/ooxml:
java/org/apache/poi/xssf/model/
java/org/apache/poi/xssf/usermodel/extensions/
testcases/org/apache/poi/xssf/usermodel/
Author: paolo
Date: Tue Mar 25 10:55:26 2008
New Revision: 640915
URL: http://svn.apache.org/viewvc?rev=640915&view=rev
Log:
XSSFCellBorder does not expose CTBorder object (same for XSSFCellFill); StylesTable refactored
Modified:
poi/branches/ooxml/src/ooxml/java/org/apache/poi/xssf/model/StylesTable.java
poi/branches/ooxml/src/ooxml/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellBorder.java
poi/branches/ooxml/src/ooxml/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellFill.java
poi/branches/ooxml/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCellStyle.java
Modified: poi/branches/ooxml/src/ooxml/java/org/apache/poi/xssf/model/StylesTable.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/ooxml/java/org/apache/poi/xssf/model/StylesTable.java?rev=640915&r1=640914&r2=640915&view=diff
==============================================================================
--- poi/branches/ooxml/src/ooxml/java/org/apache/poi/xssf/model/StylesTable.java (original)
+++ poi/branches/ooxml/src/ooxml/java/org/apache/poi/xssf/model/StylesTable.java Tue Mar 25 10:55:26 2008
@@ -44,7 +44,6 @@
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTStylesheet;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTXf;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.StyleSheetDocument;
-import javax.xml.namespace.QName;
@@ -198,28 +197,14 @@
return new XSSFCellBorder(borders.get((int)idx));
}
public long putBorder(XSSFCellBorder border) {
- return putBorder(border.getCTBorder());
- }
- public synchronized long putBorder(CTBorder border) {
- if(borders.contains(border)) {
- return borders.indexOf(border);
- }
- borders.add(border);
- return borders.size() - 1;
+ return putBorder(border, borders);
}
public XSSFCellFill getFillAt(long idx) {
return new XSSFCellFill(fills.get((int) idx));
}
public long putFill(XSSFCellFill fill) {
- return putFill(fill.getCTFill());
- }
- public synchronized long putFill(CTFill fill) {
- if (fills.contains(fill)) {
- return fills.indexOf(fill);
- }
- fills.add(fill);
- return fills.size() - 1;
+ return putFill(fill, fills);
}
/**
* For unit testing only
@@ -331,4 +316,11 @@
// Save
doc.save(out, options);
}
+
+ private long putBorder(XSSFCellBorder border, LinkedList<CTBorder> borders) {
+ return border.putBorder(borders);
+ }
+ private long putFill(XSSFCellFill fill, LinkedList<CTFill> fills) {
+ return fill.putFill(fills);
+ }
}
Modified: poi/branches/ooxml/src/ooxml/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellBorder.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/ooxml/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellBorder.java?rev=640915&r1=640914&r2=640915&view=diff
==============================================================================
--- poi/branches/ooxml/src/ooxml/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellBorder.java (original)
+++ poi/branches/ooxml/src/ooxml/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellBorder.java Tue Mar 25 10:55:26 2008
@@ -17,6 +17,8 @@
package org.apache.poi.xssf.usermodel.extensions;
+import java.util.LinkedList;
+
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTBorder;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTBorderPr;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.STBorderStyle.Enum;
@@ -43,12 +45,12 @@
TOP, RIGHT, BOTTOM, LEFT
}
- /**
- * TODO - is this the best way to allow StylesTable
- * to record us?
- */
- public CTBorder getCTBorder() {
- return border;
+ public long putBorder(LinkedList<CTBorder> borders) {
+ if(borders.contains(border)) {
+ return borders.indexOf(border);
+ }
+ borders.add(border);
+ return borders.size() - 1;
}
public Enum getBorderStyle(BorderSides side) {
Modified: poi/branches/ooxml/src/ooxml/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellFill.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/ooxml/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellFill.java?rev=640915&r1=640914&r2=640915&view=diff
==============================================================================
--- poi/branches/ooxml/src/ooxml/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellFill.java (original)
+++ poi/branches/ooxml/src/ooxml/java/org/apache/poi/xssf/usermodel/extensions/XSSFCellFill.java Tue Mar 25 10:55:26 2008
@@ -1,5 +1,7 @@
package org.apache.poi.xssf.usermodel.extensions;
+import java.util.LinkedList;
+
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTFill;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTPatternFill;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.STPatternType.Enum;
@@ -26,6 +28,14 @@
public Enum getPatternType() {
return getPatternFill().getPatternType();
+ }
+
+ public long putFill(LinkedList<CTFill> fills) {
+ if (fills.contains(fill)) {
+ return fills.indexOf(fill);
+ }
+ fills.add(fill);
+ return fills.size() - 1;
}
private CTPatternFill getPatternFill() {
Modified: poi/branches/ooxml/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCellStyle.java
URL: http://svn.apache.org/viewvc/poi/branches/ooxml/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCellStyle.java?rev=640915&r1=640914&r2=640915&view=diff
==============================================================================
--- poi/branches/ooxml/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCellStyle.java (original)
+++ poi/branches/ooxml/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFCellStyle.java Tue Mar 25 10:55:26 2008
@@ -36,7 +36,6 @@
private StylesTable stylesTable;
private CTBorder ctBorderA;
- private CTBorder ctBorderB;
private CTFill ctFill;
private CTXf cellStyleXf;
private CTXf cellXf;
@@ -49,11 +48,11 @@
// Until we do XSSFBorder properly, cheat
ctBorderA = CTBorder.Factory.newInstance();
- long borderId = stylesTable.putBorder(ctBorderA);
+ XSSFCellBorder borderA = new XSSFCellBorder(ctBorderA);
+ long borderId = stylesTable.putBorder(borderA);
assertEquals(0, borderId);
XSSFCellBorder borderB = new XSSFCellBorder();
- ctBorderB = borderB.getCTBorder();
assertEquals(1, stylesTable.putBorder(borderB));
ctFill = CTFill.Factory.newInstance();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org