Author: dishara
Date: Wed Jun 20 20:07:36 2012
New Revision: 1352289
URL: http://svn.apache.org/viewvc?rev=1352289&view=rev
Log:
Implemented couple of evaluation methods
Modified:
velocity/sandbox/jsr223/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngine.java
Modified:
velocity/sandbox/jsr223/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngine.java
URL:
http://svn.apache.org/viewvc/velocity/sandbox/jsr223/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngine.java?rev=1352289&r1=1352288&r2=1352289&view=diff
==============================================================================
---
velocity/sandbox/jsr223/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngine.java
(original)
+++
velocity/sandbox/jsr223/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngine.java
Wed Jun 20 20:07:36 2012
@@ -144,20 +144,21 @@ public class VelocityScriptEngine implem
}
public Object eval(String s) throws ScriptException {
- return null; //To change body of implemented methods use File |
Settings | File Templates.
+ return eval(s,scriptContext);
}
public Object eval(Reader reader) throws ScriptException {
- return null; //To change body of implemented methods use File |
Settings | File Templates.
+ return eval(reader,scriptContext); //To change body of implemented
methods use File | Settings | File Templates.
}
public Object eval(String s, Bindings bindings) throws ScriptException {
- return null; //To change body of implemented methods use File |
Settings | File Templates.
+ ScriptContext scriptContext =
getGeneratedScriptContextFromBinding(bindings);
+ return eval(s,scriptContext);
}
public Object eval(Reader reader, Bindings bindings) throws
ScriptException {
-// ScriptContext scriptContext = get
- return null; //To change body of implemented methods use File |
Settings | File Templates.
+ ScriptContext scriptContext =
getGeneratedScriptContextFromBinding(bindings);
+ return eval(reader,scriptContext);
}
private ScriptContext getGeneratedScriptContextFromBinding(Bindings
bindings) {
