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 [1/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...
Author: nick
Date: Tue Apr 15 09:00:50 2008
New Revision: 648303
URL: http://svn.apache.org/viewvc?rev=648303&view=rev
Log:
Nice and small change here... Update the formula parser code to use usermodel.HSSFWorkbook instead of model.Workbook. This should keep things a bit cleaner, and make it much easier for the formula code to work with XSSF
Modified:
poi/trunk/src/documentation/content/xdocs/changes.xml
poi/trunk/src/documentation/content/xdocs/status.xml
poi/trunk/src/java/org/apache/poi/hssf/dev/FormulaViewer.java
poi/trunk/src/java/org/apache/poi/hssf/model/FormulaParser.java
poi/trunk/src/java/org/apache/poi/hssf/record/CFRuleRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/NameRecord.java
poi/trunk/src/java/org/apache/poi/hssf/record/formula/AbstractFunctionPtg.java
poi/trunk/src/java/org/apache/poi/hssf/record/formula/AddPtg.java
poi/trunk/src/java/org/apache/poi/hssf/record/formula/Area3DPtg.java
poi/trunk/src/java/org/apache/poi/hssf/record/formula/AreaAPtg.java
poi/trunk/src/java/org/apache/poi/hssf/record/formula/AreaErrPtg.java
poi/trunk/src/java/org/apache/poi/hssf/record/formula/AreaNAPtg.java
poi/trunk/src/java/org/apache/poi/hssf/record/formula/AreaNPtg.java
poi/trunk/src/java/org/apache/poi/hssf/record/formula/AreaNVPtg.java
poi/trunk/src/java/org/apache/poi/hssf/record/formula/AreaPtg.java
poi/trunk/src/java/org/apache/poi/hssf/record/formula/AreaVPtg.java
poi/trunk/src/java/org/apache/poi/hssf/record/formula/ArrayPtg.java
poi/trunk/src/java/org/apache/poi/hssf/record/formula/ArrayPtgA.java
poi/trunk/src/java/org/apache/poi/hssf/record/formula/ArrayPtgV.java
poi/trunk/src/java/org/apache/poi/hssf/record/formula/AttrPtg.java
poi/trunk/src/java/org/apache/poi/hssf/record/formula/BoolPtg.java
poi/trunk/src/java/org/apache/poi/hssf/record/formula/ConcatPtg.java
poi/trunk/src/java/org/apache/poi/hssf/record/formula/DividePtg.java
poi/trunk/src/java/org/apache/poi/hssf/record/formula/EqualPtg.java
poi/trunk/src/java/org/apache/poi/hssf/record/formula/ErrPtg.java
poi/trunk/src/java/org/apache/poi/hssf/record/formula/ExpPtg.java
poi/trunk/src/java/org/apache/poi/hssf/record/formula/GreaterEqualPtg.java
poi/trunk/src/java/org/apache/poi/hssf/record/formula/GreaterThanPtg.java
poi/trunk/src/java/org/apache/poi/hssf/record/formula/IntPtg.java
poi/trunk/src/java/org/apache/poi/hssf/record/formula/IntersectionPtg.java
poi/trunk/src/java/org/apache/poi/hssf/record/formula/LessEqualPtg.java
poi/trunk/src/java/org/apache/poi/hssf/record/formula/LessThanPtg.java
poi/trunk/src/java/org/apache/poi/hssf/record/formula/MemAreaPtg.java
poi/trunk/src/java/org/apache/poi/hssf/record/formula/MemErrPtg.java
poi/trunk/src/java/org/apache/poi/hssf/record/formula/MemFuncPtg.java
poi/trunk/src/java/org/apache/poi/hssf/record/formula/MissingArgPtg.java
poi/trunk/src/java/org/apache/poi/hssf/record/formula/MultiplyPtg.java
poi/trunk/src/java/org/apache/poi/hssf/record/formula/NamePtg.java
poi/trunk/src/java/org/apache/poi/hssf/record/formula/NameXPtg.java
poi/trunk/src/java/org/apache/poi/hssf/record/formula/NotEqualPtg.java
poi/trunk/src/java/org/apache/poi/hssf/record/formula/NumberPtg.java
poi/trunk/src/java/org/apache/poi/hssf/record/formula/ParenthesisPtg.java
poi/trunk/src/java/org/apache/poi/hssf/record/formula/PercentPtg.java
poi/trunk/src/java/org/apache/poi/hssf/record/formula/PowerPtg.java
poi/trunk/src/java/org/apache/poi/hssf/record/formula/Ptg.java
poi/trunk/src/java/org/apache/poi/hssf/record/formula/RangePtg.java
poi/trunk/src/java/org/apache/poi/hssf/record/formula/Ref3DPtg.java
poi/trunk/src/java/org/apache/poi/hssf/record/formula/RefErrorPtg.java
poi/trunk/src/java/org/apache/poi/hssf/record/formula/RefNAPtg.java
poi/trunk/src/java/org/apache/poi/hssf/record/formula/RefNPtg.java
poi/trunk/src/java/org/apache/poi/hssf/record/formula/RefNVPtg.java
poi/trunk/src/java/org/apache/poi/hssf/record/formula/ReferencePtg.java
poi/trunk/src/java/org/apache/poi/hssf/record/formula/StringPtg.java
poi/trunk/src/java/org/apache/poi/hssf/record/formula/SubtractPtg.java
poi/trunk/src/java/org/apache/poi/hssf/record/formula/UnaryMinusPtg.java
poi/trunk/src/java/org/apache/poi/hssf/record/formula/UnaryPlusPtg.java
poi/trunk/src/java/org/apache/poi/hssf/record/formula/UnionPtg.java
poi/trunk/src/java/org/apache/poi/hssf/record/formula/UnknownPtg.java
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFCell.java
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormatting.java
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormattingRule.java
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFFormulaEvaluator.java
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFName.java
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFRow.java
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFSheet.java
poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFWorkbook.java
poi/trunk/src/testcases/org/apache/poi/hssf/model/TestFormulaParser.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/TestCFRuleRecord.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/aggregates/TestCFRecordsAggregate.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/formula/AbstractPtgTestCase.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/formula/TestArea3DPtg.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/formula/TestRef3DPtg.java
poi/trunk/src/testcases/org/apache/poi/hssf/record/formula/function/TestParseMissingBuiltInFuncs.java
poi/trunk/src/testcases/org/apache/poi/hssf/usermodel/TestFormulaEvaluatorBugs.java
poi/trunk/src/testcases/org/apache/poi/hssf/util/TestAreaReference.java
Modified: poi/trunk/src/documentation/content/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/poi/trunk/src/documentation/content/xdocs/changes.xml?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/documentation/content/xdocs/changes.xml (original)
+++ poi/trunk/src/documentation/content/xdocs/changes.xml Tue Apr 15 09:00:50 2008
@@ -37,6 +37,7 @@
<!-- Don't forget to update status.xml too! -->
<release version="3.0.3-beta1" date="2008-04-??">
+ <action dev="POI-DEVELOPERS" type="fix">Update the formula parser code to use a HSSFWorkbook, rather than the low level model.Workbook, to make things cleaner and make supporting XSSF formulas in future much easier</action>
<action dev="POI-DEVELOPERS" type="fix">Fix the logger used by POIFSFileSystem, so that commons-logging isn't required when not used</action>
<action dev="POI-DEVELOPERS" type="add">Update HSLFSlideShow and HSSFWorkbook to take advantage of POIFS updates, and allow reading embeded documents</action>
<action dev="POI-DEVELOPERS" type="add">Improve how POIFS works with directory entries, and update HWPFDocument to support reading an embeded word document</action>
Modified: poi/trunk/src/documentation/content/xdocs/status.xml
URL: http://svn.apache.org/viewvc/poi/trunk/src/documentation/content/xdocs/status.xml?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/documentation/content/xdocs/status.xml (original)
+++ poi/trunk/src/documentation/content/xdocs/status.xml Tue Apr 15 09:00:50 2008
@@ -34,6 +34,7 @@
<!-- Don't forget to update changes.xml too! -->
<changes>
<release version="3.0.3-beta1" date="2008-04-??">
+ <action dev="POI-DEVELOPERS" type="fix">Update the formula parser code to use a HSSFWorkbook, rather than the low level model.Workbook, to make things cleaner and make supporting XSSF formulas in future much easier</action>
<action dev="POI-DEVELOPERS" type="fix">Fix the logger used by POIFSFileSystem, so that commons-logging isn't required when not used</action>
<action dev="POI-DEVELOPERS" type="add">Update HSLFSlideShow and HSSFWorkbook to take advantage of POIFS updates, and allow reading embeded documents</action>
<action dev="POI-DEVELOPERS" type="add">Improve how POIFS works with directory entries, and update HWPFDocument to support reading an embeded word document</action>
Modified: poi/trunk/src/java/org/apache/poi/hssf/dev/FormulaViewer.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/dev/FormulaViewer.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/dev/FormulaViewer.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/dev/FormulaViewer.java Tue Apr 15 09:00:50 2008
@@ -32,6 +32,7 @@
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.apache.poi.hssf.record.*;
import org.apache.poi.hssf.record.formula.*;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.model.*;
/**
@@ -99,7 +100,7 @@
StringBuffer buf = new StringBuffer();
if (token instanceof ExpPtg) return;
- buf.append(name=((OperationPtg) token).toFormulaString((Workbook)null));
+ buf.append(name=((OperationPtg) token).toFormulaString((HSSFWorkbook)null));
buf.append(sep);
switch (token.getPtgClass()) {
case Ptg.CLASS_REF :
@@ -168,7 +169,7 @@
StringBuffer buf = new StringBuffer();
for (int i=0;i<numptgs;i++) {
token = (Ptg) tokens.get(i);
- buf.append( token.toFormulaString((Workbook)null));
+ buf.append( token.toFormulaString((HSSFWorkbook)null));
switch (token.getPtgClass()) {
case Ptg.CLASS_REF :
buf.append("(R)");
@@ -188,7 +189,7 @@
private String composeFormula(FormulaRecord record)
{
- return org.apache.poi.hssf.model.FormulaParser.toFormulaString((Workbook)null,record.getParsedExpression());
+ return org.apache.poi.hssf.model.FormulaParser.toFormulaString((HSSFWorkbook)null,record.getParsedExpression());
}
/**
Modified: poi/trunk/src/java/org/apache/poi/hssf/model/FormulaParser.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/model/FormulaParser.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/model/FormulaParser.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/model/FormulaParser.java Tue Apr 15 09:00:50 2008
@@ -27,6 +27,7 @@
import org.apache.poi.hssf.record.formula.*;
import org.apache.poi.hssf.record.formula.function.FunctionMetadata;
import org.apache.poi.hssf.record.formula.function.FunctionMetadataRegistry;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
/**
* This class parses a formula string into a List of tokens in RPN order.
@@ -86,7 +87,7 @@
*/
private char look;
- private Workbook book;
+ private HSSFWorkbook book;
/**
@@ -101,14 +102,14 @@
* model.Workbook, then use the convenience method on
* usermodel.HSSFFormulaEvaluator
*/
- public FormulaParser(String formula, Workbook book){
+ public FormulaParser(String formula, HSSFWorkbook book){
formulaString = formula;
pointer=0;
this.book = book;
formulaLength = formulaString.length();
}
- public static Ptg[] parse(String formula, Workbook book) {
+ public static Ptg[] parse(String formula, HSSFWorkbook book) {
FormulaParser fp = new FormulaParser(formula, book);
fp.parse();
return fp.getRPNPtg();
@@ -251,7 +252,7 @@
Match('!');
String sheetName = name;
String first = GetName();
- short externIdx = book.checkExternSheet(book.getSheetIndex(sheetName));
+ short externIdx = book.getExternalSheetIndex(book.getSheetIndex(sheetName));
if (look == ':') {
Match(':');
String second=GetName();
@@ -282,9 +283,9 @@
return new ReferencePtg(name);
}
- for(int i = 0; i < book.getNumNames(); i++) {
+ for(int i = 0; i < book.getNumberOfNames(); i++) {
// named range name matching is case insensitive
- if(book.getNameRecord(i).getNameText().equalsIgnoreCase(name)) {
+ if(book.getNameAt(i).getNameName().equalsIgnoreCase(name)) {
return new NamePtg(name, book);
}
}
@@ -926,7 +927,7 @@
* @param lptgs list of Ptg, can be null or empty
* @return a human readable String
*/
- public static String toFormulaString(Workbook book, List lptgs) {
+ public static String toFormulaString(HSSFWorkbook book, List lptgs) {
String retval = null;
if (lptgs == null || lptgs.size() == 0) return "#NAME";
Ptg[] ptgs = new Ptg[lptgs.size()];
@@ -952,7 +953,7 @@
* @param ptgs array of Ptg, can be null or empty
* @return a human readable String
*/
- public static String toFormulaString(Workbook book, Ptg[] ptgs) {
+ public static String toFormulaString(HSSFWorkbook book, Ptg[] ptgs) {
if (ptgs == null || ptgs.length == 0) {
// TODO - what is the justification for returning "#NAME" (which is not "#NAME?", btw)
return "#NAME";
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/CFRuleRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/CFRuleRecord.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/CFRuleRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/CFRuleRecord.java Tue Apr 15 09:00:50 2008
@@ -26,6 +26,7 @@
import org.apache.poi.hssf.record.cf.FontFormatting;
import org.apache.poi.hssf.record.cf.PatternFormatting;
import org.apache.poi.hssf.record.formula.Ptg;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.util.BitField;
import org.apache.poi.util.BitFieldFactory;
import org.apache.poi.util.LittleEndian;
@@ -152,7 +153,7 @@
/**
* Creates a new comparison operation rule
*/
- public static CFRuleRecord create(Workbook workbook, String formulaText) {
+ public static CFRuleRecord create(HSSFWorkbook workbook, String formulaText) {
Ptg[] formula1 = parseFormula(formulaText, workbook);
return new CFRuleRecord(CONDITION_TYPE_FORMULA, ComparisonOperator.NO_COMPARISON,
formula1, null);
@@ -160,7 +161,7 @@
/**
* Creates a new comparison operation rule
*/
- public static CFRuleRecord create(Workbook workbook, byte comparisonOperation,
+ public static CFRuleRecord create(HSSFWorkbook workbook, byte comparisonOperation,
String formulaText1, String formulaText2) {
Ptg[] formula1 = parseFormula(formulaText1, workbook);
Ptg[] formula2 = parseFormula(formulaText2, workbook);
@@ -651,7 +652,7 @@
/**
* @return <code>null</code> if <tt>formula</tt> was null.
*/
- private static Ptg[] parseFormula(String formula, Workbook workbook)
+ private static Ptg[] parseFormula(String formula, HSSFWorkbook workbook)
{
if(formula == null) {
return null;
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/NameRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/NameRecord.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/NameRecord.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/NameRecord.java Tue Apr 15 09:00:50 2008
@@ -18,12 +18,17 @@
package org.apache.poi.hssf.record;
+import java.util.Iterator;
import java.util.List;
import java.util.Stack;
-import java.util.Iterator;
-import org.apache.poi.hssf.model.Workbook;
-import org.apache.poi.hssf.record.formula.*;
+import org.apache.poi.hssf.record.formula.Area3DPtg;
+import org.apache.poi.hssf.record.formula.DeletedArea3DPtg;
+import org.apache.poi.hssf.record.formula.DeletedRef3DPtg;
+import org.apache.poi.hssf.record.formula.Ptg;
+import org.apache.poi.hssf.record.formula.Ref3DPtg;
+import org.apache.poi.hssf.record.formula.UnionPtg;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.util.AreaReference;
import org.apache.poi.hssf.util.RangeAddress;
import org.apache.poi.util.HexDump;
@@ -645,7 +650,7 @@
/** gets the reference , the area only (range)
* @return area reference
*/
- public String getAreaReference(Workbook book){
+ public String getAreaReference(HSSFWorkbook book){
if (field_13_name_definition == null || field_13_name_definition.isEmpty()) return "Error";
Ptg ptg = (Ptg) field_13_name_definition.peek();
String result = "";
@@ -679,7 +684,7 @@
* return an empty string if nothing is possible
* for it.
*/
- private String getAreaRefString(Ptg ptg,Workbook book) {
+ private String getAreaRefString(Ptg ptg,HSSFWorkbook book) {
if (ptg.getClass() == Area3DPtg.class){
return ptg.toFormulaString(book);
} else if (ptg.getClass() == Ref3DPtg.class){
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/formula/AbstractFunctionPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/formula/AbstractFunctionPtg.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/AbstractFunctionPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/formula/AbstractFunctionPtg.java Tue Apr 15 09:00:50 2008
@@ -17,7 +17,7 @@
package org.apache.poi.hssf.record.formula;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.formula.function.FunctionMetadata;
import org.apache.poi.hssf.record.formula.function.FunctionMetadataRegistry;
@@ -73,7 +73,7 @@
return field_2_fnc_index == FUNCTION_INDEX_EXTERNAL;
}
- public String toFormulaString(Workbook book) {
+ public String toFormulaString(HSSFWorkbook book) {
return getName();
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/formula/AddPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/formula/AddPtg.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/AddPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/formula/AddPtg.java Tue Apr 15 09:00:50 2008
@@ -23,7 +23,7 @@
*/
package org.apache.poi.hssf.record.formula;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -75,7 +75,7 @@
}
/** Implementation of method from Ptg */
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return "+";
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/formula/Area3DPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/formula/Area3DPtg.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/Area3DPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/formula/Area3DPtg.java Tue Apr 15 09:00:50 2008
@@ -17,7 +17,7 @@
package org.apache.poi.hssf.record.formula;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
import org.apache.poi.hssf.util.AreaReference;
import org.apache.poi.hssf.util.CellReference;
@@ -273,7 +273,7 @@
* @return text representation of this area reference that can be used in text
* formulas. The sheet name will get properly delimited if required.
*/
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
// First do the sheet name
StringBuffer retval = new StringBuffer();
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/formula/AreaAPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/formula/AreaAPtg.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/AreaAPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/formula/AreaAPtg.java Tue Apr 15 09:00:50 2008
@@ -29,7 +29,7 @@
import org.apache.poi.hssf.record.RecordInputStream;
import org.apache.poi.hssf.util.AreaReference;
import org.apache.poi.hssf.util.CellReference;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
/**
* Specifies a rectangular area of cells A1:A4 for instance.
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/formula/AreaErrPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/formula/AreaErrPtg.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/AreaErrPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/formula/AreaErrPtg.java Tue Apr 15 09:00:50 2008
@@ -20,7 +20,7 @@
import org.apache.poi.util.LittleEndian;
import org.apache.poi.util.BitField;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -66,7 +66,7 @@
array[offset] = (byte) (sid + ptgClass);
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return "#REF!";
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/formula/AreaNAPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/formula/AreaNAPtg.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/AreaNAPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/formula/AreaNAPtg.java Tue Apr 15 09:00:50 2008
@@ -29,7 +29,7 @@
import org.apache.poi.hssf.record.RecordInputStream;
import org.apache.poi.hssf.util.AreaReference;
import org.apache.poi.hssf.util.CellReference;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
/**
* Specifies a rectangular area of cells A1:A4 for instance.
@@ -58,7 +58,7 @@
return "AreaNAPtg";
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
throw new RuntimeException("Coding Error: This method should never be called. This ptg should be converted");
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/formula/AreaNPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/formula/AreaNPtg.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/AreaNPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/formula/AreaNPtg.java Tue Apr 15 09:00:50 2008
@@ -29,7 +29,7 @@
import org.apache.poi.hssf.record.RecordInputStream;
import org.apache.poi.hssf.util.AreaReference;
import org.apache.poi.hssf.util.CellReference;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
/**
* Specifies a rectangular area of cells A1:A4 for instance.
@@ -61,7 +61,7 @@
return "AreaNPtg";
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
throw new RuntimeException("Coding Error: This method should never be called. This ptg should be converted");
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/formula/AreaNVPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/formula/AreaNVPtg.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/AreaNVPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/formula/AreaNVPtg.java Tue Apr 15 09:00:50 2008
@@ -29,7 +29,7 @@
import org.apache.poi.hssf.record.RecordInputStream;
import org.apache.poi.hssf.util.AreaReference;
import org.apache.poi.hssf.util.CellReference;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
/**
* Specifies a rectangular area of cells A1:A4 for instance.
@@ -59,7 +59,7 @@
return "AreaNVPtg";
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
throw new RuntimeException("Coding Error: This method should never be called. This ptg should be converted");
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/formula/AreaPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/formula/AreaPtg.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/AreaPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/formula/AreaPtg.java Tue Apr 15 09:00:50 2008
@@ -24,7 +24,7 @@
import org.apache.poi.hssf.util.AreaReference;
import org.apache.poi.hssf.util.CellReference;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -303,11 +303,11 @@
field_4_last_column = column;
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return toFormulaString(this, book);
}
- protected static String toFormulaString(AreaI area, Workbook book) {
+ protected static String toFormulaString(AreaI area, HSSFWorkbook book) {
CellReference topLeft = new CellReference(area.getFirstRow(),area.getFirstColumn(),!area.isFirstRowRelative(),!area.isFirstColRelative());
CellReference botRight = new CellReference(area.getLastRow(),area.getLastColumn(),!area.isLastRowRelative(),!area.isLastColRelative());
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/formula/AreaVPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/formula/AreaVPtg.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/AreaVPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/formula/AreaVPtg.java Tue Apr 15 09:00:50 2008
@@ -29,7 +29,7 @@
import org.apache.poi.hssf.record.RecordInputStream;
import org.apache.poi.hssf.util.AreaReference;
import org.apache.poi.hssf.util.CellReference;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
/**
* Specifies a rectangular area of cells A1:A4 for instance.
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/formula/ArrayPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/formula/ArrayPtg.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/ArrayPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/formula/ArrayPtg.java Tue Apr 15 09:00:50 2008
@@ -23,7 +23,7 @@
import org.apache.poi.util.StringUtil;
import org.apache.poi.hssf.util.CellReference;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordFormatException;
import org.apache.poi.hssf.record.RecordInputStream;
import org.apache.poi.hssf.record.SSTRecord;
@@ -198,7 +198,7 @@
return size;
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
StringBuffer b = new StringBuffer();
b.append("{");
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/formula/ArrayPtgA.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/formula/ArrayPtgA.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/ArrayPtgA.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/formula/ArrayPtgA.java Tue Apr 15 09:00:50 2008
@@ -23,7 +23,7 @@
import org.apache.poi.util.StringUtil;
import org.apache.poi.hssf.util.CellReference;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordFormatException;
import org.apache.poi.hssf.record.RecordInputStream;
import org.apache.poi.hssf.record.SSTRecord;
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/formula/ArrayPtgV.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/formula/ArrayPtgV.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/ArrayPtgV.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/formula/ArrayPtgV.java Tue Apr 15 09:00:50 2008
@@ -23,7 +23,7 @@
import org.apache.poi.util.StringUtil;
import org.apache.poi.hssf.util.CellReference;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordFormatException;
import org.apache.poi.hssf.record.RecordInputStream;
import org.apache.poi.hssf.record.SSTRecord;
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/formula/AttrPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/formula/AttrPtg.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/AttrPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/formula/AttrPtg.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;
import org.apache.poi.hssf.record.RecordInputStream;
import org.apache.poi.util.LittleEndian;
@@ -209,11 +209,11 @@
if(space.isSet(field_1_options)) {
return operands[ 0 ];
} else if (optiIf.isSet(field_1_options)) {
- return toFormulaString((Workbook)null) + "(" + operands[ 0 ] +")";
+ return toFormulaString((HSSFWorkbook)null) + "(" + operands[ 0 ] +")";
} else if (optGoto.isSet(field_1_options)) {
- return toFormulaString((Workbook)null) + operands[0]; //goto isn't a real formula element should not show up
+ return toFormulaString((HSSFWorkbook)null) + operands[0]; //goto isn't a real formula element should not show up
} else {
- return toFormulaString((Workbook)null) + "(" + operands[ 0 ] + ")";
+ return toFormulaString((HSSFWorkbook)null) + "(" + operands[ 0 ] + ")";
}
}
@@ -228,7 +228,7 @@
return -1;
}
- public String toFormulaString(Workbook book) {
+ public String toFormulaString(HSSFWorkbook book) {
if(semiVolatile.isSet(field_1_options)) {
return "ATTR(semiVolatile)";
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/formula/BoolPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/formula/BoolPtg.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/BoolPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/formula/BoolPtg.java Tue Apr 15 09:00:50 2008
@@ -17,7 +17,7 @@
package org.apache.poi.hssf.record.formula;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -70,7 +70,7 @@
return SIZE;
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return field_1_value ? "TRUE" : "FALSE";
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/formula/ConcatPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/formula/ConcatPtg.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/ConcatPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/formula/ConcatPtg.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;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -64,7 +64,7 @@
return 2;
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return CONCAT;
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/formula/DividePtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/formula/DividePtg.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/DividePtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/formula/DividePtg.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;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -65,7 +65,7 @@
return 2;
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return "/";
}
@@ -74,7 +74,7 @@
StringBuffer buffer = new StringBuffer();
buffer.append(operands[ 0 ]);
- buffer.append(toFormulaString((Workbook)null));
+ buffer.append(toFormulaString((HSSFWorkbook)null));
buffer.append(operands[ 1 ]);
return buffer.toString();
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/formula/EqualPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/formula/EqualPtg.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/EqualPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/formula/EqualPtg.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;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -64,7 +64,7 @@
return 2;
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return "=";
}
@@ -74,7 +74,7 @@
buffer.append(operands[ 0 ]);
- buffer.append(toFormulaString((Workbook)null));
+ buffer.append(toFormulaString((HSSFWorkbook)null));
buffer.append(operands[ 1 ]);
return buffer.toString();
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/formula/ErrPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/formula/ErrPtg.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/ErrPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/formula/ErrPtg.java Tue Apr 15 09:00:50 2008
@@ -19,7 +19,7 @@
package org.apache.poi.hssf.record.formula;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
import org.apache.poi.hssf.usermodel.HSSFErrorConstants;
@@ -70,7 +70,7 @@
array[offset + 1] = (byte)field_1_error_code;
}
- public String toFormulaString(Workbook book) {
+ public String toFormulaString(HSSFWorkbook book) {
return HSSFErrorConstants.getText(field_1_error_code);
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/formula/ExpPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/formula/ExpPtg.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/ExpPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/formula/ExpPtg.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;
import org.apache.poi.hssf.record.RecordFormatException;
import org.apache.poi.hssf.record.RecordInputStream;
@@ -73,7 +73,7 @@
return field_2_first_col;
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
throw new RecordFormatException("Coding Error: Expected ExpPtg to be converted from Shared to Non-Shared Formula by ValueRecordsAggregate, but it wasn't");
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/formula/GreaterEqualPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/formula/GreaterEqualPtg.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/GreaterEqualPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/formula/GreaterEqualPtg.java Tue Apr 15 09:00:50 2008
@@ -19,7 +19,7 @@
package org.apache.poi.hssf.record.formula;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
@@ -67,7 +67,7 @@
return 2;
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return ">=";
}
@@ -77,7 +77,7 @@
buffer.append(operands[ 0 ]);
- buffer.append(toFormulaString((Workbook)null));
+ buffer.append(toFormulaString((HSSFWorkbook)null));
buffer.append(operands[ 1 ]);
return buffer.toString();
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/formula/GreaterThanPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/formula/GreaterThanPtg.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/GreaterThanPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/formula/GreaterThanPtg.java Tue Apr 15 09:00:50 2008
@@ -25,7 +25,7 @@
import java.util.List;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -97,7 +97,7 @@
* Implementation of method from Ptg
* @param book the Sheet References
*/
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return this.GREATERTHAN;
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/formula/IntPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/formula/IntPtg.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/IntPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/formula/IntPtg.java Tue Apr 15 09:00:50 2008
@@ -18,7 +18,7 @@
package org.apache.poi.hssf.record.formula;
import org.apache.poi.util.LittleEndian;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -72,7 +72,7 @@
return SIZE;
}
- public String toFormulaString(Workbook book) {
+ public String toFormulaString(HSSFWorkbook book) {
return String.valueOf(getValue());
}
public byte getDefaultOperandClass() {
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/formula/IntersectionPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/formula/IntersectionPtg.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/IntersectionPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/formula/IntersectionPtg.java Tue Apr 15 09:00:50 2008
@@ -17,7 +17,7 @@
package org.apache.poi.hssf.record.formula;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -59,7 +59,7 @@
}
/** Implementation of method from Ptg */
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return " ";
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/formula/LessEqualPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/formula/LessEqualPtg.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/LessEqualPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/formula/LessEqualPtg.java Tue Apr 15 09:00:50 2008
@@ -20,7 +20,7 @@
package org.apache.poi.hssf.record.formula;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
@@ -68,7 +68,7 @@
return 2;
}
- public String toFormulaString( Workbook book )
+ public String toFormulaString( HSSFWorkbook book )
{
return "<=";
}
@@ -77,7 +77,7 @@
{
StringBuffer buffer = new StringBuffer();
buffer.append( operands[0] );
- buffer.append( toFormulaString( (Workbook) null ) );
+ buffer.append( toFormulaString( (HSSFWorkbook) null ) );
buffer.append( operands[1] );
return buffer.toString();
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/formula/LessThanPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/formula/LessThanPtg.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/LessThanPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/formula/LessThanPtg.java Tue Apr 15 09:00:50 2008
@@ -27,7 +27,7 @@
import java.util.List;
//POI
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -106,7 +106,7 @@
* Implementation of method from Ptg
* @param book the Sheet References
*/
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return this.LESSTHAN;
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/formula/MemAreaPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/formula/MemAreaPtg.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/MemAreaPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/formula/MemAreaPtg.java Tue Apr 15 09:00:50 2008
@@ -25,7 +25,7 @@
package org.apache.poi.hssf.record.formula;
import org.apache.poi.util.LittleEndian;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -83,7 +83,7 @@
return SIZE;
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return ""; // TODO: Not sure how to format this. -- DN
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/formula/MemErrPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/formula/MemErrPtg.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/MemErrPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/formula/MemErrPtg.java Tue Apr 15 09:00:50 2008
@@ -25,7 +25,7 @@
package org.apache.poi.hssf.record.formula;
import org.apache.poi.util.LittleEndian;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -57,7 +57,7 @@
array[offset] = (byte) (sid + ptgClass);
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return "ERR#";
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/formula/MemFuncPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/formula/MemFuncPtg.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/MemFuncPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/formula/MemFuncPtg.java Tue Apr 15 09:00:50 2008
@@ -24,7 +24,7 @@
package org.apache.poi.hssf.record.formula;
import org.apache.poi.util.LittleEndian;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -60,7 +60,7 @@
LittleEndian.putShort( array, offset + 1, (short)field_1_len_ref_subexpression );
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return "";
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/formula/MissingArgPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/formula/MissingArgPtg.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/MissingArgPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/formula/MissingArgPtg.java Tue Apr 15 09:00:50 2008
@@ -17,7 +17,7 @@
package org.apache.poi.hssf.record.formula;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -55,7 +55,7 @@
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return " ";
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/formula/MultiplyPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/formula/MultiplyPtg.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/MultiplyPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/formula/MultiplyPtg.java Tue Apr 15 09:00:50 2008
@@ -16,7 +16,7 @@
==================================================================== */
package org.apache.poi.hssf.record.formula;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -68,7 +68,7 @@
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return "*";
}
@@ -77,9 +77,9 @@
{
StringBuffer buffer = new StringBuffer();
- buffer.append(operands[ 0 ].toFormulaString((Workbook)null));
+ buffer.append(operands[ 0 ].toFormulaString((HSSFWorkbook)null));
buffer.append("*");
- buffer.append(operands[ 1 ].toFormulaString((Workbook)null));
+ buffer.append(operands[ 1 ].toFormulaString((HSSFWorkbook)null));
return buffer.toString();
}
@@ -87,7 +87,7 @@
StringBuffer buffer = new StringBuffer();
buffer.append(operands[ 0 ]);
- buffer.append(toFormulaString((Workbook)null));
+ buffer.append(toFormulaString((HSSFWorkbook)null));
buffer.append(operands[ 1 ]);
return buffer.toString();
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/formula/NamePtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/formula/NamePtg.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/NamePtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/formula/NamePtg.java Tue Apr 15 09:00:50 2008
@@ -18,7 +18,8 @@
package org.apache.poi.hssf.record.formula;
import org.apache.poi.util.LittleEndian;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFName;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.NameRecord;
import org.apache.poi.hssf.record.RecordInputStream;
@@ -48,26 +49,24 @@
* in the workbook. The search for the name record is case insensitive. If it is not found,
* it gets created.
*/
- public NamePtg(String name, Workbook book) {
+ public NamePtg(String name, HSSFWorkbook book) {
field_1_label_index = (short)(1+getOrCreateNameRecord(book, name)); // convert to 1-based
}
/**
* @return zero based index of the found or newly created defined name record.
*/
- private static final int getOrCreateNameRecord(Workbook book, String name) {
- // perhaps this logic belongs in Workbook
- int countNames = book.getNumNames();
- NameRecord rec;
+ private static final int getOrCreateNameRecord(HSSFWorkbook book, String name) {
+ // perhaps this logic belongs in Workbook?
+ int countNames = book.getNumberOfNames();
for (int i = 0; i < countNames; i++) {
- rec = book.getNameRecord(i);
- if (name.equalsIgnoreCase(rec.getNameText())) {
+ if(name.equalsIgnoreCase( book.getNameName(i) )) {
return i;
}
}
- rec = new NameRecord();
- rec.setNameText(name);
- rec.setNameTextLength((byte) name.length());
- book.addName(rec);
+
+ HSSFName nameObj = book.createName();
+ nameObj.setNameName(name);
+
return countNames;
}
@@ -100,10 +99,9 @@
return SIZE;
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
- NameRecord rec = book.getNameRecord(field_1_label_index - 1);
- return rec.getNameText();
+ return book.getNameName(field_1_label_index - 1);
}
public byte getDefaultOperandClass() {return Ptg.CLASS_REF;}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/formula/NameXPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/formula/NameXPtg.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/NameXPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/formula/NameXPtg.java Tue Apr 15 09:00:50 2008
@@ -18,7 +18,7 @@
package org.apache.poi.hssf.record.formula;
import org.apache.poi.util.LittleEndian;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -61,7 +61,7 @@
return SIZE;
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
// -1 to convert definedNameIndex from 1-based to zero-based
return book.resolveNameXText(field_1_ixals, field_2_ilbl-1);
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/formula/NotEqualPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/formula/NotEqualPtg.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/NotEqualPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/formula/NotEqualPtg.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;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -64,7 +64,7 @@
return 2;
}
- public String toFormulaString( Workbook book )
+ public String toFormulaString( HSSFWorkbook book )
{
return "<>";
}
@@ -75,7 +75,7 @@
buffer.append( operands[0] );
- buffer.append( toFormulaString( (Workbook) null ) );
+ buffer.append( toFormulaString( (HSSFWorkbook) null ) );
buffer.append( operands[1] );
return buffer.toString();
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/formula/NumberPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/formula/NumberPtg.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/NumberPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/formula/NumberPtg.java Tue Apr 15 09:00:50 2008
@@ -18,7 +18,7 @@
package org.apache.poi.hssf.record.formula;
import org.apache.poi.util.LittleEndian;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -78,7 +78,7 @@
return SIZE;
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return "" + getValue();
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/formula/ParenthesisPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/formula/ParenthesisPtg.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/ParenthesisPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/formula/ParenthesisPtg.java Tue Apr 15 09:00:50 2008
@@ -20,7 +20,7 @@
import java.util.List;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -71,7 +71,7 @@
return 1;
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return "()";
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/formula/PercentPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/formula/PercentPtg.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/PercentPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/formula/PercentPtg.java Tue Apr 15 09:00:50 2008
@@ -23,7 +23,7 @@
*/
package org.apache.poi.hssf.record.formula;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -74,7 +74,7 @@
}
/** Implementation of method from Ptg */
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return "%";
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/formula/PowerPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/formula/PowerPtg.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/PowerPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/formula/PowerPtg.java Tue Apr 15 09:00:50 2008
@@ -19,7 +19,7 @@
import java.util.List;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -66,7 +66,7 @@
return 2;
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return "^";
}
@@ -76,7 +76,7 @@
buffer.append(operands[ 0 ]);
- buffer.append(toFormulaString((Workbook)null));
+ buffer.append(toFormulaString((HSSFWorkbook)null));
buffer.append(operands[ 1 ]);
return buffer.toString();
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/formula/Ptg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/formula/Ptg.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/Ptg.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/formula/Ptg.java Tue Apr 15 09:00:50 2008
@@ -21,7 +21,7 @@
import java.util.ArrayList;
import java.util.Stack;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -418,7 +418,7 @@
/**
* return a string representation of this token alone
*/
- public abstract String toFormulaString(Workbook book);
+ public abstract String toFormulaString(HSSFWorkbook book);
/**
* dump a debug representation (hexdump) to a string
*/
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/formula/RangePtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/formula/RangePtg.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/RangePtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/formula/RangePtg.java Tue Apr 15 09:00:50 2008
@@ -17,7 +17,7 @@
package org.apache.poi.hssf.record.formula;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -59,7 +59,7 @@
}
/** Implementation of method from Ptg */
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return ":";
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/formula/Ref3DPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/formula/Ref3DPtg.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/Ref3DPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/formula/Ref3DPtg.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;
import org.apache.poi.hssf.record.RecordInputStream;
import org.apache.poi.hssf.util.CellReference;
import org.apache.poi.hssf.util.RangeAddress;
@@ -162,8 +162,8 @@
}
// TODO - find a home for this method
- // There is already a method on Workbook called getSheetName but it seems to do something different.
- static String getSheetName(Workbook book, int externSheetIndex) {
+ // There is already a method on HSSFWorkbook called getSheetName but it seems to do something different.
+ static String getSheetName(HSSFWorkbook book, int externSheetIndex) {
// TODO - there are 3 ways this method can return null. Is each valid?
if (book == null) {
return null;
@@ -179,7 +179,7 @@
* @return text representation of this cell reference that can be used in text
* formulas. The sheet name will get properly delimited if required.
*/
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
StringBuffer retval = new StringBuffer();
String sheetName = getSheetName(book, field_1_index_extern_sheet);
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/formula/RefErrorPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/formula/RefErrorPtg.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/RefErrorPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/formula/RefErrorPtg.java Tue Apr 15 09:00:50 2008
@@ -21,7 +21,7 @@
import org.apache.poi.util.BitField;
import org.apache.poi.hssf.util.CellReference;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -74,7 +74,7 @@
return SIZE;
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
//TODO -- should we store a cellreference instance in this ptg?? but .. memory is an issue, i believe!
return "#REF!";
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/formula/RefNAPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/formula/RefNAPtg.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/RefNAPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/formula/RefNAPtg.java Tue Apr 15 09:00:50 2008
@@ -28,7 +28,7 @@
import org.apache.poi.hssf.record.RecordInputStream;
import org.apache.poi.hssf.util.CellReference;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
/**
* RefNAPtg
@@ -57,7 +57,7 @@
return "RefNAPtg";
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
throw new RuntimeException("Coding Error: This method should never be called. This ptg should be converted");
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/formula/RefNPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/formula/RefNPtg.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/RefNPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/formula/RefNPtg.java Tue Apr 15 09:00:50 2008
@@ -27,7 +27,7 @@
import org.apache.poi.hssf.record.RecordInputStream;
import org.apache.poi.hssf.util.CellReference;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
/**
* RefNPtg
@@ -58,7 +58,7 @@
return "RefNPtg";
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
throw new RuntimeException("Coding Error: This method should never be called. This ptg should be converted");
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/formula/RefNVPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/formula/RefNVPtg.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/RefNVPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/formula/RefNVPtg.java Tue Apr 15 09:00:50 2008
@@ -23,7 +23,7 @@
import org.apache.poi.hssf.record.RecordInputStream;
import org.apache.poi.hssf.util.CellReference;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
/**
* RefNVPtg
@@ -54,7 +54,7 @@
return "RefNVPtg";
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
throw new RuntimeException("Coding Error: This method should never be called. This ptg should be converted");
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/formula/ReferencePtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/formula/ReferencePtg.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/ReferencePtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/formula/ReferencePtg.java Tue Apr 15 09:00:50 2008
@@ -22,7 +22,7 @@
import org.apache.poi.util.BitFieldFactory;
import org.apache.poi.hssf.util.CellReference;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -176,7 +176,7 @@
return SIZE;
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
//TODO -- should we store a cellreference instance in this ptg?? but .. memory is an issue, i believe!
return (new CellReference(getRowAsInt(),getColumn(),!isRowRelative(),!isColRelative())).formatAsString();
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/formula/StringPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/formula/StringPtg.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/StringPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/formula/StringPtg.java Tue Apr 15 09:00:50 2008
@@ -17,7 +17,7 @@
package org.apache.poi.hssf.record.formula;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.util.BitField;
import org.apache.poi.util.BitFieldFactory;
import org.apache.poi.util.StringUtil;
@@ -109,7 +109,7 @@
}
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return "\""+getValue()+"\"";
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/formula/SubtractPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/formula/SubtractPtg.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/SubtractPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/formula/SubtractPtg.java Tue Apr 15 09:00:50 2008
@@ -18,7 +18,7 @@
package org.apache.poi.hssf.record.formula;
import java.util.List;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -63,7 +63,7 @@
return 2;
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return "-";
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/formula/UnaryMinusPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/formula/UnaryMinusPtg.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/UnaryMinusPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/formula/UnaryMinusPtg.java Tue Apr 15 09:00:50 2008
@@ -19,7 +19,7 @@
import java.util.List;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -69,7 +69,7 @@
}
/** Implementation of method from Ptg */
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return "+";
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/formula/UnaryPlusPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/formula/UnaryPlusPtg.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/UnaryPlusPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/formula/UnaryPlusPtg.java Tue Apr 15 09:00:50 2008
@@ -19,7 +19,7 @@
import java.util.List;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -69,7 +69,7 @@
}
/** Implementation of method from Ptg */
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return "+";
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/formula/UnionPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/formula/UnionPtg.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/UnionPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/formula/UnionPtg.java Tue Apr 15 09:00:50 2008
@@ -17,7 +17,7 @@
package org.apache.poi.hssf.record.formula;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -59,7 +59,7 @@
}
/** Implementation of method from Ptg */
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return ",";
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/formula/UnknownPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/formula/UnknownPtg.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/UnknownPtg.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/formula/UnknownPtg.java Tue Apr 15 09:00:50 2008
@@ -16,7 +16,7 @@
==================================================================== */
package org.apache.poi.hssf.record.formula;
-import org.apache.poi.hssf.model.Workbook;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hssf.record.RecordInputStream;
/**
@@ -51,7 +51,7 @@
return size;
}
- public String toFormulaString(Workbook book)
+ public String toFormulaString(HSSFWorkbook book)
{
return "UNKNOWN";
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFCell.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFCell.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFCell.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFCell.java Tue Apr 15 09:00:50 2008
@@ -113,7 +113,7 @@
private int cellType;
private HSSFRichTextString stringValue;
private short encoding = ENCODING_UNCHANGED;
- private Workbook book;
+ private HSSFWorkbook book;
private Sheet sheet;
private CellValueRecordInterface record;
private HSSFComment comment;
@@ -136,7 +136,7 @@
*/
//protected HSSFCell(Workbook book, Sheet sheet, short row, short col)
- protected HSSFCell(Workbook book, Sheet sheet, int row, short col)
+ protected HSSFCell(HSSFWorkbook book, Sheet sheet, int row, short col)
{
checkBounds(col);
stringValue = null;
@@ -165,7 +165,7 @@
*/
//protected HSSFCell(Workbook book, Sheet sheet, short row, short col,
- protected HSSFCell(Workbook book, Sheet sheet, int row, short col,
+ protected HSSFCell(HSSFWorkbook book, Sheet sheet, int row, short col,
int type)
{
checkBounds(col);
@@ -188,7 +188,7 @@
*/
//protected HSSFCell(Workbook book, Sheet sheet, short row,
- protected HSSFCell(Workbook book, Sheet sheet, int row,
+ protected HSSFCell(HSSFWorkbook book, Sheet sheet, int row,
CellValueRecordInterface cval)
{
record = cval;
@@ -199,7 +199,7 @@
switch (cellType)
{
case CELL_TYPE_STRING :
- stringValue = new HSSFRichTextString(book, (LabelSSTRecord ) cval);
+ stringValue = new HSSFRichTextString(book.getWorkbook(), (LabelSSTRecord ) cval);
break;
case CELL_TYPE_BLANK :
@@ -209,7 +209,7 @@
stringValue=new HSSFRichTextString(((FormulaRecordAggregate) cval).getStringValue());
break;
}
- ExtendedFormatRecord xf = book.getExFormatAt(cval.getXFIndex());
+ ExtendedFormatRecord xf = book.getWorkbook().getExFormatAt(cval.getXFIndex());
setCellStyle(new HSSFCellStyle(( short ) cval.getXFIndex(), xf, book));
}
@@ -265,7 +265,7 @@
* @return
*/
protected Workbook getBoundWorkbook() {
- return book;
+ return book.getWorkbook();
}
/**
@@ -411,9 +411,9 @@
// jmh {
// jmh str.setUncompressedUnicode();
// jmh }
- sst = book.addSSTString(str);
+ sst = book.getWorkbook().addSSTString(str);
lrec.setSSTIndex(sst);
- getRichStringCellValue().setUnicodeString(book.getSSTString(sst));
+ getRichStringCellValue().setUnicodeString(book.getWorkbook().getSSTString(sst));
}
}
record = lrec;
@@ -540,7 +540,7 @@
*/
public void setCellValue(Date value)
{
- setCellValue(HSSFDateUtil.getExcelDate(value, this.book.isUsing1904DateWindowing()));
+ setCellValue(HSSFDateUtil.getExcelDate(value, this.book.getWorkbook().isUsing1904DateWindowing()));
}
/**
@@ -560,7 +560,7 @@
*/
public void setCellValue(Calendar value)
{
- setCellValue( HSSFDateUtil.getExcelDate(value, this.book.isUsing1904DateWindowing()) );
+ setCellValue( HSSFDateUtil.getExcelDate(value, this.book.getWorkbook().isUsing1904DateWindowing()) );
}
/**
@@ -614,11 +614,11 @@
int index = 0;
UnicodeString str = value.getUnicodeString();
- index = book.addSSTString(str);
+ index = book.getWorkbook().addSSTString(str);
(( LabelSSTRecord ) record).setSSTIndex(index);
stringValue = value;
- stringValue.setWorkbookReferences(book, (( LabelSSTRecord ) record));
- stringValue.setUnicodeString(book.getSSTString(index));
+ stringValue.setWorkbookReferences(book.getWorkbook(), (( LabelSSTRecord ) record));
+ stringValue.setUnicodeString(book.getWorkbook().getSSTString(index));
}
public void setCellFormula(String formula) {
@@ -728,7 +728,7 @@
"You cannot get a date value from an error cell");
}
double value=this.getNumericCellValue();
- if (book.isUsing1904DateWindowing()) {
+ if (book.getWorkbook().isUsing1904DateWindowing()) {
return HSSFDateUtil.getJavaDate(value,true);
}
else {
@@ -913,7 +913,7 @@
public HSSFCellStyle getCellStyle()
{
short styleIndex=record.getXFIndex();
- ExtendedFormatRecord xf = book.getExFormatAt(styleIndex);
+ ExtendedFormatRecord xf = book.getWorkbook().getExFormatAt(styleIndex);
return new HSSFCellStyle(styleIndex, xf, book);
}
Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormatting.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormatting.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormatting.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormatting.java Tue Apr 15 09:00:50 2008
@@ -84,7 +84,7 @@
*/
public final class HSSFConditionalFormatting
{
- private final Workbook workbook;
+ private final HSSFWorkbook workbook;
private final CFRecordsAggregate cfAggregate;
HSSFConditionalFormatting(HSSFSheet sheet, CFRecordsAggregate cfAggregate)
@@ -95,7 +95,7 @@
if(cfAggregate == null) {
throw new IllegalArgumentException("cfAggregate must not be null");
}
- workbook = sheet.workbook.getWorkbook();
+ workbook = sheet.workbook;
this.cfAggregate = cfAggregate;
}
CFRecordsAggregate getCFRecordsAggregate() {
Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormattingRule.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormattingRule.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormattingRule.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFConditionalFormattingRule.java Tue Apr 15 09:00:50 2008
@@ -40,13 +40,13 @@
private static final byte CELL_COMPARISON = CFRuleRecord.CONDITION_TYPE_CELL_VALUE_IS;
private final CFRuleRecord cfRuleRecord;
- private final Workbook workbook;
+ private final HSSFWorkbook workbook;
- HSSFConditionalFormattingRule(Workbook pWorkbook, CFRuleRecord pRuleRecord) {
+ HSSFConditionalFormattingRule(HSSFWorkbook pWorkbook, CFRuleRecord pRuleRecord) {
workbook = pWorkbook;
cfRuleRecord = pRuleRecord;
}
- HSSFConditionalFormattingRule(Workbook pWorkbook, CFRuleRecord pRuleRecord,
+ HSSFConditionalFormattingRule(HSSFWorkbook pWorkbook, CFRuleRecord pRuleRecord,
HSSFFontFormatting fontFmt, HSSFBorderFormatting bordFmt, HSSFPatternFormatting patternFmt) {
this(pWorkbook, pRuleRecord);
setFontFormatting(fontFmt);
Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFFormulaEvaluator.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFFormulaEvaluator.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFFormulaEvaluator.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFFormulaEvaluator.java Tue Apr 15 09:00:50 2008
@@ -115,7 +115,7 @@
* formula evaluated.
*/
public static FormulaParser getUnderlyingParser(HSSFWorkbook workbook, String formula) {
- return new FormulaParser(formula, workbook.getWorkbook());
+ return new FormulaParser(formula, workbook);
}
/**
@@ -343,7 +343,7 @@
}
private static ValueEval evaluateCell(HSSFWorkbook workbook, HSSFSheet sheet,
int srcRowNum, short srcColNum, String cellFormulaText) {
- FormulaParser parser = new FormulaParser(cellFormulaText, workbook.getWorkbook());
+ FormulaParser parser = new FormulaParser(cellFormulaText, workbook);
parser.parse();
Ptg[] ptgs = parser.getRPNPtg();
// -- parsing over --
@@ -760,7 +760,7 @@
* @param workbook
*/
void inspectPtgs(String formula) {
- FormulaParser fp = new FormulaParser(formula, workbook.getWorkbook());
+ FormulaParser fp = new FormulaParser(formula, workbook);
fp.parse();
Ptg[] ptgs = fp.getRPNPtg();
System.out.println("<ptg-group>");
Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFName.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFName.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFName.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFName.java Tue Apr 15 09:00:50 2008
@@ -29,7 +29,7 @@
*/
public class HSSFName {
- private Workbook book;
+ private HSSFWorkbook book;
private NameRecord name;
/** Creates new HSSFName - called by HSSFWorkbook to create a sheet from
@@ -40,7 +40,7 @@
* @param book lowlevel Workbook object associated with the sheet.
*/
- protected HSSFName(Workbook book, NameRecord name) {
+ protected HSSFName(HSSFWorkbook book, NameRecord name) {
this.book = book;
this.name = name;
}
@@ -53,7 +53,7 @@
String result ;
short indexToExternSheet = name.getExternSheetNumber();
- result = book.findSheetNameFromExternSheet(indexToExternSheet);
+ result = book.getWorkbook().findSheetNameFromExternSheet(indexToExternSheet);
return result;
}
@@ -77,11 +77,12 @@
public void setNameName(String nameName){
name.setNameText(nameName);
name.setNameTextLength((byte)nameName.length());
+ Workbook wb = book.getWorkbook();
//Check to ensure no other names have the same case-insensitive name
- for ( int i = book.getNumNames()-1; i >=0; i-- )
+ for ( int i = wb.getNumNames()-1; i >=0; i-- )
{
- NameRecord rec = book.getNameRecord(i);
+ NameRecord rec = wb.getNameRecord(i);
if (rec != name) {
if (rec.getNameText().equalsIgnoreCase(getNameName()))
throw new IllegalArgumentException("The workbook already contains this name (case-insensitive)");
@@ -111,7 +112,7 @@
private void setSheetName(String sheetName){
int sheetNumber = book.getSheetIndex(sheetName);
- short externSheetNumber = book.checkExternSheet(sheetNumber);
+ short externSheetNumber = book.getExternalSheetIndex(sheetNumber);
name.setExternSheetNumber(externSheetNumber);
// name.setIndexToSheet(externSheetNumber);
Modified: poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFRow.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFRow.java?rev=648303&r1=648302&r2=648303&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFRow.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/usermodel/HSSFRow.java Tue Apr 15 09:00:50 2008
@@ -53,7 +53,7 @@
* reference to containing low level Workbook
*/
- private Workbook book;
+ private HSSFWorkbook book;
/**
* reference to containing Sheet
@@ -75,7 +75,7 @@
*/
//protected HSSFRow(Workbook book, Sheet sheet, short rowNum)
- protected HSSFRow(Workbook book, Sheet sheet, int rowNum)
+ protected HSSFRow(HSSFWorkbook book, Sheet sheet, int rowNum)
{
this.rowNum = rowNum;
this.book = book;
@@ -99,7 +99,7 @@
* @see org.apache.poi.hssf.usermodel.HSSFSheet#createRow(int)
*/
- protected HSSFRow(Workbook book, Sheet sheet, RowRecord record)
+ protected HSSFRow(HSSFWorkbook book, Sheet sheet, RowRecord record)
{
this.book = book;
this.sheet = sheet;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org