[OFBiz] SVN: r4985 - in trunk: applications/content/src/org/ofbiz/content/survey base/src/base/org/ofbiz/base/util/template

[jonesde at svn.ofbiz.org]

Author: jonesde
Date: 2005-05-11 22:02:35 -0500 (Wed, 11 May 2005)
New Revision: 4985

Modified:
   trunk/applications/content/src/org/ofbiz/content/survey/SurveyWrapper.java
   trunk/base/src/base/org/ofbiz/base/util/template/FreeMarkerWorker.java
Log:
Small cleanups, fixed issue in survey rendering where Static and other OFBiz tags were not available

Modified: trunk/applications/content/src/org/ofbiz/content/survey/SurveyWrapper.java
===================================================================
--- trunk/applications/content/src/org/ofbiz/content/survey/SurveyWrapper.java	2005-05-11 21:29:40 UTC (rev 4984)
+++ trunk/applications/content/src/org/ofbiz/content/survey/SurveyWrapper.java	2005-05-12 03:02:35 UTC (rev 4985)
@@ -35,6 +35,8 @@
 import java.util.List;
 import java.util.Map;
 
+import javolution.util.FastMap;
+
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.GeneralException;
 import org.ofbiz.base.util.UtilMisc;
@@ -112,7 +114,8 @@
             currentAnswers = this.getResponseAnswers(responseId);
         }
 
-        Map templateContext = new HashMap();
+        Map templateContext = FastMap.newInstance();
+        FreeMarkerWorker.addAllOfbizTransforms(templateContext);
         templateContext.put("partyId", partyId);
         templateContext.put("survey", survey);
         templateContext.put("surveyResults", results);

Modified: trunk/base/src/base/org/ofbiz/base/util/template/FreeMarkerWorker.java
===================================================================
--- trunk/base/src/base/org/ofbiz/base/util/template/FreeMarkerWorker.java	2005-05-11 21:29:40 UTC (rev 4984)
+++ trunk/base/src/base/org/ofbiz/base/util/template/FreeMarkerWorker.java	2005-05-12 03:02:35 UTC (rev 4985)
@@ -42,6 +42,8 @@
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpServletRequest;
 
+import javolution.util.FastMap;
+
 import org.ofbiz.base.location.FlexibleLocation;
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.UtilValidate;
@@ -155,7 +157,7 @@
         }
         
         if (context == null) {
-            context = new HashMap();
+            context = FastMap.newInstance();
         }
         
         // add the OFBiz transforms/methods