Author: yegor
Date: Sun Nov 21 12:04:56 2010
New Revision: 1037436
URL: http://svn.apache.org/viewvc?rev=1037436&view=rev
Log:
moved common formula-related code to org.apache.poi.ss.formula, eliminated
dependencies on HSSF, reduced the number of eclipse warnings
Added:
poi/trunk/src/java/org/apache/poi/ss/formula/atp/
- copied from r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/atp/
poi/trunk/src/java/org/apache/poi/ss/formula/eval/AreaEval.java
(contents, props changed)
- copied, changed from r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/AreaEval.java
poi/trunk/src/java/org/apache/poi/ss/formula/eval/AreaEvalBase.java
- copied, changed from r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/AreaEvalBase.java
poi/trunk/src/java/org/apache/poi/ss/formula/eval/BlankEval.java
(contents, props changed)
- copied, changed from r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/BlankEval.java
poi/trunk/src/java/org/apache/poi/ss/formula/eval/BoolEval.java
(contents, props changed)
- copied, changed from r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/BoolEval.java
poi/trunk/src/java/org/apache/poi/ss/formula/eval/ConcatEval.java
(contents, props changed)
- copied, changed from r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/ConcatEval.java
poi/trunk/src/java/org/apache/poi/ss/formula/eval/ErrorEval.java
(contents, props changed)
- copied, changed from r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/ErrorEval.java
poi/trunk/src/java/org/apache/poi/ss/formula/eval/EvaluationException.java
(contents, props changed)
- copied, changed from r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/EvaluationException.java
poi/trunk/src/java/org/apache/poi/ss/formula/eval/FunctionEval.java
(contents, props changed)
- copied, changed from r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/FunctionEval.java
poi/trunk/src/java/org/apache/poi/ss/formula/eval/IntersectionEval.java
- copied, changed from r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/IntersectionEval.java
poi/trunk/src/java/org/apache/poi/ss/formula/eval/MissingArgEval.java
- copied, changed from r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/MissingArgEval.java
poi/trunk/src/java/org/apache/poi/ss/formula/eval/NameEval.java
(contents, props changed)
- copied, changed from r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/NameEval.java
poi/trunk/src/java/org/apache/poi/ss/formula/eval/NameXEval.java
- copied, changed from r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/NameXEval.java
poi/trunk/src/java/org/apache/poi/ss/formula/eval/NumberEval.java
(contents, props changed)
- copied, changed from r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/NumberEval.java
poi/trunk/src/java/org/apache/poi/ss/formula/eval/NumericValueEval.java
(contents, props changed)
- copied, changed from r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/NumericValueEval.java
poi/trunk/src/java/org/apache/poi/ss/formula/eval/OperandResolver.java
(contents, props changed)
- copied, changed from r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/OperandResolver.java
poi/trunk/src/java/org/apache/poi/ss/formula/eval/PercentEval.java
(contents, props changed)
- copied, changed from r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/PercentEval.java
poi/trunk/src/java/org/apache/poi/ss/formula/eval/RangeEval.java
- copied, changed from r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/RangeEval.java
poi/trunk/src/java/org/apache/poi/ss/formula/eval/RefEval.java (contents,
props changed)
- copied, changed from r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/RefEval.java
poi/trunk/src/java/org/apache/poi/ss/formula/eval/RefEvalBase.java
- copied, changed from r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/RefEvalBase.java
poi/trunk/src/java/org/apache/poi/ss/formula/eval/RelationalOperationEval.java
(contents, props changed)
- copied, changed from r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/RelationalOperationEval.java
poi/trunk/src/java/org/apache/poi/ss/formula/eval/StringEval.java
(contents, props changed)
- copied, changed from r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/StringEval.java
poi/trunk/src/java/org/apache/poi/ss/formula/eval/StringValueEval.java
(contents, props changed)
- copied, changed from r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/StringValueEval.java
poi/trunk/src/java/org/apache/poi/ss/formula/eval/TwoOperandNumericOperation.java
- copied, changed from r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/TwoOperandNumericOperation.java
poi/trunk/src/java/org/apache/poi/ss/formula/eval/UnaryMinusEval.java
(contents, props changed)
- copied, changed from r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/UnaryMinusEval.java
poi/trunk/src/java/org/apache/poi/ss/formula/eval/UnaryPlusEval.java
(contents, props changed)
- copied, changed from r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/UnaryPlusEval.java
poi/trunk/src/java/org/apache/poi/ss/formula/eval/ValueEval.java
(contents, props changed)
- copied, changed from r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/ValueEval.java
Modified:
poi/trunk/src/java/org/apache/poi/ss/formula/atp/AnalysisToolPak.java
poi/trunk/src/java/org/apache/poi/ss/formula/atp/ParityFunction.java
poi/trunk/src/java/org/apache/poi/ss/formula/atp/RandBetween.java
poi/trunk/src/java/org/apache/poi/ss/formula/atp/YearFrac.java
poi/trunk/src/java/org/apache/poi/ss/formula/atp/YearFracCalculator.java
poi/trunk/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationCell.java
poi/trunk/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationWorkbook.java
poi/trunk/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluator.java
poi/trunk/src/java/org/apache/poi/ss/usermodel/CellValue.java
poi/trunk/test-data/spreadsheet/LookupFunctionsTestCaseData.xls
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/atp/AnalysisToolPak.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/atp/AnalysisToolPak.java?rev=1037436&r1=1037228&r2=1037436&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/atp/AnalysisToolPak.java
(original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/atp/AnalysisToolPak.java Sun
Nov 21 12:04:56 2010
@@ -15,14 +15,14 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hssf.record.formula.atp;
+package org.apache.poi.ss.formula.atp;
import java.util.HashMap;
import java.util.Map;
-import org.apache.poi.hssf.record.formula.eval.ValueEval;
-import org.apache.poi.hssf.record.formula.functions.FreeRefFunction;
-import org.apache.poi.hssf.record.formula.udf.UDFFinder;
+import org.apache.poi.ss.formula.eval.ValueEval;
+import org.apache.poi.ss.formula.functions.FreeRefFunction;
+import org.apache.poi.ss.formula.udf.UDFFinder;
import org.apache.poi.ss.formula.OperationEvaluationContext;
import org.apache.poi.ss.formula.eval.NotImplementedException;
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/atp/ParityFunction.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/atp/ParityFunction.java?rev=1037436&r1=1037228&r2=1037436&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/atp/ParityFunction.java
(original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/atp/ParityFunction.java Sun
Nov 21 12:04:56 2010
@@ -15,14 +15,14 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hssf.record.formula.atp;
+package org.apache.poi.ss.formula.atp;
-import org.apache.poi.hssf.record.formula.eval.BoolEval;
-import org.apache.poi.hssf.record.formula.eval.ErrorEval;
-import org.apache.poi.hssf.record.formula.eval.EvaluationException;
-import org.apache.poi.hssf.record.formula.eval.OperandResolver;
-import org.apache.poi.hssf.record.formula.eval.ValueEval;
-import org.apache.poi.hssf.record.formula.functions.FreeRefFunction;
+import org.apache.poi.ss.formula.eval.BoolEval;
+import org.apache.poi.ss.formula.eval.ErrorEval;
+import org.apache.poi.ss.formula.eval.EvaluationException;
+import org.apache.poi.ss.formula.eval.OperandResolver;
+import org.apache.poi.ss.formula.eval.ValueEval;
+import org.apache.poi.ss.formula.functions.FreeRefFunction;
import org.apache.poi.ss.formula.OperationEvaluationContext;
/**
* Implementation of Excel 'Analysis ToolPak' function ISEVEN() ISODD()<br/>
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/atp/RandBetween.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/atp/RandBetween.java?rev=1037436&r1=1037228&r2=1037436&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/atp/RandBetween.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/atp/RandBetween.java Sun Nov
21 12:04:56 2010
@@ -14,14 +14,14 @@
See the License for the specific language governing permissions and
limitations under the License.
==================================================================== */
-package org.apache.poi.hssf.record.formula.atp;
+package org.apache.poi.ss.formula.atp;
-import org.apache.poi.hssf.record.formula.eval.ErrorEval;
-import org.apache.poi.hssf.record.formula.eval.EvaluationException;
-import org.apache.poi.hssf.record.formula.eval.NumberEval;
-import org.apache.poi.hssf.record.formula.eval.OperandResolver;
-import org.apache.poi.hssf.record.formula.eval.ValueEval;
-import org.apache.poi.hssf.record.formula.functions.FreeRefFunction;
+import org.apache.poi.ss.formula.eval.ErrorEval;
+import org.apache.poi.ss.formula.eval.EvaluationException;
+import org.apache.poi.ss.formula.eval.NumberEval;
+import org.apache.poi.ss.formula.eval.OperandResolver;
+import org.apache.poi.ss.formula.eval.ValueEval;
+import org.apache.poi.ss.formula.functions.FreeRefFunction;
import org.apache.poi.ss.formula.OperationEvaluationContext;
/**
@@ -50,7 +50,7 @@ final class RandBetween implements FreeR
* Bottom is rounded up and top value is rounded down. After rounding
top has to be set greater
* than top.
*
- * @see
org.apache.poi.hssf.record.formula.functions.FreeRefFunction#evaluate(org.apache.poi.hssf.record.formula.eval.ValueEval[],
org.apache.poi.ss.formula.OperationEvaluationContext)
+ * @see
org.apache.poi.ss.formula.functions.FreeRefFunction#evaluate(org.apache.poi.ss.formula.eval.ValueEval[],
org.apache.poi.ss.formula.OperationEvaluationContext)
*/
public ValueEval evaluate(ValueEval[] args, OperationEvaluationContext
ec) {
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/atp/YearFrac.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/atp/YearFrac.java?rev=1037436&r1=1037228&r2=1037436&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/atp/YearFrac.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/atp/YearFrac.java Sun Nov 21
12:04:56 2010
@@ -15,19 +15,19 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hssf.record.formula.atp;
+package org.apache.poi.ss.formula.atp;
import java.util.Calendar;
import java.util.GregorianCalendar;
import java.util.regex.Pattern;
-import org.apache.poi.hssf.record.formula.eval.ErrorEval;
-import org.apache.poi.hssf.record.formula.eval.EvaluationException;
-import org.apache.poi.hssf.record.formula.eval.NumberEval;
-import org.apache.poi.hssf.record.formula.eval.OperandResolver;
-import org.apache.poi.hssf.record.formula.eval.StringEval;
-import org.apache.poi.hssf.record.formula.eval.ValueEval;
-import org.apache.poi.hssf.record.formula.functions.FreeRefFunction;
+import org.apache.poi.ss.formula.eval.ErrorEval;
+import org.apache.poi.ss.formula.eval.EvaluationException;
+import org.apache.poi.ss.formula.eval.NumberEval;
+import org.apache.poi.ss.formula.eval.OperandResolver;
+import org.apache.poi.ss.formula.eval.StringEval;
+import org.apache.poi.ss.formula.eval.ValueEval;
+import org.apache.poi.ss.formula.functions.FreeRefFunction;
import org.apache.poi.ss.formula.OperationEvaluationContext;
import org.apache.poi.ss.usermodel.DateUtil;
/**
Modified:
poi/trunk/src/java/org/apache/poi/ss/formula/atp/YearFracCalculator.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/atp/YearFracCalculator.java?rev=1037436&r1=1037228&r2=1037436&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/atp/YearFracCalculator.java
(original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/atp/YearFracCalculator.java
Sun Nov 21 12:04:56 2010
@@ -15,14 +15,14 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hssf.record.formula.atp;
+package org.apache.poi.ss.formula.atp;
import java.util.Calendar;
import java.util.GregorianCalendar;
import java.util.TimeZone;
-import org.apache.poi.hssf.record.formula.eval.ErrorEval;
-import org.apache.poi.hssf.record.formula.eval.EvaluationException;
+import org.apache.poi.ss.formula.eval.ErrorEval;
+import org.apache.poi.ss.formula.eval.EvaluationException;
import org.apache.poi.ss.usermodel.DateUtil;
Copied: poi/trunk/src/java/org/apache/poi/ss/formula/eval/AreaEval.java (from
r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/AreaEval.java)
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/eval/AreaEval.java?p2=poi/trunk/src/java/org/apache/poi/ss/formula/eval/AreaEval.java&p1=poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/AreaEval.java&r1=1037228&r2=1037436&rev=1037436&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/AreaEval.java
(original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/eval/AreaEval.java Sun Nov 21
12:04:56 2010
@@ -15,7 +15,7 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hssf.record.formula.eval;
+package org.apache.poi.ss.formula.eval;
import org.apache.poi.ss.formula.TwoDEval;
/**
Propchange: poi/trunk/src/java/org/apache/poi/ss/formula/eval/AreaEval.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: poi/trunk/src/java/org/apache/poi/ss/formula/eval/AreaEval.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: poi/trunk/src/java/org/apache/poi/ss/formula/eval/AreaEvalBase.java
(from r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/AreaEvalBase.java)
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/eval/AreaEvalBase.java?p2=poi/trunk/src/java/org/apache/poi/ss/formula/eval/AreaEvalBase.java&p1=poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/AreaEvalBase.java&r1=1037228&r2=1037436&rev=1037436&view=diff
==============================================================================
---
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/AreaEvalBase.java
(original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/eval/AreaEvalBase.java Sun Nov
21 12:04:56 2010
@@ -15,7 +15,7 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hssf.record.formula.eval;
+package org.apache.poi.ss.formula.eval;
import org.apache.poi.hssf.record.formula.AreaI;
Copied: poi/trunk/src/java/org/apache/poi/ss/formula/eval/BlankEval.java (from
r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/BlankEval.java)
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/eval/BlankEval.java?p2=poi/trunk/src/java/org/apache/poi/ss/formula/eval/BlankEval.java&p1=poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/BlankEval.java&r1=1037228&r2=1037436&rev=1037436&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/BlankEval.java
(original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/eval/BlankEval.java Sun Nov 21
12:04:56 2010
@@ -15,7 +15,7 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hssf.record.formula.eval;
+package org.apache.poi.ss.formula.eval;
/**
* @author Amol S. Deshmukh < amolweb at ya hoo dot com > This class is a
Propchange: poi/trunk/src/java/org/apache/poi/ss/formula/eval/BlankEval.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: poi/trunk/src/java/org/apache/poi/ss/formula/eval/BlankEval.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: poi/trunk/src/java/org/apache/poi/ss/formula/eval/BoolEval.java (from
r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/BoolEval.java)
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/eval/BoolEval.java?p2=poi/trunk/src/java/org/apache/poi/ss/formula/eval/BoolEval.java&p1=poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/BoolEval.java&r1=1037228&r2=1037436&rev=1037436&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/BoolEval.java
(original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/eval/BoolEval.java Sun Nov 21
12:04:56 2010
@@ -15,7 +15,7 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hssf.record.formula.eval;
+package org.apache.poi.ss.formula.eval;
/**
* @author Amol S. Deshmukh < amolweb at ya hoo dot com >
Propchange: poi/trunk/src/java/org/apache/poi/ss/formula/eval/BoolEval.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: poi/trunk/src/java/org/apache/poi/ss/formula/eval/BoolEval.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: poi/trunk/src/java/org/apache/poi/ss/formula/eval/ConcatEval.java (from
r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/ConcatEval.java)
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/eval/ConcatEval.java?p2=poi/trunk/src/java/org/apache/poi/ss/formula/eval/ConcatEval.java&p1=poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/ConcatEval.java&r1=1037228&r2=1037436&rev=1037436&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/ConcatEval.java
(original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/eval/ConcatEval.java Sun Nov
21 12:04:56 2010
@@ -15,10 +15,10 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hssf.record.formula.eval;
+package org.apache.poi.ss.formula.eval;
-import org.apache.poi.hssf.record.formula.functions.Fixed2ArgFunction;
-import org.apache.poi.hssf.record.formula.functions.Function;
+import org.apache.poi.ss.formula.functions.Fixed2ArgFunction;
+import org.apache.poi.ss.formula.functions.Function;
/**
* @author Amol S. Deshmukh < amolweb at ya hoo dot com >
Propchange: poi/trunk/src/java/org/apache/poi/ss/formula/eval/ConcatEval.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: poi/trunk/src/java/org/apache/poi/ss/formula/eval/ConcatEval.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: poi/trunk/src/java/org/apache/poi/ss/formula/eval/ErrorEval.java (from
r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/ErrorEval.java)
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/eval/ErrorEval.java?p2=poi/trunk/src/java/org/apache/poi/ss/formula/eval/ErrorEval.java&p1=poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/ErrorEval.java&r1=1037228&r2=1037436&rev=1037436&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/ErrorEval.java
(original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/eval/ErrorEval.java Sun Nov 21
12:04:56 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.poi.hssf.record.formula.eval;
+package org.apache.poi.ss.formula.eval;
import org.apache.poi.ss.usermodel.ErrorConstants;
Propchange: poi/trunk/src/java/org/apache/poi/ss/formula/eval/ErrorEval.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: poi/trunk/src/java/org/apache/poi/ss/formula/eval/ErrorEval.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
poi/trunk/src/java/org/apache/poi/ss/formula/eval/EvaluationException.java
(from r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/EvaluationException.java)
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/eval/EvaluationException.java?p2=poi/trunk/src/java/org/apache/poi/ss/formula/eval/EvaluationException.java&p1=poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/EvaluationException.java&r1=1037228&r2=1037436&rev=1037436&view=diff
==============================================================================
---
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/EvaluationException.java
(original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/eval/EvaluationException.java
Sun Nov 21 12:04:56 2010
@@ -15,7 +15,7 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hssf.record.formula.eval;
+package org.apache.poi.ss.formula.eval;
/**
* This class is used to simplify error handling logic <i>within</i> operator
and function
Propchange:
poi/trunk/src/java/org/apache/poi/ss/formula/eval/EvaluationException.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: poi/trunk/src/java/org/apache/poi/ss/formula/eval/FunctionEval.java
(from r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/FunctionEval.java)
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/eval/FunctionEval.java?p2=poi/trunk/src/java/org/apache/poi/ss/formula/eval/FunctionEval.java&p1=poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/FunctionEval.java&r1=1037228&r2=1037436&rev=1037436&view=diff
==============================================================================
---
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/FunctionEval.java
(original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/eval/FunctionEval.java Sun Nov
21 12:04:56 2010
@@ -15,12 +15,11 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hssf.record.formula.eval;
+package org.apache.poi.ss.formula.eval;
-import org.apache.poi.hssf.record.formula.function.FunctionMetadata;
-import org.apache.poi.hssf.record.formula.function.FunctionMetadataRegistry;
-import org.apache.poi.hssf.record.formula.functions.*;
-import org.apache.poi.ss.formula.eval.NotImplementedException;
+import org.apache.poi.ss.formula.function.FunctionMetadata;
+import org.apache.poi.ss.formula.function.FunctionMetadataRegistry;
+import org.apache.poi.ss.formula.functions.*;
/**
* @author Amol S. Deshmukh < amolweb at ya hoo dot com >
Propchange: poi/trunk/src/java/org/apache/poi/ss/formula/eval/FunctionEval.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: poi/trunk/src/java/org/apache/poi/ss/formula/eval/FunctionEval.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: poi/trunk/src/java/org/apache/poi/ss/formula/eval/IntersectionEval.java
(from r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/IntersectionEval.java)
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/eval/IntersectionEval.java?p2=poi/trunk/src/java/org/apache/poi/ss/formula/eval/IntersectionEval.java&p1=poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/IntersectionEval.java&r1=1037228&r2=1037436&rev=1037436&view=diff
==============================================================================
---
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/IntersectionEval.java
(original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/eval/IntersectionEval.java Sun
Nov 21 12:04:56 2010
@@ -15,10 +15,10 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hssf.record.formula.eval;
+package org.apache.poi.ss.formula.eval;
-import org.apache.poi.hssf.record.formula.functions.Fixed2ArgFunction;
-import org.apache.poi.hssf.record.formula.functions.Function;
+import org.apache.poi.ss.formula.functions.Fixed2ArgFunction;
+import org.apache.poi.ss.formula.functions.Function;
/**
* @author Josh Micich
Copied: poi/trunk/src/java/org/apache/poi/ss/formula/eval/MissingArgEval.java
(from r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/MissingArgEval.java)
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/eval/MissingArgEval.java?p2=poi/trunk/src/java/org/apache/poi/ss/formula/eval/MissingArgEval.java&p1=poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/MissingArgEval.java&r1=1037228&r2=1037436&rev=1037436&view=diff
==============================================================================
---
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/MissingArgEval.java
(original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/eval/MissingArgEval.java Sun
Nov 21 12:04:56 2010
@@ -15,7 +15,7 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hssf.record.formula.eval;
+package org.apache.poi.ss.formula.eval;
/**
* Represents the (intermediate) evaluated result of a missing function
argument. In most cases
Copied: poi/trunk/src/java/org/apache/poi/ss/formula/eval/NameEval.java (from
r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/NameEval.java)
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/eval/NameEval.java?p2=poi/trunk/src/java/org/apache/poi/ss/formula/eval/NameEval.java&p1=poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/NameEval.java&r1=1037228&r2=1037436&rev=1037436&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/NameEval.java
(original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/eval/NameEval.java Sun Nov 21
12:04:56 2010
@@ -15,7 +15,7 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hssf.record.formula.eval;
+package org.apache.poi.ss.formula.eval;
/**
* @author Josh Micich
Propchange: poi/trunk/src/java/org/apache/poi/ss/formula/eval/NameEval.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: poi/trunk/src/java/org/apache/poi/ss/formula/eval/NameXEval.java (from
r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/NameXEval.java)
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/eval/NameXEval.java?p2=poi/trunk/src/java/org/apache/poi/ss/formula/eval/NameXEval.java&p1=poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/NameXEval.java&r1=1037228&r2=1037436&rev=1037436&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/NameXEval.java
(original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/eval/NameXEval.java Sun Nov 21
12:04:56 2010
@@ -15,7 +15,7 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hssf.record.formula.eval;
+package org.apache.poi.ss.formula.eval;
import org.apache.poi.hssf.record.formula.NameXPtg;
Copied: poi/trunk/src/java/org/apache/poi/ss/formula/eval/NumberEval.java (from
r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/NumberEval.java)
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/eval/NumberEval.java?p2=poi/trunk/src/java/org/apache/poi/ss/formula/eval/NumberEval.java&p1=poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/NumberEval.java&r1=1037228&r2=1037436&rev=1037436&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/NumberEval.java
(original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/eval/NumberEval.java Sun Nov
21 12:04:56 2010
@@ -18,7 +18,7 @@
* Created on May 8, 2005
*
*/
-package org.apache.poi.hssf.record.formula.eval;
+package org.apache.poi.ss.formula.eval;
import org.apache.poi.hssf.record.formula.IntPtg;
import org.apache.poi.hssf.record.formula.NumberPtg;
Propchange: poi/trunk/src/java/org/apache/poi/ss/formula/eval/NumberEval.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: poi/trunk/src/java/org/apache/poi/ss/formula/eval/NumberEval.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: poi/trunk/src/java/org/apache/poi/ss/formula/eval/NumericValueEval.java
(from r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/NumericValueEval.java)
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/eval/NumericValueEval.java?p2=poi/trunk/src/java/org/apache/poi/ss/formula/eval/NumericValueEval.java&p1=poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/NumericValueEval.java&r1=1037228&r2=1037436&rev=1037436&view=diff
==============================================================================
---
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/NumericValueEval.java
(original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/eval/NumericValueEval.java Sun
Nov 21 12:04:56 2010
@@ -18,7 +18,7 @@
* Created on May 8, 2005
*
*/
-package org.apache.poi.hssf.record.formula.eval;
+package org.apache.poi.ss.formula.eval;
/**
* @author Amol S. Deshmukh < amolweb at ya hoo dot com >
Propchange:
poi/trunk/src/java/org/apache/poi/ss/formula/eval/NumericValueEval.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
poi/trunk/src/java/org/apache/poi/ss/formula/eval/NumericValueEval.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: poi/trunk/src/java/org/apache/poi/ss/formula/eval/OperandResolver.java
(from r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/OperandResolver.java)
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/eval/OperandResolver.java?p2=poi/trunk/src/java/org/apache/poi/ss/formula/eval/OperandResolver.java&p1=poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/OperandResolver.java&r1=1037228&r2=1037436&rev=1037436&view=diff
==============================================================================
---
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/OperandResolver.java
(original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/eval/OperandResolver.java Sun
Nov 21 12:04:56 2010
@@ -15,7 +15,7 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hssf.record.formula.eval;
+package org.apache.poi.ss.formula.eval;
import java.util.regex.Pattern;
Propchange:
poi/trunk/src/java/org/apache/poi/ss/formula/eval/OperandResolver.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: poi/trunk/src/java/org/apache/poi/ss/formula/eval/PercentEval.java
(from r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/PercentEval.java)
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/eval/PercentEval.java?p2=poi/trunk/src/java/org/apache/poi/ss/formula/eval/PercentEval.java&p1=poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/PercentEval.java&r1=1037228&r2=1037436&rev=1037436&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/PercentEval.java
(original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/eval/PercentEval.java Sun Nov
21 12:04:56 2010
@@ -15,10 +15,10 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hssf.record.formula.eval;
+package org.apache.poi.ss.formula.eval;
-import org.apache.poi.hssf.record.formula.functions.Fixed1ArgFunction;
-import org.apache.poi.hssf.record.formula.functions.Function;
+import org.apache.poi.ss.formula.functions.Fixed1ArgFunction;
+import org.apache.poi.ss.formula.functions.Function;
/**
Propchange: poi/trunk/src/java/org/apache/poi/ss/formula/eval/PercentEval.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: poi/trunk/src/java/org/apache/poi/ss/formula/eval/RangeEval.java (from
r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/RangeEval.java)
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/eval/RangeEval.java?p2=poi/trunk/src/java/org/apache/poi/ss/formula/eval/RangeEval.java&p1=poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/RangeEval.java&r1=1037228&r2=1037436&rev=1037436&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/RangeEval.java
(original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/eval/RangeEval.java Sun Nov 21
12:04:56 2010
@@ -15,10 +15,10 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hssf.record.formula.eval;
+package org.apache.poi.ss.formula.eval;
-import org.apache.poi.hssf.record.formula.functions.Fixed2ArgFunction;
-import org.apache.poi.hssf.record.formula.functions.Function;
+import org.apache.poi.ss.formula.functions.Fixed2ArgFunction;
+import org.apache.poi.ss.formula.functions.Function;
/**
Copied: poi/trunk/src/java/org/apache/poi/ss/formula/eval/RefEval.java (from
r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/RefEval.java)
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/eval/RefEval.java?p2=poi/trunk/src/java/org/apache/poi/ss/formula/eval/RefEval.java&p1=poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/RefEval.java&r1=1037228&r2=1037436&rev=1037436&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/RefEval.java
(original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/eval/RefEval.java Sun Nov 21
12:04:56 2010
@@ -15,7 +15,7 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hssf.record.formula.eval;
+package org.apache.poi.ss.formula.eval;
/**
* @author Amol S Deshmukh < amolweb at ya hoo dot com >
Propchange: poi/trunk/src/java/org/apache/poi/ss/formula/eval/RefEval.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: poi/trunk/src/java/org/apache/poi/ss/formula/eval/RefEval.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: poi/trunk/src/java/org/apache/poi/ss/formula/eval/RefEvalBase.java
(from r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/RefEvalBase.java)
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/eval/RefEvalBase.java?p2=poi/trunk/src/java/org/apache/poi/ss/formula/eval/RefEvalBase.java&p1=poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/RefEvalBase.java&r1=1037228&r2=1037436&rev=1037436&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/RefEvalBase.java
(original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/eval/RefEvalBase.java Sun Nov
21 12:04:56 2010
@@ -15,7 +15,7 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hssf.record.formula.eval;
+package org.apache.poi.ss.formula.eval;
/**
* Common base class for implementors of {...@link RefEval}
Copied:
poi/trunk/src/java/org/apache/poi/ss/formula/eval/RelationalOperationEval.java
(from r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/RelationalOperationEval.java)
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/eval/RelationalOperationEval.java?p2=poi/trunk/src/java/org/apache/poi/ss/formula/eval/RelationalOperationEval.java&p1=poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/RelationalOperationEval.java&r1=1037228&r2=1037436&rev=1037436&view=diff
==============================================================================
---
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/RelationalOperationEval.java
(original)
+++
poi/trunk/src/java/org/apache/poi/ss/formula/eval/RelationalOperationEval.java
Sun Nov 21 12:04:56 2010
@@ -15,10 +15,10 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hssf.record.formula.eval;
+package org.apache.poi.ss.formula.eval;
-import org.apache.poi.hssf.record.formula.functions.Fixed2ArgFunction;
-import org.apache.poi.hssf.record.formula.functions.Function;
+import org.apache.poi.ss.formula.functions.Fixed2ArgFunction;
+import org.apache.poi.ss.formula.functions.Function;
import org.apache.poi.ss.util.NumberComparer;
/**
Propchange:
poi/trunk/src/java/org/apache/poi/ss/formula/eval/RelationalOperationEval.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
poi/trunk/src/java/org/apache/poi/ss/formula/eval/RelationalOperationEval.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: poi/trunk/src/java/org/apache/poi/ss/formula/eval/StringEval.java (from
r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/StringEval.java)
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/eval/StringEval.java?p2=poi/trunk/src/java/org/apache/poi/ss/formula/eval/StringEval.java&p1=poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/StringEval.java&r1=1037228&r2=1037436&rev=1037436&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/StringEval.java
(original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/eval/StringEval.java Sun Nov
21 12:04:56 2010
@@ -15,7 +15,7 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hssf.record.formula.eval;
+package org.apache.poi.ss.formula.eval;
import org.apache.poi.hssf.record.formula.Ptg;
import org.apache.poi.hssf.record.formula.StringPtg;
Propchange: poi/trunk/src/java/org/apache/poi/ss/formula/eval/StringEval.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: poi/trunk/src/java/org/apache/poi/ss/formula/eval/StringEval.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: poi/trunk/src/java/org/apache/poi/ss/formula/eval/StringValueEval.java
(from r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/StringValueEval.java)
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/eval/StringValueEval.java?p2=poi/trunk/src/java/org/apache/poi/ss/formula/eval/StringValueEval.java&p1=poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/StringValueEval.java&r1=1037228&r2=1037436&rev=1037436&view=diff
==============================================================================
---
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/StringValueEval.java
(original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/eval/StringValueEval.java Sun
Nov 21 12:04:56 2010
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.poi.hssf.record.formula.eval;
+package org.apache.poi.ss.formula.eval;
/**
* @author Amol S. Deshmukh < amolweb at ya hoo dot com >
Propchange:
poi/trunk/src/java/org/apache/poi/ss/formula/eval/StringValueEval.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
poi/trunk/src/java/org/apache/poi/ss/formula/eval/StringValueEval.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied:
poi/trunk/src/java/org/apache/poi/ss/formula/eval/TwoOperandNumericOperation.java
(from r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/TwoOperandNumericOperation.java)
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/eval/TwoOperandNumericOperation.java?p2=poi/trunk/src/java/org/apache/poi/ss/formula/eval/TwoOperandNumericOperation.java&p1=poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/TwoOperandNumericOperation.java&r1=1037228&r2=1037436&rev=1037436&view=diff
==============================================================================
---
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/TwoOperandNumericOperation.java
(original)
+++
poi/trunk/src/java/org/apache/poi/ss/formula/eval/TwoOperandNumericOperation.java
Sun Nov 21 12:04:56 2010
@@ -15,10 +15,10 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hssf.record.formula.eval;
+package org.apache.poi.ss.formula.eval;
-import org.apache.poi.hssf.record.formula.functions.Fixed2ArgFunction;
-import org.apache.poi.hssf.record.formula.functions.Function;
+import org.apache.poi.ss.formula.functions.Fixed2ArgFunction;
+import org.apache.poi.ss.formula.functions.Function;
/**
* @author Josh Micich
Copied: poi/trunk/src/java/org/apache/poi/ss/formula/eval/UnaryMinusEval.java
(from r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/UnaryMinusEval.java)
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/eval/UnaryMinusEval.java?p2=poi/trunk/src/java/org/apache/poi/ss/formula/eval/UnaryMinusEval.java&p1=poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/UnaryMinusEval.java&r1=1037228&r2=1037436&rev=1037436&view=diff
==============================================================================
---
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/UnaryMinusEval.java
(original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/eval/UnaryMinusEval.java Sun
Nov 21 12:04:56 2010
@@ -15,10 +15,10 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hssf.record.formula.eval;
+package org.apache.poi.ss.formula.eval;
-import org.apache.poi.hssf.record.formula.functions.Fixed1ArgFunction;
-import org.apache.poi.hssf.record.formula.functions.Function;
+import org.apache.poi.ss.formula.functions.Fixed1ArgFunction;
+import org.apache.poi.ss.formula.functions.Function;
/**
* @author Amol S. Deshmukh < amolweb at ya hoo dot com >
Propchange:
poi/trunk/src/java/org/apache/poi/ss/formula/eval/UnaryMinusEval.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
poi/trunk/src/java/org/apache/poi/ss/formula/eval/UnaryMinusEval.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: poi/trunk/src/java/org/apache/poi/ss/formula/eval/UnaryPlusEval.java
(from r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/UnaryPlusEval.java)
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/eval/UnaryPlusEval.java?p2=poi/trunk/src/java/org/apache/poi/ss/formula/eval/UnaryPlusEval.java&p1=poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/UnaryPlusEval.java&r1=1037228&r2=1037436&rev=1037436&view=diff
==============================================================================
---
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/UnaryPlusEval.java
(original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/eval/UnaryPlusEval.java Sun
Nov 21 12:04:56 2010
@@ -15,10 +15,10 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hssf.record.formula.eval;
+package org.apache.poi.ss.formula.eval;
-import org.apache.poi.hssf.record.formula.functions.Fixed1ArgFunction;
-import org.apache.poi.hssf.record.formula.functions.Function;
+import org.apache.poi.ss.formula.functions.Fixed1ArgFunction;
+import org.apache.poi.ss.formula.functions.Function;
/**
Propchange: poi/trunk/src/java/org/apache/poi/ss/formula/eval/UnaryPlusEval.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: poi/trunk/src/java/org/apache/poi/ss/formula/eval/UnaryPlusEval.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: poi/trunk/src/java/org/apache/poi/ss/formula/eval/ValueEval.java (from
r1037228,
poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/ValueEval.java)
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/eval/ValueEval.java?p2=poi/trunk/src/java/org/apache/poi/ss/formula/eval/ValueEval.java&p1=poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/ValueEval.java&r1=1037228&r2=1037436&rev=1037436&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/formula/eval/ValueEval.java
(original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/eval/ValueEval.java Sun Nov 21
12:04:56 2010
@@ -15,7 +15,7 @@
limitations under the License.
==================================================================== */
-package org.apache.poi.hssf.record.formula.eval;
+package org.apache.poi.ss.formula.eval;
/**
* @author Amol S. Deshmukh < amolweb at ya hoo dot com >
Propchange: poi/trunk/src/java/org/apache/poi/ss/formula/eval/ValueEval.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: poi/trunk/src/java/org/apache/poi/ss/formula/eval/ValueEval.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
poi/trunk/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationCell.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationCell.java?rev=1037436&r1=1037435&r2=1037436&view=diff
==============================================================================
---
poi/trunk/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationCell.java
(original)
+++
poi/trunk/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationCell.java
Sun Nov 21 12:04:56 2010
@@ -17,13 +17,12 @@
package org.apache.poi.ss.formula.eval.forked;
-import org.apache.poi.hssf.record.formula.eval.BlankEval;
-import org.apache.poi.hssf.record.formula.eval.BoolEval;
-import org.apache.poi.hssf.record.formula.eval.ErrorEval;
-import org.apache.poi.hssf.record.formula.eval.NumberEval;
-import org.apache.poi.hssf.record.formula.eval.StringEval;
-import org.apache.poi.hssf.record.formula.eval.ValueEval;
-import org.apache.poi.hssf.usermodel.HSSFCell;
+import org.apache.poi.ss.formula.eval.BlankEval;
+import org.apache.poi.ss.formula.eval.BoolEval;
+import org.apache.poi.ss.formula.eval.ErrorEval;
+import org.apache.poi.ss.formula.eval.NumberEval;
+import org.apache.poi.ss.formula.eval.StringEval;
+import org.apache.poi.ss.formula.eval.ValueEval;
import org.apache.poi.ss.formula.EvaluationCell;
import org.apache.poi.ss.formula.EvaluationSheet;
import org.apache.poi.ss.usermodel.Cell;
@@ -60,27 +59,27 @@ final class ForkedEvaluationCell impleme
Class<? extends ValueEval> cls = value.getClass();
if (cls == NumberEval.class) {
- _cellType = HSSFCell.CELL_TYPE_NUMERIC;
+ _cellType = Cell.CELL_TYPE_NUMERIC;
_numberValue = ((NumberEval)value).getNumberValue();
return;
}
if (cls == StringEval.class) {
- _cellType = HSSFCell.CELL_TYPE_STRING;
+ _cellType = Cell.CELL_TYPE_STRING;
_stringValue = ((StringEval)value).getStringValue();
return;
}
if (cls == BoolEval.class) {
- _cellType = HSSFCell.CELL_TYPE_BOOLEAN;
+ _cellType = Cell.CELL_TYPE_BOOLEAN;
_booleanValue = ((BoolEval)value).getBooleanValue();
return;
}
if (cls == ErrorEval.class) {
- _cellType = HSSFCell.CELL_TYPE_ERROR;
+ _cellType = Cell.CELL_TYPE_ERROR;
_errorValue = ((ErrorEval)value).getErrorCode();
return;
}
if (cls == BlankEval.class) {
- _cellType = HSSFCell.CELL_TYPE_BLANK;
+ _cellType = Cell.CELL_TYPE_BLANK;
return;
}
throw new IllegalArgumentException("Unexpected value class (" +
cls.getName() + ")");
@@ -105,19 +104,19 @@ final class ForkedEvaluationCell impleme
return _cellType;
}
public boolean getBooleanCellValue() {
- checkCellType(HSSFCell.CELL_TYPE_BOOLEAN);
+ checkCellType(Cell.CELL_TYPE_BOOLEAN);
return _booleanValue;
}
public int getErrorCellValue() {
- checkCellType(HSSFCell.CELL_TYPE_ERROR);
+ checkCellType(Cell.CELL_TYPE_ERROR);
return _errorValue;
}
public double getNumericCellValue() {
- checkCellType(HSSFCell.CELL_TYPE_NUMERIC);
+ checkCellType(Cell.CELL_TYPE_NUMERIC);
return _numberValue;
}
public String getStringCellValue() {
- checkCellType(HSSFCell.CELL_TYPE_STRING);
+ checkCellType(Cell.CELL_TYPE_STRING);
return _stringValue;
}
public EvaluationSheet getSheet() {
Modified:
poi/trunk/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationWorkbook.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationWorkbook.java?rev=1037436&r1=1037435&r2=1037436&view=diff
==============================================================================
---
poi/trunk/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationWorkbook.java
(original)
+++
poi/trunk/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluationWorkbook.java
Sun Nov 21 12:04:56 2010
@@ -23,7 +23,6 @@ import java.util.Map;
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.hssf.record.formula.functions.FreeRefFunction;
import org.apache.poi.ss.formula.EvaluationCell;
import org.apache.poi.ss.formula.EvaluationName;
import org.apache.poi.ss.formula.EvaluationSheet;
Modified:
poi/trunk/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluator.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluator.java?rev=1037436&r1=1037435&r2=1037436&view=diff
==============================================================================
---
poi/trunk/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluator.java
(original)
+++
poi/trunk/src/java/org/apache/poi/ss/formula/eval/forked/ForkedEvaluator.java
Sun Nov 21 12:04:56 2010
@@ -17,13 +17,12 @@
package org.apache.poi.ss.formula.eval.forked;
-import org.apache.poi.hssf.record.formula.eval.BoolEval;
-import org.apache.poi.hssf.record.formula.eval.ErrorEval;
-import org.apache.poi.hssf.record.formula.eval.NumberEval;
-import org.apache.poi.hssf.record.formula.eval.StringEval;
-import org.apache.poi.hssf.record.formula.eval.ValueEval;
-import org.apache.poi.hssf.record.formula.udf.UDFFinder;
-import org.apache.poi.hssf.usermodel.HSSFCell;
+import org.apache.poi.ss.formula.eval.BoolEval;
+import org.apache.poi.ss.formula.eval.ErrorEval;
+import org.apache.poi.ss.formula.eval.NumberEval;
+import org.apache.poi.ss.formula.eval.StringEval;
+import org.apache.poi.ss.formula.eval.ValueEval;
+import org.apache.poi.ss.formula.udf.UDFFinder;
import org.apache.poi.hssf.usermodel.HSSFEvaluationWorkbook;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.formula.CollaboratingWorkbooksEnvironment;
@@ -31,6 +30,7 @@ import org.apache.poi.ss.formula.Evaluat
import org.apache.poi.ss.formula.EvaluationWorkbook;
import org.apache.poi.ss.formula.IStabilityClassifier;
import org.apache.poi.ss.formula.WorkbookEvaluator;
+import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Workbook;
/**
@@ -113,17 +113,17 @@ public final class ForkedEvaluator {
EvaluationCell cell = _sewb.getEvaluationCell(sheetName,
rowIndex, columnIndex);
switch (cell.getCellType()) {
- case HSSFCell.CELL_TYPE_BOOLEAN:
+ case Cell.CELL_TYPE_BOOLEAN:
return
BoolEval.valueOf(cell.getBooleanCellValue());
- case HSSFCell.CELL_TYPE_ERROR:
+ case Cell.CELL_TYPE_ERROR:
return
ErrorEval.valueOf(cell.getErrorCellValue());
- case HSSFCell.CELL_TYPE_FORMULA:
+ case Cell.CELL_TYPE_FORMULA:
return _evaluator.evaluate(cell);
- case HSSFCell.CELL_TYPE_NUMERIC:
+ case Cell.CELL_TYPE_NUMERIC:
return new
NumberEval(cell.getNumericCellValue());
- case HSSFCell.CELL_TYPE_STRING:
+ case Cell.CELL_TYPE_STRING:
return new
StringEval(cell.getStringCellValue());
- case HSSFCell.CELL_TYPE_BLANK:
+ case Cell.CELL_TYPE_BLANK:
return null;
}
throw new IllegalStateException("Bad cell type (" +
cell.getCellType() + ")");
Modified: poi/trunk/src/java/org/apache/poi/ss/usermodel/CellValue.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/usermodel/CellValue.java?rev=1037436&r1=1037435&r2=1037436&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/usermodel/CellValue.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/usermodel/CellValue.java Sun Nov 21
12:04:56 2010
@@ -17,8 +17,7 @@
package org.apache.poi.ss.usermodel;
-import org.apache.poi.hssf.record.formula.eval.ErrorEval;
-import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.formula.eval.ErrorEval;
/**
* Mimics the 'data view' of a cell. This allows formula evaluator
Modified: poi/trunk/test-data/spreadsheet/LookupFunctionsTestCaseData.xls
URL:
http://svn.apache.org/viewvc/poi/trunk/test-data/spreadsheet/LookupFunctionsTestCaseData.xls?rev=1037436&r1=1037435&r2=1037436&view=diff
==============================================================================
Binary files - no diff available.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
