From: Tim P <ti...@us...> - 2008-03-26 09:52:36
|
Update of /cvsroot/webmacro/webmacro/src/org/webmacro/util In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20099/src/org/webmacro/util Modified Files: WMEval.java Log Message: Javadoc, method order Index: WMEval.java =================================================================== RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/util/WMEval.java,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** WMEval.java 26 Mar 2008 09:44:42 -0000 1.23 --- WMEval.java 26 Mar 2008 09:52:33 -0000 1.24 *************** *** 276,281 **** /** ! * Evaluates the named template against the current context ! * and returns the value. * If an output stream is specified, the return value is * also written out to the stream. --- 276,291 ---- /** ! * Evaluate the supplied template against the supplied context and ! * return the result as a string. ! */ ! public String eval (Context context, Template template) throws Exception ! { ! return template.evaluateAsString(context); ! } ! ! ! /** ! * Evaluate the named template against the given context ! * and return the result as a String. * If an output stream is specified, the return value is * also written out to the stream. *************** *** 336,348 **** /** - * Evaluate the supplied context and template and return the result as a - * as a string. - */ - public String eval (Context context, Template template) throws Exception - { - return template.evaluateAsString(context); - } - - /** * Evaluates the context using a file template sending the output to a disk file. * <p> --- 346,349 ---- |