Revision 44019

View differences:

trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.lib/org.gvsig.expressionevaluator.lib.api/src/main/java/org/gvsig/expressionevaluator/ExpressionEvaluatorManager.java
16 16
    
17 17
    public Code compile(LexicalAnalyzer lex, String source);
18 18
    
19
    public Code optimize(SymbolTable symbolTable, Code code);
20
    
19 21
    public MutableSymbolTable createSymbolTable();
20 22
    
21 23
    public SymbolTable getSymbolTable(String name);
trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.lib/org.gvsig.expressionevaluator.lib.api/src/main/java/org/gvsig/expressionevaluator/Optimizer.java
14 14
    
15 15
    public Code optimize(Code code);
16 16
    
17
    public Code optimize(SymbolTable symbolTable, Code code);
18
    
17 19
    public void setSymbolTable(SymbolTable symbolTable);
18 20
    
19 21
    public SymbolTable getSymbolTable();
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
129 129
    }
130 130

  
131 131
    @Override
132
    public Code optimize(SymbolTable symbolTable, Code code) {
133
        this.setSymbolTable(symbolTable);
134
        return this.optimize(code);
135
    }
136

  
137
    @Override
132 138
    public Code optimize(Code code) {
133 139
        code = this.doOptimize(code);
134 140
        return code;
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/DefaultExpressionEvaluatorManager.java
101 101
    }
102 102

  
103 103
    @Override
104
    public Code optimize(SymbolTable symbolTable, Code code) {
105
        Optimizer optimizer = this.createOptimizer();
106
        return optimizer.optimize(symbolTable, code);
107
    }
108

  
109
    @Override
104 110
    public MutableSymbolTable createSymbolTable() {
105 111
        DefaultSymbolTable theSymbolTable = new DefaultSymbolTable();
106 112
        return theSymbolTable;

Also available in: Unified diff