Author: centic
Date: Fri May 12 11:38:05 2017
New Revision: 1794956
URL: http://svn.apache.org/viewvc?rev=1794956&view=rev
Log:
Simplify the ValueEval.toString() implementations and include more information
on unexpected types of ValueEval
Modified:
poi/trunk/src/java/org/apache/poi/ss/formula/eval/BoolEval.java
poi/trunk/src/java/org/apache/poi/ss/formula/eval/ErrorEval.java
poi/trunk/src/java/org/apache/poi/ss/formula/eval/ExternalNameEval.java
poi/trunk/src/java/org/apache/poi/ss/formula/eval/FunctionNameEval.java
poi/trunk/src/java/org/apache/poi/ss/formula/eval/StringEval.java
poi/trunk/src/java/org/apache/poi/ss/formula/functions/LookupUtils.java
poi/trunk/src/java/org/apache/poi/ss/formula/functions/Match.java
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/eval/BoolEval.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/eval/BoolEval.java?rev=1794956&r1=1794955&r2=1794956&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/eval/BoolEval.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/eval/BoolEval.java Fri May 12
11:38:05 2017
@@ -34,7 +34,7 @@ public final class BoolEval implements N
*
* @return the <tt>BoolEval</tt> instance representing <tt>b</tt>.
*/
- public static final BoolEval valueOf(boolean b) {
+ public static BoolEval valueOf(boolean b) {
return b ? TRUE : FALSE;
}
@@ -55,10 +55,8 @@ public final class BoolEval implements N
}
public String toString() {
- StringBuilder sb = new StringBuilder(64);
- sb.append(getClass().getName()).append(" [");
- sb.append(getStringValue());
- sb.append("]");
- return sb.toString();
+ return getClass().getName() + " [" +
+ getStringValue() +
+ "]";
}
}
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/eval/ErrorEval.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/eval/ErrorEval.java?rev=1794956&r1=1794955&r2=1794956&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/eval/ErrorEval.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/eval/ErrorEval.java Fri May 12
11:38:05 2017
@@ -51,7 +51,8 @@ public final class ErrorEval implements
/**
* Translates an Excel internal error code into the corresponding POI
ErrorEval instance
- * @param errorCode
+ * @param errorCode An error code listed in {@link FormulaError}
+ * @throws RuntimeException If an unknown errorCode is specified
*/
public static ErrorEval valueOf(int errorCode) {
FormulaError error = FormulaError.forInt(errorCode);
@@ -89,10 +90,8 @@ public final class ErrorEval implements
return _error.getString();
}
public String toString() {
- StringBuffer sb = new StringBuffer(64);
- sb.append(getClass().getName()).append(" [");
- sb.append(_error.getString());
- sb.append("]");
- return sb.toString();
+ return getClass().getName() + " [" +
+ _error.getString() +
+ "]";
}
}
Modified:
poi/trunk/src/java/org/apache/poi/ss/formula/eval/ExternalNameEval.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/eval/ExternalNameEval.java?rev=1794956&r1=1794955&r2=1794956&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/eval/ExternalNameEval.java
(original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/eval/ExternalNameEval.java Fri
May 12 11:38:05 2017
@@ -34,10 +34,8 @@ public final class ExternalNameEval impl
}
public String toString() {
- StringBuffer sb = new StringBuffer(64);
- sb.append(getClass().getName()).append(" [");
- sb.append(_name.getNameText());
- sb.append("]");
- return sb.toString();
+ return getClass().getName() + " [" +
+ _name.getNameText() +
+ "]";
}
}
Modified:
poi/trunk/src/java/org/apache/poi/ss/formula/eval/FunctionNameEval.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/eval/FunctionNameEval.java?rev=1794956&r1=1794955&r2=1794956&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/eval/FunctionNameEval.java
(original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/eval/FunctionNameEval.java Fri
May 12 11:38:05 2017
@@ -37,10 +37,8 @@ public final class FunctionNameEval impl
}
public String toString() {
- StringBuffer sb = new StringBuffer(64);
- sb.append(getClass().getName()).append(" [");
- sb.append(_functionName);
- sb.append("]");
- return sb.toString();
+ return getClass().getName() + " [" +
+ _functionName +
+ "]";
}
}
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/eval/StringEval.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/eval/StringEval.java?rev=1794956&r1=1794955&r2=1794956&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/eval/StringEval.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/eval/StringEval.java Fri May
12 11:38:05 2017
@@ -45,10 +45,8 @@ public final class StringEval implements
}
public String toString() {
- StringBuilder sb = new StringBuilder(64);
- sb.append(getClass().getName()).append(" [");
- sb.append(_value);
- sb.append("]");
- return sb.toString();
+ return getClass().getName() + " [" +
+ _value +
+ "]";
}
}
Modified:
poi/trunk/src/java/org/apache/poi/ss/formula/functions/LookupUtils.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/functions/LookupUtils.java?rev=1794956&r1=1794955&r2=1794956&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/functions/LookupUtils.java
(original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/functions/LookupUtils.java Fri
May 12 11:38:05 2017
@@ -184,7 +184,7 @@ final class LookupUtils {
public static final CompareResult EQUAL = new
CompareResult(false, 0);
public static final CompareResult GREATER_THAN = new
CompareResult(false, +1);
- public static final CompareResult valueOf(int
simpleCompareResult) {
+ public static CompareResult valueOf(int simpleCompareResult) {
if(simpleCompareResult < 0) {
return LESS_THAN;
}
@@ -194,7 +194,7 @@ final class LookupUtils {
return EQUAL;
}
- public static final CompareResult valueOf(boolean matches) {
+ public static CompareResult valueOf(boolean matches) {
if(matches) {
return EQUAL ;
}
@@ -215,11 +215,9 @@ final class LookupUtils {
return _isGreaterThan;
}
public String toString() {
- StringBuffer sb = new StringBuffer(64);
- sb.append(getClass().getName()).append(" [");
- sb.append(formatAsString());
- sb.append("]");
- return sb.toString();
+ return getClass().getName() + " [" +
+ formatAsString() +
+ "]";
}
private String formatAsString() {
@@ -267,11 +265,9 @@ final class LookupUtils {
return compareSameType(other);
}
public String toString() {
- StringBuffer sb = new StringBuffer(64);
- sb.append(getClass().getName()).append(" [");
- sb.append(getValueAsString());
- sb.append("]");
- return sb.toString();
+ return getClass().getName() + " [" +
+ getValueAsString() +
+ "]";
}
protected abstract CompareResult compareSameType(ValueEval
other);
/** used only for debug purposes */
@@ -475,7 +471,7 @@ final class LookupUtils {
// zero is FALSE, everything else is TRUE
return 0.0 != nve.getNumberValue();
}
- throw new RuntimeException("Unexpected eval type (" +
valEval.getClass().getName() + ")");
+ throw new RuntimeException("Unexpected eval type (" + valEval +
")");
}
public static int lookupIndexOfValue(ValueEval lookupValue, ValueVector
vector, boolean isRangeLookup) throws EvaluationException {
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/functions/Match.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/functions/Match.java?rev=1794956&r1=1794955&r2=1794956&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/functions/Match.java (original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/functions/Match.java Fri May
12 11:38:05 2017
@@ -153,7 +153,7 @@ public final class Match extends Var2or3
// else looks like a number
throw new EvaluationException(ErrorEval.NA);
}
- throw new RuntimeException("Unexpected eval type (" +
eval.getClass().getName() + ")");
+ throw new RuntimeException("Unexpected eval type (" + eval +
")");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
