[richfaces-svn-commits] JBoss Rich Faces SVN: r7747 - branches/3.2.x/cdk/generator/src/main/resources/META-INF/templates12.

Author: nbelaevski Date: 2008-04-10 19:33:32 -0400 (Thu, 10 Apr 2008) New Revision: 7747 Modified: branches/3.2.x/cdk/generator/src/main/resources/META-INF/templates12/taghandler.vm Log: http://jira.jboss.com/jira/browse/RF-2952 Modified: branches/3.2.x/cdk/generator/src/main/resources/META-INF/templates12/taghandler.vm =================================================================== --- branches/3.2.x/cdk/generator/src/main/resources/META-INF/templates12/taghandler.vm 2008-04-10 23:21:06 UTC (rev 7746) +++ branches/3.2.x/cdk/generator/src/main/resources/META-INF/templates12/taghandler.vm 2008-04-10 23:33:32 UTC (rev 7747) @@ -54,11 +54,18 @@ if (meta.isTargetInstanceOf(${component.simpleClassName}.class)) { #foreach($prop in $component.properties) #if( !$prop.existintag ) - #if( $prop.isInstanceof("javax.faces.el.MethodBinding") ) + #if( $prop.isInstanceof("javax.faces.el.MethodBinding") || $prop.isInstanceof("javax.el.MethodExpression") ) + #if ( $prop.name != "actionExpression" ) + if ("${prop.name}".equals(name)) { return new ${prop.name}Mapper(attribute); } - + + #else + + //skip $prop.name + + #end #end #end #end @@ -71,7 +78,8 @@ #foreach($prop in $component.properties) #if( !$prop.existintag ) - #if( $prop.isInstanceof("javax.faces.el.MethodBinding") ) + #if( $prop.isInstanceof("javax.faces.el.MethodBinding") || $prop.isInstanceof("javax.el.MethodExpression") ) + #if ( $prop.name != "actionExpression" ) static class ${prop.name}Mapper extends Metadata { @@ -90,13 +98,21 @@ */ public void applyMetadata(FaceletContext ctx, Object instance) { ((${component.simpleClassName}) instance) - .${prop.setterName}(new LegacyMethodBinding(this._action - .getMethodExpression(ctx, null, + .${prop.setterName} + #if( $prop.isInstanceof("javax.faces.el.MethodBinding")) + (new LegacyMethodBinding(this._action.getMethodExpression(ctx, null, SIGNATURE))); + #else + (this._action.getMethodExpression(ctx, null, + SIGNATURE)); + #end } } + #end + + #end #end #end }