Revision 44262 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/DefaultExpressionBuilder.java

View differences:

DefaultExpressionBuilder.java
53 53
    private static final String FORMAT_NOTISNULL = "( ({0}) NOT IS NULL )";
54 54
    private static final String FORMAT_OPERATOR_NOT = "( NOT ({0}) )";
55 55

  
56
    private static final String FORMAT_OPERATOR_AND = "{0} AND {1}";
56
    private static final String FORMAT_OPERATOR_AND = "({0} AND {1})";
57 57
    private static final String FORMAT_OPERATOR_OR = "{0} OR {1}";
58 58
    private static final String FORMAT_OPERATOR_EQ = "( ({0}) = ({1}) )";
59 59
    private static final String FORMAT_OPERATOR_NE = "( ({0}) <> ({1}) )";
......
65 65
    private static final String FORMAT_OPERATOR_ILIKE = "( ({0}) ILIKE ({1}) )";
66 66
    private static final String FORMAT_OPERATOR_ADD = "{0} + {1}";
67 67
    private static final String FORMAT_OPERATOR_SUBST = "{0} - {1}";
68
    private static final String FORMAT_OPERATOR_MULT = "{0} * {1}";
69
    private static final String FORMAT_OPERATOR_DIV = "{0} / {1}";
68
    private static final String FORMAT_OPERATOR_MULT = "({0} * {1})";
69
    private static final String FORMAT_OPERATOR_DIV = "({0} / {1})";
70 70
    private static final String FORMAT_OPERATOR_CONCAT = "{0} || {1}";
71 71

  
72 72
    public class GroupBase extends AbstractValue implements Group {
......
1564 1564
    public Function ST_SetSRID(Value geom, Value srid) {
1565 1565
       return function(FUNCTION_ST_POINT, geom, srid);
1566 1566
    }
1567

  
1568
    @Override
1569
    public Function list() {
1570
        return function(FUNCTION_LIST);
1571
    }
1567 1572
}

Also available in: Unified diff