Revision 44215 trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.lib/org.gvsig.expressionevaluator.lib.api/src/main/java/org/gvsig/expressionevaluator/ExpressionUtils.java

View differences:

ExpressionUtils.java
1 1
package org.gvsig.expressionevaluator;
2 2

  
3
import org.apache.commons.lang3.StringUtils;
3 4
import org.gvsig.expressionevaluator.ExpressionBuilder.Value;
4 5
import org.gvsig.tools.script.Script;
5 6

  
......
51 52
    }
52 53

  
53 54
    public static Expression createExpression(String phrase) {
55
        if( StringUtils.isBlank(phrase) ) {
56
            return null;
57
        }
54 58
        Expression expression = ExpressionEvaluatorLocator.getManager().createExpression();
55 59
        expression.setPhrase(phrase);
56 60
        return expression;
......
82 86
    }
83 87

  
84 88
    public static Code compile(String expression) {
89
        if( StringUtils.isBlank(expression) ) {
90
            return null;
91
        }
85 92
        ExpressionEvaluatorManager manager = ExpressionEvaluatorLocator.getManager();
86 93
        Code code = manager.compile(expression);
87 94
        return code;
88 95
    }
89 96

  
90 97
    public static Object evaluate(SymbolTable symbolTable, String expression) {
98
        if( StringUtils.isBlank(expression) ) {
99
            return null;
100
        }
91 101
        ExpressionEvaluatorManager manager = ExpressionEvaluatorLocator.getManager();
92 102
        Object x = manager.evaluate(symbolTable, expression);
93 103
        return x;
......
139 149
        return code.toString(Code.EMPTY_FORMATTER);
140 150
    }
141 151

  
152
    public static Expression createExpressionFromJSON(String json) {
153
        Expression expression = ExpressionUtils.createExpression();
154
        expression.fromJSON(json);
155
        return expression;
156
    }
157

  
158
    public static MutableSymbolTable createSymbolTable() {
159
        ExpressionEvaluatorManager manager = ExpressionEvaluatorLocator.getManager();
160
        MutableSymbolTable symbolTable = manager.createSymbolTable();
161
        return symbolTable;
162
    }
163

  
142 164
}

Also available in: Unified diff