Revision 45932 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

View differences:

DefaultExpressionEvaluatorManager.java
1 1
package org.gvsig.expressionevaluator.impl;
2 2

  
3 3
import org.gvsig.expressionevaluator.spi.BaseExpressionEvaluator;
4
import java.io.InputStream;
5 4
import java.io.StringWriter;
6 5
import java.net.URI;
7 6
import java.util.ArrayList;
......
32 31
import org.gvsig.expressionevaluator.SymbolTableFactory;
33 32
import org.gvsig.expressionevaluator.Compiler;
34 33
import org.gvsig.expressionevaluator.ExpressionEvaluator;
35
import org.gvsig.expressionevaluator.ExpressionEvaluatorLocator;
36 34
import org.gvsig.expressionevaluator.Formatter;
37 35
import org.gvsig.expressionevaluator.GrammarSet;
38 36
import org.gvsig.expressionevaluator.ReprMethod;
......
42 40
import org.gvsig.tools.ToolsLocator;
43 41
import org.gvsig.tools.bookmarksandhistory.Bookmarks;
44 42
import org.gvsig.tools.bookmarksandhistory.History;
45
import org.gvsig.tools.bookmarksandhistory.impl.BaseBookmarks;
46
import org.gvsig.tools.bookmarksandhistory.impl.BaseHistory;
47
import org.gvsig.tools.evaluator.Evaluator;
48 43
import org.gvsig.tools.resourcesstorage.ResourcesStorage;
49 44
import org.gvsig.tools.script.Script;
50 45
import org.slf4j.Logger;
......
64 59
    private History<Expression> history;
65 60
    private SymbolTable inmutableSymbolTable;
66 61
    private ResourcesStorage scriptsResourcesStorage;
67
    private List<ClassLoader> loaders;
62
    private final List<ClassLoader> loaders;
68 63
    private Formatter<ExpressionBuilder.Value> expressionBuilderFormatter;
69 64

  
70 65
    public DefaultExpressionEvaluatorManager() {
......
188 183
    @Override
189 184
    public Code compile(String source) {
190 185
        Compiler compiler = this.createCompiler();
186
        if( StringUtils.isBlank(source) ) {
187
            return compiler.getCodeBuilder().constant(null);
188
        }
191 189
        return compiler.compileExpression(source);
192 190
    }
193 191

  
......
210 208
        return theSymbolTable;
211 209
    }
212 210
    
211
    @Override
213 212
    public void populateSymbolTable(SymbolTable aSymbolTable) {
214 213
        for (SymbolTableFactory factory : this.getSymbolTableFactories() ) {
215 214
            try {

Also available in: Unified diff