Revision 44390 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
14 14 
import org.apache.commons.io.IOUtils;
15 15 
import org.apache.commons.lang3.ArrayUtils;
16 16 
import org.apache.commons.lang3.StringUtils;
17 
import org.gvsig.expressionevaluator.Bookmarks;
18 17 
import org.gvsig.expressionevaluator.Code;
19 18 
import org.gvsig.expressionevaluator.CodeBuilder;
20 19 
import org.gvsig.expressionevaluator.Expression;
......
28 27 
import org.gvsig.expressionevaluator.SymbolTableFactory;
29 28 
import org.gvsig.expressionevaluator.Compiler;
30 29 
import org.gvsig.expressionevaluator.GrammarSet;
31 
import org.gvsig.expressionevaluator.History;
32 30 
import org.gvsig.expressionevaluator.impl.javascripting.CosaScriptEngineFactory;
31 
import org.gvsig.tools.bookmarksandhistory.Bookmarks;
32 
import org.gvsig.tools.bookmarksandhistory.History;
33 
import org.gvsig.tools.bookmarksandhistory.impl.BaseBookmarks;
34 
import org.gvsig.tools.bookmarksandhistory.impl.BaseHistory;
33 35 
import org.gvsig.tools.script.Script;
34 36 
import org.slf4j.Logger;
35 37 
import org.slf4j.LoggerFactory;
......
43 45 
    private Double accuracy;
44 46 
    private final Map<String,SymbolTableFactory>symbolTableFactories;
45 47 
    private final Map<String,GrammarFactory> grammarFactories;
46 
    private Bookmarks bookmarks;
47 
    private History history;
48 
    private Bookmarks<Expression> bookmarks;
49 
    private History<Expression> history;
48 50 

  		




  49
  51
  
    
    public DefaultExpressionEvaluatorManager() {


  		




  50
  52
  
    
        this.symbolTableFactories = new HashMap<>();


  		




  ......




  132
  134
  
    
                interpreter.run(code);


  		




  133
  135
  
    
                values[i] = writer.toString();


  		




  134
  136
  
    
            }


  		




  
  137
  
    
            sources[i] = "<%"+sources[i]+"%>";


  		




  135
  138
  
    
        }


  		




  136
  139
  
    
        String output = StringUtils.replaceEach(source, sources, values);


  		




  137
  140
  
    
        return output;


  		




  ......




  251
  254
  
    
    }


  		




  252
  255
  
    
    


  		




  253
  256
  
    
    @Override


  		




  254
  
  
    
    public Bookmarks getBookmarks() {


  		




  
  257
  
    
    public Bookmarks<Expression> getBookmarks() {


  		




  255
  258
  
    
        if( this.bookmarks==null ) {


  		




  256
  
  
    
            this.bookmarks = new DefaultBookmarks();


  		




  
  259
  
    
            this.bookmarks = new BaseBookmarks<Expression>();


  		




  257
  260
  
    
        }


  		




  258
  261
  
    
        return this.bookmarks;


  		




  259
  262
  
    
    }


  		




  260
  263
  
    

  		




  261
  264
  
    
    @Override


  		




  262
  
  
    
    public History getHistory() {


  		




  
  265
  
    
    public History<Expression> getHistory() {


  		




  263
  266
  
    
        if( this.history==null ) {


  		




  264
  
  
    
            this.history = new DefaultHistory(20);


  		




  
  267
  
    
            this.history = new BaseHistory<Expression>(20);


  		




  265
  268
  
    
        }


  		




  266
  269
  
    
        return this.history;


  		




  267
  270
  
    
    }


  		












Also available in:  Unified diff