Revision 43989 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/DefaultExpression.java

View differences:

DefaultExpression.java
4 4
import java.util.ArrayList;
5 5
import java.util.Iterator;
6 6
import java.util.List;
7
import java.util.logging.Level;
8
import java.util.logging.Logger;
9 7
import org.apache.commons.lang3.StringUtils;
10 8
import org.gvsig.expressionevaluator.Code;
11 9
import org.gvsig.expressionevaluator.Expression;
......
118 116
    }
119 117

  
120 118
    @Override
121
    public Object execute(SymbolTable symbolTable) {
119
    public Code getCode() {
122 120
        if (this.code == null) {
123 121
            ExpressionEvaluatorManager manager = ExpressionEvaluatorLocator.getManager();
124 122
            this.code = manager.compile(this.phrase);
125 123
        }
124
        return code;
125
    }
126

  
127
    
128
    @Override
129
    public Object execute(SymbolTable symbolTable) {
126 130
        if (this.interpreter == null) {
127 131
            ExpressionEvaluatorManager manager = ExpressionEvaluatorLocator.getManager();
128 132
            this.interpreter = manager.createInterpreter();
129 133
        }
130 134
        this.interpreter.setSymbolTable(symbolTable);
131
        Object x = this.interpreter.run(code);
135
        Object x = this.interpreter.run(this.getCode());
132 136
        return x;
133 137
    }
134 138

  

Also available in: Unified diff