Revision 44750 trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.db/org.gvsig.fmap.dal.db.h2/src/main/java/org/gvsig/fmap/dal/store/h2/expressionbuilderformatter/ST_Intersects.java

View differences:

ST_Intersects.java
3 3
import java.text.MessageFormat;
4 4
import java.util.List;
5 5
import org.apache.commons.lang3.StringUtils;
6
import org.apache.commons.lang3.tuple.Pair;
7 6
import org.gvsig.expressionevaluator.ExpressionBuilder;
8 7
import static org.gvsig.expressionevaluator.GeometryExpressionBuilder.FUNCTION_ST_INTERSECTS;
9 8
import org.gvsig.expressionevaluator.ExpressionBuilder.Function;
......
34 33

  
35 34
    @Override
36 35
    public String format(Value function) {
37
        List<Pair<String,Value>> parameters = ((Function) function).parameters();
38
        String p1 = parameters.get(0).getValue().toString(formatter);
39
        String p2 = parameters.get(1).getValue().toString(formatter);
36
        List<Value> parameters = ((Function) function).parameters();
37
        String p1 = parameters.get(0).toString(formatter);
38
        String p2 = parameters.get(1).toString(formatter);
40 39
        String r = MessageFormat.format("( (({0}) && ({1})) AND ST_Intersects(({0}),({1}) ))", p1, p2);
41 40
        return r;
42 41
    }

Also available in: Unified diff