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 2008/04/15 18:01:30 UTC
svn commit: r648303 [2/2] - in /poi/trunk/src: documentation/content/xdocs/
java/org/apache/poi/hssf/dev/ java/org/apache/poi/hssf/model/
java/org/apache/poi/hssf/record/ java/org/apache/poi/hssf/record/formula/
java/org/apache/poi/hssf/usermodel/ test...
Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java Tue Apr 15 09:00:50 2008
@@ -194,7 +194,7 @@
*/
public HSSFRow createRow(int rownum)
{
- HSSFRow row = new HSSFRow(book, sheet, rownum);
+ HSSFRow row = new HSSFRow(workbook, sheet, rownum);
addRow(row, true);
return row;
@@ -209,7 +209,7 @@
private HSSFRow createRowFromRecord(RowRecord row)
{
- HSSFRow hrow = new HSSFRow(book, sheet, row);
+ HSSFRow hrow = new HSSFRow(workbook, sheet, row);
addRow(hrow, false);
return hrow;
@@ -394,7 +394,7 @@
//formula fields ( size and data )
String str_formula = obj_validation.getFirstFormula();
- FormulaParser fp = new FormulaParser(str_formula, book);
+ FormulaParser fp = new FormulaParser(str_formula, workbook);
fp.parse();
Stack ptg_arr = new Stack();
Ptg[] ptg = fp.getRPNPtg();
@@ -418,7 +418,7 @@
if ( obj_validation.getSecondFormula() != null )
{
str_formula = obj_validation.getSecondFormula();
- fp = new FormulaParser(str_formula, book);
+ fp = new FormulaParser(str_formula, workbook);
fp.parse();
ptg_arr = new Stack();
ptg = fp.getRPNPtg();
@@ -1264,7 +1264,7 @@
// Since it's a formula cell, process the
// formula string, and look to see if
// it contains any references
- FormulaParser fp = new FormulaParser(c.getCellFormula(), workbook.getWorkbook());
+ FormulaParser fp = new FormulaParser(c.getCellFormula(), workbook);
fp.parse();
// Look for references, and update if needed
@@ -1874,9 +1874,8 @@
HSSFBorderFormatting bordFmt,
HSSFPatternFormatting patternFmt) {
- Workbook wb = workbook.getWorkbook();
- CFRuleRecord rr = CFRuleRecord.create(wb, comparisonOperation, formula1, formula2);
- return new HSSFConditionalFormattingRule(wb, rr, fontFmt, bordFmt, patternFmt);
+ CFRuleRecord rr = CFRuleRecord.create(workbook, comparisonOperation, formula1, formula2);
+ return new HSSFConditionalFormattingRule(workbook, rr, fontFmt, bordFmt, patternFmt);
}
/**
@@ -1895,9 +1894,8 @@
HSSFFontFormatting fontFmt,
HSSFBorderFormatting bordFmt,
HSSFPatternFormatting patternFmt) {
- Workbook wb = workbook.getWorkbook();
- CFRuleRecord rr = CFRuleRecord.create(wb, formula);
- return new HSSFConditionalFormattingRule(wb, rr, fontFmt, bordFmt, patternFmt);
+ CFRuleRecord rr = CFRuleRecord.create(workbook, formula);
+ return new HSSFConditionalFormattingRule(workbook, rr, fontFmt, bordFmt, patternFmt);
}
/**
Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java Tue Apr 15 09:00:50 2008
@@ -36,6 +36,7 @@
import org.apache.poi.hssf.record.formula.MemFuncPtg;
import org.apache.poi.hssf.record.formula.UnionPtg;
import org.apache.poi.hssf.util.CellReference;
+import org.apache.poi.hssf.util.SheetReferences;
import org.apache.poi.poifs.filesystem.*;
import org.apache.poi.util.POILogFactory;
import org.apache.poi.util.POILogger;
@@ -249,7 +250,7 @@
}
for (int i = 0 ; i < workbook.getNumNames() ; ++i){
- HSSFName name = new HSSFName(workbook, workbook.getNameRecord(i));
+ HSSFName name = new HSSFName(this, workbook.getNameRecord(i));
names.add(name);
}
}
@@ -522,6 +523,17 @@
}
return -1;
}
+
+ /**
+ * Returns the external sheet index of the sheet
+ * with the given internal index, creating one
+ * if needed.
+ * Used by some of the more obscure formula and
+ * named range things.
+ */
+ public short getExternalSheetIndex(int internalSheetIndex) {
+ return workbook.checkExternSheet(internalSheetIndex);
+ }
/**
* create an HSSFSheet for this HSSFWorkbook, adds it to the sheets and returns
@@ -647,6 +659,10 @@
}
return retval;
}
+
+ public SheetReferences getSheetReferences() {
+ return workbook.getSheetReferences();
+ }
/**
* removes sheet at the given index
@@ -790,7 +806,7 @@
if (isNewRecord)
{
- HSSFName newName = new HSSFName(workbook, nameRecord);
+ HSSFName newName = new HSSFName(this, nameRecord);
names.add(newName);
}
@@ -1101,6 +1117,17 @@
return result;
}
+
+ /**
+ * TODO - make this less cryptic / move elsewhere
+ * @param refIndex Index to REF entry in EXTERNSHEET record in the Link Table
+ * @param definedNameIndex zero-based to DEFINEDNAME or EXTERNALNAME record
+ * @return the string representation of the defined or external name
+ */
+ public String resolveNameXText(int refIndex, int definedNameIndex) {
+ return workbook.resolveNameXText(refIndex, definedNameIndex);
+ }
+
/**
* Sets the printarea for the sheet provided
@@ -1159,7 +1186,7 @@
if (name == null) return null;
//adding one here because 0 indicates a global named region; doesnt make sense for print areas
- return name.getAreaReference(workbook);
+ return name.getAreaReference(this);
}
/**
@@ -1176,7 +1203,7 @@
public HSSFName createName(){
NameRecord nameRecord = workbook.createName();
- HSSFName newName = new HSSFName(workbook, nameRecord);
+ HSSFName newName = new HSSFName(this, nameRecord);
names.add(newName);
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java Tue Apr 15 09:00:50 2008
@@ -142,7 +142,7 @@
assertEquals(true, flag.getValue());
assertEquals("Y", y.getValue());
assertEquals("N", n.getValue());
- assertEquals("IF", funif.toFormulaString((Workbook) null));
+ assertEquals("IF", funif.toFormulaString((HSSFWorkbook) null));
assertTrue("Goto ptg exists", goto1.isGoto());
}
@@ -283,7 +283,7 @@
}
public void testMacroFunction() {
- Workbook w = Workbook.createWorkbook();
+ HSSFWorkbook w = new HSSFWorkbook();
FormulaParser fp = new FormulaParser("FOO()", w);
fp.parse();
Ptg[] ptg = fp.getRPNPtg();
@@ -589,8 +589,7 @@
* a formula consisting of a single no-arg function got rendered without the function braces
*/
public void testToFormulaStringZeroArgFunction() {
-
- Workbook book = Workbook.createWorkbook(); // not really used in this test
+ HSSFWorkbook book = new HSSFWorkbook();
Ptg[] ptgs = {
new FuncPtg(10, 0),
@@ -889,7 +888,7 @@
}
}
public void testFuncPtgSelection() {
- Workbook book = Workbook.createWorkbook();
+ HSSFWorkbook book = new HSSFWorkbook();
Ptg[] ptgs;
ptgs = FormulaParser.parse("countif(A1:A2, 1)", book);
assertEquals(3, ptgs.length);
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/TestCFRuleRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/TestCFRuleRecord.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/TestCFRuleRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/TestCFRuleRecord.java Tue Apr 15 09:00:50 2008
@@ -19,11 +19,11 @@
import junit.framework.TestCase;
-import org.apache.poi.hssf.model.Workbook;
import org.apache.poi.hssf.record.CFRuleRecord.ComparisonOperator;
import org.apache.poi.hssf.record.cf.BorderFormatting;
import org.apache.poi.hssf.record.cf.FontFormatting;
import org.apache.poi.hssf.record.cf.PatternFormatting;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.util.HSSFColor;
import org.apache.poi.util.LittleEndian;
@@ -38,7 +38,7 @@
public void testCreateCFRuleRecord ()
{
- Workbook workbook = Workbook.createWorkbook();
+ HSSFWorkbook workbook = new HSSFWorkbook();
CFRuleRecord record = CFRuleRecord.create(workbook, "7");
testCFRuleRecord(record);
@@ -278,7 +278,7 @@
}
public void testWrite() {
- Workbook workbook = Workbook.createWorkbook();
+ HSSFWorkbook workbook = new HSSFWorkbook();
CFRuleRecord rr = CFRuleRecord.create(workbook, ComparisonOperator.BETWEEN, "5", "10");
PatternFormatting patternFormatting = new PatternFormatting();
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestCFRecordsAggregate.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestCFRecordsAggregate.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestCFRecordsAggregate.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestCFRecordsAggregate.java Tue Apr 15 09:00:50 2008
@@ -24,12 +24,12 @@
import junit.framework.TestCase;
-import org.apache.poi.hssf.model.Workbook;
import org.apache.poi.hssf.record.CFHeaderRecord;
import org.apache.poi.hssf.record.CFRuleRecord;
import org.apache.poi.hssf.record.RecordFactory;
import org.apache.poi.hssf.record.CFRuleRecord.ComparisonOperator;
import org.apache.poi.hssf.record.cf.CellRange;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
/**
* Tests the serialization and deserialization of the CFRecordsAggregate
@@ -42,7 +42,7 @@
public void testCFRecordsAggregate()
{
- Workbook workbook = Workbook.createWorkbook();
+ HSSFWorkbook workbook = new HSSFWorkbook();
List recs = new ArrayList();
CFHeaderRecord header = new CFHeaderRecord();
CFRuleRecord rule1 = CFRuleRecord.create(workbook, "7");
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/formula/AbstractPtgTestCase.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/formula/AbstractPtgTestCase.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/formula/AbstractPtgTestCase.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/formula/AbstractPtgTestCase.java Tue Apr 15 09:00:50 2008
@@ -51,13 +51,9 @@
/**
* Creates a new Workbook and adds one sheet with the specified name
*/
- protected static final Workbook createWorkbookWithSheet(String sheetName) {
-
- Workbook book = Workbook.createWorkbook();
- // this creates sheet if it doesn't exist
- book.checkExternSheet(0);
- // TODO - this call alone does not create the sheet even though the javadoc says it does
- book.setSheetName(0, sheetName);
+ protected static final HSSFWorkbook createWorkbookWithSheet(String sheetName) {
+ HSSFWorkbook book = new HSSFWorkbook();
+ book.createSheet(sheetName);
return book;
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/formula/TestArea3DPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/formula/TestArea3DPtg.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/formula/TestArea3DPtg.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/formula/TestArea3DPtg.java Tue Apr 15 09:00:50 2008
@@ -18,7 +18,7 @@
package org.apache.poi.hssf.record.formula;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
/**
* Tests for Area3DPtg
@@ -35,7 +35,7 @@
Area3DPtg target = new Area3DPtg("A1:B1", (short)0);
String sheetName = "my sheet";
- Workbook book = createWorkbookWithSheet(sheetName);
+ HSSFWorkbook book = createWorkbookWithSheet(sheetName);
assertEquals("'my sheet'!A1:B1", target.toFormulaString(book));
book.setSheetName(0, "Sheet1");
@@ -44,7 +44,4 @@
book.setSheetName(0, "C64");
assertEquals("'C64'!A1:B1", target.toFormulaString(book));
}
-
-
-
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/formula/TestRef3DPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/formula/TestRef3DPtg.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/formula/TestRef3DPtg.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/formula/TestRef3DPtg.java Tue Apr 15 09:00:50 2008
@@ -18,7 +18,7 @@
package org.apache.poi.hssf.record.formula;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
/**
* Tests for Ref3DPtg
@@ -31,7 +31,7 @@
Ref3DPtg target = new Ref3DPtg("A1", (short)0);
- Workbook book = createWorkbookWithSheet("my sheet");
+ HSSFWorkbook book = createWorkbookWithSheet("my sheet");
assertEquals("'my sheet'!A1", target.toFormulaString(book));
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/formula/function/TestParseMissingBuiltInFuncs.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/formula/function/TestParseMissingBuiltInFuncs.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/formula/function/TestParseMissingBuiltInFuncs.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/formula/function/TestParseMissingBuiltInFuncs.java Tue Apr 15 09:00:50 2008
@@ -26,6 +26,7 @@
import org.apache.poi.hssf.record.formula.FuncPtg;
import org.apache.poi.hssf.record.formula.FuncVarPtg;
import org.apache.poi.hssf.record.formula.Ptg;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
/**
* Tests parsing of some built-in functions that were not properly
* registered in POI as bug #44675, #44733 (March/April 2008).
@@ -35,7 +36,7 @@
public final class TestParseMissingBuiltInFuncs extends TestCase {
private static Ptg[] parse(String formula) {
- Workbook book = Workbook.createWorkbook();
+ HSSFWorkbook book = new HSSFWorkbook();
return FormulaParser.parse(formula, book);
}
private static void confirmFunc(String formula, int expPtgArraySize, boolean isVarArgFunc, int funcIx) {
@@ -57,7 +58,7 @@
assertEquals(expCls, ptgF.getClass());
// check that parsed Ptg array converts back to formula text OK
- Workbook book = Workbook.createWorkbook();
+ HSSFWorkbook book = new HSSFWorkbook();
String reRenderedFormula = FormulaParser.toFormulaString(book, ptgs);
assertEquals(formula, reRenderedFormula);
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java Tue Apr 15 09:00:50 2008
@@ -203,7 +203,7 @@
assertEquals(2, ptg.getLastColumn());
assertEquals(0, ptg.getFirstRow());
assertEquals(65535, ptg.getLastRow());
- assertEquals("C:C", ptg.toFormulaString(wb.getWorkbook()));
+ assertEquals("C:C", ptg.toFormulaString(wb));
// Will show as C:C, but won't know how many
// rows it covers as we don't have the sheet
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/util/TestAreaReference.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/util/TestAreaReference.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/util/TestAreaReference.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/util/TestAreaReference.java Tue Apr 15 09:00:50 2008
@@ -211,12 +211,12 @@
Area3DPtg ptgB = (Area3DPtg)def.get(1);
Area3DPtg ptgC = (Area3DPtg)def.get(2);
UnionPtg ptgD = (UnionPtg)def.get(3);
- assertEquals("", ptgA.toFormulaString(workbook));
- assertEquals(refA, ptgB.toFormulaString(workbook));
- assertEquals(refB, ptgC.toFormulaString(workbook));
- assertEquals(",", ptgD.toFormulaString(workbook));
+ assertEquals("", ptgA.toFormulaString(wb));
+ assertEquals(refA, ptgB.toFormulaString(wb));
+ assertEquals(refB, ptgC.toFormulaString(wb));
+ assertEquals(",", ptgD.toFormulaString(wb));
- assertEquals(ref, nr.getAreaReference(workbook));
+ assertEquals(ref, nr.getAreaReference(wb));
// Check the high level definition
int idx = wb.getNameIndex("test");
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org