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:20:57 UTC
svn commit: r1044231 -
/ofbiz/trunk/applications/content/src/org/ofbiz/content/webapp/ftl/
Author: doogie
Date: Fri Dec 10 07:20:57 2010
New Revision: 1044231
URL: http://svn.apache.org/viewvc?rev=1044231&view=rev
Log:
Deprecate the local getArg/getWrappedObject wrappers in all transforms.
Several ftl transforms had local methods, to that wrapped the same named
method in FreeMarkerWorker. Near as I can tell, this was to reduce
local typing, by not having to always type FreeMarkerWorker. Having
these local methods increases the permgen memory use(by increasing the
size of the bytecode). Also, it makes it more difficult to
cross-reference; when the getArg method is seen by a developer, is it a
local method, or a static import? Using the fully qualified variant
makes it easier to understand what is going on.
The replacement is to use the fully qualified versions in
FreeMarkerWorker.
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/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
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=1044231&r1=1044230&r2=1044231&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:20:57 2010
@@ -57,16 +57,26 @@ public class CheckPermissionTransform im
public static final String [] removeKeyNames = {};
/**
+ * @deprecated use FreeMarkerWorker.getWrappedObject()
* A wrapper for the FreeMarkerWorker version.
*/
+ @Deprecated
public static Object getWrappedObject(String varName, Environment env) {
return FreeMarkerWorker.getWrappedObject(varName, env);
}
+ /**
+ * @deprecated use FreeMarkerWorker.getArg()
+ */
+ @Deprecated
public static String getArg(Map args, String key, Environment env) {
return FreeMarkerWorker.getArg(args, key, env);
}
+ /**
+ * @deprecated use FreeMarkerWorker.getArg()
+ */
+ @Deprecated
public static String getArg(Map args, String key, Map ctx) {
return FreeMarkerWorker.getArg(args, key, ctx);
}
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=1044231&r1=1044230&r2=1044231&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:20:57 2010
@@ -55,16 +55,26 @@ public class EditRenderSubContentCacheTr
public static final String [] saveKeyNames = {"contentId", "subContentId", "subDataResourceTypeId", "mimeTypeId", "whenMap", "locale", "wrapTemplateId", "encloseWrapText", "nullThruDatesOnly"};
/**
+ * @deprecated use FreeMarkerWorker.getWrappedObject()
* A wrapper for the FreeMarkerWorker version.
*/
+ @Deprecated
public static Object getWrappedObject(String varName, Environment env) {
return FreeMarkerWorker.getWrappedObject(varName, env);
}
+ /**
+ * @deprecated use FreeMarkerWorker.getArg()
+ */
+ @Deprecated
public static String getArg(Map args, String key, Environment env) {
return FreeMarkerWorker.getArg(args, key, env);
}
+ /**
+ * @deprecated use FreeMarkerWorker.getArg()
+ */
+ @Deprecated
public static String getArg(Map args, String key, Map ctx) {
return FreeMarkerWorker.getArg(args, key, ctx);
}
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=1044231&r1=1044230&r2=1044231&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:20:57 2010
@@ -50,16 +50,26 @@ public class EditRenderSubContentTransfo
public static final String module = EditRenderSubContentTransform.class.getName();
/**
+ * @deprecated use FreeMarkerWorker.getWrappedObject()
* A wrapper for the FreeMarkerWorker version.
*/
+ @Deprecated
public static Object getWrappedObject(String varName, Environment env) {
return FreeMarkerWorker.getWrappedObject(varName, env);
}
+ /**
+ * @deprecated use FreeMarkerWorker.getArg()
+ */
+ @Deprecated
public static String getArg(Map args, String key, Environment env) {
return FreeMarkerWorker.getArg(args, key, env);
}
+ /**
+ * @deprecated use FreeMarkerWorker.getArg()
+ */
+ @Deprecated
public static String getArg(Map args, String key, Map ctx) {
return FreeMarkerWorker.getArg(args, key, ctx);
}
@@ -68,20 +78,20 @@ public class EditRenderSubContentTransfo
final StringBuilder buf = new StringBuilder();
final Environment env = Environment.getCurrentEnvironment();
Map ctx = (Map) FreeMarkerWorker.getWrappedObject("context", env);
- final String editTemplate = getArg(args, "editTemplate", ctx);
- final String wrapTemplateId = getArg(args, "wrapTemplateId", ctx);
- final String mapKey = getArg(args, "mapKey", ctx);
- final String templateContentId = getArg(args, "templateContentId", ctx);
- final String subContentId = getArg(args, "subContentId", ctx);
- String subDataResourceTypeIdTemp = getArg(args, "subDataResourceTypeId", ctx);
- final String contentId = getArg(args, "contentId", ctx);
+ final String editTemplate = FreeMarkerWorker.getArg(args, "editTemplate", ctx);
+ final String wrapTemplateId = FreeMarkerWorker.getArg(args, "wrapTemplateId", ctx);
+ final String mapKey = FreeMarkerWorker.getArg(args, "mapKey", ctx);
+ final String templateContentId = FreeMarkerWorker.getArg(args, "templateContentId", ctx);
+ final String subContentId = FreeMarkerWorker.getArg(args, "subContentId", ctx);
+ String subDataResourceTypeIdTemp = FreeMarkerWorker.getArg(args, "subDataResourceTypeId", ctx);
+ final String contentId = FreeMarkerWorker.getArg(args, "contentId", ctx);
final Locale locale = (Locale) FreeMarkerWorker.getWrappedObject("locale", env);
- String mimeTypeIdTemp = getArg(args, "mimeTypeId", ctx);
- final String rootDir = getArg(args, "rootDir", ctx);
- final String webSiteId = getArg(args, "webSiteId", ctx);
- final String https = getArg(args, "https", ctx);
+ 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);
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=1044231&r1=1044230&r2=1044231&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:20:57 2010
@@ -50,16 +50,26 @@ public class InjectNodeTrailCsvTransform
public static final String [] removeKeyNames = {"nodeTrailCsv"};
/**
+ * @deprecated use FreeMarkerWorker.getWrappedObject()
* A wrapper for the FreeMarkerWorker version.
*/
+ @Deprecated
public static Object getWrappedObject(String varName, Environment env) {
return FreeMarkerWorker.getWrappedObject(varName, env);
}
+ /**
+ * @deprecated use FreeMarkerWorker.getArg()
+ */
+ @Deprecated
public static String getArg(Map args, String key, Environment env) {
return FreeMarkerWorker.getArg(args, key, env);
}
+ /**
+ * @deprecated use FreeMarkerWorker.getArg()
+ */
+ @Deprecated
public static String getArg(Map args, String key, Map ctx) {
return FreeMarkerWorker.getArg(args, key, ctx);
}
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=1044231&r1=1044230&r2=1044231&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:20:57 2010
@@ -60,16 +60,26 @@ public class LimitedSubContentCacheTrans
public static final String [] saveKeyNames = {"contentId", "subContentId", "entityList", "entityIndex", "subDataResourceTypeId", "mimeTypeId", "whenMap", "locale", "entityList", "viewSize", "viewIndex", "highIndex", "lowIndex", "listSize", "wrapTemplateId", "encloseWrapText", "nullThruDatesOnly", "globalNodeTrail", "outputIndex"};
/**
+ * @deprecated use FreeMarkerWorker.getWrappedObject()
* A wrapper for the FreeMarkerWorker version.
*/
+ @Deprecated
public static Object getWrappedObject(String varName, Environment env) {
return FreeMarkerWorker.getWrappedObject(varName, env);
}
+ /**
+ * @deprecated use FreeMarkerWorker.getArg()
+ */
+ @Deprecated
public static String getArg(Map args, String key, Environment env) {
return FreeMarkerWorker.getArg(args, key, env);
}
+ /**
+ * @deprecated use FreeMarkerWorker.getArg()
+ */
+ @Deprecated
public static String getArg(Map args, String key, Map ctx) {
return FreeMarkerWorker.getArg(args, key, ctx);
}
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=1044231&r1=1044230&r2=1044231&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:20:57 2010
@@ -55,16 +55,26 @@ public class LoopSubContentTransform imp
public static final String[] removeKeyNames = {"wrapTemplateId", "entityList", "entityIndex", "textData", "dataResourceId","drDataResourceId", "subContentIdSub", "parentContent", "wrappedFTL"};
/**
+ * @deprecated use FreeMarkerWorker.getWrappedObject()
* A wrapper for the FreeMarkerWorker version.
*/
+ @Deprecated
public static Object getWrappedObject(String varName, Environment env) {
return FreeMarkerWorker.getWrappedObject(varName, env);
}
+ /**
+ * @deprecated use FreeMarkerWorker.getArg()
+ */
+ @Deprecated
public static String getArg(Map args, String key, Environment env) {
return FreeMarkerWorker.getArg(args, key, env);
}
+ /**
+ * @deprecated use FreeMarkerWorker.getArg()
+ */
+ @Deprecated
public static String getArg(Map args, String key, Map ctx) {
return FreeMarkerWorker.getArg(args, key, ctx);
}
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=1044231&r1=1044230&r2=1044231&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:20:57 2010
@@ -52,16 +52,22 @@ public class RenderSubContentTransform i
public static final String module = RenderSubContentTransform.class.getName();
/**
+ * @deprecated use FreeMarkerWorker.getArg()
* Does a conditional search to return a value for a parameter with the passed name. Looks first to see if it was passed as an argument to the transform.
* Secondly, it looks to see if it is passed as a parameter in the template context object.
* <p/>
* Note that this is different from the getArg method of EditRenderDataResourceTransform, which checks the request object instead of the template context
* object.
*/
+ @Deprecated
public static String getArg(Map args, String key, Environment env) {
return FreeMarkerWorker.getArg(args, key, env);
}
+ /**
+ * @deprecated use FreeMarkerWorker.getArg()
+ */
+ @Deprecated
public static String getArg(Map args, String key, Map ctx) {
return FreeMarkerWorker.getArg(args, key, ctx);
}
@@ -73,12 +79,12 @@ public class RenderSubContentTransform i
if (ctx == null) {
ctx = FastMap.newInstance();
}
- final String mapKey = getArg(args, "mapKey", ctx);
- final String subContentId = getArg(args, "subContentId", ctx);
- final String subDataResourceTypeId = getArg(args, "subDataResourceTypeId", ctx);
- final String contentId = getArg(args, "contentId", ctx);
- final String mimeTypeId = getArg(args, "mimeTypeId", ctx);
- final String throwExceptionOnError = getArg(args, "throwExceptionOnError", ctx);
+ final String mapKey = FreeMarkerWorker.getArg(args, "mapKey", ctx);
+ final String subContentId = FreeMarkerWorker.getArg(args, "subContentId", ctx);
+ final String subDataResourceTypeId = FreeMarkerWorker.getArg(args, "subDataResourceTypeId", ctx);
+ 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);
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=1044231&r1=1044230&r2=1044231&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:20:57 2010
@@ -54,16 +54,26 @@ public class TraverseSubContentCacheTran
public static final String [] saveKeyNames = {"contentId", "subContentId", "subDataResourceTypeId", "mimeTypeId", "whenMap", "locale", "wrapTemplateId", "encloseWrapText", "nullThruDatesOnly", "globalNodeTrail"};
/**
+ * @deprecated use FreeMarkerWorker.getWrappedObject()
* A wrapper for the FreeMarkerWorker version.
*/
+ @Deprecated
public static Object getWrappedObject(String varName, Environment env) {
return FreeMarkerWorker.getWrappedObject(varName, env);
}
+ /**
+ * @deprecated use FreeMarkerWorker.getArg()
+ */
+ @Deprecated
public static String getArg(Map args, String key, Environment env) {
return FreeMarkerWorker.getArg(args, key, env);
}
+ /**
+ * @deprecated use FreeMarkerWorker.getArg()
+ */
+ @Deprecated
public static String getArg(Map args, String key, Map ctx) {
return FreeMarkerWorker.getArg(args, key, ctx);
}
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=1044231&r1=1044230&r2=1044231&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:20:57 2010
@@ -56,16 +56,26 @@ public class TraverseSubContentTransform
public static final String [] removeKeyNames = {"templateContentId", "subDataResourceTypeId", "mapKey", "wrappedFTL", "nodeTrail"};
/**
+ * @deprecated use FreeMarkerWorker.getWrappedObject()
* A wrapper for the FreeMarkerWorker version.
*/
+ @Deprecated
public static Object getWrappedObject(String varName, Environment env) {
return FreeMarkerWorker.getWrappedObject(varName, env);
}
+ /**
+ * @deprecated use FreeMarkerWorker.getArg()
+ */
+ @Deprecated
public static String getArg(Map args, String key, Environment env) {
return FreeMarkerWorker.getArg(args, key, env);
}
+ /**
+ * @deprecated use FreeMarkerWorker.getArg()
+ */
+ @Deprecated
public static String getArg(Map args, String key, Map ctx) {
return FreeMarkerWorker.getArg(args, key, ctx);
}
@@ -79,24 +89,24 @@ public class TraverseSubContentTransform
FreeMarkerWorker.overrideWithArgs(templateCtx, args);
final Delegator delegator = (Delegator) FreeMarkerWorker.getWrappedObject("delegator", env);
/*
- final String editTemplate = getArg(args, "editTemplate", ctx);
- final String wrapTemplateId = getArg(args, "wrapTemplateId", ctx);
- //final String mapKey = getArg(args, "mapKey", ctx);
- final String templateContentId = getArg(args, "templateContentId", ctx);
- final String subDataResourceTypeId = getArg(args, "subDataResourceTypeId", ctx);
- final String contentId = getArg(args, "contentId", ctx);
- final String subContentId = getArg(args, "subContentId", ctx);
- final String rootDir = getArg(args, "rootDir", ctx);
- final String webSiteId = getArg(args, "webSiteId", ctx);
- final String https = getArg(args, "https", ctx);
- final String viewSize = getArg(args, "viewSize", ctx);
- final String viewIndex = getArg(args, "viewIndex", ctx);
- final String listSize = getArg(args, "listSize", ctx);
- final String highIndex = getArg(args, "highIndex", ctx);
- final String lowIndex = getArg(args, "lowIndex", ctx);
- final String queryString = getArg(args, "queryString", ctx);
+ final String editTemplate = FreeMarkerWorker.getArg(args, "editTemplate", ctx);
+ final String wrapTemplateId = FreeMarkerWorker.getArg(args, "wrapTemplateId", ctx);
+ //final String mapKey = FreeMarkerWorker.getArg(args, "mapKey", ctx);
+ final String templateContentId = FreeMarkerWorker.getArg(args, "templateContentId", ctx);
+ final String subDataResourceTypeId = FreeMarkerWorker.getArg(args, "subDataResourceTypeId", ctx);
+ final String contentId = FreeMarkerWorker.getArg(args, "contentId", ctx);
+ final String subContentId = FreeMarkerWorker.getArg(args, "subContentId", 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 String viewSize = FreeMarkerWorker.getArg(args, "viewSize", ctx);
+ final String viewIndex = FreeMarkerWorker.getArg(args, "viewIndex", ctx);
+ final String listSize = FreeMarkerWorker.getArg(args, "listSize", ctx);
+ 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 String mimeTypeId = getArg(args, "mimeTypeId", ctx);
+ final String mimeTypeId = FreeMarkerWorker.getArg(args, "mimeTypeId", ctx);
*/
final LocalDispatcher dispatcher = (LocalDispatcher) FreeMarkerWorker.getWrappedObject("dispatcher", env);
//final GenericValue userLogin = (GenericValue) FreeMarkerWorker.getWrappedObject("userLogin", env);
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=1044231&r1=1044230&r2=1044231&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:20:57 2010
@@ -54,16 +54,26 @@ public class WrapSubContentCacheTransfor
public static final String [] saveKeyNames = {"contentId", "subContentId", "subDataResourceTypeId", "mimeTypeId", "whenMap", "locale", "wrapTemplateId", "encloseWrapText", "nullThruDatesOnly"};
/**
+ * @deprecated use FreeMarkerWorker.getWrappedObject()
* A wrapper for the FreeMarkerWorker version.
*/
+ @Deprecated
public static Object getWrappedObject(String varName, Environment env) {
return FreeMarkerWorker.getWrappedObject(varName, env);
}
+ /**
+ * @deprecated use FreeMarkerWorker.getArg()
+ */
+ @Deprecated
public static String getArg(Map args, String key, Environment env) {
return FreeMarkerWorker.getArg(args, key, env);
}
+ /**
+ * @deprecated use FreeMarkerWorker.getArg()
+ */
+ @Deprecated
public static String getArg(Map args, String key, Map ctx) {
return FreeMarkerWorker.getArg(args, key, ctx);
}