You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by do...@apache.org on 2010/12/10 08:21:10 UTC
svn commit: r1044232 - in /ofbiz/trunk:
applications/content/src/org/ofbiz/content/webapp/ftl/
framework/base/src/org/ofbiz/base/util/template/
framework/widget/src/org/ofbiz/widget/menu/
Author: doogie
Date: Fri Dec 10 07:21:09 2010
New Revision: 1044232
URL: http://svn.apache.org/viewvc?rev=1044232&view=rev
Log:
Make FreeMarkerWorker.getWrappedObject auto-cast to whatever type the
caller wants.
Modified:
ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/CheckPermissionTransform.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentTransform.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/InjectNodeTrailCsvTransform.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/LoopSubContentTransform.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAndSubContent.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAsText.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentTransform.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentAsText.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentTransform.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java
ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/WrapSubContentCacheTransform.java
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/menu/MenuWrapTransform.java
Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/CheckPermissionTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/CheckPermissionTransform.java?rev=1044232&r1=1044231&r2=1044232&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/CheckPermissionTransform.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/CheckPermissionTransform.java Fri Dec 10 07:21:09 2010
@@ -87,9 +87,9 @@ public class CheckPermissionTransform im
final Environment env = Environment.getCurrentEnvironment();
final Map templateCtx = FreeMarkerWorker.createEnvironmentMap(env);
//FreeMarkerWorker.convertContext(templateCtx);
- final Delegator delegator = (Delegator) FreeMarkerWorker.getWrappedObject("delegator", env);
- final HttpServletRequest request = (HttpServletRequest) FreeMarkerWorker.getWrappedObject("request", env);
- final GenericValue userLogin = (GenericValue) FreeMarkerWorker.getWrappedObject("userLogin", env);
+ final Delegator delegator = FreeMarkerWorker.getWrappedObject("delegator", env);
+ final HttpServletRequest request = FreeMarkerWorker.getWrappedObject("request", env);
+ final GenericValue userLogin = FreeMarkerWorker.getWrappedObject("userLogin", env);
FreeMarkerWorker.getSiteParameters(request, templateCtx);
FreeMarkerWorker.overrideWithArgs(templateCtx, args);
final String mode = (String)templateCtx.get("mode");
Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java?rev=1044232&r1=1044231&r2=1044232&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentCacheTransform.java Fri Dec 10 07:21:09 2010
@@ -82,13 +82,13 @@ public class EditRenderSubContentCacheTr
public Writer getWriter(final Writer out, Map args) {
final StringBuilder buf = new StringBuilder();
final Environment env = Environment.getCurrentEnvironment();
- final Map templateCtx = (Map) FreeMarkerWorker.getWrappedObject("context", env);
- final LocalDispatcher dispatcher = (LocalDispatcher) FreeMarkerWorker.getWrappedObject("dispatcher", env);
- final Delegator delegator = (Delegator) FreeMarkerWorker.getWrappedObject("delegator", env);
- final HttpServletRequest request = (HttpServletRequest) FreeMarkerWorker.getWrappedObject("request", env);
+ final Map templateCtx = FreeMarkerWorker.getWrappedObject("context", env);
+ final LocalDispatcher dispatcher = FreeMarkerWorker.getWrappedObject("dispatcher", env);
+ final Delegator delegator = FreeMarkerWorker.getWrappedObject("delegator", env);
+ final HttpServletRequest request = FreeMarkerWorker.getWrappedObject("request", env);
FreeMarkerWorker.getSiteParameters(request, templateCtx);
FreeMarkerWorker.overrideWithArgs(templateCtx, args);
- final GenericValue userLogin = (GenericValue) FreeMarkerWorker.getWrappedObject("userLogin", env);
+ final GenericValue userLogin = FreeMarkerWorker.getWrappedObject("userLogin", env);
List trail = (List)templateCtx.get("globalNodeTrail");
String contentAssocPredicateId = (String)templateCtx.get("contentAssocPredicateId");
String strNullThruDatesOnly = (String)templateCtx.get("nullThruDatesOnly");
Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentTransform.java?rev=1044232&r1=1044231&r2=1044232&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentTransform.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/EditRenderSubContentTransform.java Fri Dec 10 07:21:09 2010
@@ -77,7 +77,7 @@ public class EditRenderSubContentTransfo
public Writer getWriter(final Writer out, Map args) {
final StringBuilder buf = new StringBuilder();
final Environment env = Environment.getCurrentEnvironment();
- Map ctx = (Map) FreeMarkerWorker.getWrappedObject("context", env);
+ Map ctx = FreeMarkerWorker.getWrappedObject("context", env);
final String editTemplate = FreeMarkerWorker.getArg(args, "editTemplate", ctx);
final String wrapTemplateId = FreeMarkerWorker.getArg(args, "wrapTemplateId", ctx);
final String mapKey = FreeMarkerWorker.getArg(args, "mapKey", ctx);
@@ -87,16 +87,16 @@ public class EditRenderSubContentTransfo
final String contentId = FreeMarkerWorker.getArg(args, "contentId", ctx);
- final Locale locale = (Locale) FreeMarkerWorker.getWrappedObject("locale", env);
+ final Locale locale = FreeMarkerWorker.getWrappedObject("locale", env);
String mimeTypeIdTemp = FreeMarkerWorker.getArg(args, "mimeTypeId", ctx);
final String rootDir = FreeMarkerWorker.getArg(args, "rootDir", ctx);
final String webSiteId = FreeMarkerWorker.getArg(args, "webSiteId", ctx);
final String https = FreeMarkerWorker.getArg(args, "https", ctx);
- final LocalDispatcher dispatcher = (LocalDispatcher) FreeMarkerWorker.getWrappedObject("dispatcher", env);
- final Delegator delegator = (Delegator) FreeMarkerWorker.getWrappedObject("delegator", env);
- final GenericValue userLogin = (GenericValue) FreeMarkerWorker.getWrappedObject("userLogin", env);
- GenericValue subContentDataResourceViewTemp = (GenericValue) FreeMarkerWorker.getWrappedObject("subContentDataResourceView", env);
- //final HttpServletRequest request = (HttpServletRequest)FreeMarkerWorker.getWrappedObject("request", env);
+ final LocalDispatcher dispatcher = FreeMarkerWorker.getWrappedObject("dispatcher", env);
+ final Delegator delegator = FreeMarkerWorker.getWrappedObject("delegator", env);
+ final GenericValue userLogin = FreeMarkerWorker.getWrappedObject("userLogin", env);
+ GenericValue subContentDataResourceViewTemp = FreeMarkerWorker.getWrappedObject("subContentDataResourceView", env);
+ //final HttpServletRequest request = FreeMarkerWorker.getWrappedObject("request", env);
ctx.put("mapKey", mapKey);
ctx.put("subDataResourceTypeIdTemp", subDataResourceTypeIdTemp);
@@ -213,7 +213,7 @@ public class EditRenderSubContentTransfo
throw new IOException("Error rendering content" + e2.toString());
}
- Map ctx = (Map) FreeMarkerWorker.getWrappedObject("context", env);
+ Map ctx = FreeMarkerWorker.getWrappedObject("context", env);
templateContext.put("contentId", contentId);
templateContext.put("locale", locale);
templateContext.put("mapKey", null);
Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/InjectNodeTrailCsvTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/InjectNodeTrailCsvTransform.java?rev=1044232&r1=1044231&r2=1044232&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/InjectNodeTrailCsvTransform.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/InjectNodeTrailCsvTransform.java Fri Dec 10 07:21:09 2010
@@ -78,11 +78,11 @@ public class InjectNodeTrailCsvTransform
public Writer getWriter(final Writer out, Map args) {
final StringBuilder buf = new StringBuilder();
final Environment env = Environment.getCurrentEnvironment();
- final Map templateCtx = (Map) FreeMarkerWorker.getWrappedObject("context", env);
+ final Map templateCtx = FreeMarkerWorker.getWrappedObject("context", env);
//FreeMarkerWorker.convertContext(templateCtx);
- final Delegator delegator = (Delegator) FreeMarkerWorker.getWrappedObject("delegator", env);
- final HttpServletRequest request = (HttpServletRequest) FreeMarkerWorker.getWrappedObject("request", env);
- final GenericValue userLogin = (GenericValue) FreeMarkerWorker.getWrappedObject("userLogin", env);
+ final Delegator delegator = FreeMarkerWorker.getWrappedObject("delegator", env);
+ final HttpServletRequest request = FreeMarkerWorker.getWrappedObject("request", env);
+ final GenericValue userLogin = FreeMarkerWorker.getWrappedObject("userLogin", env);
FreeMarkerWorker.getSiteParameters(request, templateCtx);
FreeMarkerWorker.overrideWithArgs(templateCtx, args);
Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java?rev=1044232&r1=1044231&r2=1044232&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/LimitedSubContentCacheTransform.java Fri Dec 10 07:21:09 2010
@@ -90,8 +90,8 @@ public class LimitedSubContentCacheTrans
final StringBuilder buf = new StringBuilder();
final Environment env = Environment.getCurrentEnvironment();
final Map templateRoot = FreeMarkerWorker.createEnvironmentMap(env);
- final Delegator delegator = (Delegator) FreeMarkerWorker.getWrappedObject("delegator", env);
- final HttpServletRequest request = (HttpServletRequest) FreeMarkerWorker.getWrappedObject("request", env);
+ final Delegator delegator = FreeMarkerWorker.getWrappedObject("delegator", env);
+ final HttpServletRequest request = FreeMarkerWorker.getWrappedObject("request", env);
FreeMarkerWorker.getSiteParameters(request, templateRoot);
final Map savedValuesUp = FastMap.newInstance();
FreeMarkerWorker.saveContextValues(templateRoot, upSaveKeyNames, savedValuesUp);
@@ -135,7 +135,7 @@ public class LimitedSubContentCacheTrans
final int returnLimit = Integer.parseInt(limitSize);
// limitMode will be "random" to begin with
String limitMode = (String) templateRoot.get("limitMode");
- final GenericValue userLogin = (GenericValue) FreeMarkerWorker.getWrappedObject("userLogin", env);
+ final GenericValue userLogin = FreeMarkerWorker.getWrappedObject("userLogin", env);
List globalNodeTrail = (List) templateRoot.get("globalNodeTrail");
String strNullThruDatesOnly = (String) templateRoot.get("nullThruDatesOnly");
String orderBy = (String) templateRoot.get("orderBy");
Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/LoopSubContentTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/LoopSubContentTransform.java?rev=1044232&r1=1044231&r2=1044232&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/LoopSubContentTransform.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/LoopSubContentTransform.java Fri Dec 10 07:21:09 2010
@@ -148,9 +148,9 @@ public class LoopSubContentTransform imp
public Writer getWriter(final Writer out, Map args) {
final StringBuilder buf = new StringBuilder();
final Environment env = Environment.getCurrentEnvironment();
- final Map templateCtx = (Map) FreeMarkerWorker.getWrappedObject("context", env);
- final LocalDispatcher dispatcher = (LocalDispatcher) FreeMarkerWorker.getWrappedObject("dispatcher", env);
- final Delegator delegator = (Delegator) FreeMarkerWorker.getWrappedObject("delegator", env);
+ final Map templateCtx = FreeMarkerWorker.getWrappedObject("context", env);
+ final LocalDispatcher dispatcher = FreeMarkerWorker.getWrappedObject("dispatcher", env);
+ final Delegator delegator = FreeMarkerWorker.getWrappedObject("delegator", env);
final Map savedValues = FreeMarkerWorker.saveValues(templateCtx, saveKeyNames);
FreeMarkerWorker.overrideWithArgs(templateCtx, args);
Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAndSubContent.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAndSubContent.java?rev=1044232&r1=1044231&r2=1044232&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAndSubContent.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAndSubContent.java Fri Dec 10 07:21:09 2010
@@ -54,10 +54,10 @@ public class RenderContentAndSubContent
public Writer getWriter(final Writer out, Map args) {
final Environment env = Environment.getCurrentEnvironment();
- final LocalDispatcher dispatcher = (LocalDispatcher) FreeMarkerWorker.getWrappedObject("dispatcher", env);
- final Delegator delegator = (Delegator) FreeMarkerWorker.getWrappedObject("delegator", env);
- final HttpServletRequest request = (HttpServletRequest) FreeMarkerWorker.getWrappedObject("request", env);
- final HttpServletResponse response = (HttpServletResponse) FreeMarkerWorker.getWrappedObject("response", env);
+ final LocalDispatcher dispatcher = FreeMarkerWorker.getWrappedObject("dispatcher", env);
+ final Delegator delegator = FreeMarkerWorker.getWrappedObject("delegator", env);
+ final HttpServletRequest request = FreeMarkerWorker.getWrappedObject("request", env);
+ final HttpServletResponse response = FreeMarkerWorker.getWrappedObject("response", env);
final Map envMap = FreeMarkerWorker.createEnvironmentMap(env);
final Map templateRoot = MapStack.create();
((MapStack)templateRoot).push(envMap);
Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAsText.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAsText.java?rev=1044232&r1=1044231&r2=1044232&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAsText.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentAsText.java Fri Dec 10 07:21:09 2010
@@ -58,12 +58,12 @@ public class RenderContentAsText impleme
public Writer getWriter(final Writer out, Map args) {
final Environment env = Environment.getCurrentEnvironment();
- //final Map templateCtx = (Map) FreeMarkerWorker.getWrappedObject("context", env);
+ //final Map templateCtx = FreeMarkerWorker.getWrappedObject("context", env);
//final Map templateCtx = FastMap.newInstance();
- final LocalDispatcher dispatcher = (LocalDispatcher) FreeMarkerWorker.getWrappedObject("dispatcher", env);
- final Delegator delegator = (Delegator) FreeMarkerWorker.getWrappedObject("delegator", env);
- final HttpServletRequest request = (HttpServletRequest) FreeMarkerWorker.getWrappedObject("request", env);
- final HttpServletResponse response = (HttpServletResponse) FreeMarkerWorker.getWrappedObject("response", env);
+ final LocalDispatcher dispatcher = FreeMarkerWorker.getWrappedObject("dispatcher", env);
+ final Delegator delegator = FreeMarkerWorker.getWrappedObject("delegator", env);
+ final HttpServletRequest request = FreeMarkerWorker.getWrappedObject("request", env);
+ final HttpServletResponse response = FreeMarkerWorker.getWrappedObject("response", env);
final Map templateRoot = FreeMarkerWorker.createEnvironmentMap(env);
if (Debug.verboseOn()) Debug.logVerbose("in RenderSubContent, contentId(0):" + templateRoot.get("contentId"), module);
FreeMarkerWorker.getSiteParameters(request, templateRoot);
@@ -71,7 +71,7 @@ public class RenderContentAsText impleme
FreeMarkerWorker.saveContextValues(templateRoot, upSaveKeyNames, savedValuesUp);
FreeMarkerWorker.overrideWithArgs(templateRoot, args);
if (Debug.verboseOn()) Debug.logVerbose("in RenderSubContent, contentId(2):" + templateRoot.get("contentId"), module);
- // not used yet: final GenericValue userLogin = (GenericValue) FreeMarkerWorker.getWrappedObject("userLogin", env);
+ // not used yet: final GenericValue userLogin = FreeMarkerWorker.getWrappedObject("userLogin", env);
// not used yet: List trail = (List)templateRoot.get("globalNodeTrail");
//if (Debug.infoOn()) Debug.logInfo("in Render(0), globalNodeTrail ." + trail , module);
// not used yet: String contentAssocPredicateId = (String)templateRoot.get("contentAssocPredicateId");
Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentTransform.java?rev=1044232&r1=1044231&r2=1044232&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentTransform.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderContentTransform.java Fri Dec 10 07:21:09 2010
@@ -54,10 +54,10 @@ public class RenderContentTransform impl
public Writer getWriter(final Writer out, Map args) {
final Environment env = Environment.getCurrentEnvironment();
- final Delegator delegator = (Delegator) FreeMarkerWorker.getWrappedObject("delegator", env);
- final LocalDispatcher dispatcher = (LocalDispatcher) FreeMarkerWorker.getWrappedObject("dispatcher", env);
- final HttpServletRequest request = (HttpServletRequest) FreeMarkerWorker.getWrappedObject("request", env);
- final HttpServletResponse response = (HttpServletResponse) FreeMarkerWorker.getWrappedObject("response", env);
+ final Delegator delegator = FreeMarkerWorker.getWrappedObject("delegator", env);
+ final LocalDispatcher dispatcher = FreeMarkerWorker.getWrappedObject("dispatcher", env);
+ final HttpServletRequest request = FreeMarkerWorker.getWrappedObject("request", env);
+ final HttpServletResponse response = FreeMarkerWorker.getWrappedObject("response", env);
final Map templateRoot = MapStack.create(FreeMarkerWorker.createEnvironmentMap(env));
((MapStack)templateRoot).push(args);
Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentAsText.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentAsText.java?rev=1044232&r1=1044231&r2=1044232&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentAsText.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentAsText.java Fri Dec 10 07:21:09 2010
@@ -58,12 +58,12 @@ public class RenderSubContentAsText impl
public Writer getWriter(final Writer out, Map args) {
final Environment env = Environment.getCurrentEnvironment();
- //final Map templateCtx = (Map) FreeMarkerWorker.getWrappedObject("context", env);
+ //final Map templateCtx = FreeMarkerWorker.getWrappedObject("context", env);
//final Map templateCtx = FastMap.newInstance();
- final LocalDispatcher dispatcher = (LocalDispatcher) FreeMarkerWorker.getWrappedObject("dispatcher", env);
- final Delegator delegator = (Delegator) FreeMarkerWorker.getWrappedObject("delegator", env);
- final HttpServletRequest request = (HttpServletRequest) FreeMarkerWorker.getWrappedObject("request", env);
- final HttpServletResponse response = (HttpServletResponse) FreeMarkerWorker.getWrappedObject("response", env);
+ final LocalDispatcher dispatcher = FreeMarkerWorker.getWrappedObject("dispatcher", env);
+ final Delegator delegator = FreeMarkerWorker.getWrappedObject("delegator", env);
+ final HttpServletRequest request = FreeMarkerWorker.getWrappedObject("request", env);
+ final HttpServletResponse response = FreeMarkerWorker.getWrappedObject("response", env);
final Map templateRoot = FreeMarkerWorker.createEnvironmentMap(env);
if (Debug.infoOn()) Debug.logInfo("in RenderSubContent, contentId(0):" + templateRoot.get("contentId"), module);
FreeMarkerWorker.getSiteParameters(request, templateRoot);
@@ -71,7 +71,7 @@ public class RenderSubContentAsText impl
FreeMarkerWorker.saveContextValues(templateRoot, upSaveKeyNames, savedValuesUp);
FreeMarkerWorker.overrideWithArgs(templateRoot, args);
if (Debug.infoOn()) Debug.logInfo("in RenderSubContent, contentId(2):" + templateRoot.get("contentId"), module);
- //final GenericValue userLogin = (GenericValue) FreeMarkerWorker.getWrappedObject("userLogin", env);
+ //final GenericValue userLogin = FreeMarkerWorker.getWrappedObject("userLogin", env);
//List trail = (List)templateRoot.get("globalNodeTrail");
//if (Debug.infoOn()) Debug.logInfo("in Render(0), globalNodeTrail ." + trail , module);
//String contentAssocPredicateId = (String)templateRoot.get("contentAssocPredicateId");
Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java?rev=1044232&r1=1044231&r2=1044232&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentCacheTransform.java Fri Dec 10 07:21:09 2010
@@ -60,12 +60,12 @@ public class RenderSubContentCacheTransf
public Writer getWriter(final Writer out, Map args) {
final StringBuilder buf = new StringBuilder();
final Environment env = Environment.getCurrentEnvironment();
- //final Map templateCtx = (Map) FreeMarkerWorker.getWrappedObject("context", env);
+ //final Map templateCtx = FreeMarkerWorker.getWrappedObject("context", env);
//final Map templateCtx = FastMap.newInstance();
- final LocalDispatcher dispatcher = (LocalDispatcher) FreeMarkerWorker.getWrappedObject("dispatcher", env);
- final Delegator delegator = (Delegator) FreeMarkerWorker.getWrappedObject("delegator", env);
- final HttpServletRequest request = (HttpServletRequest) FreeMarkerWorker.getWrappedObject("request", env);
- final HttpServletResponse response = (HttpServletResponse) FreeMarkerWorker.getWrappedObject("response", env);
+ final LocalDispatcher dispatcher = FreeMarkerWorker.getWrappedObject("dispatcher", env);
+ final Delegator delegator = FreeMarkerWorker.getWrappedObject("delegator", env);
+ final HttpServletRequest request = FreeMarkerWorker.getWrappedObject("request", env);
+ final HttpServletResponse response = FreeMarkerWorker.getWrappedObject("response", env);
final Map templateRoot = FreeMarkerWorker.createEnvironmentMap(env);
//if (Debug.infoOn()) Debug.logInfo("in RenderSubContent, contentId(0):" + templateRoot.get("contentId"), module);
FreeMarkerWorker.getSiteParameters(request, templateRoot);
@@ -73,7 +73,7 @@ public class RenderSubContentCacheTransf
FreeMarkerWorker.saveContextValues(templateRoot, upSaveKeyNames, savedValuesUp);
FreeMarkerWorker.overrideWithArgs(templateRoot, args);
//if (Debug.infoOn()) Debug.logInfo("in RenderSubContent, contentId(2):" + templateRoot.get("contentId"), module);
- final GenericValue userLogin = (GenericValue) FreeMarkerWorker.getWrappedObject("userLogin", env);
+ final GenericValue userLogin = FreeMarkerWorker.getWrappedObject("userLogin", env);
List trail = (List)templateRoot.get("globalNodeTrail");
//if (Debug.infoOn()) Debug.logInfo("in Render(0), globalNodeTrail ." + trail , module);
String contentAssocPredicateId = (String)templateRoot.get("contentAssocPredicateId");
Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentTransform.java?rev=1044232&r1=1044231&r2=1044232&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentTransform.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/RenderSubContentTransform.java Fri Dec 10 07:21:09 2010
@@ -75,7 +75,7 @@ public class RenderSubContentTransform i
public Writer getWriter(final Writer out, Map args) {
//final StringBuilder buf = new StringBuilder();
final Environment env = Environment.getCurrentEnvironment();
- Map ctx = (Map) FreeMarkerWorker.getWrappedObject("context", env);
+ Map ctx = FreeMarkerWorker.getWrappedObject("context", env);
if (ctx == null) {
ctx = FastMap.newInstance();
}
@@ -85,12 +85,12 @@ public class RenderSubContentTransform i
final String contentId = FreeMarkerWorker.getArg(args, "contentId", ctx);
final String mimeTypeId = FreeMarkerWorker.getArg(args, "mimeTypeId", ctx);
final String throwExceptionOnError = FreeMarkerWorker.getArg(args, "throwExceptionOnError", ctx);
- final Locale locale = (Locale) FreeMarkerWorker.getWrappedObject("locale", env);
- final HttpServletRequest request = (HttpServletRequest) FreeMarkerWorker.getWrappedObject("request", env);
- final LocalDispatcher dispatcher = (LocalDispatcher) FreeMarkerWorker.getWrappedObject("dispatcher", env);
- final Delegator delegator = (Delegator) FreeMarkerWorker.getWrappedObject("delegator", env);
- final GenericValue userLogin = (GenericValue) FreeMarkerWorker.getWrappedObject("userLogin", env);
- GenericValue subContentDataResourceViewTemp = (GenericValue) FreeMarkerWorker.getWrappedObject("subContentDataResourceView", env);
+ final Locale locale = FreeMarkerWorker.getWrappedObject("locale", env);
+ final HttpServletRequest request = FreeMarkerWorker.getWrappedObject("request", env);
+ final LocalDispatcher dispatcher = FreeMarkerWorker.getWrappedObject("dispatcher", env);
+ final Delegator delegator = FreeMarkerWorker.getWrappedObject("delegator", env);
+ final GenericValue userLogin = FreeMarkerWorker.getWrappedObject("userLogin", env);
+ GenericValue subContentDataResourceViewTemp = FreeMarkerWorker.getWrappedObject("subContentDataResourceView", env);
if (subContentDataResourceViewTemp == null) {
List assocTypes = UtilMisc.toList("SUB_CONTENT");
Timestamp fromDate = UtilDateTime.nowTimestamp();
@@ -156,7 +156,7 @@ public class RenderSubContentTransform i
throw new IOException("Error rendering content" + e.toString());
}
- //Map resultCtx = (Map) FreeMarkerWorker.getWrappedObject("context", env);
+ //Map resultCtx = FreeMarkerWorker.getWrappedObject("context", env);
templateContext.put("mapKey", null);
templateContext.put("subContentId", null);
templateContext.put("subDataResourceTypeId", null);
Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java?rev=1044232&r1=1044231&r2=1044232&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentCacheTransform.java Fri Dec 10 07:21:09 2010
@@ -81,7 +81,7 @@ public class TraverseSubContentCacheTran
public Writer getWriter(final Writer out, Map args) {
final StringBuilder buf = new StringBuilder();
final Environment env = Environment.getCurrentEnvironment();
- //final Map templateRoot = (Map) FreeMarkerWorker.getWrappedObject("context", env);
+ //final Map templateRoot = FreeMarkerWorker.getWrappedObject("context", env);
final Map templateRoot = FreeMarkerWorker.createEnvironmentMap(env);
//FreeMarkerWorker.convertContext(templateRoot);
final Map savedValuesUp = FastMap.newInstance();
@@ -90,10 +90,10 @@ public class TraverseSubContentCacheTran
FreeMarkerWorker.overrideWithArgs(templateRoot, args);
String startContentAssocTypeId = (String)templateRoot.get("contentAssocTypeId");
//if (Debug.infoOn()) Debug.logInfo("in TraverseSubContentCache, startContentAssocTypeId:" + startContentAssocTypeId, module);
- final Delegator delegator = (Delegator) FreeMarkerWorker.getWrappedObject("delegator", env);
- final HttpServletRequest request = (HttpServletRequest) FreeMarkerWorker.getWrappedObject("request", env);
+ final Delegator delegator = FreeMarkerWorker.getWrappedObject("delegator", env);
+ final HttpServletRequest request = FreeMarkerWorker.getWrappedObject("request", env);
FreeMarkerWorker.getSiteParameters(request, templateRoot);
- final GenericValue userLogin = (GenericValue) FreeMarkerWorker.getWrappedObject("userLogin", env);
+ final GenericValue userLogin = FreeMarkerWorker.getWrappedObject("userLogin", env);
Object obj = templateRoot.get("globalNodeTrail");
List globalNodeTrail = (List)obj;
//List globalNodeTrail = (List)templateRoot.get("globalNodeTrail");
Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java?rev=1044232&r1=1044231&r2=1044232&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/TraverseSubContentTransform.java Fri Dec 10 07:21:09 2010
@@ -83,11 +83,11 @@ public class TraverseSubContentTransform
public Writer getWriter(final Writer out, Map args) {
final StringBuilder buf = new StringBuilder();
final Environment env = Environment.getCurrentEnvironment();
- final Map templateCtx = (Map) FreeMarkerWorker.getWrappedObject("context", env);
+ final Map templateCtx = FreeMarkerWorker.getWrappedObject("context", env);
//FreeMarkerWorker.convertContext(templateCtx);
final Map savedValues = FreeMarkerWorker.saveValues(templateCtx, saveKeyNames);
FreeMarkerWorker.overrideWithArgs(templateCtx, args);
- final Delegator delegator = (Delegator) FreeMarkerWorker.getWrappedObject("delegator", env);
+ final Delegator delegator = FreeMarkerWorker.getWrappedObject("delegator", env);
/*
final String editTemplate = FreeMarkerWorker.getArg(args, "editTemplate", ctx);
final String wrapTemplateId = FreeMarkerWorker.getArg(args, "wrapTemplateId", ctx);
@@ -105,12 +105,12 @@ public class TraverseSubContentTransform
final String highIndex = FreeMarkerWorker.getArg(args, "highIndex", ctx);
final String lowIndex = FreeMarkerWorker.getArg(args, "lowIndex", ctx);
final String queryString = FreeMarkerWorker.getArg(args, "queryString", ctx);
- final Locale locale = (Locale) FreeMarkerWorker.getWrappedObject("locale", env);
+ final Locale locale = FreeMarkerWorker.getWrappedObject("locale", env);
final String mimeTypeId = FreeMarkerWorker.getArg(args, "mimeTypeId", ctx);
*/
- final LocalDispatcher dispatcher = (LocalDispatcher) FreeMarkerWorker.getWrappedObject("dispatcher", env);
- //final GenericValue userLogin = (GenericValue) FreeMarkerWorker.getWrappedObject("userLogin", env);
- GenericValue view = (GenericValue) FreeMarkerWorker.getWrappedObject("subContentDataResourceView", env);
+ final LocalDispatcher dispatcher = FreeMarkerWorker.getWrappedObject("dispatcher", env);
+ //final GenericValue userLogin = FreeMarkerWorker.getWrappedObject("userLogin", env);
+ GenericValue view = FreeMarkerWorker.getWrappedObject("subContentDataResourceView", env);
final Integer indent = (templateCtx.get("indent") == null) ? Integer.valueOf(0) : (Integer)templateCtx.get("indent");
String contentId = (String)templateCtx.get("contentId");
@@ -272,7 +272,7 @@ public class TraverseSubContentTransform
throw new IOException("Error rendering content" + e.toString());
}
/*
- Map resultsCtx = (Map) FreeMarkerWorker.getWrappedObject("context", env);
+ Map resultsCtx = FreeMarkerWorker.getWrappedObject("context", env);
templateContext.put("contentId", contentId);
templateContext.put("locale", locale);
templateContext.put("mapKey", null);
Modified: ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/WrapSubContentCacheTransform.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/WrapSubContentCacheTransform.java?rev=1044232&r1=1044231&r2=1044232&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/WrapSubContentCacheTransform.java (original)
+++ ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/WrapSubContentCacheTransform.java Fri Dec 10 07:21:09 2010
@@ -81,16 +81,16 @@ public class WrapSubContentCacheTransfor
public Writer getWriter(final Writer out, Map args) {
final StringBuilder buf = new StringBuilder();
final Environment env = Environment.getCurrentEnvironment();
- Map envContext = (Map) FreeMarkerWorker.getWrappedObject("context", env);
+ Map envContext = FreeMarkerWorker.getWrappedObject("context", env);
final Map templateCtx;
if (envContext == null) {
templateCtx = FreeMarkerWorker.createEnvironmentMap(env);
} else {
templateCtx = envContext;
}
- final LocalDispatcher dispatcher = (LocalDispatcher) FreeMarkerWorker.getWrappedObject("dispatcher", env);
- final Delegator delegator = (Delegator) FreeMarkerWorker.getWrappedObject("delegator", env);
- final HttpServletRequest request = (HttpServletRequest) FreeMarkerWorker.getWrappedObject("request", env);
+ final LocalDispatcher dispatcher = FreeMarkerWorker.getWrappedObject("dispatcher", env);
+ final Delegator delegator = FreeMarkerWorker.getWrappedObject("delegator", env);
+ final HttpServletRequest request = FreeMarkerWorker.getWrappedObject("request", env);
FreeMarkerWorker.getSiteParameters(request, templateCtx);
final Map savedValuesUp = FastMap.newInstance();
FreeMarkerWorker.saveContextValues(templateCtx, upSaveKeyNames, savedValuesUp);
@@ -99,7 +99,7 @@ public class WrapSubContentCacheTransfor
//if (Debug.infoOn()) Debug.logInfo("in Wrap(0b), savedValuesUp ." + savedValuesUp , module);
final String wrapTemplateId = (String)templateCtx.get("wrapTemplateId");
//if (Debug.infoOn()) Debug.logInfo("in WrapSubContent, wrapTemplateId(1):" + wrapTemplateId, module);
- final GenericValue userLogin = (GenericValue) FreeMarkerWorker.getWrappedObject("userLogin", env);
+ final GenericValue userLogin = FreeMarkerWorker.getWrappedObject("userLogin", env);
List trail = (List)templateCtx.get("globalNodeTrail");
//if (Debug.infoOn()) Debug.logInfo("in WrapSubContent, trail(0):" + trail, "");
String contentAssocPredicateId = (String)templateCtx.get("contentAssocPredicateId");
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=1044232&r1=1044231&r2=1044232&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 Fri Dec 10 07:21:09 2010
@@ -341,7 +341,7 @@ public class FreeMarkerWorker {
}
public static String getArg(Map<String, ? extends Object> args, String key, Environment env) {
- Map<String, ? extends Object> templateContext = UtilGenerics.checkMap(FreeMarkerWorker.getWrappedObject("context", env));
+ Map<String, ? extends Object> templateContext = FreeMarkerWorker.getWrappedObject("context", env);
return getArg(args, key, templateContext);
}
@@ -382,7 +382,7 @@ public class FreeMarkerWorker {
* @param varName the name of the variable in the FreeMarker context.
* @param env the FreeMarker Environment
*/
- public static Object getWrappedObject(String varName, Environment env) {
+ public static <T> T getWrappedObject(String varName, Environment env) {
Object obj = null;
try {
obj = env.getVariable(varName);
@@ -399,7 +399,7 @@ public class FreeMarkerWorker {
} catch (TemplateModelException e) {
Debug.logInfo(e.getMessage(), module);
}
- return obj;
+ return UtilGenerics.<T>cast(obj);
}
/**
@@ -687,7 +687,7 @@ public class FreeMarkerWorker {
te.printStackTrace(pw);
String stackTrace = tempWriter.toString();
- StringUtil.SimpleEncoder simpleEncoder = (SimpleEncoder) FreeMarkerWorker.getWrappedObject("simpleEncoder", env);
+ StringUtil.SimpleEncoder simpleEncoder = FreeMarkerWorker.getWrappedObject("simpleEncoder", env);
if (simpleEncoder != null) {
stackTrace = simpleEncoder.encode(stackTrace);
}
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=1044232&r1=1044231&r2=1044232&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 Fri Dec 10 07:21:09 2010
@@ -73,13 +73,13 @@ public class MenuWrapTransform implement
@SuppressWarnings("unchecked")
public Writer getWriter(final Writer out, Map args) {
final Environment env = Environment.getCurrentEnvironment();
- final Delegator delegator = (Delegator) FreeMarkerWorker.getWrappedObject("delegator", env);
- final HttpServletRequest request = (HttpServletRequest) FreeMarkerWorker.getWrappedObject("request", env);
- final HttpServletResponse response = (HttpServletResponse) FreeMarkerWorker.getWrappedObject("response", env);
- final HttpSession session = (HttpSession) FreeMarkerWorker.getWrappedObject("session", env);
+ final Delegator delegator = FreeMarkerWorker.getWrappedObject("delegator", env);
+ final HttpServletRequest request = FreeMarkerWorker.getWrappedObject("request", env);
+ final HttpServletResponse response = FreeMarkerWorker.getWrappedObject("response", env);
+ final HttpSession session = FreeMarkerWorker.getWrappedObject("session", env);
- final GenericValue userLogin = (GenericValue) FreeMarkerWorker.getWrappedObject("userLogin", env);
- final Map<String, Object> templateCtx = UtilGenerics.checkMap(FreeMarkerWorker.getWrappedObject("context", env));
+ final GenericValue userLogin = FreeMarkerWorker.getWrappedObject("userLogin", env);
+ final Map<String, Object> templateCtx = FreeMarkerWorker.getWrappedObject("context", env);
FreeMarkerWorker.getSiteParameters(request, templateCtx);