Revision 46969

View differences:

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/DefaultFeatureExpressionEvaluator.java
5 5
import java.util.List;
6 6
import java.util.Objects;
7 7
import java.util.Set;
8
import javax.json.JsonObject;
8 9
import org.apache.commons.lang3.StringUtils;
9 10
import org.gvsig.expressionevaluator.Code;
10 11
import org.gvsig.expressionevaluator.Code.Callable;
......
17 18
import org.gvsig.expressionevaluator.impl.symboltable.FeatureSymbolTableImpl;
18 19
import org.gvsig.expressionevaluator.ExpressionEvaluator;
19 20
import org.gvsig.expressionevaluator.impl.DefaultExpression;
21
import org.gvsig.expressionevaluator.spi.BaseExpressionEvaluator;
20 22
import org.gvsig.fmap.dal.expressionevaluator.FeatureSymbolTable;
21 23
import org.gvsig.fmap.dal.feature.Feature;
24
import org.gvsig.json.Json;
25
import org.gvsig.json.JsonObjectBuilder;
22 26
import org.gvsig.tools.ToolsLocator;
23 27
import org.gvsig.tools.dynobject.DynStruct;
24 28
import org.gvsig.tools.evaluator.AbstractEvaluator;
......
266 270
        }
267 271
    }
268 272

  
273
    @Override
274
    public void fromJson(JsonObject json) {
275
        ExpressionEvaluatorManager manager = ExpressionEvaluatorLocator.getManager();
276
        this.symbolTable = manager.createSymbolTable();
277
        this.featureSymbolTable = new FeatureSymbolTableImpl();
278
        this.symbolTable.addSymbolTable(this.featureSymbolTable);
279
        this.availableOperators = null;
280
        this.availableFunctions = null;
281
        this.expression = (Expression) Json.toObject(json, "expression");
282
    }
283

  
284
    @Override
285
    public JsonObjectBuilder toJsonBuilder() {
286
        JsonObjectBuilder state = Json.createObjectBuilder();
287
        state.add("expression", this.expression);
288
        return state;
289
    }
290

  
269 291
}

Also available in: Unified diff