[richfaces-svn-commits] JBoss Rich Faces SVN: r17312 - in root/cdk/trunk/plugins/generator/src/main: resources/META-INF/templates and 1 other directory.

Author: nbelaevski Date: 2010-05-27 05:58:42 -0400 (Thu, 27 May 2010) New Revision: 17312 Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/PropertyModel.java root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/_attribute-accessor-primitive.ftl root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/_attribute-accessor.ftl root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/_attribute_accessors.ftl root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/_attributes-old.ftl Log: Fixed CDK unit tests failures Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/PropertyModel.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/PropertyModel.java 2010-05-27 09:19:57 UTC (rev 17311) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/generate/freemarker/PropertyModel.java 2010-05-27 09:58:42 UTC (rev 17312) @@ -78,6 +78,10 @@ value = isBingingAttribute(); } else if ("isBinging".equals(key)) { value = isBinging(); + } else if ("typeName".equals(key)) { + value = getTypeName(); + } else if ("isPrimitive".equals(key)) { + value = isPrimitive(); } else { return super.get(key); } @@ -93,6 +97,9 @@ return this.property.isBinding(); } + public boolean isPrimitive() { + return this.property.isPrimitive(); + } private String typeForCasting() { ClassName type = this.property.getType(); Modified: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/_attribute-accessor-primitive.ftl =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/_attribute-accessor-primitive.ftl 2010-05-27 09:19:57 UTC (rev 17311) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/_attribute-accessor-primitive.ftl 2010-05-27 09:58:42 UTC (rev 17312) @@ -1,9 +1,9 @@ - public void ${attribute.setterName}(${attribute.simpleTypeName} ${attribute.name}) { + public void ${attribute.setterName}(${attribute.typeName} ${attribute.name}) { this.${attribute.name} = ${attribute.name}; this.is${attribute.capitalizeName}Setted = true; } - public ${attribute.simpleTypeName} ${attribute.getterName}() { + public ${attribute.typeName} ${attribute.getterName}() { if (this.is${attribute.capitalizeName}Setted) { return ${attribute.name}; } Modified: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/_attribute-accessor.ftl =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/_attribute-accessor.ftl 2010-05-27 09:19:57 UTC (rev 17311) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/_attribute-accessor.ftl 2010-05-27 09:58:42 UTC (rev 17312) @@ -1,8 +1,8 @@ - public void ${attribute.setterName}(${attribute.simpleTypeName} ${attribute.name}) { + public void ${attribute.setterName}(${attribute.typeName} ${attribute.name}) { this.${attribute.name} = ${attribute.name}; } - public ${attribute.simpleTypeName} ${attribute.getterName}() { + public ${attribute.typeName} ${attribute.getterName}() { <#if ! attribute.literal > if (${attribute.name} != null) { return ${attribute.name}; @@ -10,7 +10,7 @@ ValueBinding vb = getValueBinding("${attribute.name}"); if (null != vb) { - return (${attribute.simpleTypeName}) vb.getValue(getFacesContext()); + return (${attribute.typeName}) vb.getValue(getFacesContext()); } </#if> return ${attribute.name}; Modified: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/_attribute_accessors.ftl =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/_attribute_accessors.ftl 2010-05-27 09:19:57 UTC (rev 17311) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/_attribute_accessors.ftl 2010-05-27 09:58:42 UTC (rev 17312) @@ -5,7 +5,7 @@ <#assign propertyKey=attribute.name> </#if> - public ${attribute.simpleTypeName} ${attribute.getterName}() { + public ${attribute.typeName} ${attribute.getterName}() { <#if attribute.typeForCasting?contains("Boolean")> return Boolean.valueOf(getStateHelper().eval(Properties.${propertyKey}<#if attribute.defaultValue?exists>, ${attribute.defaultValue}</#if>).toString()); <#elseif attribute.typeForCasting?contains("Object") > @@ -18,7 +18,7 @@ } <#if ! attribute.readOnly > - public void ${attribute.setterName}(${attribute.simpleTypeName} ${attribute.name}) { + public void ${attribute.setterName}(${attribute.typeName} ${attribute.name}) { getStateHelper().put(Properties.${propertyKey}, ${attribute.name}); } </#if> \ No newline at end of file Modified: root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/_attributes-old.ftl =================================================================== --- root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/_attributes-old.ftl 2010-05-27 09:19:57 UTC (rev 17311) +++ root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/_attributes-old.ftl 2010-05-27 09:58:42 UTC (rev 17312) @@ -1,5 +1,5 @@ <#list generatedAttributes as attribute> - private ${attribute.simpleTypeName} ${attribute.name}; + private ${attribute.typeName} ${attribute.name}; <#if (attribute.isPrimitive)>private boolean is${attribute.capitalizeName}Setted = false;</#if> </#list>