Revision 44191 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.fmap.dal.expressionevaluator.ExpressionEvaluator;
13 14
import org.gvsig.fmap.dal.expressionevaluator.FeatureSymbolTable;
14 15
import org.gvsig.fmap.dal.feature.Feature;
15 16
import org.gvsig.tools.evaluator.AbstractEvaluator;
......
17 18
import org.gvsig.tools.evaluator.EvaluatorData;
18 19
import org.gvsig.tools.evaluator.EvaluatorException;
19 20
import org.gvsig.tools.evaluator.EvaluatorFieldsInfo;
20
import org.gvsig.tools.evaluator.EvaluatorWithDescriptions;
21 21
import org.gvsig.tools.exception.BaseException;
22 22
import org.gvsig.tools.visitor.VisitCanceledException;
23 23
import org.gvsig.tools.visitor.Visitor;
24 24
import org.gvsig.tools.lang.Cloneable;
25
import org.slf4j.Logger;
26
import org.slf4j.LoggerFactory;
25 27

  
28
@SuppressWarnings("UseSpecificCatch")
26 29
public class DefaultExpressionEvaluator 
27 30
        extends AbstractEvaluator 
28
        implements EvaluatorWithDescriptions, Cloneable 
31
        implements ExpressionEvaluator, Cloneable 
29 32
    {
30 33

  
34
    private static final Logger LOGGER = LoggerFactory.getLogger(DefaultExpressionEvaluator.class);
35
    
31 36
    private static class DescriptionAdapter implements Description {
32 37

  
33 38
        Function function;
......
100 105
    }
101 106

  
102 107
    @Override
108
    public String getName() {
109
        return "Genereric expression";
110
    }
111

  
112
    @Override
113
    public String getDescription() {
114
        return this.expression.getPhrase();
115
    }
116

  
117
    @Override
118
    public String getSQL() {
119
        return this.expression.getPhrase();
120
    }
121

  
122
    @Override
123
    public Expression getExpression() {
124
        return expression;
125
    }
126

  
127
    @Override
128
    public SymbolTable getSymbolTable() {
129
        return this.symbolTable;
130
    }
131
    
132
    @Override
103 133
    public Object evaluate(EvaluatorData data) throws EvaluatorException {
104 134
        this.featureSymbolTable.setFeature((Feature) data);
105 135
        Object v = this.expression.execute(this.symbolTable);
......
107 137
    }
108 138

  
109 139
    @Override
110
    public String getName() {
111
        return "Genereric expression";
112
    }
113

  
114
    @Override
115 140
    public EvaluatorFieldsInfo getFieldsInfo() {
116 141
        final Set<String> names = new HashSet<>();
117 142
        try {
......
162 187
        return availableFunctions;
163 188
    }
164 189

  
165
    private SymbolTable getSymbolTable() {
166
        return this.symbolTable;
167
    }
168

  
169 190
    @Override
170 191
    public Evaluator clone() throws CloneNotSupportedException {
171 192
        DefaultExpressionEvaluator other = (DefaultExpressionEvaluator) super.clone();

Also available in: Unified diff