Revision 44533 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
48 48
    private Bookmarks<Expression> bookmarks;
49 49
    private History<Expression> history;
50 50
    private SymbolTable inmutableSymbolTable;
51
    private ResourcesStorage scriptsResourcesStorage;
51 52

  
52 53
    public DefaultExpressionEvaluatorManager() {
53 54
        this.symbolTableFactories = new HashMap<>();
54 55
        this.grammarFactories = new HashMap<>();
56
        this.scriptsResourcesStorage = ResourcesStorage.EMPTY_RESOURCESSTORAGE;
55 57
    }
56 58

  
57 59
    @Override
......
226 228

  
227 229
    @Override
228 230
    public Interpreter createInterpreter() {
229
        return new DefaultInterpreter();
231
        Interpreter interpreter = new DefaultInterpreter();
232
        interpreter.setResourcesStorage(this.scriptsResourcesStorage);
233
        return interpreter;
230 234
    }
231 235

  
232 236
    @Override
......
310 314

  
311 315
    @Override
312 316
    public Script locateScript(String name) {
313
        return null;
317
        return loadScript(this.scriptsResourcesStorage, name);
314 318
    }
315 319

  
316 320
    @Override
......
407 411
        }
408 412

  
409 413
    }
414
    
415
    @Override
416
    public ResourcesStorage getScriptsResourcesStorage() {
417
        return this.scriptsResourcesStorage;
418
    }
419

  
420
    @Override
421
    public void setScriptsResourcesStorage(ResourcesStorage scriptsResourcesStorage) {
422
        this.scriptsResourcesStorage = scriptsResourcesStorage;
423
    }
424
    
410 425
}
411 426

  

Also available in: Unified diff