From a4c8a89d6874723301b141cc953f29765430df04 Mon Sep 17 00:00:00 2001
From: bdc34 <bdc34@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Fri, 14 Jan 2011 18:26:47 +0000
Subject: [PATCH] adding of directives to browse widget

---
 .../webapp/web/widgets/BrowseWidget.java      | 28 ++++++++++++++-----
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/BrowseWidget.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/BrowseWidget.java
index fed238260..bbadada9f 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/BrowseWidget.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/BrowseWidget.java
@@ -18,6 +18,7 @@ import edu.cornell.mannlib.vitro.webapp.beans.Individual;
 import edu.cornell.mannlib.vitro.webapp.beans.VClass;
 import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.VClassGroupCache;
 import edu.cornell.mannlib.vitro.webapp.web.templatemodels.VClassGroupTemplateModel;
 import edu.cornell.mannlib.vitro.webapp.web.templatemodels.VClassTemplateModel;
@@ -57,12 +58,23 @@ public class BrowseWidget extends Widget {
     private WidgetTemplateValues doClassAlphaDisplay(Environment env,
             Map params, HttpServletRequest request, ServletContext context) {
         // TODO Auto-generated method stub
+        
         return null;
     }
 
+    private Map<String,Object> getCommonValues(Environment env, ServletContext context){
+        Map<String,Object> values = new HashMap<String,Object>();
+        values.putAll(FreemarkerHttpServlet.getDirectives());
+                
+        return values;
+    }
+    
     protected WidgetTemplateValues doAllClassGroupsDisplay(Environment env, Map params,
-            HttpServletRequest request, ServletContext context) {
-        Map<String,Object> body = getAllClassGroupData(request, params, context);
+            HttpServletRequest request, ServletContext context) {        
+        Map<String,Object> body = new HashMap<String,Object>();
+        body.putAll(getCommonValues(env,context));        
+        body.putAll(getAllClassGroupData(request, params, context));
+        
         try {
             body.put("urls",env.getDataModel().get("urls"));
             body.put("currentPage", env.getDataModel().get("currentPage"));                        
@@ -97,9 +109,10 @@ public class BrowseWidget extends Widget {
     }
     
     protected WidgetTemplateValues doClassDisplay(Environment env, Map params,
-            HttpServletRequest request, ServletContext context) {        
-        
-        Map<String,Object> body = getClassData(request,params,context);
+            HttpServletRequest request, ServletContext context) {                
+        Map<String,Object> body = new HashMap<String,Object>();
+        body.putAll(getCommonValues(env,context));        
+        body.putAll(getClassData(request,params,context));
         
         try {
             body.put("urls",env.getDataModel().get("urls"));
@@ -136,8 +149,9 @@ public class BrowseWidget extends Widget {
 
     protected WidgetTemplateValues doClassGroupDisplay(Environment env,
             Map params, HttpServletRequest request, ServletContext context) {
-
-        Map<String,Object> body = getClassGroupData(request,params, context);
+        Map<String,Object> body = new HashMap<String,Object>();
+        body.putAll(getCommonValues(env,context));        
+        body.putAll( getClassGroupData(request,params, context));
         
         try {
             body.put("urls",env.getDataModel().get("urls"));