Revision 44738 trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.dal/org.gvsig.fmap.dal.impl/src/main/java/org/gvsig/fmap/dal/impl/expressionevaluator/DefaultExpressionEvaluator.java

View differences:

DefaultExpressionEvaluator.java
10 10 
import org.gvsig.expressionevaluator.ExpressionEvaluatorLocator;
11 11 
import org.gvsig.expressionevaluator.ExpressionEvaluatorManager;
12 12 
import org.gvsig.expressionevaluator.Function;
13 
import org.gvsig.expressionevaluator.impl.symboltable.FeatureSymbolTableImpl;
13 14 
import org.gvsig.fmap.dal.expressionevaluator.ExpressionEvaluator;
14 15 
import org.gvsig.fmap.dal.expressionevaluator.FeatureSymbolTable;
15 16 
import org.gvsig.fmap.dal.feature.Feature;
......
19 20 
import org.gvsig.tools.evaluator.EvaluatorException;
20 21 
import org.gvsig.tools.evaluator.EvaluatorFieldsInfo;
21 22 
import org.gvsig.tools.exception.BaseException;
22 
import org.gvsig.tools.visitor.VisitCanceledException;
23 
import org.gvsig.tools.visitor.Visitor;
24 23 
import org.gvsig.tools.lang.Cloneable;
25 24 
import org.slf4j.Logger;
26 25 
import org.slf4j.LoggerFactory;
......
85 84 
    public DefaultExpressionEvaluator(String source) {
86 85 
        ExpressionEvaluatorManager manager = ExpressionEvaluatorLocator.getManager();
87 86 
        this.symbolTable = manager.createSymbolTable();
88 
        this.featureSymbolTable = new DefaultFeatureSymbolTable();
87 
        this.featureSymbolTable = new FeatureSymbolTableImpl();
89 88 
        this.symbolTable.addSymbolTable(this.featureSymbolTable);
90 89
91 90 
        this.expression = manager.createExpression();
......
96 95 
        ExpressionEvaluatorManager manager = ExpressionEvaluatorLocator.getManager();
97 96 
        this.expression = expression;
98 97 
        this.symbolTable = manager.createSymbolTable();
99 
        this.featureSymbolTable = new DefaultFeatureSymbolTable(
98 
        this.featureSymbolTable = new FeatureSymbolTableImpl(
100 99 
//                expression.getUserScript(),
101 100 
//                expression.getScripts()
102 101 
        );
......
140 139 
    public EvaluatorFieldsInfo getFieldsInfo() {
141 140 
        final Set<String> names = new HashSet<>();
142 141 
        try {
143 
            this.expression.getCode().accept(new Visitor() {
144 
                @Override
145 
                public void visit(Object code) throws VisitCanceledException, BaseException {
146 
                    if (code instanceof Code.Identifier) {
147 
                        Code.Identifier identifier = (Code.Identifier) code;
148 
                        names.add(identifier.name());
149 
                    }
150 
                }
142 
            this.expression.getCode().accept((Object code) -> {
143 
              if (code instanceof Code.Identifier) {
144 
                Code.Identifier identifier = (Code.Identifier) code;
145 
                names.add(identifier.name());
146 
              }
151 147 
            });
152 148 
            EvaluatorFieldsInfo info = new EvaluatorFieldsInfo();
153 149 
            for (String name : names) {

Also available in: Unified diff