Revision 44644 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/DefaultOptimizer.java

View differences:

DefaultOptimizer.java
7 7
import org.gvsig.expressionevaluator.Code;
8 8
import org.gvsig.expressionevaluator.Code.Caller;
9 9
import org.gvsig.expressionevaluator.CodeBuilder;
10
import org.gvsig.expressionevaluator.ExpressionEvaluatorManager;
10 11
import org.gvsig.expressionevaluator.Function;
11 12
import org.gvsig.expressionevaluator.Interpreter;
12 13
import org.gvsig.expressionevaluator.SymbolTable;
......
115 116
    private final OptimizerSymbolTable symbolTable;
116 117
    private Interpreter interpreter;
117 118
    private CodeBuilder codeBuilder;
119
    protected ExpressionEvaluatorManager manager;
118 120

  
119
    public DefaultOptimizer() {
121
    public DefaultOptimizer(ExpressionEvaluatorManager manager) {
122
        this.manager = manager;
120 123
        this.symbolTable = new OptimizerSymbolTable();
121 124
    }
122 125

  
123
    public DefaultOptimizer(SymbolTable symbolTable) {
124
        this();
126
    public DefaultOptimizer(ExpressionEvaluatorManager manager, SymbolTable symbolTable) {
127
        this(manager);
125 128
        this.symbolTable.setSymbolTable(symbolTable);
126 129
    }
127 130

  
......
147 150
    @Override
148 151
    public CodeBuilder getCodeBuilder() {
149 152
        if (this.codeBuilder == null) {
150
            this.codeBuilder = new DefaultCodeBuilder();
153
            this.codeBuilder = new DefaultCodeBuilder(this.manager);
151 154
        }
152 155
        return this.codeBuilder;
153 156
    }

Also available in: Unified diff