From 9bd79b636d49d805169e4dea8eb177cd98a129d3 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 18 Nov 2010 23:29:32 +0000
Subject: [PATCH] Removing explicit wrapper specification when putting values
 in the template data model.

---
 .../freemarker/N3EditFormController.java      | 20 ++++++-------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/N3EditFormController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/N3EditFormController.java
index 8f04140b4..c86491714 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/N3EditFormController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/N3EditFormController.java
@@ -68,21 +68,13 @@ public class N3EditFormController extends FreemarkerHttpServlet{
     private Map<String, Object> makeEditDataMap(EditConfiguration editConfig,
             EditSubmission editSubmission) throws TemplateModelException {
         
-        Map<String,Object> map = new HashMap<String,Object>();
-        
-        //This dosen't seem to be the right thing:
-        map.put("editConfig", ObjectWrapper.BEANS_WRAPPER.wrap(editConfig));
-        
-        //<@dump var="editConfig"/> outputs: 
-        /*
-         * Template variable dump
-            Variable name: editConfig
-            Type: string
-            Value: edu.cornell.mannlib.vitro.webapp.edit.n3editing.EditConfiguration@1e60601
-         */
-        
+        Map<String,Object> map = new HashMap<String,Object>();        
+
+        map.put("editConfig", editConfig);
+
         if( editSubmission != null)
-            map.put("editSubmission", ObjectWrapper.BEANS_WRAPPER.wrap(editSubmission));                
+            map.put("editSubmission", editSubmission); 
+        
         return map;                
     }
 }