Author: alexsmirnov Date: 2010-01-18 20:19:35 -0500 (Mon, 18 Jan 2010) New Revision: 16326 Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/ComponentTemplateModel.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/ValidatorTemplateModel.java root/cdk/trunk/plugins/maven-cdk-plugin/src/it/xml-configured-component/src/main/java/org/richfaces/cdk/renderkit/SimpleTestRenderer.java Log: Remove duplicated check for "attributes" property. Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/ComponentTemplateModel.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/ComponentTemplateModel.java 2010-01-18 23:44:20 UTC (rev 16325) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/ComponentTemplateModel.java 2010-01-19 01:19:35 UTC (rev 16326) @@ -69,8 +69,6 @@ @Override public TemplateModel get(String key) throws TemplateModelException { if ("attributes".equals(key)) { - return new PropertyMapModel(component.getAttributes(),wrapper); - } else if ("attributes".equals(key)) { return attributes(); } else if ("generatedAttributes".equals(key)) { return generatedAttributes(); Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/ValidatorTemplateModel.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/ValidatorTemplateModel.java 2010-01-18 23:44:20 UTC (rev 16325) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/ValidatorTemplateModel.java 2010-01-19 01:19:35 UTC (rev 16326) @@ -63,7 +63,7 @@ @Override public TemplateModel get(String key) throws TemplateModelException { if ("attributes".equals(key)) { - return new PropertyMapModel(component.getAttributes(),wrapper); + return attributes(); } else if ("generatedAttributes".equals(key)) { return generatedAttributes(); } else if ("eventNames".equals(key)) { Modified: root/cdk/trunk/plugins/maven-cdk-plugin/src/it/xml-configured-component/src/main/java/org/richfaces/cdk/renderkit/SimpleTestRenderer.java =================================================================== --- root/cdk/trunk/plugins/maven-cdk-plugin/src/it/xml-configured-component/src/main/java/org/richfaces/cdk/renderkit/SimpleTestRenderer.java 2010-01-18 23:44:20 UTC (rev 16325) +++ root/cdk/trunk/plugins/maven-cdk-plugin/src/it/xml-configured-component/src/main/java/org/richfaces/cdk/renderkit/SimpleTestRenderer.java 2010-01-19 01:19:35 UTC (rev 16326) @@ -23,6 +23,10 @@ package org.richfaces.cdk.renderkit; +import java.io.IOException; + +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; import javax.faces.render.Renderer; /** @@ -31,5 +35,17 @@ * */ public class SimpleTestRenderer extends Renderer { + + @Override + public void encodeBegin(FacesContext context, UIComponent component) throws IOException { + } + @Override + public void encodeEnd(FacesContext context, UIComponent component) throws IOException { + } + + @Override + public boolean getRendersChildren() { + return false; + } }