December 2010 - richfaces-svn-commits

JBoss Rich Faces SVN: r20517 - trunk/ui/output/ui/src/main/resources/META-INF.

by richfaces-svn-commits＠lists.jboss.org

Author: Alex.Kolonitsky Date: 2010-12-13 03:33:01 -0500 (Mon, 13 Dec 2010) New Revision: 20517 Modified: trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml Log: RF-9880: Toggle panel: attributes height and width ignored Modified: trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml 2010-12-13 07:16:27 UTC (rev 20516) +++ trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml 2010-12-13 08:33:01 UTC (rev 20517) @@ -985,16 +985,6 @@ </property> <property> <description></description> - <property-name>height</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> - <property-name>width</property-name> - <property-class>java.lang.String</property-class> - </property> - <property> - <description></description> <property-name>bypassUpdates</property-name> <property-class>boolean</property-class> </property> @@ -1300,6 +1290,16 @@ </property> <property> <description></description> + <property-name>height</property-name> + <property-class>java.lang.String</property-class> + </property> + <property> + <description></description> + <property-name>width</property-name> + <property-class>java.lang.String</property-class> + </property> + <property> + <description></description> <property-name>itemHeaderClassActive</property-name> <property-class>java.lang.String</property-class> </property>

14 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r20516 - in modules/docs/trunk/Component_Reference: src/main/docbook/en-US and 2 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: SeanRogers Date: 2010-12-13 02:16:27 -0500 (Mon, 13 Dec 2010) New Revision: 20516 Added: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richtree-Basic_usage.js modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richtree-Basic_usage.xml_sample modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richtree-Icon_facets.xml_sample modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richtree-nodeFace_attribute.xml_sample modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richtree-nodeFace_attribute_with_Expression_Language.xml_sample modules/docs/trunk/Component_Reference/src/main/docbook/en-US/images/exam-Component_Reference-richtree-Basic_usage.png modules/docs/trunk/Component_Reference/src/main/docbook/en-US/images/exam-Component_Reference-richtree-nodeFace_attribute.png Modified: modules/docs/trunk/Component_Reference/Component_Reference_chapters.txt modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Trees.xml Log: Draft of rich:tree Modified: modules/docs/trunk/Component_Reference/Component_Reference_chapters.txt =================================================================== --- modules/docs/trunk/Component_Reference/Component_Reference_chapters.txt 2010-12-13 06:12:51 UTC (rev 20515) +++ modules/docs/trunk/Component_Reference/Component_Reference_chapters.txt 2010-12-13 07:16:27 UTC (rev 20516) @@ -47,7 +47,7 @@ -- rich:calendar x- rich:colorPicker xx rich:editor -x- rich:fileUpload +-- rich:fileUpload -- rich:inplaceInput -- rich:inplaceSelect -- rich:inputNumberSlider @@ -94,11 +94,11 @@ xx rich:menuGroup xx rich:menuItem xx rich:menuSeparator -x- rich:panelMenu -x- rich:panelMenuGroup -x- rich:panelMenuItem -xx rich:toolBar -xx rich:toolBarGroup +-- rich:panelMenu +-- rich:panelMenuGroup +-- rich:panelMenuItem +-- rich:toolBar +-- rich:toolBarGroup - chap-Component_Reference-Output_and_messages x- rich:message Modified: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Trees.xml =================================================================== --- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Trees.xml 2010-12-13 06:12:51 UTC (rev 20515) +++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Trees.xml 2010-12-13 07:16:27 UTC (rev 20516) @@ -41,23 +41,275 @@ <section id="sect-Component_Reference-Trees-richtree"> <title><sgmltag><rich:tree></sgmltag></title> <para> - Incomplete + The <sgmltag><rich:tree></sgmltag> component provides a hierarchical tree control. Each <sgmltag><rich:tree></sgmltag> component typically consists of <sgmltag><rich:treeNode></sgmltag> child components. The appearance and behavior of the tree and its nodes can be fully customized. </para> - </section> + + <section id="sect-Component_Reference-richtree-Basic_usage"> + <title>Basic usage</title> + <para> + The <sgmltag><rich:tree></sgmltag> component requires the <varname>value</varname> attribute to point to the data model for populating the tree. The data model must be either an <interfacename>org.richfaces.model.TreeNode</interfacename> interface, an <varname>org.richfaces.model.TreeDataModel</varname> interface, or a <interfacename>javax.swing.tree.TreeNode</interfacename> interface. The <varname>var</varname> attribute declares the variable used for iterating through the data model, so that child <sgmltag><rich:treeNode></sgmltag> components can reference each iteration. + </para> + <para> + In addition to these attributes, the <sgmltag><rich:tree></sgmltag> component needs one or more <sgmltag><rich:treeNode></sgmltag> components to work with the data model. + </para> + <example id="exam-Component_Reference-richtree-Basic_usage"> + <title>Basic usage</title> + <para> + This example demonstrates basic usage of the <sgmltag><rich:tree></sgmltag> component using an <interfacename>org.richfaces.model.TreeNode</interfacename> data model. + </para> + <para> + The data model is constructed as follows: + </para> + <programlisting language="Java" role="JAVA"><xi:include parse="text" href="extras/exam-Component_Reference-richtree-Basic_usage.js" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> + <para> + The tree then accesses the nodes of the model using the <literal>station</literal> variable: + </para> + <programlisting language="XML" role="XML"><xi:include parse="text" href="extras/exam-Component_Reference-richtree-Basic_usage.xml_sample" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> + <mediaobject> + <imageobject> + <imagedata fileref="images/exam-Component_Reference-richtree-Basic_usage.png" format="PNG" /> + </imageobject> + </mediaobject> + </example> + </section> + + <section id="sect-Component_Reference-richtree-Appearance"> + <title>Appearance</title> + <para> + Different nodes in the tree can have different appearances, such as node icons, depending on the type of data the node contains. Use the <varname>nodeFace</varname> attribute to differentiate the types of nodes; the node is then rendered according to the <sgmltag><rich:treeNode></sgmltag> component with the corresponding <varname>type</varname> attribute. <xref linkend="exam-Component_Reference-richtree-Appearance" /> shows a <sgmltag><rich:tree></sgmltag> component with three different child <sgmltag><rich:treeNode></sgmltag> components defined to represent three different node appearances. Refer to <xref linkend="sect-Component_Reference-richtreeNode-Appearance" /> for details on customizing the appearance of <sgmltag><rich:treeNode></sgmltag> components. + </para> + <example id="exam-Component_Reference-richtree-nodeFace_attribute"> + <title><varname>nodeFace</varname> attribute</title> + <programlisting language="XML" role="XML"><xi:include parse="text" href="extras/exam-Component_Reference-richtree-nodeFace_attribute.xml_sample" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> + <mediaobject> + <imageobject> + <imagedata fileref="images/exam-Component_Reference-richtree-nodeFace_attribute.png" format="PNG" /> + </imageobject> + </mediaobject> + </example> + <para> + Alternatively, use Expression Language (<acronym>EL</acronym>) with the <varname>nodeFace</varname> attribute, as shown in <xref linkend="exam-Component_Reference-richtree-nodeFace_attribute_with_Expression_Language" />. + </para> + <example id="exam-Component_Reference-richtree-nodeFace_attribute_with_Expression_Language"> + <title><varname>nodeface</varname> attribute with Expression Language</title> + <programlisting language="XML" role="XML"><xi:include parse="text" href="extras/exam-Component_Reference-richtree-nodeFace_attribute_with_Expression_Language.xml_sample" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> + </example> + <para> + If the <varname>nodeFace</varname> attribute returns null, the node is rendered as a "<emphasis>typeless</emphasis>" node. The <emphasis>typeless</emphasis> node is the first child <sgmltag><rich:treeNode></sgmltag> component with a valid <varname>rendered</varname> attribute, but without a defined <varname>type</varname> attribute. + </para> + <para> + Icons for different nodes and node states can be defined for the whole tree using the following attributes: + </para> + <variablelist> + <varlistentry> + <term><varname>icon</varname></term> + <listitem> + <para> + The <varname>icon</varname> attribute points to the icon to use for any node that contains child nodes. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><varname>iconLeaf</varname></term> + <listitem> + <para> + The <varname>iconLeaf</varname> attribute points to the icon to use for any node that does not contain any child nodes. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><varname>iconExpanded</varname> and <varname>iconCollapsed</varname></term> + <listitem> + <para> + The <varname>iconExpanded</varname> and <varname>iconCollapsed</varname> attributes point to the icons to use for expanded and collapsed nodes respectively. If these attributes are defined, the <varname>icon</varname> attribute is not used. + </para> + </listitem> + </varlistentry> + </variablelist> + <para> + Alternatively, use facets with the same names as the attributes to define the icons, as shown in <xref linkend="exam-Component_Reference-richtree-Icon_facets" />. + </para> + <example id="exam-Component_Reference-richtree-Icon_facets"> + <title>Icon facets</title> + <programlisting language="XML" role="XML"><xi:include parse="text" href="extras/exam-Component_Reference-richtree-Icon_facets.xml_sample" xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting> + </example> + </section> + + <section id="sect-Component_Reference-richtree-Expanding_and_collapsing_tree_nodes"> + <title>Expanding and collapsing tree nodes</title> + <para> + The switching mode for performing submissions is determined by the <varname>switchType</varname> attribute, which can have one of the following three values: + </para> + <variablelist> + <varlistentry> + <term><literal>ajax</literal></term> + <listitem> + <para> + This is the default setting. The <sgmltag><rich:tree></sgmltag> component performs an Ajax form submission, and only the content of the tree is rendered. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><literal>server</literal></term> + <listitem> + <para> + The <sgmltag><rich:tree></sgmltag> component performs a common submission, completely re-rendering the page. + </para> + </listitem> + </varlistentry> + <varlistentry> + <term><literal>client</literal></term> + <listitem> + <para> + The <sgmltag><rich:tree></sgmltag> component updates on the client side, re-rendering itself and any additional components listed with the <varname>render</varname> attribute. + </para> + </listitem> + </varlistentry> + </variablelist> + + <section id="sect-Component_Reference-richtree-Identifying_nodes"> + <title>Identifying nodes</title> + <para> + During requests. + </para> + </section> + </section> + +  +  + + <section id="sect-Component_Reference-richtree-Event_handling"> + <title>Event handling</title> + <para> + In addition to the standard Ajax events and HMTL events, the <sgmltag><rich:tree></sgmltag> component uses the following client-side events: + </para> + <itemizedlist> + <listitem> + <para> + The <varname>onexpand</varname> event is triggered when a node is expanded. + </para> + </listitem> + <listitem> + <para> + The <varname>oncollapse</varname> event is triggered when a node is collapsed. + </para> + </listitem> + <listitem> + <para> + The <varname>ondragstart</varname> event is triggered when an element starts being dragged. + </para> + </listitem> + <listitem> + <para> + The <varname>ondragexit</varname> event is triggered when an element is dragged out of the tree. + </para> + </listitem> + <listitem> + <para> + The <varname>ondragenter</varname> event is triggered when an element is dragged into the tree. + </para> + </listitem> + <listitem> + <para> + The <varname>ondragend</varname> event is triggered when an element is dropped. + </para> + </listitem> + </itemizedlist> + <para> + The <sgmltag><rich:tree></sgmltag> component uses the following server-side listeners: + </para> + <itemizedlist> + <listitem> + <para> + The <varname>changeExpandListener</varname> listener processes expand and collapse events. + </para> + </listitem> + <listitem> + <para> + The <varname>dragListener</varname> listener processes drag events. + </para> + </listitem> + <listitem> + <para> + The <varname>dropListener</varname> listener processes drop events. + </para> + </listitem> + <listitem> + <para> + The <varname>nodeSelectListener</varname> listener processes the request when a node is selected. + </para> + </listitem> + </itemizedlist> + </section> + + <section id="sect-Component_Reference-richtree-Reference_data"> + <title>Reference data</title> + <itemizedlist> + <listitem> + <para> + <parameter>component-type</parameter>: <classname>org.richfaces.tree</classname> + </para> + </listitem> + <listitem> + <para> + <parameter>component-class</parameter>: <classname>org.richfaces.component.html.Htmltree</classname> + </para> + </listitem> + <listitem> + <para> + <parameter>component-family</parameter>: <classname>org.richfaces.tree</classname> + </para> + </listitem> + <listitem> + <para> + <parameter>renderer-type</parameter>: <classname>org.richfaces.treeRenderer</classname> + </para> + </listitem> + <listitem> + <para> + <parameter>tag-class</parameter>: <classname>org.richfaces.taglib.treeTag</classname> + </para> + </listitem> + </itemizedlist> + </section> - <section id="sect-Component_Reference-Trees-richtreeNode"> - <title><sgmltag><rich:treeNode></sgmltag></title> - <para> - Incomplete - </para> + <section id="sect-Component_Reference-Trees-richtreeNode"> + <title><sgmltag><rich:treeNode></sgmltag></title> + <para> + Incomplete + </para> + + <section id="sect-Component_Reference-richtreeNode-Basic_usage"> + <title>Basic usage</title> + <para> + Incomplete + </para> + </section> + + <section id="sect-Component_Reference-richtreeNode-Appearance"> + <title>Appearance</title> + <para> + Use the <varname>rendered</varname> attribute to determine whether the node should actually be rendered in the tree or not. Using the <varname>rendered</varname> attribute in combination with the other <sgmltag><rich:treeNode></sgmltag> attributes + </para> + </section> + </section> </section> - + +  + </chapter> Added: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richtree-Basic_usage.js =================================================================== --- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richtree-Basic_usage.js (rev 0) +++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richtree-Basic_usage.js 2010-12-13 07:16:27 UTC (rev 20516) @@ -0,0 +1,15 @@ +private TreeNodeImpl<String> stationRoot = new TreeNodeImpl<String>(); +private TreeNodeImpl<String> stationNodes = new TreeNodeImpl<String>(); +private String[] kickRadioFeed = { "Hall & Oates - Kiss On My List", + "David Bowie - Let's Dance", + "Lyn Collins - Think (About It)", + "Kim Carnes - Bette Davis Eyes", + "KC & the Sunshine Band - Give It Up" }; + +stationRoot.setData("KickRadio"); +stationNodes.addChild(0, stationRoot); +for (int i = 0; i < kickRadioFeed.length; i++){ + TreeNodeImpl<String> child = new TreeNodeImpl<String>(); + child.setData(kickRadioFeed[i]); + stationRoot.addChild(i, child); +} Added: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richtree-Basic_usage.xml_sample =================================================================== --- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richtree-Basic_usage.xml_sample (rev 0) +++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richtree-Basic_usage.xml_sample 2010-12-13 07:16:27 UTC (rev 20516) @@ -0,0 +1,5 @@ +<rich:tree value="#{stations.stationNodes}" var="station"> + <rich:treeNode> + <h:outputText value="#{station}" /> + </rich:treeNode> +</rich:tree> Added: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richtree-Icon_facets.xml_sample =================================================================== --- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richtree-Icon_facets.xml_sample (rev 0) +++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richtree-Icon_facets.xml_sample 2010-12-13 07:16:27 UTC (rev 20516) @@ -0,0 +1,15 @@ +<rich:tree value="#{library.data}" var="item"> + <f:facet name="icon"> + <h:graphicImage value="/images/tree/singer.png "/> + </f:facet> + <f:facet name="iconCollapsed"> + <h:graphicImage value="/images/tree/singer.png" /> + </f:facet> + <f:facet name="iconExpanded"> + <h:graphicImage value="/images/tree/singer.png" /> + </f:facet> + <f:facet name="iconLeaf"> + <h:graphicImage value="/images/tree/song.png" /> + </f:facet> + ... +</rich:tree> Added: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richtree-nodeFace_attribute.xml_sample =================================================================== --- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richtree-nodeFace_attribute.xml_sample (rev 0) +++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richtree-nodeFace_attribute.xml_sample 2010-12-13 07:16:27 UTC (rev 20516) @@ -0,0 +1,11 @@ +<rich:tree style="width:300px" value="#{library.data}" var="item" nodeFace="#{item.type}"> + <rich:treeNode type="artist" iconLeaf="/images/tree/singer.png" icon="/images/tree/singer.png"> + <h:outputText value="#{item.name}" /> + </rich:treeNode> + <rich:treeNode type="album" iconLeaf="/images/tree/disc.png" icon="/images/tree/disc.png"> + <h:outputText value="#{item.title}" /> + </rich:treeNode> + <rich:treeNode type="song" iconLeaf="/images/tree/song.png" icon="/images/tree/song.png"> + <h:outputText value="#{item.title}" /> + </rich:treeNode> +</rich:tree> Added: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richtree-nodeFace_attribute_with_Expression_Language.xml_sample =================================================================== --- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richtree-nodeFace_attribute_with_Expression_Language.xml_sample (rev 0) +++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richtree-nodeFace_attribute_with_Expression_Language.xml_sample 2010-12-13 07:16:27 UTC (rev 20516) @@ -0,0 +1 @@ +<rich:tree value="#{library.data}" var="item" nodeFace="#{data.name != 'param-value' ? 'artist' : 'album'}"> Added: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/images/exam-Component_Reference-richtree-Basic_usage.png =================================================================== (Binary files differ) Property changes on: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/images/exam-Component_Reference-richtree-Basic_usage.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/images/exam-Component_Reference-richtree-nodeFace_attribute.png =================================================================== (Binary files differ) Property changes on: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/images/exam-Component_Reference-richtree-nodeFace_attribute.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

