svn commit: r684378 - in /ofbiz/trunk/framework/widget/src/org/ofbiz/widget: ContentWorkerInterface.java menu/MenuWrapTransform.java

[doogie]

Author: doogie
Date: Sat Aug  9 16:54:33 2008
New Revision: 684378

URL: http://svn.apache.org/viewvc?rev=684378&view=rev
Log:
Few more generics things.

Modified:
    
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ContentWorkerInterface.java
    
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/MenuWrapTransform.java

Modified: 
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ContentWorkerInterface.java
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ContentWorkerInterface.java?rev=684378&r1=684377&r2=684378&view=diff
==============================================================================
--- 
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ContentWorkerInterface.java 
(original)
+++ 
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/ContentWorkerInterface.java 
Sat Aug  9 16:54:33 2008
@@ -35,14 +35,14 @@
 public interface ContentWorkerInterface {
 
     // helper methods
-    public GenericValue getCurrentContentExt(GenericDelegator delegator, List 
trail, GenericValue userLogin, Map ctx, Boolean nullThruDatesOnly, String 
contentAssocPredicateId)  throws GeneralException;
+    public GenericValue getCurrentContentExt(GenericDelegator delegator, 
List<Map<String, ? extends Object>> trail, GenericValue userLogin, Map<String, 
Object> ctx, Boolean nullThruDatesOnly, String contentAssocPredicateId)  throws 
GeneralException;
     public GenericValue getWebSitePublishPointExt(GenericDelegator delegator, 
String contentId, boolean ignoreCache) throws GenericEntityException;
-    public String getMimeTypeIdExt(GenericDelegator delegator, GenericValue 
view, Map ctx);
+    public String getMimeTypeIdExt(GenericDelegator delegator, GenericValue 
view, Map<String, Object> ctx);
 
     // new rendering methods
-    public void renderContentAsTextExt(LocalDispatcher dispatcher, 
GenericDelegator delegator, String contentId, Appendable out, Map 
templateContext, Locale locale, String mimeTypeId, boolean cache) throws 
GeneralException, IOException;
-    public String renderContentAsTextExt(LocalDispatcher dispatcher, 
GenericDelegator delegator, String contentId, Map templateContext, Locale 
locale, String mimeTypeId, boolean cache) throws GeneralException, IOException;
+    public void renderContentAsTextExt(LocalDispatcher dispatcher, 
GenericDelegator delegator, String contentId, Appendable out, Map<String, 
Object> templateContext, Locale locale, String mimeTypeId, boolean cache) 
throws GeneralException, IOException;
+    public String renderContentAsTextExt(LocalDispatcher dispatcher, 
GenericDelegator delegator, String contentId, Map<String, Object> 
templateContext, Locale locale, String mimeTypeId, boolean cache) throws 
GeneralException, IOException;
 
-    public void renderSubContentAsTextExt(LocalDispatcher dispatcher, 
GenericDelegator delegator, String contentId, Appendable out, String mapKey, 
Map templateContext, Locale locale, String mimeTypeId, boolean cache) throws 
GeneralException, IOException;
-    public String renderSubContentAsTextExt(LocalDispatcher dispatcher, 
GenericDelegator delegator, String contentId, String mapKey, Map 
templateContext, Locale locale, String mimeTypeId, boolean cache) throws 
GeneralException, IOException;            
+    public void renderSubContentAsTextExt(LocalDispatcher dispatcher, 
GenericDelegator delegator, String contentId, Appendable out, String mapKey, 
Map<String, Object> templateContext, Locale locale, String mimeTypeId, boolean 
cache) throws GeneralException, IOException;
+    public String renderSubContentAsTextExt(LocalDispatcher dispatcher, 
GenericDelegator delegator, String contentId, String mapKey, Map<String, 
Object> templateContext, Locale locale, String mimeTypeId, boolean cache) 
throws GeneralException, IOException;            
 }

Modified: 
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/MenuWrapTransform.java
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/MenuWrapTransform.java?rev=684378&r1=684377&r2=684378&view=diff
==============================================================================
--- 
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/MenuWrapTransform.java 
(original)
+++ 
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/MenuWrapTransform.java 
Sat Aug  9 16:54:33 2008
@@ -88,7 +88,7 @@
         //final String menuName = (String)templateCtx.get("menuName");
         //final String associatedContentId = 
(String)templateCtx.get("associatedContentId");
         final GenericValue userLogin = (GenericValue) 
FreeMarkerWorker.getWrappedObject("userLogin", env);
-        List trail = (List)templateCtx.get("globalNodeTrail");
+        List<Map<String, ? extends Object>> trail = 
UtilGenerics.checkList(templateCtx.get("globalNodeTrail"));
         String contentAssocPredicateId = 
(String)templateCtx.get("contentAssocPredicateId");
         String strNullThruDatesOnly = 
(String)templateCtx.get("nullThruDatesOnly");
         Boolean nullThruDatesOnly = (strNullThruDatesOnly != null && 
strNullThruDatesOnly.equalsIgnoreCase("true")) ? Boolean.TRUE :Boolean.FALSE;