Author: adrianc
Date: Thu Oct 24 00:42:12 2013
New Revision: 1535245
URL:
http://svn.apache.org/r1535245Log:
Use parameterized return type in FreeMarkerWorker.unwrap method.
Modified:
ofbiz/trunk/framework/base/src/org/ofbiz/base/util/template/FreeMarkerWorker.java
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=1535245&r1=1535244&r2=1535245&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 Thu Oct 24 00:42:12 2013
@@ -450,7 +450,8 @@ public class FreeMarkerWorker {
return returnObj;
}
- public static Object unwrap(Object o) {
+ @SuppressWarnings("unchecked")
+ public static <T> T unwrap(Object o) {
Object returnObj = null;
if (o == TemplateModel.NOTHING) {
@@ -461,7 +462,7 @@ public class FreeMarkerWorker {
returnObj = ((BeanModel) o).getWrappedObject();
}
- return returnObj;
+ return (T) returnObj;
}
public static void checkForLoop(String path, Map<String, Object> ctx) throws IOException {