14 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r20514 - trunk.

by richfaces-svn-commits＠lists.jboss.org

Author: alexsmirnov Date: 2010-12-13 00:14:01 -0500 (Mon, 13 Dec 2010) New Revision: 20514 Modified: trunk/ Log: Initialized merge tracking via "svnmerge" with revisions "1-20023" from https://svn.jboss.org/repos/richfaces/branches/RF-8742-1 Property changes on: trunk ___________________________________________________________________ Name: svnmerge-integrated - /branches/RF-7817:1-19154 /branches/RF-8742:1-19867 /branches/RF-9309:1-19112,19378 + /branches/RF-7817:1-19154 /branches/RF-8742:1-19867 /branches/RF-8742-1:1-20023 /branches/RF-9309:1-19112,19378

14 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r20513 - in trunk: examples/input-demo/src/main/webapp/examples and 5 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: konstantin.mishin Date: 2010-12-10 20:23:52 -0500 (Fri, 10 Dec 2010) New Revision: 20513 Added: trunk/ui/input/api/src/main/java/org/richfaces/model/ trunk/ui/input/api/src/main/java/org/richfaces/model/UploadedFile.java Modified: trunk/examples/input-demo/src/main/java/org/richfaces/demo/FileUploadBean.java trunk/examples/input-demo/src/main/webapp/examples/fileupload.xhtml trunk/ui/input/api/src/main/java/org/richfaces/event/UploadEvent.java trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java trunk/ui/input/ui/src/main/java/org/richfaces/request/FileParam.java trunk/ui/input/ui/src/main/java/org/richfaces/request/MultipartRequest.java trunk/ui/input/ui/src/main/java/org/richfaces/request/Param.java trunk/ui/input/ui/src/main/java/org/richfaces/request/ValueParam.java Log: RF-9972 Modified: trunk/examples/input-demo/src/main/java/org/richfaces/demo/FileUploadBean.java =================================================================== --- trunk/examples/input-demo/src/main/java/org/richfaces/demo/FileUploadBean.java 2010-12-10 20:35:57 UTC (rev 20512) +++ trunk/examples/input-demo/src/main/java/org/richfaces/demo/FileUploadBean.java 2010-12-11 01:23:52 UTC (rev 20513) @@ -28,7 +28,7 @@ import javax.faces.event.AjaxBehaviorEvent; import org.richfaces.event.UploadEvent; -import org.richfaces.model.UploadItem; +import org.richfaces.model.UploadedFile; /** * @author Konstantin Mishin @@ -41,10 +41,10 @@ private String acceptedTypes; private boolean enabled = true; private boolean noDuplicate = false; - private UploadItem item; + private UploadedFile file; - public UploadItem getItem() { - return item; + public UploadedFile getFile() { + return file; } // public void paint(OutputStream stream, Object object) throws IOException { @@ -52,7 +52,7 @@ // } public void listener(UploadEvent event) throws Exception { - item = event.getUploadItem(); + file = event.getUploadedFile(); } public void setEnabled(boolean enabled) { Modified: trunk/examples/input-demo/src/main/webapp/examples/fileupload.xhtml =================================================================== --- trunk/examples/input-demo/src/main/webapp/examples/fileupload.xhtml 2010-12-10 20:35:57 UTC (rev 20512) +++ trunk/examples/input-demo/src/main/webapp/examples/fileupload.xhtml 2010-12-11 01:23:52 UTC (rev 20513) @@ -69,7 +69,7 @@ fileUploadListener="#{fileUploadBean.listener}" noDuplicate="#{fileUploadBean.noDuplicate}" onfilesubmit="onfilesubmit(event)" onuploadcomplete="onuploadcomplete(event)"/> <h:outputText value="File name:" /> - <a4j:outputPanel ajaxRendered="true">#{fileUploadBean.item.fileName}</a4j:outputPanel> + <a4j:outputPanel ajaxRendered="true">#{fileUploadBean.file.name}</a4j:outputPanel> <br /> <h:outputText value="Attribute name: "/> <h:inputText id="name"/> Modified: trunk/ui/input/api/src/main/java/org/richfaces/event/UploadEvent.java =================================================================== --- trunk/ui/input/api/src/main/java/org/richfaces/event/UploadEvent.java 2010-12-10 20:35:57 UTC (rev 20512) +++ trunk/ui/input/api/src/main/java/org/richfaces/event/UploadEvent.java 2010-12-11 01:23:52 UTC (rev 20513) @@ -1,22 +1,23 @@ -/** - * License Agreement. +/* + * 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. * - * JBoss RichFaces - Ajax4jsf Component Library + * 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. * - * Copyright (C) 2007 Exadel, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, + * 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 + * 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 library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * 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. */ package org.richfaces.event; @@ -24,16 +25,20 @@ import javax.faces.event.FacesEvent; import javax.faces.event.FacesListener; -import org.richfaces.model.UploadItem; +import org.richfaces.model.UploadedFile; +/** + * @author Konstantin Mishin + * + */ public class UploadEvent extends FacesEvent { private static final long serialVersionUID = -7645197191376210068L; - private UploadItem uploadItem = null; + private UploadedFile uploadedFile = null; - public UploadEvent(UIComponent component, UploadItem uploadItem) { + public UploadEvent(UIComponent component, UploadedFile uploadedFile) { super(component); - this.uploadItem = uploadItem; + this.uploadedFile = uploadedFile; } public boolean isAppropriateListener(FacesListener listener) { @@ -44,12 +49,7 @@ ((FileUploadListener) listener).processUpload(this); } - /** - * Returns UploadItem instance. Returns first element of list of UploadItems in case of multiple upload. - * - * @return the uploadItem - */ - public UploadItem getUploadItem() { - return uploadItem; + public UploadedFile getUploadedFile() { + return uploadedFile; } } Added: trunk/ui/input/api/src/main/java/org/richfaces/model/UploadedFile.java =================================================================== --- trunk/ui/input/api/src/main/java/org/richfaces/model/UploadedFile.java (rev 0) +++ trunk/ui/input/api/src/main/java/org/richfaces/model/UploadedFile.java 2010-12-11 01:23:52 UTC (rev 20513) @@ -0,0 +1,36 @@ +/* + * 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. + */ +package org.richfaces.model; + +import java.io.InputStream; + +/** + * @author Konstantin Mishin + * + */ +public interface UploadedFile { + String getContentType(); + byte[] getData(); + InputStream getInputStream(); + String getName(); + long getSize(); +} Modified: trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java =================================================================== --- trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java 2010-12-10 20:35:57 UTC (rev 20512) +++ trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/FileUploadRendererBase.java 2010-12-11 01:23:52 UTC (rev 20513) @@ -26,7 +26,7 @@ import javax.faces.context.FacesContext; import org.richfaces.event.UploadEvent; -import org.richfaces.model.UploadItem; +import org.richfaces.model.UploadedFile; import org.richfaces.request.MultipartRequest; /** @@ -40,9 +40,9 @@ ExternalContext externalContext = context.getExternalContext(); Object request = externalContext.getRequest(); if (request instanceof MultipartRequest) { - UploadItem uploadItem = ((MultipartRequest) request).getUploadItem(component.getClientId(context)); - if (uploadItem != null) { - component.queueEvent(new UploadEvent(component, uploadItem)); + UploadedFile file = ((MultipartRequest) request).getUploadedFile(component.getClientId(context)); + if (file != null) { + component.queueEvent(new UploadEvent(component, file)); } } } Modified: trunk/ui/input/ui/src/main/java/org/richfaces/request/FileParam.java =================================================================== --- trunk/ui/input/ui/src/main/java/org/richfaces/request/FileParam.java 2010-12-10 20:35:57 UTC (rev 20512) +++ trunk/ui/input/ui/src/main/java/org/richfaces/request/FileParam.java 2010-12-11 01:23:52 UTC (rev 20513) @@ -29,123 +29,98 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import org.richfaces.exception.FileUploadException; import org.richfaces.log.Logger; import org.richfaces.log.RichfacesLogger; +import org.richfaces.model.UploadedFile; -class FileParam extends Param { +/** + * @author Konstantin Mishin + * + */ +class FileParam implements Param, UploadedFile { private static final Logger LOGGER = RichfacesLogger.APPLICATION.getLogger(); - private String filename; + private String name; private String contentType; - private int fileSize; - - private ByteArrayOutputStream bOut = null; - private FileOutputStream fOut = null; - private File tempFile = null; - - public FileParam(String name) { - super(name); - } - - public Object getFile() { - if (null != tempFile) { - return tempFile; - } else if (null != bOut) { - return bOut.toByteArray(); + private OutputStream outputStream; + private File file; + private byte[] data; + + public FileParam(String name, String contentType, boolean createTempFiles, String tempFilesDirectory) { + if (createTempFiles) { + try { + File dir = null; + if (tempFilesDirectory != null) { + dir = new File(tempFilesDirectory); + } + file = File.createTempFile("richfaces_uploaded_file_", null, dir); + file.deleteOnExit(); + outputStream = new FileOutputStream(file); + } catch (IOException ex) { + if (outputStream != null) { + try { + outputStream.close(); + } catch (IOException e) { + LOGGER.error(e.getMessage(), e); + } + } + throw new FileUploadException("Could not create temporary file"); + } + } else { + outputStream = new ByteArrayOutputStream(); } - return null; + this.name = name; + this.contentType = contentType; } - public String getFilename() { - return filename; + public String getName() { + return name; } - public void setFilename(String filename) { - this.filename = filename; - } - public String getContentType() { return contentType; } - public void setContentType(String contentType) { - this.contentType = contentType; - } - - public int getFileSize() { - return fileSize; - } - - public File createTempFile(String tempFilesDirectory) { - try { - File dir = null; - if (tempFilesDirectory != null) { - dir = new File(tempFilesDirectory); - } - tempFile = File.createTempFile("richfaces_uploaded_file_", null, dir); - tempFile.deleteOnExit(); - fOut = new FileOutputStream(tempFile); - } catch (IOException ex) { - if (fOut != null) { - try { - fOut.close(); - } catch (IOException e) { - LOGGER.error(e.getMessage(), e); - } - } - - throw new FileUploadException("Could not create temporary file"); + public long getSize() { + long size = -1; + if (data != null) { + size = data.length; + } else { + size = file.length(); } - return tempFile; + return size; } - public void deleteFile() { - try { - if (fOut != null) { - fOut.close(); - } - if (tempFile != null) { - tempFile.delete(); - } - } catch (Exception e) { - throw new FileUploadException("Could not delete temporary file"); - } - } - public byte[] getData() { - if (bOut != null) { - return bOut.toByteArray(); - } else if (tempFile != null) { - if (tempFile.exists()) { - FileInputStream fIn = null; + byte[] result = null; + if (data != null) { + result = data; + } else { + long fileLength = file.length(); + if (fileLength > Integer.MAX_VALUE) { + throw new IllegalArgumentException("File content is too long to be allocated as byte[]"); + } else { + FileInputStream inputStream = null; try { - long fileLength = tempFile.length(); - if (fileLength > Integer.MAX_VALUE) { - throw new IllegalArgumentException("File content is too long to be allocated as byte[]"); - } - - fIn = new FileInputStream(tempFile); - + inputStream = new FileInputStream(file); byte[] fileData = new byte[(int) fileLength]; int totalRead = 0; - int read = 0; + int read; do { - read = fIn.read(fileData, totalRead, fileData.length - totalRead); - if (read > 0) { - totalRead += read; - } + read = inputStream.read(fileData, totalRead, fileData.length - totalRead); + totalRead += read; } while (read > 0); - - return fileData; - } catch (IOException ex) { /* too bad? */ + result = fileData; + } catch (IOException ex) { LOGGER.error(ex.getMessage(), ex); } finally { - if (fIn != null) { + if (inputStream != null) { try { - fIn.close(); + inputStream.close(); } catch (IOException e) { LOGGER.error(e.getMessage(), e); } @@ -153,54 +128,46 @@ } } } - - return null; + return result; } public InputStream getInputStream() { - if (bOut != null) { - return new ByteArrayInputStream(bOut.toByteArray()); - } else if (tempFile != null) { + InputStream stream = null; + if (data != null) { + stream = new ByteArrayInputStream(data); + } else { try { - return new FileInputStream(tempFile) { - @Override - public void close() throws IOException { - super.close(); - tempFile.delete(); - } - }; + stream = new FileInputStream(file); } catch (FileNotFoundException ex) { LOGGER.error(ex.getMessage(), ex); } } - - return null; + return stream; } - @Override public void complete() throws IOException { - if (fOut != null) { + if (outputStream instanceof ByteArrayOutputStream) { + data = ((ByteArrayOutputStream) outputStream).toByteArray(); + } else { try { - fOut.close(); + outputStream.close(); } catch (IOException ex) { LOGGER.error(ex.getMessage(), ex); } - fOut = null; } + outputStream = null; } - public void handle(byte[] bytes, int length) throws IOException { - // read += length; - if (fOut != null) { - fOut.write(bytes, 0, length); - fOut.flush(); + public void clear() { + if (data != null) { + data = null; } else { - if (bOut == null) { - bOut = new ByteArrayOutputStream(); - } - bOut.write(bytes, 0, length); + file.delete(); } + } - fileSize += length; + public void handle(byte[] bytes, int length) throws IOException { + outputStream.write(bytes, 0, length); + outputStream.flush(); } } \ No newline at end of file Modified: trunk/ui/input/ui/src/main/java/org/richfaces/request/MultipartRequest.java =================================================================== --- trunk/ui/input/ui/src/main/java/org/richfaces/request/MultipartRequest.java 2010-12-10 20:35:57 UTC (rev 20512) +++ trunk/ui/input/ui/src/main/java/org/richfaces/request/MultipartRequest.java 2010-12-11 01:23:52 UTC (rev 20513) @@ -46,7 +46,7 @@ import org.richfaces.exception.FileUploadException; import org.richfaces.log.Logger; import org.richfaces.log.RichfacesLogger; -import org.richfaces.model.UploadItem; +import org.richfaces.model.UploadedFile; import org.richfaces.request.ByteSequenceMatcher.BytesHandler; public class MultipartRequest extends HttpServletRequestWrapper { @@ -196,7 +196,7 @@ while (it.hasNext()) { Param p = it.next(); if (p instanceof FileParam) { - ((FileParam) p).deleteFile(); + ((FileParam) p).clear(); } } } @@ -222,20 +222,14 @@ String paramName = headers.get(PARAM_NAME); if (paramName != null) { if (headers.containsKey(PARAM_FILENAME)) { - FileParam fp = new FileParam(paramName); + param = new FileParam(decodeFileName(headers.get(PARAM_FILENAME)), headers.get(PARAM_CONTENT_TYPE), + createTempFiles, tempFilesDirectory); this.keys.add(paramName); - - if (createTempFiles) { - fp.createTempFile(tempFilesDirectory); - } - fp.setContentType(headers.get(PARAM_CONTENT_TYPE)); - fp.setFilename(decodeFileName(headers.get(PARAM_FILENAME))); - param = fp; } else { if (parameters.containsKey(paramName)) { param = parameters.get(paramName); } else { - param = new ValueParam(paramName, encoding); + param = new ValueParam(encoding); } } @@ -586,12 +580,10 @@ return params; } - public UploadItem getUploadItem(String name) { + public UploadedFile getUploadedFile(String name) { Param param = getParam(name); - if (param instanceof FileParam) { - FileParam fileParam = (FileParam) param; - return new UploadItem(fileParam.getFilename(), fileParam.getFileSize(), fileParam.getContentType(), - fileParam.getFile()); + if (param instanceof UploadedFile) { + return (UploadedFile) param; } else { return null; } Modified: trunk/ui/input/ui/src/main/java/org/richfaces/request/Param.java =================================================================== --- trunk/ui/input/ui/src/main/java/org/richfaces/request/Param.java 2010-12-10 20:35:57 UTC (rev 20512) +++ trunk/ui/input/ui/src/main/java/org/richfaces/request/Param.java 2010-12-11 01:23:52 UTC (rev 20513) @@ -25,16 +25,10 @@ import org.richfaces.request.ByteSequenceMatcher.BytesHandler; -abstract class Param implements BytesHandler { - private String name; - - public Param(String name) { - this.name = name; - } - - public String getName() { - return name; - } - - public abstract void complete() throws IOException; +/** + * @author Konstantin Mishin + * + */ +interface Param extends BytesHandler { + void complete() throws IOException; } \ No newline at end of file Modified: trunk/ui/input/ui/src/main/java/org/richfaces/request/ValueParam.java =================================================================== --- trunk/ui/input/ui/src/main/java/org/richfaces/request/ValueParam.java 2010-12-10 20:35:57 UTC (rev 20512) +++ trunk/ui/input/ui/src/main/java/org/richfaces/request/ValueParam.java 2010-12-11 01:23:52 UTC (rev 20513) @@ -26,14 +26,13 @@ import java.util.ArrayList; import java.util.List; -class ValueParam extends Param { +class ValueParam implements Param { private Object value = null; private ByteArrayOutputStream buf = new ByteArrayOutputStream(); private String encoding; - public ValueParam(String name, String encoding) { - super(name); + public ValueParam(String encoding) { this.encoding = encoding; } @@ -60,7 +59,6 @@ } public void handle(byte[] bytes, int length) throws IOException { - // read += length; buf.write(bytes, 0, length); } } \ No newline at end of file

14 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r20512 - in trunk: examples/output-demo/src/main/webapp/examples/accordion and 4 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2010-12-10 15:35:57 -0500 (Fri, 10 Dec 2010) New Revision: 20512 Added: trunk/ui/output/ui/src/main/java/org/richfaces/component/package-info.java Modified: trunk/examples/output-demo/src/main/webapp/examples/accordion.xhtml trunk/examples/output-demo/src/main/webapp/examples/accordion/RF-9364.xhtml trunk/examples/output-demo/src/main/webapp/examples/accordion/RF-9851.xhtml trunk/examples/output-demo/src/main/webapp/examples/collapsiblePanel.xhtml trunk/examples/output-demo/src/main/webapp/examples/panelMenu.xhtml trunk/examples/output-demo/src/main/webapp/examples/tabPanel.xhtml trunk/examples/output-demo/src/main/webapp/examples/togglePanel-ajax.xhtml trunk/examples/output-demo/src/main/webapp/examples/togglePanel-client.xhtml trunk/examples/output-demo/src/main/webapp/examples/togglePanel-mixed.xhtml trunk/examples/output-demo/src/main/webapp/examples/togglePanel-server.xhtml trunk/examples/output-demo/src/main/webapp/examples/togglePanel.xhtml trunk/examples/output-demo/src/main/webapp/examples/tooltip.xhtml trunk/examples/output-demo/src/main/webapp/qunit/accordion.xhtml trunk/examples/output-demo/src/main/webapp/qunit/accordionHeaders.xhtml trunk/examples/output-demo/src/main/webapp/qunit/collapsiblePanel.xhtml trunk/examples/output-demo/src/main/webapp/qunit/panelMenu.xhtml trunk/examples/output-demo/src/main/webapp/qunit/tab.xhtml trunk/examples/output-demo/src/main/webapp/qunit/tabPanel.xhtml trunk/examples/output-demo/src/main/webapp/qunit/togglePanel.xhtml trunk/examples/output-demo/src/main/webapp/qunit/togglePanelItem.xhtml trunk/examples/output-demo/src/main/webapp/qunit/tooltip.xhtml trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance.xhtml trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu.xhtml trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuGroup-expanded.xhtml trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuGroup-topGroup.xhtml trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuGroup.xhtml trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuItem.xhtml trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/tooltip.xhtml Log: https://issues.jboss.org/browse/RF-9918 Modified: trunk/examples/output-demo/src/main/webapp/examples/accordion/RF-9364.xhtml =================================================================== --- trunk/examples/output-demo/src/main/webapp/examples/accordion/RF-9364.xhtml 2010-12-10 19:12:15 UTC (rev 20511) +++ trunk/examples/output-demo/src/main/webapp/examples/accordion/RF-9364.xhtml 2010-12-10 20:35:57 UTC (rev 20512) @@ -3,7 +3,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:pn="http://richfaces.org/output"> + xmlns:pn="http://richfaces.org/pn"> <body> <ui:composition template="/templates/template.xhtml"> Modified: trunk/examples/output-demo/src/main/webapp/examples/accordion/RF-9851.xhtml =================================================================== --- trunk/examples/output-demo/src/main/webapp/examples/accordion/RF-9851.xhtml 2010-12-10 19:12:15 UTC (rev 20511) +++ trunk/examples/output-demo/src/main/webapp/examples/accordion/RF-9851.xhtml 2010-12-10 20:35:57 UTC (rev 20512) @@ -3,7 +3,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:pn="http://richfaces.org/output"> + xmlns:pn="http://richfaces.org/pn"> <body> <ui:composition template="/templates/template.xhtml"> Modified: trunk/examples/output-demo/src/main/webapp/examples/accordion.xhtml =================================================================== --- trunk/examples/output-demo/src/main/webapp/examples/accordion.xhtml 2010-12-10 19:12:15 UTC (rev 20511) +++ trunk/examples/output-demo/src/main/webapp/examples/accordion.xhtml 2010-12-10 20:35:57 UTC (rev 20512) @@ -3,7 +3,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:pn="http://richfaces.org/output"> + xmlns:pn="http://richfaces.org/pn"> <body> <ui:composition template="/templates/template.xhtml"> Modified: trunk/examples/output-demo/src/main/webapp/examples/collapsiblePanel.xhtml =================================================================== --- trunk/examples/output-demo/src/main/webapp/examples/collapsiblePanel.xhtml 2010-12-10 19:12:15 UTC (rev 20511) +++ trunk/examples/output-demo/src/main/webapp/examples/collapsiblePanel.xhtml 2010-12-10 20:35:57 UTC (rev 20512) @@ -3,7 +3,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:pn="http://richfaces.org/output"> + xmlns:pn="http://richfaces.org/pn"> <body> <ui:composition template="/templates/template.xhtml"> Modified: trunk/examples/output-demo/src/main/webapp/examples/panelMenu.xhtml =================================================================== --- trunk/examples/output-demo/src/main/webapp/examples/panelMenu.xhtml 2010-12-10 19:12:15 UTC (rev 20511) +++ trunk/examples/output-demo/src/main/webapp/examples/panelMenu.xhtml 2010-12-10 20:35:57 UTC (rev 20512) @@ -26,7 +26,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:pn="http://richfaces.org/output"> + xmlns:pn="http://richfaces.org/pn"> <body> <ui:composition template="/templates/template.xhtml"> Modified: trunk/examples/output-demo/src/main/webapp/examples/tabPanel.xhtml =================================================================== --- trunk/examples/output-demo/src/main/webapp/examples/tabPanel.xhtml 2010-12-10 19:12:15 UTC (rev 20511) +++ trunk/examples/output-demo/src/main/webapp/examples/tabPanel.xhtml 2010-12-10 20:35:57 UTC (rev 20512) @@ -3,7 +3,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:pn="http://richfaces.org/output"> + xmlns:pn="http://richfaces.org/pn"> <body> <ui:composition template="/templates/template.xhtml"> Modified: trunk/examples/output-demo/src/main/webapp/examples/togglePanel-ajax.xhtml =================================================================== --- trunk/examples/output-demo/src/main/webapp/examples/togglePanel-ajax.xhtml 2010-12-10 19:12:15 UTC (rev 20511) +++ trunk/examples/output-demo/src/main/webapp/examples/togglePanel-ajax.xhtml 2010-12-10 20:35:57 UTC (rev 20512) @@ -3,7 +3,8 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:pn="http://richfaces.org/output"> + xmlns:pn="http://richfaces.org/pn" + xmlns:ou="http://richfaces.org/output"> <body> <ui:composition template="/templates/template.xhtml"> @@ -22,38 +23,38 @@ </pn:togglePanel> <h:outputLink> - <pn:toggleControl targetPanel="panel" targetItem="name1" event="click" /> + <ou:toggleControl targetPanel="panel" targetItem="name1" event="click" /> name1 </h:outputLink> | <h:outputLink> - <pn:toggleControl targetPanel="panel" targetItem="name2" event="click" /> + <ou:toggleControl targetPanel="panel" targetItem="name2" event="click" /> name2 </h:outputLink> | <h:outputLink> - <pn:toggleControl targetPanel="panel" targetItem="name3" event="click" /> + <ou:toggleControl targetPanel="panel" targetItem="name3" event="click" /> name3 </h:outputLink> <br/> <h:outputLink> - <pn:toggleControl targetPanel="panel" targetItem="@first" event="click"/> + <ou:toggleControl targetPanel="panel" targetItem="@first" event="click"/> |< first </h:outputLink> | <h:outputLink> - <pn:toggleControl targetPanel="panel" targetItem="@prev" event="click"/> + <ou:toggleControl targetPanel="panel" targetItem="@prev" event="click"/> <- prev </h:outputLink> | <h:outputLink> - <pn:toggleControl targetPanel="panel" targetItem="@next" event="click"/> + <ou:toggleControl targetPanel="panel" targetItem="@next" event="click"/> next -> </h:outputLink> | <h:outputLink> - <pn:toggleControl targetPanel="panel" targetItem="@last" event="click"/> + <ou:toggleControl targetPanel="panel" targetItem="@last" event="click"/> last >| </h:outputLink> </h:form> Modified: trunk/examples/output-demo/src/main/webapp/examples/togglePanel-client.xhtml =================================================================== --- trunk/examples/output-demo/src/main/webapp/examples/togglePanel-client.xhtml 2010-12-10 19:12:15 UTC (rev 20511) +++ trunk/examples/output-demo/src/main/webapp/examples/togglePanel-client.xhtml 2010-12-10 20:35:57 UTC (rev 20512) @@ -3,7 +3,8 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:pn="http://richfaces.org/output"> + xmlns:pn="http://richfaces.org/pn" + xmlns:ou="http://richfaces.org/output"> <body> <ui:composition template="/templates/template.xhtml"> @@ -20,38 +21,38 @@ </pn:togglePanel> <h:outputLink> - <pn:toggleControl targetPanel="panel" targetItem="name1" event="click" /> + <ou:toggleControl targetPanel="panel" targetItem="name1" event="click" /> name1 </h:outputLink> | <h:outputLink> - <pn:toggleControl targetPanel="panel" targetItem="name2" event="click" /> + <ou:toggleControl targetPanel="panel" targetItem="name2" event="click" /> name2 </h:outputLink> | <h:outputLink> - <pn:toggleControl targetPanel="panel" targetItem="name3" event="click" /> + <ou:toggleControl targetPanel="panel" targetItem="name3" event="click" /> name3 </h:outputLink> <br /> <h:outputLink> - <pn:toggleControl targetPanel="panel" targetItem="@first" event="click" /> + <ou:toggleControl targetPanel="panel" targetItem="@first" event="click" /> |< first </h:outputLink> | <h:outputLink> - <pn:toggleControl targetPanel="panel" targetItem="@prev" event="click" /> + <ou:toggleControl targetPanel="panel" targetItem="@prev" event="click" /> <- prev </h:outputLink> | <h:outputLink> - <pn:toggleControl targetPanel="panel" targetItem="@next" event="click" /> + <ou:toggleControl targetPanel="panel" targetItem="@next" event="click" /> next -> </h:outputLink> | <h:outputLink> - <pn:toggleControl targetPanel="panel" targetItem="@last" event="click" /> + <ou:toggleControl targetPanel="panel" targetItem="@last" event="click" /> last >| </h:outputLink> </h:form> Modified: trunk/examples/output-demo/src/main/webapp/examples/togglePanel-mixed.xhtml =================================================================== --- trunk/examples/output-demo/src/main/webapp/examples/togglePanel-mixed.xhtml 2010-12-10 19:12:15 UTC (rev 20511) +++ trunk/examples/output-demo/src/main/webapp/examples/togglePanel-mixed.xhtml 2010-12-10 20:35:57 UTC (rev 20512) @@ -3,7 +3,8 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:pn="http://richfaces.org/output"> + xmlns:pn="http://richfaces.org/pn" + xmlns:ou="http://richfaces.org/output"> <body> <ui:composition template="/templates/template.xhtml"> @@ -20,38 +21,38 @@ </pn:togglePanel> <h:outputLink> - <pn:toggleControl targetPanel="panel" targetItem="name1" event="click" /> + <ou:toggleControl targetPanel="panel" targetItem="name1" event="click" /> name1 client </h:outputLink> | <h:outputLink> - <pn:toggleControl targetPanel="panel" targetItem="name2" event="click" /> + <ou:toggleControl targetPanel="panel" targetItem="name2" event="click" /> name2 ajax </h:outputLink> | <h:outputLink> - <pn:toggleControl targetPanel="panel" targetItem="name3" event="click" /> + <ou:toggleControl targetPanel="panel" targetItem="name3" event="click" /> name3 server </h:outputLink> <br /> <h:outputLink> - <pn:toggleControl targetPanel="panel" targetItem="@first" event="click" /> + <ou:toggleControl targetPanel="panel" targetItem="@first" event="click" /> |< first </h:outputLink> | <h:outputLink> - <pn:toggleControl targetPanel="panel" targetItem="@prev" event="click" /> + <ou:toggleControl targetPanel="panel" targetItem="@prev" event="click" /> <- prev </h:outputLink> | <h:outputLink> - <pn:toggleControl targetPanel="panel" targetItem="@next" event="click" /> + <ou:toggleControl targetPanel="panel" targetItem="@next" event="click" /> next -> </h:outputLink> | <h:outputLink> - <pn:toggleControl targetPanel="panel" targetItem="@last" event="click" /> + <ou:toggleControl targetPanel="panel" targetItem="@last" event="click" /> last >| </h:outputLink> </h:form> Modified: trunk/examples/output-demo/src/main/webapp/examples/togglePanel-server.xhtml =================================================================== --- trunk/examples/output-demo/src/main/webapp/examples/togglePanel-server.xhtml 2010-12-10 19:12:15 UTC (rev 20511) +++ trunk/examples/output-demo/src/main/webapp/examples/togglePanel-server.xhtml 2010-12-10 20:35:57 UTC (rev 20512) @@ -3,7 +3,8 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:pn="http://richfaces.org/output"> + xmlns:pn="http://richfaces.org/pn" + xmlns:ou="http://richfaces.org/output"> <body> <ui:composition template="/templates/template.xhtml"> @@ -21,38 +22,38 @@ </pn:togglePanel> <h:outputLink> - <pn:toggleControl targetPanel="panel" targetItem="name1" event="click" /> + <ou:toggleControl targetPanel="panel" targetItem="name1" event="click" /> name1 </h:outputLink> | <h:outputLink> - <pn:toggleControl targetPanel="panel" targetItem="name2" event="click" /> + <ou:toggleControl targetPanel="panel" targetItem="name2" event="click" /> name2 </h:outputLink> | <h:outputLink> - <pn:toggleControl targetPanel="panel" targetItem="name3" event="click" /> + <ou:toggleControl targetPanel="panel" targetItem="name3" event="click" /> name3 </h:outputLink> <br/> <h:outputLink> - <pn:toggleControl targetPanel="panel" targetItem="@first" event="click"/> + <ou:toggleControl targetPanel="panel" targetItem="@first" event="click"/> |< first </h:outputLink> | <h:outputLink> - <pn:toggleControl targetPanel="panel" targetItem="@prev" event="click"/> + <ou:toggleControl targetPanel="panel" targetItem="@prev" event="click"/> <- prev </h:outputLink> | <h:outputLink> - <pn:toggleControl targetPanel="panel" targetItem="@next" event="click"/> + <ou:toggleControl targetPanel="panel" targetItem="@next" event="click"/> next -> </h:outputLink> | <h:outputLink> - <pn:toggleControl targetPanel="panel" targetItem="@last" event="click"/> + <ou:toggleControl targetPanel="panel" targetItem="@last" event="click"/> last >| </h:outputLink> </h:form> Modified: trunk/examples/output-demo/src/main/webapp/examples/togglePanel.xhtml =================================================================== --- trunk/examples/output-demo/src/main/webapp/examples/togglePanel.xhtml 2010-12-10 19:12:15 UTC (rev 20511) +++ trunk/examples/output-demo/src/main/webapp/examples/togglePanel.xhtml 2010-12-10 20:35:57 UTC (rev 20512) @@ -3,7 +3,8 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:pn="http://richfaces.org/output"> + xmlns:pn="http://richfaces.org/pn" + xmlns:ou="http://richfaces.org/output"> <body> <ui:composition template="/templates/template.xhtml"> @@ -23,12 +24,12 @@ </pn:togglePanel> <h:outputLink> - <pn:toggleControl targetPanel="my_id" targetItem="name2" event="click" /> + <ou:toggleControl targetPanel="my_id" targetItem="name2" event="click" /> Click me :) it is toggle control </h:outputLink> <h:outputLink> - <pn:toggleControl targetPanel="my_id" targetItem="name1" event="click" /> + <ou:toggleControl targetPanel="my_id" targetItem="name1" event="click" /> Click me :) it another toggle control </h:outputLink> Modified: trunk/examples/output-demo/src/main/webapp/examples/tooltip.xhtml =================================================================== --- trunk/examples/output-demo/src/main/webapp/examples/tooltip.xhtml 2010-12-10 19:12:15 UTC (rev 20511) +++ trunk/examples/output-demo/src/main/webapp/examples/tooltip.xhtml 2010-12-10 20:35:57 UTC (rev 20512) @@ -26,6 +26,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:pn="http://richfaces.org/pn" xmlns:rich="http://richfaces.org/output"> <body> @@ -43,29 +44,29 @@ <rich:panel id="sample1" styleClass="tooltip-text" bodyClass="rich-laguna-panel-no-header"> <p>Here you can see <b>default client-side</b> tool-tip</p> - <rich:tooltip id="tt1" styleClass="tooltip"> + <pn:tooltip id="tt1" styleClass="tooltip"> <span style="white-space: nowrap"> This tool-tip content was <strong>pre-rendered</strong> to the page.<br /> Also the tooltip following mouse by default </span> - </rich:tooltip> + </pn:tooltip> </rich:panel> <rich:panel id="sample2" styleClass="tooltip" bodyClass="rich-laguna-panel-no-header"> <p>This tool-tip will not <b>follow mouse</b>. Also this tool-tip has a <b>delay 1.5 sec</b>, so be patient!</p> - <rich:tooltip followMouse="false" showDelay="1500" + <pn:tooltip followMouse="false" showDelay="1500" styleClass="tooltip-custom-body"> <span style="white-space: nowrap"> This tool-tip content also <strong>pre-rendered</strong> to the page.<br /> </span> - </rich:tooltip> + </pn:tooltip> </rich:panel> <h:form> <rich:panel id="sample3" styleClass="tooltip-text" bodyClass="rich-laguna-panel-no-header"> <p>This tool-tip rendered on server <b>in separate request</b>. </p> - <rich:tooltip mode="ajax" styleClass="tooltip" layout="block"> + <pn:tooltip mode="ajax" styleClass="tooltip" layout="block"> <f:facet name="defaultContent"> <strong>Wait...</strong> </f:facet> @@ -75,14 +76,14 @@ <h:outputText style="white-space:nowrap" value="tooltips requested" /> </h:panelGrid> - </rich:tooltip> + </pn:tooltip> </rich:panel> </h:form> <h:form> <rich:panel id="sample4" styleClass="tooltip-text" bodyClass="rich-laguna-panel-no-header"> <p>This tool-tip will be <b>activated on mouse click</b>.</p> - <rich:tooltip showEvent="click" mode="ajax" styleClass="tooltip" + <pn:tooltip showEvent="click" mode="ajax" styleClass="tooltip" layout="block"> <f:facet name="defaultContent"> <strong>Wait...</strong> @@ -96,7 +97,7 @@ <h:outputText value="#{tooltipData.tooltipCounter}" styleClass="tooltipData" /> </h:panelGrid> - </rich:tooltip> + </pn:tooltip> </rich:panel> </h:form> </h:panelGrid> Modified: trunk/examples/output-demo/src/main/webapp/qunit/accordion.xhtml =================================================================== --- trunk/examples/output-demo/src/main/webapp/qunit/accordion.xhtml 2010-12-10 19:12:15 UTC (rev 20511) +++ trunk/examples/output-demo/src/main/webapp/qunit/accordion.xhtml 2010-12-10 20:35:57 UTC (rev 20512) @@ -3,7 +3,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:pn="http://richfaces.org/output"> + xmlns:pn="http://richfaces.org/pn"> <body> <ui:composition template="/templates/template.xhtml"> Modified: trunk/examples/output-demo/src/main/webapp/qunit/accordionHeaders.xhtml =================================================================== --- trunk/examples/output-demo/src/main/webapp/qunit/accordionHeaders.xhtml 2010-12-10 19:12:15 UTC (rev 20511) +++ trunk/examples/output-demo/src/main/webapp/qunit/accordionHeaders.xhtml 2010-12-10 20:35:57 UTC (rev 20512) @@ -3,7 +3,8 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:pn="http://richfaces.org/output"> + xmlns:pn="http://richfaces.org/pn" + xmlns:ou="http://richfaces.org/output"> <body> <ui:composition template="/templates/template.xhtml"> @@ -44,22 +45,22 @@ </pn:accordion> <h:outputLink> - <pn:toggleControl targetPanel="panel" targetItem="@first" event="click"/> + <ou:toggleControl targetPanel="panel" targetItem="@first" event="click"/> |< first </h:outputLink> | <h:outputLink> - <pn:toggleControl targetPanel="panel" targetItem="@prev" event="click"/> + <ou:toggleControl targetPanel="panel" targetItem="@prev" event="click"/> <- prev </h:outputLink> | <h:outputLink> - <pn:toggleControl targetPanel="panel" targetItem="@next" event="click"/> + <ou:toggleControl targetPanel="panel" targetItem="@next" event="click"/> next -> </h:outputLink> | <h:outputLink> - <pn:toggleControl targetPanel="panel" targetItem="@last" event="click"/> + <ou:toggleControl targetPanel="panel" targetItem="@last" event="click"/> last >| </h:outputLink> Modified: trunk/examples/output-demo/src/main/webapp/qunit/collapsiblePanel.xhtml =================================================================== --- trunk/examples/output-demo/src/main/webapp/qunit/collapsiblePanel.xhtml 2010-12-10 19:12:15 UTC (rev 20511) +++ trunk/examples/output-demo/src/main/webapp/qunit/collapsiblePanel.xhtml 2010-12-10 20:35:57 UTC (rev 20512) @@ -3,7 +3,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:pn="http://richfaces.org/output"> + xmlns:pn="http://richfaces.org/pn"> <body> <ui:composition template="/templates/template.xhtml"> Modified: trunk/examples/output-demo/src/main/webapp/qunit/panelMenu.xhtml =================================================================== --- trunk/examples/output-demo/src/main/webapp/qunit/panelMenu.xhtml 2010-12-10 19:12:15 UTC (rev 20511) +++ trunk/examples/output-demo/src/main/webapp/qunit/panelMenu.xhtml 2010-12-10 20:35:57 UTC (rev 20512) @@ -27,7 +27,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:pn="http://richfaces.org/output"> + xmlns:pn="http://richfaces.org/pn"> <body> <ui:composition template="/templates/template.xhtml"> Modified: trunk/examples/output-demo/src/main/webapp/qunit/tab.xhtml =================================================================== --- trunk/examples/output-demo/src/main/webapp/qunit/tab.xhtml 2010-12-10 19:12:15 UTC (rev 20511) +++ trunk/examples/output-demo/src/main/webapp/qunit/tab.xhtml 2010-12-10 20:35:57 UTC (rev 20512) @@ -3,7 +3,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:pn="http://richfaces.org/output"> + xmlns:pn="http://richfaces.org/pn"> <body> <ui:composition template="/templates/template.xhtml"> Modified: trunk/examples/output-demo/src/main/webapp/qunit/tabPanel.xhtml =================================================================== --- trunk/examples/output-demo/src/main/webapp/qunit/tabPanel.xhtml 2010-12-10 19:12:15 UTC (rev 20511) +++ trunk/examples/output-demo/src/main/webapp/qunit/tabPanel.xhtml 2010-12-10 20:35:57 UTC (rev 20512) @@ -3,7 +3,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:pn="http://richfaces.org/output"> + xmlns:pn="http://richfaces.org/pn"> <body> <ui:composition template="/templates/template.xhtml"> Modified: trunk/examples/output-demo/src/main/webapp/qunit/togglePanel.xhtml =================================================================== --- trunk/examples/output-demo/src/main/webapp/qunit/togglePanel.xhtml 2010-12-10 19:12:15 UTC (rev 20511) +++ trunk/examples/output-demo/src/main/webapp/qunit/togglePanel.xhtml 2010-12-10 20:35:57 UTC (rev 20512) @@ -3,7 +3,8 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:pn="http://richfaces.org/output"> + xmlns:pn="http://richfaces.org/pn" + xmlns:ou="http://richfaces.org/output"> <body> <ui:composition template="/templates/template.xhtml"> @@ -29,15 +30,15 @@ </pn:togglePanel> <h:outputLink> - <pn:toggleControl targetPanel="panel" targetItem="name1" event="click" /> + <ou:toggleControl targetPanel="panel" targetItem="name1" event="click" /> name1 </h:outputLink> <h:outputLink> - <pn:toggleControl targetPanel="panel" targetItem="name2" event="click" /> + <ou:toggleControl targetPanel="panel" targetItem="name2" event="click" /> name2 </h:outputLink> <h:outputLink> - <pn:toggleControl targetPanel="panel" targetItem="name3" event="click" /> + <ou:toggleControl targetPanel="panel" targetItem="name3" event="click" /> name3 </h:outputLink> </h:form> Modified: trunk/examples/output-demo/src/main/webapp/qunit/togglePanelItem.xhtml =================================================================== --- trunk/examples/output-demo/src/main/webapp/qunit/togglePanelItem.xhtml 2010-12-10 19:12:15 UTC (rev 20511) +++ trunk/examples/output-demo/src/main/webapp/qunit/togglePanelItem.xhtml 2010-12-10 20:35:57 UTC (rev 20512) @@ -3,7 +3,8 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:pn="http://richfaces.org/output"> + xmlns:pn="http://richfaces.org/pn" + xmlns:ou="http://richfaces.org/output"> <body> <ui:composition template="/templates/template.xhtml"> @@ -29,15 +30,15 @@ </pn:togglePanel> <h:outputLink> - <pn:toggleControl targetPanel="panel" targetItem="name1" event="click" /> + <ou:toggleControl targetPanel="panel" targetItem="name1" event="click" /> name1 </h:outputLink> <h:outputLink> - <pn:toggleControl targetPanel="panel" targetItem="name2" event="click" /> + <ou:toggleControl targetPanel="panel" targetItem="name2" event="click" /> name2 </h:outputLink> <h:outputLink> - <pn:toggleControl targetPanel="panel" targetItem="name3" event="click" /> + <ou:toggleControl targetPanel="panel" targetItem="name3" event="click" /> name3 </h:outputLink> </h:form> Modified: trunk/examples/output-demo/src/main/webapp/qunit/tooltip.xhtml =================================================================== --- trunk/examples/output-demo/src/main/webapp/qunit/tooltip.xhtml 2010-12-10 19:12:15 UTC (rev 20511) +++ trunk/examples/output-demo/src/main/webapp/qunit/tooltip.xhtml 2010-12-10 20:35:57 UTC (rev 20512) @@ -27,7 +27,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:pn="http://richfaces.org/output"> + xmlns:pn="http://richfaces.org/pn"> <body> <ui:composition template="/templates/template.xhtml"> Added: trunk/ui/output/ui/src/main/java/org/richfaces/component/package-info.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/package-info.java (rev 0) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/package-info.java 2010-12-10 20:35:57 UTC (rev 20512) @@ -0,0 +1,23 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, 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. + */ +(a)org.richfaces.cdk.annotations.TagLibrary(uri="http://richfaces.org/output", shortName="ou") +package org.richfaces.component; Modified: trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml 2010-12-10 19:12:15 UTC (rev 20511) +++ trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml 2010-12-10 20:35:57 UTC (rev 20512) @@ -1,884 +1,8 @@ -<?xml version="1.0" encoding="UTF-8"?> -<facelet-taglib id="output" version="2.0" +<?xml version="1.0" encoding="UTF-8"?><facelet-taglib id="output" version="2.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facelettaglibrary_2_0.xsd"> - <namespace>http://richfaces.org/output</namespace> + <namespace>http://richfaces.org/pn</namespace> <tag> - <tag-name>dropDownMenu</tag-name> - <component> - <component-type>org.richfaces.DropDownMenu</component-type> - <renderer-type>org.richfaces.DropDownMenuRenderer</renderer-type> - <handler-class/> - </component> - <attribute> - <description>The value binding expression used to wire up this component to a component property of a JavaBean class</description> - <name>binding</name> - <type>javax.faces.component.UIComponent</type> - </attribute> - <attribute> - <description>Direction indication for text that does not inherit directionality. Valid values are "LTR" (left-to-right) and "RTL" (right-to-left).</description> - <display-name>Direction</display-name> - <name>dir</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>disabled</name> - <type>boolean</type> - </attribute> - <attribute> - <name>hideDelay</name> - <type>int</type> - </attribute> - <attribute> - <description>The component identifier for this component. This value must be unique within the closest parent component that is a naming container.</description> - <display-name>Component Identifier</display-name> - <name>id</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>Code describing the language used in the generated markup for this component.</description> - <display-name>Language Code</display-name> - <name>lang</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>mode</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>Javascript code executed when a pointer button is clicked over this element.</description> - <display-name>Button Click Script</display-name> - <name>onclick</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>Javascript code executed when a pointer button is double clicked over this element.</description> - <display-name>Double Click Script</display-name> - <name>ondblclick</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>ongrouphide</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>ongroupshow</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onhide</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onitemclick</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>Javascript code executed when a key is pressed down over this element.</description> - <display-name>Key Down Script</display-name> - <name>onkeydown</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>Javascript code executed when a key is pressed and released over this element.</description> - <display-name>Key Press Script</display-name> - <name>onkeypress</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>Javascript code executed when a key is released over this element.</description> - <display-name>Key Up Script</display-name> - <name>onkeyup</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>Javascript code executed when a pointer button is pressed down over this element.</description> - <display-name>Mouse Down Script</display-name> - <name>onmousedown</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>Javascript code executed when a pointer button is moved within this element.</description> - <display-name>Mouse Move Script</display-name> - <name>onmousemove</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>Javascript code executed when a pointer button is moved away from this element.</description> - <display-name>Mouse Out Script</display-name> - <name>onmouseout</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>Javascript code executed when a pointer button is moved onto this element.</description> - <display-name>Mouse Over Script</display-name> - <name>onmouseover</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>Javascript code executed when a pointer button is released over this element.</description> - <display-name>Mouse Up Script</display-name> - <name>onmouseup</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onshow</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>popupWith</name> - <type>int</type> - </attribute> - <attribute> - <description>Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on any subsequent form submit. The default value for this property is true.</description> - <display-name>Rendered Flag</display-name> - <name>rendered</name> - <type>boolean</type> - </attribute> - <attribute> - <name>showDelay</name> - <type>int</type> - </attribute> - <attribute> - <name>showEvent</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>CSS style(s) to be applied when this component is rendered.</description> - <display-name>CSS Styles</display-name> - <name>style</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>Space-separated list of CSS style class(es) to be applied when this element is rendered. This value must be passed through as the "class" attribute on generated markup.</description> - <display-name>CSS Style Classes</display-name> - <name>styleClass</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>Advisory title information about markup elements generated for this component.</description> - <display-name>Advisory Title</display-name> - <name>title</name> - <type>java.lang.String</type> - </attribute> - </tag> - <tag> - <tag-name>menuSeparator</tag-name> - <component> - <component-type>org.richfaces.MenuSeparator</component-type> - <renderer-type>org.richfaces.MenuSeparatorRenderer</renderer-type> - <handler-class/> - </component> - <attribute> - <description>The value binding expression used to wire up this component to a component property of a JavaBean class</description> - <name>binding</name> - <type>javax.faces.component.UIComponent</type> - </attribute> - <attribute> - <description>The component identifier for this component. This value must be unique within the closest parent component that is a naming container.</description> - <display-name>Component Identifier</display-name> - <name>id</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on any subsequent form submit. The default value for this property is true.</description> - <display-name>Rendered Flag</display-name> - <name>rendered</name> - <type>boolean</type> - </attribute> - </tag> - <tag> - <tag-name>menuGroup</tag-name> - <component> - <component-type>org.richfaces.MenuGroup</component-type> - <renderer-type>org.richfaces.MenuGroupRenderer</renderer-type> - <handler-class/> - </component> - <attribute> - <description>The value binding expression used to wire up this component to a component property of a JavaBean class</description> - <name>binding</name> - <type>javax.faces.component.UIComponent</type> - </attribute> - <attribute> - <description>Converter instance registered with this component.</description> - <display-name>Converter</display-name> - <name>converter</name> - <type>javax.faces.convert.Converter</type> - </attribute> - <attribute> - <description>Direction indication for text that does not inherit directionality. Valid values are "LTR" (left-to-right) and "RTL" (right-to-left).</description> - <display-name>Direction</display-name> - <name>dir</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>disabled</name> - <type>boolean</type> - </attribute> - <attribute> - <name>icon</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>iconDisabled</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>iconFolder</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>iconFolderDisabled</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>The component identifier for this component. This value must be unique within the closest parent component that is a naming container.</description> - <display-name>Component Identifier</display-name> - <name>id</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>Code describing the language used in the generated markup for this component.</description> - <display-name>Language Code</display-name> - <name>lang</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>Javascript code executed when a pointer button is clicked over this element.</description> - <display-name>Button Click Script</display-name> - <name>onclick</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>Javascript code executed when a pointer button is double clicked over this element.</description> - <display-name>Double Click Script</display-name> - <name>ondblclick</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onhide</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>Javascript code executed when a key is pressed down over this element.</description> - <display-name>Key Down Script</display-name> - <name>onkeydown</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>Javascript code executed when a key is pressed and released over this element.</description> - <display-name>Key Press Script</display-name> - <name>onkeypress</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>Javascript code executed when a key is released over this element.</description> - <display-name>Key Up Script</display-name> - <name>onkeyup</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>Javascript code executed when a pointer button is pressed down over this element.</description> - <display-name>Mouse Down Script</display-name> - <name>onmousedown</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>Javascript code executed when a pointer button is moved within this element.</description> - <display-name>Mouse Move Script</display-name> - <name>onmousemove</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>Javascript code executed when a pointer button is moved away from this element.</description> - <display-name>Mouse Out Script</display-name> - <name>onmouseout</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>Javascript code executed when a pointer button is moved onto this element.</description> - <display-name>Mouse Over Script</display-name> - <name>onmouseover</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>Javascript code executed when a pointer button is released over this element.</description> - <display-name>Mouse Up Script</display-name> - <name>onmouseup</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onshow</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on any subsequent form submit. The default value for this property is true.</description> - <display-name>Rendered Flag</display-name> - <name>rendered</name> - <type>boolean</type> - </attribute> - <attribute> - <description>CSS style(s) to be applied when this component is rendered.</description> - <display-name>CSS Styles</display-name> - <name>style</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>Space-separated list of CSS style class(es) to be applied when this element is rendered. This value must be passed through as the "class" attribute on generated markup.</description> - <display-name>CSS Style Classes</display-name> - <name>styleClass</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>Advisory title information about markup elements generated for this component.</description> - <display-name>Advisory Title</display-name> - <name>title</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>The current value of this component.</description> - <display-name>Value</display-name> - <name>value</name> - <type>java.lang.Object</type> - </attribute> - </tag> - <tag> - <tag-name>menuItem</tag-name> - <component> - <component-type>org.richfaces.MenuItem</component-type> - <renderer-type>org.richfaces.MenuItemRenderer</renderer-type> - <handler-class/> - </component> - <attribute> - <description>MethodExpression representing the application action to invoke when this component is activated by the user. The expression must evaluate to a public method that takes no parameters, and returns an Object (the toString() of which is called to derive the logical outcome) which is passed to the NavigationHandler for this application.</description> - <display-name>Application Action</display-name> - <name>action</name> - <type>javax.faces.el.MethodBinding</type> - </attribute> - <attribute> - <description>MethodExpression representing the application action to invoke when this component is activated by the user. The expression must evaluate to a public method that takes no parameters, and returns an Object (the toString() of which is called to derive the logical outcome) which is passed to the NavigationHandler for this application.</description> - <display-name>Application Action</display-name> - <name>actionExpression</name> - <type>javax.el.MethodExpression</type> - </attribute> - <attribute> - <description><p> MethodExpression representing an action listener method that will be notified when this component is activated by the user. The expression must evaluate to a public method that takes an ActionEvent parameter, with a return type of void, <span class="changed_added_2_0">or to a public method that takes no arguments with a return type of void. In the latter case, the method has no way of easily knowing where the event came from, but this can be useful in cases where a notification is needed that "some action happened".</span> </p></description> - <display-name>Action Listener</display-name> - <name>actionListener</name> - <type>javax.faces.el.MethodBinding</type> - </attribute> - <attribute> - <description>The value binding expression used to wire up this component to a component property of a JavaBean class</description> - <name>binding</name> - <type>javax.faces.component.UIComponent</type> - </attribute> - <attribute> - <description>Direction indication for text that does not inherit directionality. Valid values are "LTR" (left-to-right) and "RTL" (right-to-left).</description> - <display-name>Direction</display-name> - <name>dir</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>disabled</name> - <type>boolean</type> - </attribute> - <attribute> - <name>icon</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>iconDisabled</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>The component identifier for this component. This value must be unique within the closest parent component that is a naming container.</description> - <display-name>Component Identifier</display-name> - <name>id</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>Flag indicating that, if this component is activated by the user, notifications should be delivered to interested listeners and actions immediately (that is, during Apply Request Values phase) rather than waiting until Invoke Application phase.</description> - <display-name>Immediate Action</display-name> - <name>immediate</name> - <type>boolean</type> - </attribute> - <attribute> - <name>label</name> - <type>java.lang.Object</type> - </attribute> - <attribute> - <description>Code describing the language used in the generated markup for this component.</description> - <display-name>Language Code</display-name> - <name>lang</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>mode</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>Javascript code executed when a pointer button is clicked over this element.</description> - <display-name>Button Click Script</display-name> - <name>onclick</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>Javascript code executed when a pointer button is double clicked over this element.</description> - <display-name>Double Click Script</display-name> - <name>ondblclick</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>Javascript code executed when a key is pressed down over this element.</description> - <display-name>Key Down Script</display-name> - <name>onkeydown</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>Javascript code executed when a key is pressed and released over this element.</description> - <display-name>Key Press Script</display-name> - <name>onkeypress</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>Javascript code executed when a key is released over this element.</description> - <display-name>Key Up Script</display-name> - <name>onkeyup</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>Javascript code executed when a pointer button is pressed down over this element.</description> - <display-name>Mouse Down Script</display-name> - <name>onmousedown</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>Javascript code executed when a pointer button is moved within this element.</description> - <display-name>Mouse Move Script</display-name> - <name>onmousemove</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>Javascript code executed when a pointer button is moved away from this element.</description> - <display-name>Mouse Out Script</display-name> - <name>onmouseout</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>Javascript code executed when a pointer button is moved onto this element.</description> - <display-name>Mouse Over Script</display-name> - <name>onmouseover</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>Javascript code executed when a pointer button is released over this element.</description> - <display-name>Mouse Up Script</display-name> - <name>onmouseup</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on any subsequent form submit. The default value for this property is true.</description> - <display-name>Rendered Flag</display-name> - <name>rendered</name> - <type>boolean</type> - </attribute> - <attribute> - <description>CSS style(s) to be applied when this component is rendered.</description> - <display-name>CSS Styles</display-name> - <name>style</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>Space-separated list of CSS style class(es) to be applied when this element is rendered. This value must be passed through as the "class" attribute on generated markup.</description> - <display-name>CSS Style Classes</display-name> - <name>styleClass</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>Advisory title information about markup elements generated for this component.</description> - <display-name>Advisory Title</display-name> - <name>title</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>The current value of this component.</description> - <display-name>Value</display-name> - <name>value</name> - <type>java.lang.Object</type> - </attribute> - </tag> - <tag> - <tag-name>toolbar</tag-name> - <component> - <component-type>org.richfaces.Toolbar</component-type> - <renderer-type>org.richfaces.ToolbarRenderer</renderer-type> - <handler-class/> - </component> - <attribute> - <description>The value binding expression used to wire up this component to a component property of a JavaBean class</description> - <name>binding</name> - <type>javax.faces.component.UIComponent</type> - </attribute> - <attribute> - <name>height</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>The component identifier for this component. This value must be unique within the closest parent component that is a naming container.</description> - <display-name>Component Identifier</display-name> - <name>id</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>itemClass</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>itemStyle</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>itemSeparator</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onitemclick</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onitemdblclick</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onitemkeydown</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onitemkeypress</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onitemkeyup</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onitemmousedown</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onitemmousemove</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onitemmouseout</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onitemmouseover</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onitemmouseup</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on any subsequent form submit. The default value for this property is true.</description> - <display-name>Rendered Flag</display-name> - <name>rendered</name> - <type>boolean</type> - </attribute> - <attribute> - <name>width</name> - <type>java.lang.String</type> - </attribute> - </tag> - <tag> - <tag-name>toolbarGroup</tag-name> - <component> - <component-type>org.richfaces.ToolbarGroup</component-type> - <renderer-type>org.richfaces.ToolbarGroupRenderer</renderer-type> - <handler-class/> - </component> - <attribute> - <description>The value binding expression used to wire up this component to a component property of a JavaBean class</description> - <name>binding</name> - <type>javax.faces.component.UIComponent</type> - </attribute> - <attribute> - <description>The component identifier for this component. This value must be unique within the closest parent component that is a naming container.</description> - <display-name>Component Identifier</display-name> - <name>id</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>itemClass</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>itemStyle</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>itemSeparator</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>location</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onitemclick</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onitemdblclick</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onitemkeydown</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onitemkeypress</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onitemkeyup</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onitemmousedown</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onitemmousemove</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onitemmouseout</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onitemmouseover</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onitemmouseup</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <description>Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on any subsequent form submit. The default value for this property is true.</description> - <display-name>Rendered Flag</display-name> - <name>rendered</name> - <type>boolean</type> - </attribute> - </tag> - <tag> - <tag-name>toggleControl</tag-name> - <behavior> - <behavior-id>org.richfaces.component.behavior.ToggleControl</behavior-id> - <handler-class>org.richfaces.view.facelets.html.CustomBehaviorHandler</handler-class> - </behavior> - </tag> - <tag> - <tag-name>panel</tag-name> - <component> - <component-type>org.richfaces.Panel</component-type> - <renderer-type>org.richfaces.PanelRenderer</renderer-type> - <handler-class/> - </component> - </tag> - <tag> - <tag-name>progressBar</tag-name> - <component> - <component-type>org.richfaces.ProgressBar</component-type> - <renderer-type>org.richfaces.ProgressBarRenderer</renderer-type> - <handler-class/> - </component> - </tag> - <tag> - <tag-name>popupPanel</tag-name> - <component> - <description>JSF component class</description> - <component-type>org.richfaces.PopupPanel</component-type> - <renderer-type>org.richfaces.PopupPanelRenderer</renderer-type> - <handler-class/> - </component> - <attribute> - <name>autosized</name> - <type>boolean</type> - </attribute> - <attribute> - <description>The value binding expression used to wire up this component to a component property of a JavaBean class</description> - <name>binding</name> - <type>javax.faces.component.UIComponent</type> - </attribute> - <attribute> - <name>controlsClass</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>domElementAttachment</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>followByScroll</name> - <type>boolean</type> - </attribute> - <attribute> - <name>header</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>headerClass</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>height</name> - <type>int</type> - </attribute> - <attribute> - <description>The component identifier for this component. This value must be unique within the closest parent component that is a naming container.</description> - <display-name>Component Identifier</display-name> - <name>id</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>keepVisualState</name> - <type>boolean</type> - </attribute> - <attribute> - <name>left</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>maxHeight</name> - <type>int</type> - </attribute> - <attribute> - <name>maxWidth</name> - <type>int</type> - </attribute> - <attribute> - <name>minHeight</name> - <type>int</type> - </attribute> - <attribute> - <name>minWidth</name> - <type>int</type> - </attribute> - <attribute> - <name>modal</name> - <type>boolean</type> - </attribute> - <attribute> - <name>moveable</name> - <type>boolean</type> - </attribute> - <attribute> - <name>onbeforehide</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onbeforeshow</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onhide</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmaskclick</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmaskcontextmenu</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmaskdblclick</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmaskmousedown</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmaskmousemove</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmaskmouseout</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmaskmouseover</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmaskmouseup</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onmove</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onresize</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>onshow</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>overlapEmbedObjects</name> - <type>boolean</type> - </attribute> - <attribute> - <description>Flag indicating whether or not this component should be rendered (during Render Response Phase), or processed on any subsequent form submit. The default value for this property is true.</description> - <display-name>Rendered Flag</display-name> - <name>rendered</name> - <type>boolean</type> - </attribute> - <attribute> - <name>resizeable</name> - <type>boolean</type> - </attribute> - <attribute> - <name>shadowDepth</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>shadowOpacity</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>show</name> - <type>boolean</type> - </attribute> - <attribute> - <name>top</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>trimOverlayedElements</name> - <type>boolean</type> - </attribute> - <attribute> - <name>visualOptions</name> - <type>java.lang.String</type> - </attribute> - <attribute> - <name>width</name> - <type>int</type> - </attribute> - <attribute> - <name>zindex</name> - <type>int</type> - </attribute> - </tag> - <tag> <tag-name>tabPanel</tag-name> <component> <component-type>org.richfaces.TabPanel</component-type> Modified: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance.xhtml =================================================================== --- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance.xhtml 2010-12-10 19:12:15 UTC (rev 20511) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu-icons-inheritance.xhtml 2010-12-10 20:35:57 UTC (rev 20512) @@ -28,7 +28,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:pn="http://richfaces.org/output" + xmlns:pn="http://richfaces.org/pn" xmlns:rich="http://richfaces.org/rich"> <h:head> Modified: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu.xhtml =================================================================== --- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu.xhtml 2010-12-10 19:12:15 UTC (rev 20511) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenu.xhtml 2010-12-10 20:35:57 UTC (rev 20512) @@ -28,7 +28,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:pn="http://richfaces.org/output" + xmlns:pn="http://richfaces.org/pn" xmlns:rich="http://richfaces.org/rich"> <h:head> Modified: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuGroup-expanded.xhtml =================================================================== --- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuGroup-expanded.xhtml 2010-12-10 19:12:15 UTC (rev 20511) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuGroup-expanded.xhtml 2010-12-10 20:35:57 UTC (rev 20512) @@ -28,7 +28,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:pn="http://richfaces.org/output" + xmlns:pn="http://richfaces.org/pn" xmlns:rich="http://richfaces.org/rich"> <h:head> Modified: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuGroup-topGroup.xhtml =================================================================== --- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuGroup-topGroup.xhtml 2010-12-10 19:12:15 UTC (rev 20511) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuGroup-topGroup.xhtml 2010-12-10 20:35:57 UTC (rev 20512) @@ -28,7 +28,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:pn="http://richfaces.org/output" + xmlns:pn="http://richfaces.org/pn" xmlns:rich="http://richfaces.org/rich"> <h:head> Modified: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuGroup.xhtml =================================================================== --- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuGroup.xhtml 2010-12-10 19:12:15 UTC (rev 20511) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuGroup.xhtml 2010-12-10 20:35:57 UTC (rev 20512) @@ -28,7 +28,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:pn="http://richfaces.org/output" + xmlns:pn="http://richfaces.org/pn" xmlns:rich="http://richfaces.org/rich"> <h:head> Modified: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuItem.xhtml =================================================================== --- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuItem.xhtml 2010-12-10 19:12:15 UTC (rev 20511) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/panelMenuItem.xhtml 2010-12-10 20:35:57 UTC (rev 20512) @@ -28,7 +28,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:pn="http://richfaces.org/output" + xmlns:pn="http://richfaces.org/pn" xmlns:rich="http://richfaces.org/rich"> <h:head> Modified: trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/tooltip.xhtml =================================================================== --- trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/tooltip.xhtml 2010-12-10 19:12:15 UTC (rev 20511) +++ trunk/ui/output/ui/src/test/resources/org/richfaces/renderkit/html/tooltip.xhtml 2010-12-10 20:35:57 UTC (rev 20512) @@ -28,7 +28,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:pn="http://richfaces.org/output" + xmlns:pn="http://richfaces.org/pn" xmlns:rich="http://richfaces.org/rich"> <h:head>

14 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r20511 - trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/fileupload.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2010-12-10 14:12:15 -0500 (Fri, 10 Dec 2010) New Revision: 20511 Added: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/fileupload/UploadedImage.java Removed: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/fileupload/UplocadedImage.java Modified: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/fileupload/FileUploadBean.java Log: Renamed UplocadedImage to UploadedImage Made UploadedImage Serializable Modified: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/fileupload/FileUploadBean.java =================================================================== --- trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/fileupload/FileUploadBean.java 2010-12-10 18:21:31 UTC (rev 20510) +++ trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/fileupload/FileUploadBean.java 2010-12-10 19:12:15 UTC (rev 20511) @@ -19,7 +19,7 @@ @SessionScoped public class FileUploadBean implements Serializable { - private ArrayList<UplocadedImage> files = new ArrayList<UplocadedImage>(); + private ArrayList<UploadedImage> files = new ArrayList<UploadedImage>(); private int uploadsAvailable = 5; private boolean autoUpload = false; private boolean useFlash = false; @@ -38,7 +38,7 @@ public void listener(UploadEvent event) throws Exception { UploadItem item = event.getUploadItem(); - UplocadedImage file = new UplocadedImage(); + UploadedImage file = new UploadedImage(); file.setLength(item.getData().length); file.setName(item.getFileName()); file.setData(item.getData()); @@ -56,11 +56,11 @@ return System.currentTimeMillis(); } - public ArrayList<UplocadedImage> getFiles() { + public ArrayList<UploadedImage> getFiles() { return files; } - public void setFiles(ArrayList<UplocadedImage> files) { + public void setFiles(ArrayList<UploadedImage> files) { this.files = files; } Copied: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/fileupload/UploadedImage.java (from rev 20506, trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/fileupload/UplocadedImage.java) =================================================================== --- trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/fileupload/UploadedImage.java (rev 0) +++ trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/fileupload/UploadedImage.java 2010-12-10 19:12:15 UTC (rev 20511) @@ -0,0 +1,55 @@ +package org.richfaces.demo.fileupload; + +import java.io.Serializable; + +public class UploadedImage implements Serializable { + + private static final long serialVersionUID = -8192553629588066292L; + + private String name; + private String mime; + private long length; + private byte[] data; + + public byte[] getData() { + return data; + } + + public void setData(byte[] data) { + this.data = data; + } + + public String getName() { + return name; + } + + public void setName(String name) { + int extDot = name.lastIndexOf('.'); + if (extDot > 0) { + String extension = name.substring(extDot + 1); + if ("bmp".equals(extension)) { + mime = "image/bmp"; + } else if ("jpg".equals(extension)) { + mime = "image/jpeg"; + } else if ("gif".equals(extension)) { + mime = "image/gif"; + } else if ("png".equals(extension)) { + mime = "image/png"; + } else { + mime = "image/unknown"; + } + } + } + + public long getLength() { + return length; + } + + public void setLength(long length) { + this.length = length; + } + + public String getMime() { + return mime; + } +} Deleted: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/fileupload/UplocadedImage.java =================================================================== --- trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/fileupload/UplocadedImage.java 2010-12-10 18:21:31 UTC (rev 20510) +++ trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/fileupload/UplocadedImage.java 2010-12-10 19:12:15 UTC (rev 20511) @@ -1,52 +0,0 @@ -package org.richfaces.demo.fileupload; - -public class UplocadedImage { - - private String name; - private String mime; - private long length; - private byte[] data; - - public byte[] getData() { - return data; - } - - public void setData(byte[] data) { - this.data = data; - } - - public String getName() { - return name; - } - - public void setName(String name) { - name = name; - int extDot = name.lastIndexOf('.'); - if (extDot > 0) { - String extension = name.substring(extDot + 1); - if ("bmp".equals(extension)) { - mime = "image/bmp"; - } else if ("jpg".equals(extension)) { - mime = "image/jpeg"; - } else if ("gif".equals(extension)) { - mime = "image/gif"; - } else if ("png".equals(extension)) { - mime = "image/png"; - } else { - mime = "image/unknown"; - } - } - } - - public long getLength() { - return length; - } - - public void setLength(long length) { - this.length = length; - } - - public String getMime() { - return mime; - } -}

14 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r20510 - branches/RF-8742-1/ui/validator/ui/src/test/java/org/richfaces/javascript/client.

by richfaces-svn-commits＠lists.jboss.org

Author: alexsmirnov Date: 2010-12-10 13:21:31 -0500 (Fri, 10 Dec 2010) New Revision: 20510 Modified: branches/RF-8742-1/ui/validator/ui/src/test/java/org/richfaces/javascript/client/MockTestBase.java Log: CODING IN PROGRESS - issue RF-9217: CSV: development tests for client side(qunit) https://jira.jboss.org/browse/RF-9217 Modified: branches/RF-8742-1/ui/validator/ui/src/test/java/org/richfaces/javascript/client/MockTestBase.java =================================================================== --- branches/RF-8742-1/ui/validator/ui/src/test/java/org/richfaces/javascript/client/MockTestBase.java 2010-12-10 17:37:50 UTC (rev 20509) +++ branches/RF-8742-1/ui/validator/ui/src/test/java/org/richfaces/javascript/client/MockTestBase.java 2010-12-10 18:21:31 UTC (rev 20510) @@ -16,8 +16,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList.Builder; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Lists; @RunWith(Parameterized.class) public abstract class MockTestBase {

14 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r20509 - in trunk/ui: input/ui/src/main/java/org/richfaces/component and 5 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2010-12-10 12:37:50 -0500 (Fri, 10 Dec 2010) New Revision: 20509 Added: trunk/ui/input/ui/src/main/java/org/richfaces/resource/ trunk/ui/input/ui/src/main/java/org/richfaces/resource/FileUploadProgressResource.java Modified: trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractFileUpload.java trunk/ui/input/ui/src/main/java/org/richfaces/context/FileUploadPartialViewContextFactory.java trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/fileupload.js trunk/ui/input/ui/src/main/resources/META-INF/richfaces/resource-mappings.properties trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractProgressBar.java Log: File upload switched to progress bar using resource GET polling Modified: trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractFileUpload.java =================================================================== --- trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractFileUpload.java 2010-12-10 17:27:16 UTC (rev 20508) +++ trunk/ui/input/ui/src/main/java/org/richfaces/component/AbstractFileUpload.java 2010-12-10 17:37:50 UTC (rev 20509) @@ -37,9 +37,8 @@ import org.richfaces.cdk.annotations.JsfComponent; import org.richfaces.cdk.annotations.JsfRenderer; import org.richfaces.cdk.annotations.Tag; -import org.richfaces.context.FileUploadPartialViewContextFactory; import org.richfaces.event.FileUploadListener; -import org.richfaces.request.MultipartRequest; +import org.richfaces.renderkit.RenderKitUtils; /** * @author Konstantin Mishin @@ -85,16 +84,14 @@ } } if (component != null) { - component.setValueExpression("value", context.getApplication().getExpressionFactory() - .createValueExpression(context.getELContext(), - "#{" + MultipartRequest.PERCENT_BEAN_NAME + "[param['" - + FileUploadPartialViewContextFactory.UID_KEY + "']]}", Integer.class)); + String resourcePath = RenderKitUtils.getResourcePath(context, "org.richfaces", "fileUploadProgress"); + component.getAttributes().put("resource", resourcePath); } } /** * <p>Add a new {@link FileUploadListener} to the set of listeners - * interested in being notified when {@link UploadEvent}s occur.</p> + * interested in being notified when {@link org.richfaces.UploadEvent}s occur.</p> * * @param listener The {@link FileUploadListener} to be added * @throws NullPointerException if <code>listener</code> Modified: trunk/ui/input/ui/src/main/java/org/richfaces/context/FileUploadPartialViewContextFactory.java =================================================================== --- trunk/ui/input/ui/src/main/java/org/richfaces/context/FileUploadPartialViewContextFactory.java 2010-12-10 17:27:16 UTC (rev 20508) +++ trunk/ui/input/ui/src/main/java/org/richfaces/context/FileUploadPartialViewContextFactory.java 2010-12-10 17:37:50 UTC (rev 20509) @@ -52,6 +52,8 @@ public static final String UID_KEY = "rf_fu_uid"; + public static final String UID_ALT_KEY = "rf_fu_uid_alt"; + private static enum ResponseState { sizeExceeded, stopped, serverError }; Added: trunk/ui/input/ui/src/main/java/org/richfaces/resource/FileUploadProgressResource.java =================================================================== --- trunk/ui/input/ui/src/main/java/org/richfaces/resource/FileUploadProgressResource.java (rev 0) +++ trunk/ui/input/ui/src/main/java/org/richfaces/resource/FileUploadProgressResource.java 2010-12-10 17:37:50 UTC (rev 20509) @@ -0,0 +1,52 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, 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. + */ +package org.richfaces.resource; + +import java.util.Map; + +import javax.faces.context.FacesContext; + +import org.richfaces.context.FileUploadPartialViewContextFactory; +import org.richfaces.request.MultipartRequest; + +/** + * @author Nick Belaevski + * + */ +public class FileUploadProgressResource extends AbstractJSONResource { + + @Override + protected Object getData(FacesContext context) { + Map<String, Object> sessionMap = context.getExternalContext().getSessionMap(); + Map<String, Number> percentMap = (Map<String, Number>) sessionMap.get(MultipartRequest.PERCENT_BEAN_NAME); + + Number result = null; + + if (percentMap != null) { + String uploadId = context.getExternalContext().getRequestParameterMap().get(FileUploadPartialViewContextFactory.UID_ALT_KEY); + result = (Number) percentMap.get(uploadId); + } + + return result != null ? result : 0; + } + +} Modified: trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/fileupload.js =================================================================== --- trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/fileupload.js 2010-12-10 17:27:16 UTC (rev 20508) +++ trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/fileupload.js 2010-12-10 17:37:50 UTC (rev 20509) @@ -23,6 +23,8 @@ var UID = "rf_fu_uid"; + var UID_ALT = "rf_fu_uid_alt"; + var ITEM_HTML = '<div class="rf-fu-itm">' + '<span class="rf-fu-itm-lft"><span class="rf-fu-itm-lbl"/><span class="rf-fu-itm-st"/></span>' + '<span class="rf-fu-itm-rgh"><a href="javascript:void(0)" class="rf-fu-itm-lnk"/></span></div>'; @@ -251,11 +253,12 @@ this.model.state = ITEM_STATE.UPLOADING; this.uid = Math.random(); this.fileUpload.__submit(); - var params = {}; - params[UID] = this.uid; if (this.fileUpload.progressBar) { this.fileUpload.progressBar.setValue(0); this.state.html(this.fileUpload.progressBarElement.detach()); + + var params = {}; + params[UID_ALT] = this.uid; this.fileUpload.progressBar.enable(params); } }, Modified: trunk/ui/input/ui/src/main/resources/META-INF/richfaces/resource-mappings.properties =================================================================== --- trunk/ui/input/ui/src/main/resources/META-INF/richfaces/resource-mappings.properties 2010-12-10 17:27:16 UTC (rev 20508) +++ trunk/ui/input/ui/src/main/resources/META-INF/richfaces/resource-mappings.properties 2010-12-10 17:37:50 UTC (rev 20509) @@ -14,4 +14,5 @@ org.richfaces.images\:fuBtnGrad.png=org.richfaces.renderkit.html.BaseGradient\ {baseColorParam=additionalBackgroundColor, gradientColorParam=trimColor, height=18, width=1} org.richfaces.images\:fuBtnDisGrad.png=org.richfaces.renderkit.html.BaseGradient\ - {baseColorParam=tableSubfooterBackgroundColor, gradientColorParam=tableFooterBackgroundColor, height=18, width=1} \ No newline at end of file + {baseColorParam=tableSubfooterBackgroundColor, gradientColorParam=tableFooterBackgroundColor, height=18, width=1} +org.richfaces\:fileUploadProgress=org.richfaces.resource.FileUploadProgressResource \ No newline at end of file Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractProgressBar.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractProgressBar.java 2010-12-10 17:27:16 UTC (rev 20508) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractProgressBar.java 2010-12-10 17:37:50 UTC (rev 20509) @@ -135,6 +135,9 @@ @Attribute public abstract Object getValue(); + @Attribute(hidden = true) + public abstract String getResource(); + public void encodeMetaComponent(FacesContext context, String metaComponentId) throws IOException { ((MetaComponentRenderer) getRenderer(context)).encodeMetaComponent(context, this, metaComponentId); }

14 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r20508 - trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html.

by richfaces-svn-commits＠lists.jboss.org

Author: abelevich Date: 2010-12-10 12:27:16 -0500 (Fri, 10 Dec 2010) New Revision: 20508 Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/ToolbarRendererBase.java Log: fix class concatination Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/ToolbarRendererBase.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/ToolbarRendererBase.java 2010-12-10 17:22:28 UTC (rev 20507) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/ToolbarRendererBase.java 2010-12-10 17:27:16 UTC (rev 20508) @@ -219,7 +219,7 @@ writer.startElement(HtmlConstants.TD_ELEM, component); String separatorClass = "rf-tb-sep"; - concatClasses(separatorClass, (String) component.getAttributes().get("separatorClass")); + separatorClass = concatClasses(separatorClass, (String) component.getAttributes().get("separatorClass")); writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, separatorClass, null); if (separator != null) { @@ -229,7 +229,7 @@ writer.write(" "); writer.endElement(HtmlConstants.DIV_ELEM); } else { - concatClasses(separatorClass, (String) component.getAttributes().get("separatorClass")); + separatorClass = concatClasses(separatorClass, (String) component.getAttributes().get("separatorClass")); writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, separatorClass, null); String uri = RenderKitUtils.getResourceURL(itemSeparator, context);

14 years, 1 month

1
0
0 / 0

JBoss Rich Faces SVN: r20507 - modules/tests/metamer/trunk/application/src/main/webapp/components/richTree.

by richfaces-svn-commits＠lists.jboss.org

Author: lfryc(a)redhat.com Date: 2010-12-10 12:22:28 -0500 (Fri, 10 Dec 2010) New Revision: 20507 Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/treeAdaptors.xhtml Log: added rendered condition to allow treeNode attribute verification (RF-9698) Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/treeAdaptors.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/treeAdaptors.xhtml 2010-12-10 17:04:10 UTC (rev 20506) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/treeAdaptors.xhtml 2010-12-10 17:22:28 UTC (rev 20507) @@ -80,7 +80,7 @@ rendered="#{richTreeModelRecursiveAdaptorBean.attributes['rendered'].value}" > - <rich:treeNode> + <rich:treeNode rendered="#{node.class.simpleName != 'RecursiveNode' || node.number != 1 || richTreeNodeBean.attributes['rendered'].value}"> <a4j:outputPanel id="panel"> #{node.label} </a4j:outputPanel>

14 years, 1 month

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits December 2010