[richfaces-svn-commits] JBoss Rich Faces SVN: r19383 - in trunk/cdk/generator/src/main: resources/META-INF/templates and 1 other directories.
Author: alexsmirnov
Date: 2010-09-29 14:55:42 -0400 (Wed, 29 Sep 2010)
New Revision: 19383
Modified:
trunk/cdk/generator/src/main/java/org/richfaces/cdk/templatecompiler/JavaClassModelWrapper.java
trunk/cdk/generator/src/main/resources/META-INF/templates/component.ftl
trunk/cdk/generator/src/main/resources/META-INF/templates/java/write-boolean-attribute.ftl
Log:
RESOLVED - issue RF-9325: CDK: can't specify 'readonly' attribute on html
<input > element in the xml template
https://jira.jboss.org/browse/RF-9325
Modified:
trunk/cdk/generator/src/main/java/org/richfaces/cdk/templatecompiler/JavaClassModelWrapper.java
===================================================================
---
trunk/cdk/generator/src/main/java/org/richfaces/cdk/templatecompiler/JavaClassModelWrapper.java 2010-09-29
17:44:24 UTC (rev 19382)
+++
trunk/cdk/generator/src/main/java/org/richfaces/cdk/templatecompiler/JavaClassModelWrapper.java 2010-09-29
18:55:42 UTC (rev 19383)
@@ -19,7 +19,6 @@
@Override
public TemplateModel wrap(Object obj) throws TemplateModelException {
- // TODO wrap specified model classes.
TemplateModel templateModel;
if (obj instanceof JavaStatement) {
Modified: trunk/cdk/generator/src/main/resources/META-INF/templates/component.ftl
===================================================================
--- trunk/cdk/generator/src/main/resources/META-INF/templates/component.ftl 2010-09-29
17:44:24 UTC (rev 19382)
+++ trunk/cdk/generator/src/main/resources/META-INF/templates/component.ftl 2010-09-29
18:55:42 UTC (rev 19383)
@@ -18,7 +18,6 @@
import javax.el.MethodExpression;
import javax.el.ValueExpression;
import javax.faces.component.StateHelper;
-import org.richfaces.component.PartialStateHolderHelper;
import ${baseClass};
<#include "_attributes_import.ftl">
Modified:
trunk/cdk/generator/src/main/resources/META-INF/templates/java/write-boolean-attribute.ftl
===================================================================
---
trunk/cdk/generator/src/main/resources/META-INF/templates/java/write-boolean-attribute.ftl 2010-09-29
17:44:24 UTC (rev 19382)
+++
trunk/cdk/generator/src/main/resources/META-INF/templates/java/write-boolean-attribute.ftl 2010-09-29
18:55:42 UTC (rev 19383)
@@ -1,12 +1,16 @@
-<#if value.literal && value == "true">
+<#if value.literal >
+ <#if value == '"true"' || value ==
'"${attributeName}"' >
${responseWriterVariable}.writeAttribute("${attributeName}","${attributeName}",null);
+ </#if>
<#else>
<#if value.type == "boolean" >
if(${value}) {
<#elseif value.type == "Boolean" >
if(Boolean.TRUE.equals(${value})) {
+ <#elseif value.type == "String" >
+ if("${attributeName}".equals(${value}) || Boolean.valueOf(${value}) ) {
<#else>
- if(Boolean.valueOf(String.valueOf(${value}))) {
+ if(null != ${value} && ( Boolean.valueOf(${value}.toString()) ||
"${attributeName}".equals(${value}.toString())) ) {
</#if>
${responseWriterVariable}.writeAttribute("${attributeName}","${attributeName}",null);
}