[richfaces-svn-commits] JBoss Rich Faces SVN: r15938 - in root/ui-sandbox/trunk: components/tables/ui/src/main and 5 other directories.

Author: nbelaevski Date: 2009-11-19 22:19:39 -0500 (Thu, 19 Nov 2009) New Revision: 15938 Added: root/ui-sandbox/trunk/components/tables/ui/src/main/config/faces-config.xml root/ui-sandbox/trunk/components/tables/ui/src/main/old_configs/ root/ui-sandbox/trunk/components/tables/ui/src/main/old_configs/component/ Removed: root/ui-sandbox/trunk/components/tables/ui/src/main/config/component/ root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/faces-config.xml Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ToggleControlRendererBase.java root/ui-sandbox/trunk/components/tables/ui/src/main/templates/org/richfaces/renderkit/html/toggle-control.template.xml root/ui-sandbox/trunk/pom.xml Log: https://jira.jboss.org/jira/browse/RF-7732 - updates for ui-sandbox/tables/* projects Copied: root/ui-sandbox/trunk/components/tables/ui/src/main/config/faces-config.xml (from rev 15927, root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/faces-config.xml) =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/config/faces-config.xml (rev 0) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/config/faces-config.xml 2009-11-20 03:19:39 UTC (rev 15938) @@ -0,0 +1,86 @@ +<?xml version='1.0' encoding='UTF-8'?> +<!-- +JBoss, Home of Professional Open Source +Copyright ${year}, Red Hat, Inc. and individual contributors +by the @authors tag. See the copyright.txt in the distribution for a +full listing of individual contributors. + + +This is free software; you can redistribute it and/or modify it +under the terms of the GNU Lesser General Public License as +published by the Free Software Foundation; either version 2.1 of +the License, or (at your option) any later version. + + +This software is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + + +You should have received a copy of the GNU Lesser General Public +License along with this software; if not, write to the Free +Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +02110-1301 USA, or see the FSF site: http://www.fsf.org. +--> +<faces-config xmlns="http://java.sun.com/xml/ns/javaee" + version="2.0"> + + <component> + <component-type>org.richfaces.DataTable</component-type> + <component-class>org.richfaces.component.html.HtmlDataTable</component-class> + <component-extension> + <cdk:generate xmlns:cdk="http://richfaces.org/cdk/extensions">false</cd... + </component-extension> + </component> + + <component> + <component-type>org.richfaces.ExtendedDataTable</component-type> + <component-class>org.richfaces.component.html.HtmlExtendedDataTable</component-class> + <component-extension> + <cdk:generate xmlns:cdk="http://richfaces.org/cdk/extensions">false</cd... + </component-extension> + </component> + <component> + <component-type>org.richfaces.Column</component-type> + <component-class>org.richfaces.component.html.HtmlColumn</component-class> + <component-extension> + <cdk:generate xmlns:cdk="http://richfaces.org/cdk/extensions">false</cd... + </component-extension> + </component> + <component> + <component-type>org.richfaces.Colgroup</component-type> + <component-class>org.richfaces.component.html.HtmlColumnGroup</component-class> + <component-extension> + <cdk:generate xmlns:cdk="http://richfaces.org/cdk/extensions">false</cd... + </component-extension> + </component> + <component> + <component-type>org.richfaces.SubTable</component-type> + <component-class>org.richfaces.component.html.HtmlSubTable</component-class> + <component-extension> + <cdk:generate xmlns:cdk="http://richfaces.org/cdk/extensions">false</cd... + </component-extension> + </component> + <component> + <component-type>org.richfaces.ToggleControl</component-type> + <component-class>org.richfaces.component.html.HtmlToggleControl</component-class> + <component-extension> + <cdk:generate xmlns:cdk="http://richfaces.org/cdk/extensions">false</cd... + </component-extension> + </component> + + <render-kit> + <render-kit-id>HTML_BASIC</render-kit-id> + <renderer> + <component-family>org.richfaces.DataTable</component-family> + <renderer-type>org.richfaces.DataTableRenderer</renderer-type> + <renderer-class>org.richfaces.renderkit.DataTableRenderer</renderer-class> + </renderer> + <renderer> + <component-family>org.richfaces.Data</component-family> + <renderer-type>org.richfaces.ExtendedDataTableRenderer</renderer-type> + <renderer-class>org.richfaces.renderkit.ExtendedDataTableRenderer</renderer-class> + </renderer> + </render-kit> +</faces-config> \ No newline at end of file Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ToggleControlRendererBase.java =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ToggleControlRendererBase.java 2009-11-20 03:13:24 UTC (rev 15937) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/renderkit/ToggleControlRendererBase.java 2009-11-20 03:19:39 UTC (rev 15938) @@ -34,14 +34,14 @@ private static final String COLLAPSE_STATE = "collapse"; - public void encodeControl(FacesContext context, UIToggleControl toggleControl) throws IOException{ - + protected void encodeControl(FacesContext context, UIComponent component) throws IOException{ + UIToggleControl toggleControl = (UIToggleControl) component; UISubTable subTable = findComponent(context, toggleControl); if(subTable != null) { ResponseWriter writer = context.getResponseWriter(); - String toggleId = toggleControl.getClientId(); - String subTableId = subTable.getClientId(); + String toggleId = toggleControl.getClientId(context); + String subTableId = subTable.getClientId(context); boolean expanded = subTable.getExpanded(); String initialState = expanded ? EXPAND_STATE : COLLAPSE_STATE; Copied: root/ui-sandbox/trunk/components/tables/ui/src/main/old_configs/component (from rev 15927, root/ui-sandbox/trunk/components/tables/ui/src/main/config/component) Deleted: root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/faces-config.xml =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/faces-config.xml 2009-11-20 03:13:24 UTC (rev 15937) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/resources/META-INF/faces-config.xml 2009-11-20 03:19:39 UTC (rev 15938) @@ -1,73 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!-- -JBoss, Home of Professional Open Source -Copyright ${year}, Red Hat, Inc. and individual contributors -by the @authors tag. See the copyright.txt in the distribution for a -full listing of individual contributors. - - -This is free software; you can redistribute it and/or modify it -under the terms of the GNU Lesser General Public License as -published by the Free Software Foundation; either version 2.1 of -the License, or (at your option) any later version. - - -This software is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - - -You should have received a copy of the GNU Lesser General Public -License along with this software; if not, write to the Free -Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -02110-1301 USA, or see the FSF site: http://www.fsf.org. ---> -<faces-config xmlns="http://java.sun.com/xml/ns/javaee" - version="2.0"> - - <component> - <component-type>org.richfaces.DataTable</component-type> - <component-class>org.richfaces.component.html.HtmlDataTable</component-class> - </component> - - <component> - <component-type>org.richfaces.ExtendedDataTable</component-type> - <component-class>org.richfaces.component.html.HtmlExtendedDataTable</component-class> - </component> - <component> - <component-type>org.richfaces.Column</component-type> - <component-class>org.richfaces.component.html.HtmlColumn</component-class> - </component> - <component> - <component-type>org.richfaces.Colgroup</component-type> - <component-class>org.richfaces.component.html.HtmlColumnGroup</component-class> - </component> - <component> - <component-type>org.richfaces.SubTable</component-type> - <component-class>org.richfaces.component.html.HtmlSubTable</component-class> - </component> - <component> - <component-type>org.richfaces.ToggleControl</component-type> - <component-class>org.richfaces.component.html.HtmlToggleControl</component-class> - </component> - - <render-kit> - <render-kit-id>HTML_BASIC</render-kit-id> - <renderer> - <component-family>org.richfaces.DataTable</component-family> - <renderer-type>org.richfaces.DataTableRenderer</renderer-type> - <renderer-class>org.richfaces.renderkit.DataTableRenderer</renderer-class> - </renderer> - <renderer> - <component-family>org.richfaces.Data</component-family> - <renderer-type>org.richfaces.ExtendedDataTableRenderer</renderer-type> - <renderer-class>org.richfaces.renderkit.ExtendedDataTableRenderer</renderer-class> - </renderer> - <renderer> - <component-family>org.richfaces.ToggleControl</component-family> - <renderer-type>org.richfaces.ToggleControlRenderer</renderer-type> - <renderer-class>org.richfaces.renderkit.html.ToggleControlRenderer</renderer-class> - </renderer> - </render-kit> -</faces-config> \ No newline at end of file Modified: root/ui-sandbox/trunk/components/tables/ui/src/main/templates/org/richfaces/renderkit/html/toggle-control.template.xml =================================================================== --- root/ui-sandbox/trunk/components/tables/ui/src/main/templates/org/richfaces/renderkit/html/toggle-control.template.xml 2009-11-20 03:13:24 UTC (rev 15937) +++ root/ui-sandbox/trunk/components/tables/ui/src/main/templates/org/richfaces/renderkit/html/toggle-control.template.xml 2009-11-20 03:19:39 UTC (rev 15938) @@ -1,13 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> + <cdk:root xmlns="http://richfaces.org/xhtml-el" xmlns:cdk="http://richfaces.org/cdk" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - class="org.richfaces.renderkit.html.ToggleControlRenderer" - superclass="org.richfaces.renderkit.ToggleControlRendererBase" - componentclass="org.richfaces.component.UIToggleControl"> - - <span id="#{clientId}" class="#{component.attributes['styleClass']}"> - <cdk:call expression="encodeControl(context, component);" /> - </span> + xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:cc="http://java.sun.com/jsf/composite" + xmlns:javaee="http://java.sun.com/xml/ns/javaee"> + + <cc:interface> + <cdk:class>org.richfaces.renderkit.html.ToggleControlRenderer</cdk:class> + <cdk:superclass>org.richfaces.renderkit.ToggleControlRendererBase</cdk:superclass> + <cdk:component-family>org.richfaces.ToggleControl</cdk:component-family> + <cdk:renderer-type>org.richfaces.ToggleControlRenderer</cdk:renderer-type> + </cc:interface> + + <cc:implementation> + <span id="#{clientId}" class="#{cc.attributes['styleClass']}"> + <cdk:call expression="encodeControl(facesContext, cc);" /> + </span> + </cc:implementation> </cdk:root> \ No newline at end of file Modified: root/ui-sandbox/trunk/pom.xml =================================================================== --- root/ui-sandbox/trunk/pom.xml 2009-11-20 03:13:24 UTC (rev 15937) +++ root/ui-sandbox/trunk/pom.xml 2009-11-20 03:19:39 UTC (rev 15938) @@ -22,6 +22,13 @@ <groupId>org.richfaces.cdk</groupId> <artifactId>maven-cdk-plugin</artifactId> <executions> + <execution> + <id>cdk-generate-sources</id> + <phase>generate-sources</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> <!--execution> <phase>generate-sources</phase> <goals>