Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

changed short to int in Function.evaluate() method signature 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@881704 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Josh Micich 2009-11-18 09:21:12 +00:00
parent b676951ff2
commit 48368af6c9
57 changed files with 74 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/java/org/apache/poi/hssf/record/formula/eval/ConcatEval.java
View File

@ -30,7 +30,7 @@ public final class ConcatEval implements Function {
// enforce singleton
}
public ValueEval evaluate(ValueEval[] args, int srcRow, short srcCol) {
public ValueEval evaluate(ValueEval[] args, int srcRow, int srcCol) {
if(args.length != 2) {
return ErrorEval.VALUE_INVALID;
}

2
src/java/org/apache/poi/hssf/record/formula/eval/IntersectionEval.java
View File

@ -30,7 +30,7 @@ public final class IntersectionEval implements Function {
// enforces singleton
}
public ValueEval evaluate(ValueEval[] args, int srcRow, short srcCol) {
public ValueEval evaluate(ValueEval[] args, int srcRow, int srcCol) {
if(args.length != 2) {
return ErrorEval.VALUE_INVALID;
}

2
src/java/org/apache/poi/hssf/record/formula/eval/PercentEval.java
View File

@ -32,7 +32,7 @@ public final class PercentEval implements Function {
// enforce singleton
}
public ValueEval evaluate(ValueEval[] args, int srcRow, short srcCol) {
public ValueEval evaluate(ValueEval[] args, int srcRow, int srcCol) {
if (args.length != 1) {
return ErrorEval.VALUE_INVALID;
}

2
src/java/org/apache/poi/hssf/record/formula/eval/RangeEval.java
View File

@ -32,7 +32,7 @@ public final class RangeEval implements Function {
// enforces singleton
}
public ValueEval evaluate(ValueEval[] args, int srcRow, short srcCol) {
public ValueEval evaluate(ValueEval[] args, int srcRow, int srcCol) {
if(args.length != 2) {
return ErrorEval.VALUE_INVALID;
}

2
src/java/org/apache/poi/hssf/record/formula/eval/RelationalOperationEval.java
View File

@ -55,7 +55,7 @@ public abstract class RelationalOperationEval implements Function {
* Blank < Positive numbers
* </pre>
*/
public final ValueEval evaluate(ValueEval[] operands, int srcRow, short srcCol) {
public final ValueEval evaluate(ValueEval[] operands, int srcRow, int srcCol) {
if (operands.length != 2) {
return ErrorEval.VALUE_INVALID;
}

2
src/java/org/apache/poi/hssf/record/formula/eval/TwoOperandNumericOperation.java
View File

@ -29,7 +29,7 @@ public abstract class TwoOperandNumericOperation implements Function {
return OperandResolver.coerceValueToDouble(ve);
}
public final ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) {
public final ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) {
double result;
try {
double d0 = singleOperandEvaluate(args[0], srcCellRow, srcCellCol);

2
src/java/org/apache/poi/hssf/record/formula/eval/UnaryMinusEval.java
View File

@ -32,7 +32,7 @@ public final class UnaryMinusEval implements Function {
// enforce singleton
}
public ValueEval evaluate(ValueEval[] args, int srcRow, short srcCol) {
public ValueEval evaluate(ValueEval[] args, int srcRow, int srcCol) {
if (args.length != 1) {
return ErrorEval.VALUE_INVALID;
}

2
src/java/org/apache/poi/hssf/record/formula/eval/UnaryPlusEval.java
View File

@ -32,7 +32,7 @@ public final class UnaryPlusEval implements Function {
// enforce singleton
}
public ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) {
public ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) {
if(args.length != 1) {
return ErrorEval.VALUE_INVALID;
}

2
src/java/org/apache/poi/hssf/record/formula/functions/BooleanFunction.java
View File

@ -38,7 +38,7 @@ import org.apache.poi.hssf.record.formula.eval.RefEval;
*/
public abstract class BooleanFunction implements Function {
public final ValueEval evaluate(ValueEval[] args, int srcRow, short srcCol) {
public final ValueEval evaluate(ValueEval[] args, int srcRow, int srcCol) {
if (args.length < 1) {
return ErrorEval.VALUE_INVALID;
}

2
src/java/org/apache/poi/hssf/record/formula/functions/CalendarFieldFunction.java
View File

@ -48,7 +48,7 @@ public final class CalendarFieldFunction implements Function {
_needsOneBaseAdjustment = needsOneBaseAdjustment;
}
public ValueEval evaluate(ValueEval[] operands, int srcCellRow, short srcCellCol) {
public ValueEval evaluate(ValueEval[] operands, int srcCellRow, int srcCellCol) {
if (operands.length != 1) {
return ErrorEval.VALUE_INVALID;
}

2
src/java/org/apache/poi/hssf/record/formula/functions/Choose.java
View File

@ -27,7 +27,7 @@ import org.apache.poi.hssf.record.formula.eval.ValueEval;
*/
public final class Choose implements Function {
public ValueEval evaluate(ValueEval[] args, int srcRowIndex, short srcColumnIndex) {
public ValueEval evaluate(ValueEval[] args, int srcRowIndex, int srcColumnIndex) {
if (args.length < 2) {
return ErrorEval.VALUE_INVALID;
}

2
src/java/org/apache/poi/hssf/record/formula/functions/Column.java
View File

@ -24,7 +24,7 @@ import org.apache.poi.hssf.record.formula.eval.RefEval;
import org.apache.poi.hssf.record.formula.eval.ValueEval;
public final class Column implements Function {
public ValueEval evaluate(ValueEval[] evals, int srcCellRow, short srcCellCol) {
public ValueEval evaluate(ValueEval[] evals, int srcCellRow, int srcCellCol) {
ValueEval retval = null;
int cnum = -1;

2
src/java/org/apache/poi/hssf/record/formula/functions/Columns.java
View File

@ -30,7 +30,7 @@ import org.apache.poi.hssf.record.formula.eval.ValueEval;
*/
public final class Columns implements Function {
public ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) {
public ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) {
switch(args.length) {
case 1:
// expected

2
src/java/org/apache/poi/hssf/record/formula/functions/Count.java
View File

@ -36,7 +36,7 @@ import org.apache.poi.hssf.record.formula.functions.CountUtils.I_MatchPredicate;
*/
public final class Count implements Function {
public ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) {
public ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) {
int nArgs = args.length;
if (nArgs < 1) {
// too few arguments

2
src/java/org/apache/poi/hssf/record/formula/functions/Counta.java
View File

@ -34,7 +34,7 @@ import org.apache.poi.hssf.record.formula.functions.CountUtils.I_MatchPredicate;
*/
public final class Counta implements Function {
public ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) {
public ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) {
int nArgs = args.length;
if (nArgs < 1) {
// too few arguments

2
src/java/org/apache/poi/hssf/record/formula/functions/Countblank.java
View File

@ -38,7 +38,7 @@ import org.apache.poi.hssf.record.formula.functions.CountUtils.I_MatchPredicate;
*/
public final class Countblank implements Function {
public ValueEval evaluate(ValueEval[] args, int srcRowIndex, short srcColumnIndex) {
public ValueEval evaluate(ValueEval[] args, int srcRowIndex, int srcColumnIndex) {
if (args.length != 1) {
// TODO - it doesn't seem to be possible to enter COUNTBLANK() into Excel with the wrong arg count
// perhaps this should be an exception

2
src/java/org/apache/poi/hssf/record/formula/functions/Countif.java
View File

@ -400,7 +400,7 @@ public final class Countif implements Function {
}
}
public ValueEval evaluate(ValueEval[] args, int srcRowIndex, short srcColumnIndex) {
public ValueEval evaluate(ValueEval[] args, int srcRowIndex, int srcColumnIndex) {
switch(args.length) {
case 2:
// expected

2
src/java/org/apache/poi/hssf/record/formula/functions/Errortype.java
View File

@ -52,7 +52,7 @@ import org.apache.poi.hssf.usermodel.HSSFErrorConstants;
*/
public final class Errortype implements Function {
public ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) {
public ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) {
try {
OperandResolver.getSingleValue(args[0], srcCellRow, srcCellCol);

2
src/java/org/apache/poi/hssf/record/formula/functions/False.java
View File

@ -27,7 +27,7 @@ import org.apache.poi.hssf.record.formula.eval.ValueEval;
*/
public final class False implements Function {
public ValueEval evaluate(ValueEval[] operands, int srcRow, short srcCol) {
public ValueEval evaluate(ValueEval[] operands, int srcRow, int srcCol) {
ValueEval retval;
switch (operands.length) {
default:

2
src/java/org/apache/poi/hssf/record/formula/functions/Find.java
View File

@ -36,7 +36,7 @@ import org.apache.poi.hssf.record.formula.eval.ValueEval;
*/
public final class Find extends TextFunction {
protected ValueEval evaluateFunc(ValueEval[] args, int srcCellRow, short srcCellCol)
protected ValueEval evaluateFunc(ValueEval[] args, int srcCellRow, int srcCellCol)
throws EvaluationException {
int nArgs = args.length;

2
src/java/org/apache/poi/hssf/record/formula/functions/Function.java
View File

@ -39,5 +39,5 @@ public interface Function {
* numeric functions evaluate to {@link Double#NaN} be sure to translate the result to {@link
* ErrorEval#NUM_ERROR}.
*/
ValueEval evaluate(ValueEval[] args, int srcRowIndex, short srcColumnIndex);
ValueEval evaluate(ValueEval[] args, int srcRowIndex, int srcColumnIndex);
}

2
src/java/org/apache/poi/hssf/record/formula/functions/Hlookup.java
View File

@ -41,7 +41,7 @@ import org.apache.poi.hssf.record.formula.functions.LookupUtils.ValueVector;
*/
public final class Hlookup implements Function {
public ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) {
public ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) {
ValueEval arg3 = null;
switch(args.length) {
case 4:

2
src/java/org/apache/poi/hssf/record/formula/functions/Hyperlink.java
View File

@ -41,7 +41,7 @@ import org.apache.poi.hssf.record.formula.eval.ValueEval;
*/
public final class Hyperlink implements Function {
public ValueEval evaluate(ValueEval[] operands, int srcRow, short srcCol) {
public ValueEval evaluate(ValueEval[] operands, int srcRow, int srcCol) {
int lastArgIx = operands.length - 1;
if (lastArgIx < 0 || lastArgIx > 1) {
return ErrorEval.VALUE_INVALID;

2
src/java/org/apache/poi/hssf/record/formula/functions/If.java
View File

@ -29,7 +29,7 @@ import org.apache.poi.hssf.record.formula.eval.ValueEval;
*/
public final class If implements Function {
public ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) {
public ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) {
ValueEval falseResult;
switch (args.length) {
case 3:

4
src/java/org/apache/poi/hssf/record/formula/functions/Index.java
View File

@ -46,7 +46,7 @@ import org.apache.poi.hssf.record.formula.eval.ValueEval;
*/
public final class Index implements Function {
public ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) {
public ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) {
int nArgs = args.length;
if(nArgs < 2) {
// too few arguments
@ -179,7 +179,7 @@ public final class Index implements Function {
* @return the resolved 1-based index. Zero if the arg was missing or blank
* @throws EvaluationException if the arg is an error value evaluates to a negative numeric value
*/
private static int resolveIndexArg(ValueEval arg, int srcCellRow, short srcCellCol) throws EvaluationException {
private static int resolveIndexArg(ValueEval arg, int srcCellRow, int srcCellCol) throws EvaluationException {
ValueEval ev = OperandResolver.getSingleValue(arg, srcCellRow, srcCellCol);
if (ev == MissingArgEval.instance) {

2
src/java/org/apache/poi/hssf/record/formula/functions/IsError.java
View File

@ -28,7 +28,7 @@ import org.apache.poi.hssf.record.formula.eval.ValueEval;
*/
public final class IsError implements Function {
public ValueEval evaluate(ValueEval[] operands, int srcCellRow, short srcCellCol) {
public ValueEval evaluate(ValueEval[] operands, int srcCellRow, int srcCellCol) {
if (operands.length != 1) {
return ErrorEval.VALUE_INVALID;
}

2
src/java/org/apache/poi/hssf/record/formula/functions/IsNa.java
View File

@ -38,7 +38,7 @@ import org.apache.poi.ss.usermodel.ErrorConstants;
*/
public final class IsNa implements Function {
public ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) {
public ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) {
if(args.length != 1) {
return ErrorEval.VALUE_INVALID;
}

2
src/java/org/apache/poi/hssf/record/formula/functions/Isblank.java
View File

@ -30,7 +30,7 @@ import org.apache.poi.hssf.record.formula.eval.ValueEval;
*/
public final class Isblank implements Function {
public ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) {
public ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) {
if(args.length != 1) {
return ErrorEval.VALUE_INVALID;
}

2
src/java/org/apache/poi/hssf/record/formula/functions/Isref.java
View File

@ -27,7 +27,7 @@ import org.apache.poi.hssf.record.formula.eval.ValueEval;
* @author Amol S. Deshmukh &lt; amolweb at ya hoo dot com &gt;
*/
public final class Isref implements Function {
public ValueEval evaluate(ValueEval[] operands, int srcCellRow, short srcCellCol) {
public ValueEval evaluate(ValueEval[] operands, int srcCellRow, int srcCellCol) {
if (operands.length != 1) {
return ErrorEval.VALUE_INVALID;
}

2
src/java/org/apache/poi/hssf/record/formula/functions/LogicalFunction.java
View File

@ -45,7 +45,7 @@ public abstract class LogicalFunction implements Function {
return retval;
}
public final ValueEval evaluate(ValueEval[] operands, int srcCellRow, short srcCellCol) {
public final ValueEval evaluate(ValueEval[] operands, int srcCellRow, int srcCellCol) {
if (operands.length != 1) {
return ErrorEval.VALUE_INVALID;
}

2
src/java/org/apache/poi/hssf/record/formula/functions/Lookup.java
View File

@ -40,7 +40,7 @@ import org.apache.poi.hssf.record.formula.functions.LookupUtils.ValueVector;
*/
public final class Lookup implements Function {
public ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) {
public ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) {
switch(args.length) {
case 3:
break;

2
src/java/org/apache/poi/hssf/record/formula/functions/LookupUtils.java
View File

@ -385,7 +385,7 @@ final class LookupUtils {
* @return
* @throws EvaluationException
*/
public static boolean resolveRangeLookupArg(ValueEval rangeLookupArg, int srcCellRow, short srcCellCol) throws EvaluationException {
public static boolean resolveRangeLookupArg(ValueEval rangeLookupArg, int srcCellRow, int srcCellCol) throws EvaluationException {
if(rangeLookupArg == null) {
// range_lookup arg not provided
return true; // default is TRUE

4
src/java/org/apache/poi/hssf/record/formula/functions/Match.java
View File

@ -66,7 +66,7 @@ import org.apache.poi.hssf.record.formula.functions.LookupUtils.ValueVector;
public final class Match implements Function {
public ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) {
public ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) {
double match_type = 1; // default
@ -154,7 +154,7 @@ public final class Match implements Function {
private static double evaluateMatchTypeArg(ValueEval arg, int srcCellRow, short srcCellCol)
private static double evaluateMatchTypeArg(ValueEval arg, int srcCellRow, int srcCellCol)
throws EvaluationException {
ValueEval match_type = OperandResolver.getSingleValue(arg, srcCellRow, srcCellCol);

2
src/java/org/apache/poi/hssf/record/formula/functions/Mode.java
View File

@ -73,7 +73,7 @@ public final class Mode implements Function {
}
public ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) {
public ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) {
double result;
try {
List<Double> temp = new ArrayList<Double>();

2
src/java/org/apache/poi/hssf/record/formula/functions/MultiOperandNumericFunction.java
View File

@ -82,7 +82,7 @@ public abstract class MultiOperandNumericFunction implements Function {
private static final int DEFAULT_MAX_NUM_OPERANDS = 30;
public final ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) {
public final ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) {
double d;
try {

2
src/java/org/apache/poi/hssf/record/formula/functions/Na.java
View File

@ -27,7 +27,7 @@ import org.apache.poi.hssf.record.formula.eval.ValueEval;
*/
public final class Na implements Function {
public ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) {
public ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) {
return ErrorEval.NA;
}

2
src/java/org/apache/poi/hssf/record/formula/functions/Not.java
View File

@ -32,7 +32,7 @@ import org.apache.poi.hssf.record.formula.eval.ValueEval;
*/
public final class Not implements Function {
public ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) {
public ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) {
if (args.length != 1) {
return ErrorEval.VALUE_INVALID;
}

2
src/java/org/apache/poi/hssf/record/formula/functions/NotImplementedFunction.java
View File

@ -38,7 +38,7 @@ public final class NotImplementedFunction implements Function {
_functionName = name;
}
public ValueEval evaluate(ValueEval[] operands, int srcRow, short srcCol) {
public ValueEval evaluate(ValueEval[] operands, int srcRow, int srcCol) {
throw new NotImplementedException(_functionName);
}
public String getFunctionName() {

2
src/java/org/apache/poi/hssf/record/formula/functions/Now.java
View File

@ -31,7 +31,7 @@ import org.apache.poi.hssf.usermodel.HSSFDateUtil;
*/
public final class Now implements Function {
public ValueEval evaluate(ValueEval[] evals, int srcCellRow, short srcCellCol) {
public ValueEval evaluate(ValueEval[] evals, int srcCellRow, int srcCellCol) {
if (evals.length > 0) {
return ErrorEval.VALUE_INVALID;
}

12
src/java/org/apache/poi/hssf/record/formula/functions/NumericFunction.java
View File

@ -32,7 +32,7 @@ public abstract class NumericFunction implements Function {
static final double TEN = 10.0;
static final double LOG_10_TO_BASE_e = Math.log(TEN);
protected static final double singleOperandEvaluate(ValueEval arg, int srcCellRow, short srcCellCol) throws EvaluationException {
protected static final double singleOperandEvaluate(ValueEval arg, int srcCellRow, int srcCellCol) throws EvaluationException {
ValueEval ve = OperandResolver.getSingleValue(arg, srcCellRow, srcCellCol);
double result = OperandResolver.coerceValueToDouble(ve);
checkValue(result);
@ -45,7 +45,7 @@ public abstract class NumericFunction implements Function {
}
}
public final ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) {
public final ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) {
double result;
try {
result = eval(args, srcCellRow, srcCellCol);
@ -56,7 +56,7 @@ public abstract class NumericFunction implements Function {
return new NumberEval(result);
}
protected abstract double eval(ValueEval[] args, int srcCellRow, short srcCellCol) throws EvaluationException;
protected abstract double eval(ValueEval[] args, int srcCellRow, int srcCellCol) throws EvaluationException;
/* -------------------------------------------------------------------------- */
// intermediate sub-classes (one-arg, two-arg and multi-arg)
@ -65,7 +65,7 @@ public abstract class NumericFunction implements Function {
protected OneArg() {
// no fields to initialise
}
protected final double eval(ValueEval[] args, int srcCellRow, short srcCellCol) throws EvaluationException {
protected final double eval(ValueEval[] args, int srcCellRow, int srcCellCol) throws EvaluationException {
if (args.length != 1) {
throw new EvaluationException(ErrorEval.VALUE_INVALID);
}
@ -79,7 +79,7 @@ public abstract class NumericFunction implements Function {
protected TwoArg() {
// no fields to initialise
}
protected final double eval(ValueEval[] args, int srcCellRow, short srcCellCol) throws EvaluationException {
protected final double eval(ValueEval[] args, int srcCellRow, int srcCellCol) throws EvaluationException {
if (args.length != 2) {
throw new EvaluationException(ErrorEval.VALUE_INVALID);
}
@ -97,7 +97,7 @@ public abstract class NumericFunction implements Function {
_minArgs = minArgs;
_maxArgs = maxArgs;
}
protected final double eval(ValueEval[] args, int srcCellRow, short srcCellCol) throws EvaluationException {
protected final double eval(ValueEval[] args, int srcCellRow, int srcCellCol) throws EvaluationException {
int nArgs = args.length;
if (nArgs < _minArgs || nArgs > _maxArgs) {
throw new EvaluationException(ErrorEval.VALUE_INVALID);

6
src/java/org/apache/poi/hssf/record/formula/functions/Offset.java
View File

@ -163,7 +163,7 @@ public final class Offset implements Function {
}
}
public ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) {
public ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) {
if(args.length < 3 || args.length > 5) {
return ErrorEval.VALUE_INVALID;
}
@ -223,7 +223,7 @@ public final class Offset implements Function {
/**
* OFFSET's numeric arguments (2..5) have similar processing rules
*/
private static int evaluateIntArg(ValueEval eval, int srcCellRow, short srcCellCol) throws EvaluationException {
private static int evaluateIntArg(ValueEval eval, int srcCellRow, int srcCellCol) throws EvaluationException {
double d = evaluateDoubleArg(eval, srcCellRow, srcCellCol);
return convertDoubleToInt(d);
@ -239,7 +239,7 @@ public final class Offset implements Function {
return (int)Math.floor(d);
}
private static double evaluateDoubleArg(ValueEval eval, int srcCellRow, short srcCellCol) throws EvaluationException {
private static double evaluateDoubleArg(ValueEval eval, int srcCellRow, int srcCellCol) throws EvaluationException {
ValueEval ve = OperandResolver.getSingleValue(eval, srcCellRow, srcCellCol);
if (ve instanceof NumericValueEval) {

2
src/java/org/apache/poi/hssf/record/formula/functions/Pi.java
View File

@ -29,7 +29,7 @@ public final class Pi implements Function {
private static final NumberEval PI_EVAL = new NumberEval(Math.PI);
public ValueEval evaluate(ValueEval[] operands, int srcRow, short srcCol) {
public ValueEval evaluate(ValueEval[] operands, int srcRow, int srcCol) {
ValueEval retval;
switch (operands.length) {
default:

2
src/java/org/apache/poi/hssf/record/formula/functions/Rand.java
View File

@ -27,7 +27,7 @@ import org.apache.poi.hssf.record.formula.eval.ValueEval;
*/
public final class Rand implements Function {
public ValueEval evaluate(ValueEval[] operands, int srcRow, short srcCol) {
public ValueEval evaluate(ValueEval[] operands, int srcRow, int srcCol) {
ValueEval retval;
switch (operands.length) {
default:

2
src/java/org/apache/poi/hssf/record/formula/functions/Replace.java
View File

@ -39,7 +39,7 @@ import org.apache.poi.hssf.record.formula.eval.ValueEval;
*/
public final class Replace extends TextFunction {
protected ValueEval evaluateFunc(ValueEval[] args, int srcCellRow, short srcCellCol)
protected ValueEval evaluateFunc(ValueEval[] args, int srcCellRow, int srcCellCol)
throws EvaluationException {
if (args.length != 4) {
return ErrorEval.VALUE_INVALID;

2
src/java/org/apache/poi/hssf/record/formula/functions/Row.java
View File

@ -25,7 +25,7 @@ import org.apache.poi.hssf.record.formula.eval.ValueEval;
public final class Row implements Function {
public ValueEval evaluate(ValueEval[] evals, int srcCellRow, short srcCellCol) {
public ValueEval evaluate(ValueEval[] evals, int srcCellRow, int srcCellCol) {
ValueEval retval = null;
int rnum = -1;

2
src/java/org/apache/poi/hssf/record/formula/functions/Rows.java
View File

@ -30,7 +30,7 @@ import org.apache.poi.hssf.record.formula.eval.ValueEval;
*/
public final class Rows implements Function {
public ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) {
public ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) {
switch(args.length) {
case 1:
// expected

2
src/java/org/apache/poi/hssf/record/formula/functions/Substitute.java
View File

@ -29,7 +29,7 @@ import org.apache.poi.hssf.record.formula.eval.ValueEval;
*/
public final class Substitute extends TextFunction {
protected ValueEval evaluateFunc(ValueEval[] args, int srcCellRow, short srcCellCol)
protected ValueEval evaluateFunc(ValueEval[] args, int srcCellRow, int srcCellCol)
throws EvaluationException {
if (args.length < 3 || args.length > 4) {
return ErrorEval.VALUE_INVALID;

2
src/java/org/apache/poi/hssf/record/formula/functions/Sumif.java
View File

@ -40,7 +40,7 @@ import org.apache.poi.hssf.record.formula.functions.CountUtils.I_MatchPredicate;
*/
public final class Sumif implements Function {
public ValueEval evaluate(ValueEval[] args, int srcRowIndex, short srcColumnIndex) {
public ValueEval evaluate(ValueEval[] args, int srcRowIndex, int srcColumnIndex) {
if (args.length < 2) {
return ErrorEval.VALUE_INVALID;
}

2
src/java/org/apache/poi/hssf/record/formula/functions/Sumproduct.java
View File

@ -53,7 +53,7 @@ import org.apache.poi.hssf.record.formula.eval.ValueEval;
public final class Sumproduct implements Function {
public ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) {
public ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) {
int maxN = args.length;

2
src/java/org/apache/poi/hssf/record/formula/functions/T.java
View File

@ -24,7 +24,7 @@ import org.apache.poi.hssf.record.formula.eval.ValueEval;
public final class T implements Function {
public ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) {
public ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) {
switch (args.length) {
default:
return ErrorEval.VALUE_INVALID;

18
src/java/org/apache/poi/hssf/record/formula/functions/TextFunction.java
View File

@ -33,16 +33,16 @@ public abstract class TextFunction implements Function {
protected static final String EMPTY_STRING = "";
protected static final String evaluateStringArg(ValueEval eval, int srcRow, short srcCol) throws EvaluationException {
protected static final String evaluateStringArg(ValueEval eval, int srcRow, int srcCol) throws EvaluationException {
ValueEval ve = OperandResolver.getSingleValue(eval, srcRow, srcCol);
return OperandResolver.coerceValueToString(ve);
}
protected static final int evaluateIntArg(ValueEval arg, int srcCellRow, short srcCellCol) throws EvaluationException {
protected static final int evaluateIntArg(ValueEval arg, int srcCellRow, int srcCellCol) throws EvaluationException {
ValueEval ve = OperandResolver.getSingleValue(arg, srcCellRow, srcCellCol);
return OperandResolver.coerceValueToInt(ve);
}
public final ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) {
public final ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) {
try {
return evaluateFunc(args, srcCellRow, srcCellCol);
} catch (EvaluationException e) {
@ -50,7 +50,7 @@ public abstract class TextFunction implements Function {
}
}
protected abstract ValueEval evaluateFunc(ValueEval[] args, int srcCellRow, short srcCellCol) throws EvaluationException;
protected abstract ValueEval evaluateFunc(ValueEval[] args, int srcCellRow, int srcCellCol) throws EvaluationException;
/* ---------------------------------------------------------------------- */
@ -59,7 +59,7 @@ public abstract class TextFunction implements Function {
protected SingleArgTextFunc() {
// no fields to initialise
}
protected ValueEval evaluateFunc(ValueEval[] args, int srcCellRow, short srcCellCol)
protected ValueEval evaluateFunc(ValueEval[] args, int srcCellRow, int srcCellCol)
throws EvaluationException {
if (args.length != 1) {
return ErrorEval.VALUE_INVALID;
@ -109,7 +109,7 @@ public abstract class TextFunction implements Function {
*/
public static final Function MID = new TextFunction() {
protected ValueEval evaluateFunc(ValueEval[] args, int srcCellRow, short srcCellCol)
protected ValueEval evaluateFunc(ValueEval[] args, int srcCellRow, int srcCellCol)
throws EvaluationException {
if (args.length != 3) {
return ErrorEval.VALUE_INVALID;
@ -144,7 +144,7 @@ public abstract class TextFunction implements Function {
protected LeftRight(boolean isLeft) {
_isLeft = isLeft;
}
protected ValueEval evaluateFunc(ValueEval[] args, int srcCellRow, short srcCellCol)
protected ValueEval evaluateFunc(ValueEval[] args, int srcCellRow, int srcCellCol)
throws EvaluationException {
if (args.length != 2) {
return ErrorEval.VALUE_INVALID;
@ -167,7 +167,7 @@ public abstract class TextFunction implements Function {
public static final Function CONCATENATE = new TextFunction() {
protected ValueEval evaluateFunc(ValueEval[] args, int srcCellRow, short srcCellCol)
protected ValueEval evaluateFunc(ValueEval[] args, int srcCellRow, int srcCellCol)
throws EvaluationException {
StringBuffer sb = new StringBuffer();
for (int i=0, iSize=args.length; i<iSize; i++) {
@ -179,7 +179,7 @@ public abstract class TextFunction implements Function {
public static final Function EXACT = new TextFunction() {
protected ValueEval evaluateFunc(ValueEval[] args, int srcCellRow, short srcCellCol)
protected ValueEval evaluateFunc(ValueEval[] args, int srcCellRow, int srcCellCol)
throws EvaluationException {
if (args.length != 2) {
return ErrorEval.VALUE_INVALID;

2
src/java/org/apache/poi/hssf/record/formula/functions/Time.java
View File

@ -37,7 +37,7 @@ public final class Time implements Function {
private static final int SECONDS_PER_DAY = HOURS_PER_DAY * SECONDS_PER_HOUR;
public ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) {
public ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) {
if (args.length != 3) {
return ErrorEval.VALUE_INVALID;
}

2
src/java/org/apache/poi/hssf/record/formula/functions/Today.java
View File

@ -32,7 +32,7 @@ import org.apache.poi.hssf.usermodel.HSSFDateUtil;
*/
public final class Today implements Function {
public ValueEval evaluate(ValueEval[] evals, int srcCellRow, short srcCellCol) {
public ValueEval evaluate(ValueEval[] evals, int srcCellRow, int srcCellCol) {
if (evals.length > 0) {
return ErrorEval.VALUE_INVALID;
}

2
src/java/org/apache/poi/hssf/record/formula/functions/True.java
View File

@ -27,7 +27,7 @@ import org.apache.poi.hssf.record.formula.eval.ValueEval;
*/
public final class True implements Function {
public ValueEval evaluate(ValueEval[] operands, int srcRow, short srcCol) {
public ValueEval evaluate(ValueEval[] operands, int srcRow, int srcCol) {
ValueEval retval;
switch (operands.length) {
default:

2
src/java/org/apache/poi/hssf/record/formula/functions/Value.java
View File

@ -41,7 +41,7 @@ public final class Value implements Function {
private static final int MIN_DISTANCE_BETWEEN_THOUSANDS_SEPARATOR = 4;
private static final Double ZERO = new Double(0.0);
public ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) {
public ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) {
if (args.length != 1) {
return ErrorEval.VALUE_INVALID;
}

2
src/java/org/apache/poi/hssf/record/formula/functions/Vlookup.java
View File

@ -41,7 +41,7 @@ import org.apache.poi.hssf.record.formula.functions.LookupUtils.ValueVector;
*/
public final class Vlookup implements Function {
public ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) {
public ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) {
ValueEval arg3 = null;
switch(args.length) {
case 4:

2
src/java/org/apache/poi/hssf/record/formula/functions/XYNumericFunction.java
View File

@ -96,7 +96,7 @@ public abstract class XYNumericFunction implements Function {
*/
protected abstract Accumulator createAccumulator();
public final ValueEval evaluate(ValueEval[] args, int srcCellRow, short srcCellCol) {
public final ValueEval evaluate(ValueEval[] args, int srcCellRow, int srcCellCol) {
if (args.length != 2) {
return ErrorEval.VALUE_INVALID;
}