Author: alexsmirnov
Date: 2009-12-01 20:39:54 -0500 (Tue, 01 Dec 2009)
New Revision: 16032
Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/FreeMarkerRenderer.java
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Component.java
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/component.ftl
root/cdk/trunk/plugins/maven-cdk-plugin/src/it/xml-configured-component/src/main/config/faces-config.xml
root/cdk/trunk/plugins/maven-cdk-plugin/src/it/xml-configured-component/src/main/templates/testPanel.xml
root/cdk/trunk/plugins/maven-cdk-plugin/src/it/xml-configured-component/verify.bsh
Log:
build two components and renderer in IT test
Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/FreeMarkerRenderer.java
===================================================================
---
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/FreeMarkerRenderer.java 2009-12-02
00:49:46 UTC (rev 16031)
+++
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/freemarker/FreeMarkerRenderer.java 2009-12-02
01:39:54 UTC (rev 16032)
@@ -76,7 +76,7 @@
@Override
public Boolean visit(Visitable c, P param) throws CdkException {
if (isMyComponent(c)) {
- return processComponent((C) c, param);
+ processComponent((C) c, param);
}
return null;
Modified:
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Component.java
===================================================================
---
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Component.java 2009-12-02
00:49:46 UTC (rev 16031)
+++
root/cdk/trunk/plugins/generator/src/main/java/org/richfaces/cdk/model/Component.java 2009-12-02
01:39:54 UTC (rev 16032)
@@ -28,7 +28,7 @@
/**
* <p class="changed_added_4_0">Is that component c</p>
*/
- private boolean generate = true;
+ private boolean generate = false;
/**
* <p class="changed_added_4_0">
Modified:
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/component.ftl
===================================================================
---
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/component.ftl 2009-12-02
00:49:46 UTC (rev 16031)
+++
root/cdk/trunk/plugins/generator/src/main/resources/META-INF/templates/component.ftl 2009-12-02
01:39:54 UTC (rev 16032)
@@ -60,9 +60,9 @@
</#if>
<#if (eventNames?size > 0)>
- private static final Collection<String> EVENT_NAMES =
Collections.unmodifiableCollection(
+ private static final Collection<String> EVENT_NAMES =
Collections.unmodifiableCollection(Arrays.asList(
<@concat seq=eventNames ; event>"${event.name}"</@concat>
- );
+ ));
public Collection<String> getEventNames() {
return EVENT_NAMES; }
Modified:
root/cdk/trunk/plugins/maven-cdk-plugin/src/it/xml-configured-component/src/main/config/faces-config.xml
===================================================================
---
root/cdk/trunk/plugins/maven-cdk-plugin/src/it/xml-configured-component/src/main/config/faces-config.xml 2009-12-02
00:49:46 UTC (rev 16031)
+++
root/cdk/trunk/plugins/maven-cdk-plugin/src/it/xml-configured-component/src/main/config/faces-config.xml 2009-12-02
01:39:54 UTC (rev 16032)
@@ -44,10 +44,12 @@
xpointer="xmlns(cdk=http://richfaces.org/cdk/extensions)xpointer(/cd...
href="urn:attributes:events-props.xml" />
<property>
- <property-name>onclick</property-name>
+ <property-name>onheaderclick</property-name>
+ <property-class>java.lang.String</property-class>
<property-extension>
<cdk:generate>true</cdk:generate>
- <cdk:event default="true">action</cdk:event>
+ <cdk:event-name>headerclick</cdk:event-name>
+ <cdk:event-name default="true">action</cdk:event-name>
</property-extension>
</property>
<component-extension>
Modified:
root/cdk/trunk/plugins/maven-cdk-plugin/src/it/xml-configured-component/src/main/templates/testPanel.xml
===================================================================
---
root/cdk/trunk/plugins/maven-cdk-plugin/src/it/xml-configured-component/src/main/templates/testPanel.xml 2009-12-02
00:49:46 UTC (rev 16031)
+++
root/cdk/trunk/plugins/maven-cdk-plugin/src/it/xml-configured-component/src/main/templates/testPanel.xml 2009-12-02
01:39:54 UTC (rev 16032)
@@ -5,7 +5,7 @@
<cdk:class>org.richfaces.cdk.renderkit.html.TestPanelRenderer</cdk:class>
<cdk:superclass>org.richfaces.cdk.renderkit.AbstractTestPanelRenderer</cdk:superclass>
<cdk:component-family>org.richfaces.cdk.TestPanel</cdk:component-family>
- <cdk:component-type>org.richfaces.cdk.HtmlTestPanel</cdk:component-type>
+ <!-- cdk:component-type>org.richfaces.cdk.HtmlTestPanel</cdk:component-type
-->
<cdk:renderer-type>org.richfaces.cdk.TestPanelRenderer</cdk:renderer-type>
<cdk:renderkit-id>HTML_BASIC</cdk:renderkit-id>
<cdk:renders-children>true</cdk:renders-children>
@@ -31,18 +31,15 @@
</cc:interface>
<cc:implementation>
- start
- <c:if test="#{cc.attributes['ifTest'] !=
null}">if content</c:if>
- <c:choose>
- <c:when test="#{cc.attributes['anotherTest'] !=
null}">when content</c:when>
- <c:when test="#{cc.attributes['coolTest'] !=
null}">
- <c:if test="#{cc.attributes['nestedIfTest'] !=
null}">nested if content</c:if>
- </c:when>
- <c:otherwise>otherwise content</c:otherwise>
- </c:choose>
+ <div>
+ <c:if test="#{cc.facets['header'] != null}">
+ <div class="tpHeader">
+ <cdk:call
expression='cc.getFacet("header").encodeAll(facesContext)'/>
+ </div>
+ </c:if>
<c:forEach items="#{cc.children}"
var="iterationVar">
- forEach content
+ <cdk:call
expression='((javax.faces.component.UIComponent)iterationVar).encodeAll(facesContext)'/>
</c:forEach>
- finish
+ </div>
</cc:implementation>
</cdk:root>
\ No newline at end of file
Modified:
root/cdk/trunk/plugins/maven-cdk-plugin/src/it/xml-configured-component/verify.bsh
===================================================================
---
root/cdk/trunk/plugins/maven-cdk-plugin/src/it/xml-configured-component/verify.bsh 2009-12-02
00:49:46 UTC (rev 16031)
+++
root/cdk/trunk/plugins/maven-cdk-plugin/src/it/xml-configured-component/verify.bsh 2009-12-02
01:39:54 UTC (rev 16032)
@@ -14,7 +14,7 @@
File classesDirectory = new File( basedir, "target/classes" );
- String[] classes = {
"org/richfaces/cdk/component/UITestPanel","org/richfaces/cdk/renderkit/html/TestPanelRenderer"
};
+ String[] classes = {
"org/richfaces/cdk/component/UITestPanel","org/richfaces/cdk/component/html/HtmlTestPanel","org/richfaces/cdk/renderkit/html/TestPanelRenderer"
};
for ( String generatedClass : classes )
{
File generatedClassFile = new File( generatedPackage, generatedClass +
".java" );