Revision 44389 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/ExpressionUtils.java

View differences:

ExpressionUtils.java
1 1
package org.gvsig.expressionevaluator;
2 2

  
3
import java.io.File;
3 4
import org.apache.commons.lang3.StringUtils;
4 5
import org.gvsig.expressionevaluator.ExpressionBuilder.Value;
5 6
import org.gvsig.tools.script.Script;
......
168 169
        return symbolTable;
169 170
    }
170 171

  
172
    public String evaluatePage(String source) {
173
        ExpressionEvaluatorManager manager = ExpressionEvaluatorLocator.getManager();
174
        return manager.evaluatePage(source);
175
    }
176
    
177
    public String evaluatePage(SymbolTable symbolTable, String source) {
178
        ExpressionEvaluatorManager manager = ExpressionEvaluatorLocator.getManager();
179
        return manager.evaluatePage(symbolTable, source);
180
    }
181

  
182
    public File evaluateFilename(File source) {
183
        return evaluateFilename(null, source);
184
    }
185
    
186
    @SuppressWarnings("StringEquality")
187
    public File evaluateFilename(SymbolTable symbolTable, File source) {
188
        ExpressionEvaluatorManager manager = ExpressionEvaluatorLocator.getManager();
189
        String src =  source.getPath();
190
        String r = manager.evaluatePage(symbolTable, src);
191
        if( r == src ) { // !!! I compare that it is the same pointer, it is what I want.
192
            return source;
193
        }
194
        File f = new File(r);
195
        return f;
196
    }
197
    
171 198
}

Also available in: Unified diff