You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2010/10/04 10:55:13 UTC
svn commit: r1004148 -
/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java
Author: jleroux
Date: Mon Oct 4 08:55:13 2010
New Revision: 1004148
URL: http://svn.apache.org/viewvc?rev=1004148&view=rev
Log:
Deprecates renderTemplateFromString from Scott's remark on dev ML.
I also removed a wrong @Override annotation for OFBizTemplateExceptionHandler
Modified:
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java
Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java?rev=1004148&r1=1004147&r2=1004148&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java (original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java Mon Oct 4 08:55:13 2010
@@ -158,6 +158,7 @@ public class FreeMarkerWorker {
renderTemplate(templateLocation, templateString, context, outWriter, true);
}
+
/**
* Renders a template contained in a String.
* @param templateLocation A unique ID for this template - used for caching
@@ -186,6 +187,25 @@ public class FreeMarkerWorker {
renderTemplate(template, context, outWriter);
}
+ /**
+ * @deprecated, replaced by {@link #renderTemplateFromString(String templateString, String templateLocation, Map<String, Object> context, Appendable outWriter, boolean useCache)}
+ */
+ @Deprecated
+ public static Environment renderTemplateFromString(String templateString, String templateLocation, Map<String, Object> context, Appendable outWriter) throws TemplateException, IOException {
+ Template template = cachedTemplates.get(templateLocation);
+ if (template == null) {
+ synchronized (cachedTemplates) {
+ template = cachedTemplates.get(templateLocation);
+ if (template == null) {
+ Reader templateReader = new StringReader(templateString);
+ template = new Template(templateLocation, templateReader, defaultOfbizConfig);
+ templateReader.close();
+ cachedTemplates.put(templateLocation, template);
+ }
+ }
+ }
+ return renderTemplate(template, context, outWriter);
+ }
public static Environment renderTemplateFromString(String templateString, String templateLocation, Map<String, Object> context, Appendable outWriter, boolean useCache) throws TemplateException, IOException {
Template template = null;
@@ -669,8 +689,6 @@ public class FreeMarkerWorker {
*
*/
static class OFBizTemplateExceptionHandler implements TemplateExceptionHandler {
-
- @Override
public void handleTemplateException(TemplateException te, Environment env, Writer out) throws TemplateException {
StringWriter tempWriter = new StringWriter();
PrintWriter pw = new PrintWriter(tempWriter, true);