You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ye...@apache.org on 2010/11/24 17:54:28 UTC
svn commit: r1038691 - in /poi/trunk: ./
src/ooxml/java/org/apache/poi/xssf/usermodel/
src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/
src/ooxml/testcases/org/apache/poi/xssf/usermodel/
src/resources/main/org/apache/poi/hssf/ src/scratchpad/src/o...
Author: yegor
Date: Wed Nov 24 16:54:26 2010
New Revision: 1038691
URL: http://svn.apache.org/viewvc?rev=1038691&view=rev
Log:
moved ptg classes to org.apache.poi.ss.formula.ptg
Added:
poi/trunk/src/testcases/org/apache/poi/ss/formula/constant/
- copied from r1038208, poi/trunk/src/testcases/org/apache/poi/hssf/record/constant/
poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/
- copied from r1038208, poi/trunk/src/testcases/org/apache/poi/hssf/record/formula/
Removed:
poi/trunk/src/resources/main/org/apache/poi/hssf/
Modified:
poi/trunk/ (props changed)
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationWorkbook.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFName.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRichTextString.java
poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFRowShifter.java
poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java
poi/trunk/src/scratchpad/src/org/apache/poi/hssf/usermodel/HSSFChart.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/TestEvaluationCache.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/TestFormulaShifter.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/TestWorkbookEvaluator.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/constant/TestConstantValueParser.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestAreaEval.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestRangeEval.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestUnaryPlusEval.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/function/TestParseMissingBuiltInFuncs.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/EvalFactory.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/AbstractPtgTestCase.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/AllFormulaTests.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestArea3DPtg.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestAreaErrPtg.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestAreaPtg.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestArrayPtg.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestAttrPtg.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestErrPtg.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestExternalFunctionFormulas.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestExternalNameReference.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestFuncPtg.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestFuncVarPtg.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestIntersectionPtg.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestPercentPtg.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestRangePtg.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestRef3DPtg.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestReferencePtg.java
poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestUnionPtg.java
poi/trunk/src/testcases/org/apache/poi/ss/util/TestNumberToTextConverter.java
Propchange: poi/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Nov 24 16:54:26 2010
@@ -1,19 +1,16 @@
-dist
-scripts
+classes
+workbook.xls
+bak
+*.iws
+build.number
*.el
+TEST-org.apache.poi*.xml
+build
+.settings
+scripts
*.ipr
-*.iws
+untitled1.jpx
*.iml
-build.number
log*.*
+dist
*.log
-build
-.classpath
-.project
-workbook.xls
-bak
-classes
-untitled1.jpx
-TEST-org.apache.poi*.xml
-.settings
-
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java?rev=1038691&r1=1038690&r2=1038691&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFCell.java Wed Nov 24 16:54:26 2010
@@ -22,7 +22,7 @@ import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
-import org.apache.poi.hssf.record.formula.Ptg;
+import org.apache.poi.ss.formula.ptg.Ptg;
import org.apache.poi.ss.formula.SharedFormula;
import org.apache.poi.ss.formula.eval.ErrorEval;
import org.apache.poi.ss.SpreadsheetVersion;
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationWorkbook.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationWorkbook.java?rev=1038691&r1=1038690&r2=1038691&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationWorkbook.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFEvaluationWorkbook.java Wed Nov 24 16:54:26 2010
@@ -17,9 +17,9 @@
package org.apache.poi.xssf.usermodel;
-import org.apache.poi.hssf.record.formula.NamePtg;
-import org.apache.poi.hssf.record.formula.NameXPtg;
-import org.apache.poi.hssf.record.formula.Ptg;
+import org.apache.poi.ss.formula.ptg.NamePtg;
+import org.apache.poi.ss.formula.ptg.NameXPtg;
+import org.apache.poi.ss.formula.ptg.Ptg;
import org.apache.poi.ss.SpreadsheetVersion;
import org.apache.poi.ss.formula.EvaluationCell;
import org.apache.poi.ss.formula.EvaluationName;
@@ -29,7 +29,6 @@ import org.apache.poi.ss.formula.Formula
import org.apache.poi.ss.formula.FormulaParsingWorkbook;
import org.apache.poi.ss.formula.FormulaRenderingWorkbook;
import org.apache.poi.ss.formula.FormulaType;
-import org.apache.poi.ss.formula.EvaluationWorkbook.ExternalName;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTDefinedName;
/**
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFName.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFName.java?rev=1038691&r1=1038690&r2=1038691&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFName.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFName.java Wed Nov 24 16:54:26 2010
@@ -16,7 +16,7 @@
==================================================================== */
package org.apache.poi.xssf.usermodel;
-import org.apache.poi.hssf.record.formula.Ptg;
+import org.apache.poi.ss.formula.ptg.Ptg;
import org.apache.poi.ss.formula.FormulaParser;
import org.apache.poi.ss.formula.FormulaType;
import org.apache.poi.ss.usermodel.Name;
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRichTextString.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRichTextString.java?rev=1038691&r1=1038690&r2=1038691&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRichTextString.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/XSSFRichTextString.java Wed Nov 24 16:54:26 2010
@@ -480,6 +480,7 @@ public class XSSFRichTextString implemen
return buf.toString();
}
+ @SuppressWarnings("deprecation")
void applyFont(TreeMap<Integer, CTRPrElt> formats, int startIndex, int endIndex, CTRPrElt fmt) {
// delete format runs that fit between startIndex and endIndex
// runs intersecting startIndex and endIndex remain
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFRowShifter.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFRowShifter.java?rev=1038691&r1=1038690&r2=1038691&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFRowShifter.java (original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/usermodel/helpers/XSSFRowShifter.java Wed Nov 24 16:54:26 2010
@@ -25,7 +25,7 @@ import org.apache.poi.ss.formula.Formula
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.formula.FormulaShifter;
-import org.apache.poi.hssf.record.formula.Ptg;
+import org.apache.poi.ss.formula.ptg.Ptg;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCell;
import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCellFormula;
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java?rev=1038691&r1=1038690&r2=1038691&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFFormulaParser.java Wed Nov 24 16:54:26 2010
@@ -19,10 +19,10 @@ package org.apache.poi.xssf.usermodel;
import junit.framework.TestCase;
-import org.apache.poi.hssf.record.formula.Ptg;
-import org.apache.poi.hssf.record.formula.RefPtg;
-import org.apache.poi.hssf.record.formula.IntPtg;
-import org.apache.poi.hssf.record.formula.FuncPtg;
+import org.apache.poi.ss.formula.ptg.Ptg;
+import org.apache.poi.ss.formula.ptg.RefPtg;
+import org.apache.poi.ss.formula.ptg.IntPtg;
+import org.apache.poi.ss.formula.ptg.FuncPtg;
import org.apache.poi.ss.formula.FormulaParseException;
import org.apache.poi.ss.formula.FormulaParser;
import org.apache.poi.ss.formula.FormulaType;
Modified: poi/trunk/src/scratchpad/src/org/apache/poi/hssf/usermodel/HSSFChart.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/src/org/apache/poi/hssf/usermodel/HSSFChart.java?rev=1038691&r1=1038690&r2=1038691&view=diff
==============================================================================
--- poi/trunk/src/scratchpad/src/org/apache/poi/hssf/usermodel/HSSFChart.java (original)
+++ poi/trunk/src/scratchpad/src/org/apache/poi/hssf/usermodel/HSSFChart.java Wed Nov 24 16:54:26 2010
@@ -35,9 +35,9 @@ import org.apache.poi.hssf.record.Record
import org.apache.poi.hssf.record.SCLRecord;
import org.apache.poi.hssf.record.UnknownRecord;
import org.apache.poi.hssf.record.VCenterRecord;
-import org.apache.poi.hssf.record.formula.Area3DPtg;
-import org.apache.poi.hssf.record.formula.AreaPtgBase;
-import org.apache.poi.hssf.record.formula.Ptg;
+import org.apache.poi.ss.formula.ptg.Area3DPtg;
+import org.apache.poi.ss.formula.ptg.AreaPtgBase;
+import org.apache.poi.ss.formula.ptg.Ptg;
import org.apache.poi.ss.util.CellRangeAddress;
import org.apache.poi.ss.util.CellRangeAddressBase;
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/TestEvaluationCache.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/TestEvaluationCache.java?rev=1038691&r1=1038690&r2=1038691&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/TestEvaluationCache.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/TestEvaluationCache.java Wed Nov 24 16:54:26 2010
@@ -29,7 +29,7 @@ import junit.framework.AssertionFailedEr
import junit.framework.TestCase;
import org.apache.poi.hssf.model.HSSFFormulaParser;
-import org.apache.poi.hssf.record.formula.Ptg;
+import org.apache.poi.ss.formula.ptg.Ptg;
import org.apache.poi.ss.formula.eval.BlankEval;
import org.apache.poi.ss.formula.eval.BoolEval;
import org.apache.poi.ss.formula.eval.ErrorEval;
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/TestFormulaShifter.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/TestFormulaShifter.java?rev=1038691&r1=1038690&r2=1038691&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/TestFormulaShifter.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/TestFormulaShifter.java Wed Nov 24 16:54:26 2010
@@ -18,10 +18,9 @@
package org.apache.poi.ss.formula;
import junit.framework.TestCase;
-import org.apache.poi.hssf.record.formula.AreaErrPtg;
-import org.apache.poi.hssf.record.formula.AreaPtg;
-import org.apache.poi.hssf.record.formula.Ptg;
-import org.apache.poi.ss.formula.FormulaShifter;
+import org.apache.poi.ss.formula.ptg.AreaErrPtg;
+import org.apache.poi.ss.formula.ptg.AreaPtg;
+import org.apache.poi.ss.formula.ptg.Ptg;
/**
* Tests for {@link FormulaShifter}.
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/TestWorkbookEvaluator.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/TestWorkbookEvaluator.java?rev=1038691&r1=1038690&r2=1038691&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/TestWorkbookEvaluator.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/TestWorkbookEvaluator.java Wed Nov 24 16:54:26 2010
@@ -21,13 +21,13 @@ import junit.framework.AssertionFailedEr
import junit.framework.TestCase;
import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.record.formula.AreaErrPtg;
-import org.apache.poi.hssf.record.formula.AttrPtg;
-import org.apache.poi.hssf.record.formula.DeletedArea3DPtg;
-import org.apache.poi.hssf.record.formula.DeletedRef3DPtg;
-import org.apache.poi.hssf.record.formula.IntPtg;
-import org.apache.poi.hssf.record.formula.Ptg;
-import org.apache.poi.hssf.record.formula.RefErrorPtg;
+import org.apache.poi.ss.formula.ptg.AreaErrPtg;
+import org.apache.poi.ss.formula.ptg.AttrPtg;
+import org.apache.poi.ss.formula.ptg.DeletedArea3DPtg;
+import org.apache.poi.ss.formula.ptg.DeletedRef3DPtg;
+import org.apache.poi.ss.formula.ptg.IntPtg;
+import org.apache.poi.ss.formula.ptg.Ptg;
+import org.apache.poi.ss.formula.ptg.RefErrorPtg;
import org.apache.poi.ss.formula.eval.BlankEval;
import org.apache.poi.ss.formula.eval.ErrorEval;
import org.apache.poi.ss.formula.eval.MissingArgEval;
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/constant/TestConstantValueParser.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/constant/TestConstantValueParser.java?rev=1038691&r1=1038208&r2=1038691&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/constant/TestConstantValueParser.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/constant/TestConstantValueParser.java Wed Nov 24 16:54:26 2010
@@ -15,7 +15,7 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hssf.record.constant;
+package org.apache.poi.ss.formula.constant;
import java.util.Arrays;
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestAreaEval.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestAreaEval.java?rev=1038691&r1=1038690&r2=1038691&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestAreaEval.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestAreaEval.java Wed Nov 24 16:54:26 2010
@@ -20,7 +20,7 @@ package org.apache.poi.ss.formula.eval;
import junit.framework.AssertionFailedError;
import junit.framework.TestCase;
-import org.apache.poi.hssf.record.formula.AreaPtg;
+import org.apache.poi.ss.formula.ptg.AreaPtg;
import org.apache.poi.ss.formula.functions.EvalFactory;
/**
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestRangeEval.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestRangeEval.java?rev=1038691&r1=1038690&r2=1038691&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestRangeEval.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestRangeEval.java Wed Nov 24 16:54:26 2010
@@ -20,8 +20,8 @@ package org.apache.poi.ss.formula.eval;
import junit.framework.AssertionFailedError;
import junit.framework.TestCase;
-import org.apache.poi.hssf.record.formula.AreaI;
-import org.apache.poi.hssf.record.formula.AreaI.OffsetArea;
+import org.apache.poi.ss.formula.ptg.AreaI;
+import org.apache.poi.ss.formula.ptg.AreaI.OffsetArea;
import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
import org.apache.poi.hssf.usermodel.HSSFRow;
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestUnaryPlusEval.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestUnaryPlusEval.java?rev=1038691&r1=1038690&r2=1038691&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestUnaryPlusEval.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/eval/TestUnaryPlusEval.java Wed Nov 24 16:54:26 2010
@@ -19,7 +19,7 @@ package org.apache.poi.ss.formula.eval;
import junit.framework.TestCase;
-import org.apache.poi.hssf.record.formula.AreaPtg;
+import org.apache.poi.ss.formula.ptg.AreaPtg;
import org.apache.poi.ss.formula.functions.EvalFactory;
import org.apache.poi.ss.formula.functions.NumericFunctionInvoker;
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/function/TestParseMissingBuiltInFuncs.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/function/TestParseMissingBuiltInFuncs.java?rev=1038691&r1=1038690&r2=1038691&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/function/TestParseMissingBuiltInFuncs.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/function/TestParseMissingBuiltInFuncs.java Wed Nov 24 16:54:26 2010
@@ -21,10 +21,10 @@ import junit.framework.AssertionFailedEr
import junit.framework.TestCase;
import org.apache.poi.hssf.model.HSSFFormulaParser;
-import org.apache.poi.hssf.record.formula.AbstractFunctionPtg;
-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.ss.formula.ptg.AbstractFunctionPtg;
+import org.apache.poi.ss.formula.ptg.FuncPtg;
+import org.apache.poi.ss.formula.ptg.FuncVarPtg;
+import org.apache.poi.ss.formula.ptg.Ptg;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
/**
* Tests parsing of some built-in functions that were not properly
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/EvalFactory.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/EvalFactory.java?rev=1038691&r1=1038690&r2=1038691&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/EvalFactory.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/functions/EvalFactory.java Wed Nov 24 16:54:26 2010
@@ -17,10 +17,10 @@
package org.apache.poi.ss.formula.functions;
-import org.apache.poi.hssf.record.formula.AreaI;
-import org.apache.poi.hssf.record.formula.AreaPtg;
-import org.apache.poi.hssf.record.formula.Ref3DPtg;
-import org.apache.poi.hssf.record.formula.RefPtg;
+import org.apache.poi.ss.formula.ptg.AreaI;
+import org.apache.poi.ss.formula.ptg.AreaPtg;
+import org.apache.poi.ss.formula.ptg.Ref3DPtg;
+import org.apache.poi.ss.formula.ptg.RefPtg;
import org.apache.poi.ss.formula.eval.AreaEval;
import org.apache.poi.ss.formula.eval.AreaEvalBase;
import org.apache.poi.ss.formula.eval.NumberEval;
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/AbstractPtgTestCase.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/AbstractPtgTestCase.java?rev=1038691&r1=1038208&r2=1038691&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/AbstractPtgTestCase.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/AbstractPtgTestCase.java Wed Nov 24 16:54:26 2010
@@ -15,7 +15,7 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hssf.record.formula;
+package org.apache.poi.ss.formula.ptg;
import junit.framework.TestCase;
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/AllFormulaTests.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/AllFormulaTests.java?rev=1038691&r1=1038208&r2=1038691&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/AllFormulaTests.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/AllFormulaTests.java Wed Nov 24 16:54:26 2010
@@ -15,7 +15,7 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hssf.record.formula;
+package org.apache.poi.ss.formula.ptg;
import org.apache.poi.ss.formula.TestFormulaShifter;
import org.apache.poi.ss.formula.TestSheetNameFormatter;
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestArea3DPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestArea3DPtg.java?rev=1038691&r1=1038208&r2=1038691&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestArea3DPtg.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestArea3DPtg.java Wed Nov 24 16:54:26 2010
@@ -15,7 +15,7 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hssf.record.formula;
+package org.apache.poi.ss.formula.ptg;
import org.apache.poi.hssf.usermodel.HSSFEvaluationWorkbook;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestAreaErrPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestAreaErrPtg.java?rev=1038691&r1=1038208&r2=1038691&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestAreaErrPtg.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestAreaErrPtg.java Wed Nov 24 16:54:26 2010
@@ -15,7 +15,7 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hssf.record.formula;
+package org.apache.poi.ss.formula.ptg;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestAreaPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestAreaPtg.java?rev=1038691&r1=1038208&r2=1038691&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestAreaPtg.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestAreaPtg.java Wed Nov 24 16:54:26 2010
@@ -16,7 +16,7 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hssf.record.formula;
+package org.apache.poi.ss.formula.ptg;
import junit.framework.TestCase;
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestArrayPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestArrayPtg.java?rev=1038691&r1=1038208&r2=1038691&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestArrayPtg.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestArrayPtg.java Wed Nov 24 16:54:26 2010
@@ -15,7 +15,7 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hssf.record.formula;
+package org.apache.poi.ss.formula.ptg;
import java.util.Arrays;
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestAttrPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestAttrPtg.java?rev=1038691&r1=1038208&r2=1038691&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestAttrPtg.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestAttrPtg.java Wed Nov 24 16:54:26 2010
@@ -15,7 +15,7 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hssf.record.formula;
+package org.apache.poi.ss.formula.ptg;
import java.util.Arrays;
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestErrPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestErrPtg.java?rev=1038691&r1=1038208&r2=1038691&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestErrPtg.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestErrPtg.java Wed Nov 24 16:54:26 2010
@@ -15,7 +15,7 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hssf.record.formula;
+package org.apache.poi.ss.formula.ptg;
import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestExternalFunctionFormulas.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestExternalFunctionFormulas.java?rev=1038691&r1=1038208&r2=1038691&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestExternalFunctionFormulas.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestExternalFunctionFormulas.java Wed Nov 24 16:54:26 2010
@@ -15,7 +15,7 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hssf.record.formula;
+package org.apache.poi.ss.formula.ptg;
import java.io.File;
import java.io.FileOutputStream;
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestExternalNameReference.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestExternalNameReference.java?rev=1038691&r1=1038208&r2=1038691&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestExternalNameReference.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestExternalNameReference.java Wed Nov 24 16:54:26 2010
@@ -15,7 +15,7 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hssf.record.formula;
+package org.apache.poi.ss.formula.ptg;
import junit.framework.TestCase;
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestFuncPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestFuncPtg.java?rev=1038691&r1=1038208&r2=1038691&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestFuncPtg.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestFuncPtg.java Wed Nov 24 16:54:26 2010
@@ -15,7 +15,7 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hssf.record.formula;
+package org.apache.poi.ss.formula.ptg;
import junit.framework.TestCase;
import org.apache.poi.hssf.record.TestcaseRecordInputStream;
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestFuncVarPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestFuncVarPtg.java?rev=1038691&r1=1038208&r2=1038691&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestFuncVarPtg.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestFuncVarPtg.java Wed Nov 24 16:54:26 2010
@@ -15,7 +15,7 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hssf.record.formula;
+package org.apache.poi.ss.formula.ptg;
import org.apache.poi.hssf.model.HSSFFormulaParser;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestIntersectionPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestIntersectionPtg.java?rev=1038691&r1=1038208&r2=1038691&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestIntersectionPtg.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestIntersectionPtg.java Wed Nov 24 16:54:26 2010
@@ -15,7 +15,7 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hssf.record.formula;
+package org.apache.poi.ss.formula.ptg;
import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestPercentPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestPercentPtg.java?rev=1038691&r1=1038208&r2=1038691&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestPercentPtg.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestPercentPtg.java Wed Nov 24 16:54:26 2010
@@ -15,7 +15,7 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hssf.record.formula;
+package org.apache.poi.ss.formula.ptg;
import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestRangePtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestRangePtg.java?rev=1038691&r1=1038208&r2=1038691&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestRangePtg.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestRangePtg.java Wed Nov 24 16:54:26 2010
@@ -15,7 +15,7 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hssf.record.formula;
+package org.apache.poi.ss.formula.ptg;
import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestRef3DPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestRef3DPtg.java?rev=1038691&r1=1038208&r2=1038691&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestRef3DPtg.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestRef3DPtg.java Wed Nov 24 16:54:26 2010
@@ -15,7 +15,7 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hssf.record.formula;
+package org.apache.poi.ss.formula.ptg;
import org.apache.poi.hssf.usermodel.HSSFEvaluationWorkbook;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestReferencePtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestReferencePtg.java?rev=1038691&r1=1038208&r2=1038691&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestReferencePtg.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestReferencePtg.java Wed Nov 24 16:54:26 2010
@@ -15,7 +15,7 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hssf.record.formula;
+package org.apache.poi.ss.formula.ptg;
import java.util.Arrays;
Modified: poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestUnionPtg.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestUnionPtg.java?rev=1038691&r1=1038208&r2=1038691&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestUnionPtg.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/formula/ptg/TestUnionPtg.java Wed Nov 24 16:54:26 2010
@@ -15,7 +15,7 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hssf.record.formula;
+package org.apache.poi.ss.formula.ptg;
import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
Modified: poi/trunk/src/testcases/org/apache/poi/ss/util/TestNumberToTextConverter.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/ss/util/TestNumberToTextConverter.java?rev=1038691&r1=1038690&r2=1038691&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/ss/util/TestNumberToTextConverter.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/ss/util/TestNumberToTextConverter.java Wed Nov 24 16:54:26 2010
@@ -22,9 +22,8 @@ import junit.framework.ComparisonFailure
import junit.framework.TestCase;
import org.apache.poi.hssf.record.FormulaRecord;
-import org.apache.poi.hssf.record.constant.ConstantValueParser;
-import org.apache.poi.hssf.record.formula.NumberPtg;
-import org.apache.poi.ss.util.NumberToTextConverter;
+import org.apache.poi.ss.formula.constant.ConstantValueParser;
+import org.apache.poi.ss.formula.ptg.NumberPtg;
import org.apache.poi.ss.util.NumberToTextConversionExamples.ExampleConversion;
/**
* Tests for {@link NumberToTextConverter}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org