Author: jholmes
Date: Thu May 15 09:44:50 2008
New Revision: 656728
URL: http://svn.apache.org/viewvc?rev=656728&view=rev
Log:
Update to take advantage of performance improvements in FreeMarker and remove
use of deprecated method.
WW-2649
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/StrutsBeanWrapper.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/StrutsBeanWrapper.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/StrutsBeanWrapper.java?rev=656728&r1=656727&r2=656728&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/StrutsBeanWrapper.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/StrutsBeanWrapper.java
Thu May 15 09:44:50 2008
@@ -53,22 +53,18 @@
*/
public class StrutsBeanWrapper extends BeansWrapper {
private boolean altMapWrapper;
-
+
StrutsBeanWrapper(boolean altMapWrapper) {
this.altMapWrapper = altMapWrapper;
}
- public TemplateModel wrap(Object object) throws TemplateModelException {
- if (object instanceof TemplateBooleanModel) {
- return super.wrap(object);
- }
-
+ protected ModelFactory getModelFactory(Class clazz) {
// attempt to get the best of both the SimpleMapModel and the MapModel
of FM.
- if (altMapWrapper && object instanceof Map) {
- return getInstance(object, FriendlyMapModel.FACTORY);
+ if (altMapWrapper && Map.class.isAssignableFrom(clazz)) {
+ return FriendlyMapModel.FACTORY;
}
- return super.wrap(object);
+ return super.getModelFactory(clazz);
}
/**
