Author: nbelaevski Date: 2010-02-02 06:27:33 -0500 (Tue, 02 Feb 2010) New Revision: 16394 Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassGenerator.java root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassVisitor.java Log: https://jira.jboss.org/jira/browse/RF-7732 https://jira.jboss.org/jira/browse/RF-8309 Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassGenerator.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassGenerator.java 2010-02-02 11:10:04 UTC (rev 16393) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassGenerator.java 2010-02-02 11:27:33 UTC (rev 16394) @@ -39,6 +39,7 @@ import org.richfaces.cdk.model.Property; import org.richfaces.cdk.model.RenderKitModel; import org.richfaces.cdk.model.RendererModel; +import org.richfaces.cdk.model.RendererModel.Type; import org.richfaces.cdk.templatecompiler.model.Template; import org.richfaces.cdk.xmlconfig.JAXBBinding; @@ -66,13 +67,23 @@ } private ComponentModel findComponentByRenderer(RendererModel renderer) { + String rendererFamily = renderer.getFamily(); + Type rendererType = renderer.getType(); + Collection<ComponentModel> components = context.getLibrary().getComponents(); if (components != null) { for (ComponentModel component : components) { + if (!rendererFamily.equals(component.getFamily())) { + continue; + } + + //TODO - compare renderkit Id? Collection<RendererModel> renderers = component.getRenderers(); if (renderers != null) { - if (renderers.contains(renderer)) { - return component; + for (RendererModel rendererModel : renderers) { + if (rendererType.equals(rendererModel.getType())) { + return component; + } } } } Modified: root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassVisitor.java =================================================================== --- root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassVisitor.java 2010-02-02 11:10:04 UTC (rev 16393) +++ root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/templatecompiler/RendererClassVisitor.java 2010-02-02 11:27:33 UTC (rev 16394) @@ -313,7 +313,7 @@ return sb.toString(); } - private JavaField createPassThroughField(Map<String, Attribute> attributesMap) { + private JavaField createPassThroughField(Map<String, Attribute> htmlAttributesMap) { String fieldName = PASS_THROUGH_ATTRIBUTES_FIELD_NAME; if (passThroughCounter >= 0) { fieldName += ("_" + passThroughCounter); @@ -336,14 +336,13 @@ StringBuilder fieldValue = new StringBuilder("Collections.unmodifiableMap(ComponentAttribute.createMap("); boolean isFirstArgument = true; - for (Map.Entry<String, Attribute> entry : attributesMap.entrySet()) { + for (Map.Entry<String, Attribute> entry : htmlAttributesMap.entrySet()) { if (isFirstArgument) { isFirstArgument = false; } else { fieldValue.append(", "); } - // TODO behaviors data String htmlAttributeName = entry.getKey(); String componentAttributeName = entry.getValue().getComponentAttributeName(); fieldValue.append(createPassThroughAttributeCode(htmlAttributeName, componentAttributeName));