Revision 44855 trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.lib/org.gvsig.expressionevaluator.lib.impl/src/main/java/org/gvsig/expressionevaluator/impl/function/operator/AddOperator.java

View differences:

AddOperator.java
3 3 
import java.util.Objects;
4 4 
import org.gvsig.expressionevaluator.Code;
5 5 
import org.gvsig.expressionevaluator.Code.Constant;
6 
import org.gvsig.expressionevaluator.ExpressionBuilder;
7 6 
import static org.gvsig.expressionevaluator.ExpressionBuilder.OPERATOR_ADD;
8 7 
import org.gvsig.expressionevaluator.ExpressionRuntimeException;
9 8 
import org.gvsig.expressionevaluator.Function;
......
32 31 
    public Object call(Interpreter interpreter, Object op1, Object op2) {
33 32 
        int type = this.getType(op1, op2);
34 33 
        if( (type & TYPE_DOUBLE) == TYPE_DOUBLE ) {
35 
            double value = ((Number) op1).doubleValue() + ((Number) op2).doubleValue();
34 
            double value = getDouble(op1,1) + getDouble(op2,2);
36 35 
            return value;
37 36 
        }
38 37 
        if( (type & TYPE_FLOAT) == TYPE_FLOAT ) {
39 
            double value = ((Number) op1).floatValue() + ((Number) op2).floatValue();
38 
            double value = getFloat(op1,1) + getFloat(op2,2);
40 39 
            return value;
41 40 
        }
42 41 
        if( (type & TYPE_LONG) == TYPE_LONG ) {
43 
            long value = ((Number) op1).longValue() + ((Number) op2).longValue();
42 
            long value = getLong(op1,1) + getLong(op2,2);
44 43 
            return value;
45 44 
        }
46 45 
        if( (type & TYPE_INT) == TYPE_INT ) {
47 
            int value = ((Number) op1).intValue()+ ((Number) op2).intValue();
46 
            int value = getInt(op1,1) + getInt(op2,2);
48 47 
            return value;
49 48 
        }
50 49 
        if( (type & TYPE_STRING) == TYPE_STRING ) {

Also available in: Unified diff