August 2007 - richfaces-svn-commits

JBoss Rich Faces SVN: r2667 - in trunk/ui/treeModel/src/main: java/org/richfaces/component and 1 other directory.

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

Author: nbelaevski Date: 2007-08-31 12:31:59 -0400 (Fri, 31 Aug 2007) New Revision: 2667 Modified: trunk/ui/treeModel/src/main/config/component/recursiveTreeNodes.xml trunk/ui/treeModel/src/main/config/component/treeNodes.xml trunk/ui/treeModel/src/main/java/org/richfaces/component/UIRecursiveTreeNodes.java trunk/ui/treeModel/src/main/java/org/richfaces/component/UITreeNodes.java Log: http://jira.jboss.com/jira/browse/RF-768 Modified: trunk/ui/treeModel/src/main/config/component/recursiveTreeNodes.xml =================================================================== --- trunk/ui/treeModel/src/main/config/component/recursiveTreeNodes.xml 2007-08-31 16:30:28 UTC (rev 2666) +++ trunk/ui/treeModel/src/main/config/component/recursiveTreeNodes.xml 2007-08-31 16:31:59 UTC (rev 2667) @@ -49,28 +49,23 @@ </description> </property> <property elonly="true"> - <name>root</name> + <name>roots</name> <classname>java.lang.Object</classname> <description> </description> </property> - <property hidden="true"> - <name>activeBoth</name> + <property> + <name>included</name> <classname>boolean</classname> <defaultvalue>true</defaultvalue> </property> - <property exist="true"> - <name>active</name> - <classname>boolean</classname> - <defaultvalue>true</defaultvalue> - </property> <property> - <name>activeRoot</name> + <name>includedRoot</name> <classname>boolean</classname> <defaultvalue>true</defaultvalue> </property> <property> - <name>activeNodes</name> + <name>includedNode</name> <classname>boolean</classname> <defaultvalue>true</defaultvalue> </property> Modified: trunk/ui/treeModel/src/main/config/component/treeNodes.xml =================================================================== --- trunk/ui/treeModel/src/main/config/component/treeNodes.xml 2007-08-31 16:30:28 UTC (rev 2666) +++ trunk/ui/treeModel/src/main/config/component/treeNodes.xml 2007-08-31 16:31:59 UTC (rev 2667) @@ -49,7 +49,7 @@ </description> </property> <property> - <name>active</name> + <name>includedNode</name> <classname>boolean</classname> <defaultvalue>true</defaultvalue> </property> Modified: trunk/ui/treeModel/src/main/java/org/richfaces/component/UIRecursiveTreeNodes.java =================================================================== --- trunk/ui/treeModel/src/main/java/org/richfaces/component/UIRecursiveTreeNodes.java 2007-08-31 16:30:28 UTC (rev 2666) +++ trunk/ui/treeModel/src/main/java/org/richfaces/component/UIRecursiveTreeNodes.java 2007-08-31 16:31:59 UTC (rev 2667) @@ -6,8 +6,6 @@ import java.util.Iterator; -import javax.faces.el.ValueBinding; - import org.apache.commons.collections.iterators.IteratorChain; import org.richfaces.model.StackingTreeModel; import org.richfaces.model.StackingTreeModelDataProvider; @@ -24,36 +22,21 @@ public static final String COMPONENT_FAMILY = "org.richfaces.RecursiveTreeNodes"; - public abstract Object getRoot(); - public abstract void setRoot(Object root); + public abstract Object getRoots(); + public abstract void setRoots(Object roots); - public abstract boolean isActiveBoth(); - public abstract void setActiveBoth(boolean active); + public abstract boolean isIncluded(); + public abstract void setIncluded(boolean active); - public abstract boolean isActiveRoot(); - public abstract void setActiveRoot(boolean active); + public abstract boolean isIncludedRoot(); + public abstract void setIncludedRoot(boolean active); - public abstract boolean isActiveNodes(); - public abstract void setActiveNodes(boolean active); - - public boolean isActive() { - return isActiveBoth() && isActiveRoot(); + protected boolean includeNode() { + return isIncluded() && isIncludedRoot(); } - - public void setActive(boolean active) { - setActiveBoth(active); - } - public void setValueBinding(String name, ValueBinding binding) { - if ("active".equals(name)) { - super.setValueBinding("activeBoth", binding); - } else { - super.setValueBinding(name, binding); - } - } - public Object getData() { - return getRoot(); + return getRoots(); } public abstract String getVar(); @@ -92,7 +75,7 @@ } protected boolean isActiveData() { - return UIRecursiveTreeNodes.this.isActiveBoth() && UIRecursiveTreeNodes.this.isActiveNodes(); + return UIRecursiveTreeNodes.this.isIncluded() && UIRecursiveTreeNodes.this.isIncludedNode(); } }; stackingModel.addStackingModel(recursiveModel); Modified: trunk/ui/treeModel/src/main/java/org/richfaces/component/UITreeNodes.java =================================================================== --- trunk/ui/treeModel/src/main/java/org/richfaces/component/UITreeNodes.java 2007-08-31 16:30:28 UTC (rev 2666) +++ trunk/ui/treeModel/src/main/java/org/richfaces/component/UITreeNodes.java 2007-08-31 16:31:59 UTC (rev 2667) @@ -23,9 +23,13 @@ public abstract String getVar(); public abstract void setVar(String var); - public abstract boolean isActive(); - public abstract void setActive(boolean active); + public abstract boolean isIncludedNode(); + public abstract void setIncludedNode(boolean includeNode); + protected boolean includeNode() { + return isIncludedNode(); + } + protected StackingTreeModel createStackingTreeModel() { StackingTreeModel treeModel = new VisualStackingTreeModel(getId(), getVar(), new StackingTreeModelDataProvider() { @@ -39,7 +43,7 @@ } protected boolean isActiveData() { - return UITreeNodes.this.isActive(); + return UITreeNodes.this.includeNode(); } };

17 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r2666 - trunk/framework/api/src/main/java/org/richfaces/model.

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

Author: nbelaevski Date: 2007-08-31 12:30:28 -0400 (Fri, 31 Aug 2007) New Revision: 2666 Modified: trunk/framework/api/src/main/java/org/richfaces/model/SequenceDataModel.java Log: Handling for single object in SequenceDataModel Modified: trunk/framework/api/src/main/java/org/richfaces/model/SequenceDataModel.java =================================================================== --- trunk/framework/api/src/main/java/org/richfaces/model/SequenceDataModel.java 2007-08-31 16:23:02 UTC (rev 2665) +++ trunk/framework/api/src/main/java/org/richfaces/model/SequenceDataModel.java 2007-08-31 16:30:28 UTC (rev 2666) @@ -6,6 +6,7 @@ import java.io.IOException; import java.util.AbstractList; import java.util.Arrays; +import java.util.Collections; import java.util.Iterator; import java.util.List; @@ -120,8 +121,10 @@ } }; + } else if (data instanceof Object[]) { + this.list = Arrays.asList((Object[]) data); } else if (data != null) { - this.list = Arrays.asList((Object[]) data); + this.list = Collections.singletonList(data); } else { this.list = null; }

17 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r2665 - in trunk/docs/userguide/en/src/main: resources/images and 1 other directory.

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

Author: vkukharchuk Date: 2007-08-31 12:23:02 -0400 (Fri, 31 Aug 2007) New Revision: 2665 Added: trunk/docs/userguide/en/src/main/docbook/included/recursiveTreeNodes.desc.xml trunk/docs/userguide/en/src/main/docbook/included/recursiveTreeNodes.xml trunk/docs/userguide/en/src/main/resources/images/recursiveTreeNodes1.png Modified: trunk/docs/userguide/en/src/main/docbook/included/treeNodes.desc.xml trunk/docs/userguide/en/src/main/docbook/included/treeNodes.xml Log: http://jira.jboss.com/jira/browse/RF-658 Added: trunk/docs/userguide/en/src/main/docbook/included/recursiveTreeNodes.desc.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/recursiveTreeNodes.desc.xml (rev 0) +++ trunk/docs/userguide/en/src/main/docbook/included/recursiveTreeNodes.desc.xml 2007-08-31 16:23:02 UTC (rev 2665) @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<section> + <sectioninfo> + <keywordset> + <keyword>recursiveTreeNodes</keyword> + </keywordset> + </sectioninfo> + <section> + <title>Description</title> + <para> + The <property>rich:recursiveTreeNodes</property> provides possibility to define data models and process nodes recursively. + </para> + + <figure> + <title>Expanded tree with recursiveTreeNodes</title> + <mediaobject> + <imageobject> + <imagedata fileref="images/recursiveTreeNodes1.png"/> + </imageobject> + </mediaobject> + </figure> + + </section> + <section> + <title>Key Features</title> + <itemizedlist> + <listitem>Allows to define combined data models</listitem> + <listitem>Possibility to define nodes for processing via attributes</listitem> + <listitem>Allows to process nodes recursively</listitem> + </itemizedlist> + </section> +</section> Added: trunk/docs/userguide/en/src/main/docbook/included/recursiveTreeNodes.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/recursiveTreeNodes.xml (rev 0) +++ trunk/docs/userguide/en/src/main/docbook/included/recursiveTreeNodes.xml 2007-08-31 16:23:02 UTC (rev 2665) @@ -0,0 +1,233 @@ +<?xml version='1.0' encoding='UTF-8'?> +<section> + <sectioninfo> + <keywordset> + <keyword>recursiveTreeNodes</keyword> + <keyword>rich:recursiveTreeNodes</keyword> + <keyword>HtmlRecursiveTreeNodes</keyword> + </keywordset> + </sectioninfo> + + <table> + <title>Component identification parameters </title> + <tgroup cols="2"> + <thead> + <row> + <entry>Name</entry> + <entry>Value</entry> + </row> + </thead> + <tbody> + <row> + <entry>component-type</entry> + <entry>org.richfaces.RecursiveTreeNodes</entry> + </row> + <row> + <entry>component-class</entry> + <entry>org.richfaces.component.html.HtmlRecursiveTreeNodes</entry> + </row> + <row> + <entry>component-family</entry> + <entry>org.richfaces.RecursiveTreeNodes</entry> + </row> +  + <row> + <entry>tag-class</entry> + <entry>org.richfaces.taglib.RecursiveTreeNodesTag</entry> + </row> + </tbody> + </tgroup> + </table> + + <section> + <title>Creating the Component with a Page Tag</title> + <para>To create the simplest variant of <property>rich:recursiveTreeNodes</property> on a page, use the + following syntax:</para> + + <para> + <emphasis role="bold">Example:</emphasis> + </para> + <programlisting role="XML"><![CDATA[... + <rich:recursiveTreeNodes var="issue" root="#{project.root}" nodes="#{model.issues}"> + ... + <rich:treeNode> +  + </rich:treeNode> + +  + ... + </rich:recursiveTreeNodes> +... +]]></programlisting> + </section> + + <section> + <title>Creating the Component Dynamically Using Java</title> + + <para> + <emphasis role="bold">Example:</emphasis> + </para> + <programlisting role="JAVA"><![CDATA[import org.richfaces.component.html.HtmlRecursiveTreeNodes; +... +HtmlRecursiveTreeNodes myRecursiveTreeNodes = new HtmlRecursiveTreeNodes(); +... +]]></programlisting> + </section> + + <section> + <title>Details of Usage</title> + <para> + <emphasis role="bold">The typical variant of using:</emphasis> + </para> + <programlisting role="XML"><![CDATA[... +<rich:tree adviseNodeOpened="#{treeModelBean.adviseNodeOpened}" switchType="client"> + <rich:treeNodes id="project" nodes="#{loaderBean.projects}" var="project"> + + <rich:treeNode> + <h:commandLink action="#{project.click}" value="Project: #{project.name}" /> + </rich:treeNode> + + <rich:recursiveTreeNodes id="dir" var="dir" root="#{project.dirs}" nodes="#{dir.directories}"> + + <rich:treeNode> + <h:commandLink action="#{dir.click}" value="Directory: #{dir.name}" /> + </rich:treeNode> + + <rich:treeNodes id="file" var="file" nodes="#{dir.files}"> + <rich:treeNode> + <h:commandLink action="#{file.click}" value="File: #{file.name}" /> + </rich:treeNode> + </rich:treeNodes> + + <rich:treeNodes id="file1" var="file" nodes="#{dir.files}"> + <rich:treeNode> + <h:commandLink action="#{file.click}" value="File1: #{file.name}" /> + </rich:treeNode> + </rich:treeNodes> + + <rich:recursiveTreeNodes id="archiveEntry" var="archiveEntry" + root="#{dir.files}" nodes="#{archiveEntry.archiveEntries}" + activeRoot="#{archiveEntry.class.simpleName == 'ArchiveFile'}" + activeNodes="#{archiveEntry.class.simpleName == 'ArchiveEntry'}"> + + <rich:treeNode id="archiveEntryNode"> + <h:commandLink action="#{archiveEntry.click}" value="Archive entry: #{archiveEntry.name}" /> + </rich:treeNode> + + </rich:recursiveTreeNodes> + + </rich:recursiveTreeNodes> + </rich:treeNodes> +</rich:tree> +... +]]></programlisting> + + </section> + +</section> Modified: trunk/docs/userguide/en/src/main/docbook/included/treeNodes.desc.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/treeNodes.desc.xml 2007-08-31 15:43:09 UTC (rev 2664) +++ trunk/docs/userguide/en/src/main/docbook/included/treeNodes.desc.xml 2007-08-31 16:23:02 UTC (rev 2665) @@ -8,8 +8,7 @@ <section> <title>Description</title> <para> - The <property>rich:treeNodes</property> provides possibility to combine <property>rich:treeNode</property> - to logical groups. + The <property>rich:treeNodes</property> provides possibility to define data models and create representations to them. </para> <figure> @@ -25,9 +24,9 @@ <section> <title>Key Features</title> <itemizedlist> - <listitem>Allows to define a set of nodes</listitem> - <listitem>No developers JavaScript writing needed to use it on pages</listitem> - <listitem>Built-in Ajax processing</listitem> + <listitem>Allows to define combined data models</listitem> + <listitem>Possibility to define nodes for processing via attributes</listitem> + <listitem>Allows to process nodes recursively</listitem> </itemizedlist> </section> </section> Modified: trunk/docs/userguide/en/src/main/docbook/included/treeNodes.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/treeNodes.xml 2007-08-31 15:43:09 UTC (rev 2664) +++ trunk/docs/userguide/en/src/main/docbook/included/treeNodes.xml 2007-08-31 16:23:02 UTC (rev 2665) @@ -78,106 +78,37 @@ ... ]]></programlisting> </section> - </section> Added: trunk/docs/userguide/en/src/main/resources/images/recursiveTreeNodes1.png =================================================================== (Binary files differ) Property changes on: trunk/docs/userguide/en/src/main/resources/images/recursiveTreeNodes1.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

17 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r2664 - in trunk/samples/richfaces-demo/src/main: webapp/richfaces/repeat and 1 other directories.

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

Author: ilya_shaikovsky Date: 2007-08-31 11:43:09 -0400 (Fri, 31 Aug 2007) New Revision: 2664 Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/repeat/examples/UpdateBean.java Modified: trunk/samples/richfaces-demo/src/main/java/org/richfaces/datatable/UpdateBean.java trunk/samples/richfaces-demo/src/main/webapp/richfaces/repeat/examples/repeater.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/repeat/usage.xhtml Log: Modified: trunk/samples/richfaces-demo/src/main/java/org/richfaces/datatable/UpdateBean.java =================================================================== --- trunk/samples/richfaces-demo/src/main/java/org/richfaces/datatable/UpdateBean.java 2007-08-31 14:57:14 UTC (rev 2663) +++ trunk/samples/richfaces-demo/src/main/java/org/richfaces/datatable/UpdateBean.java 2007-08-31 15:43:09 UTC (rev 2664) @@ -2,10 +2,38 @@ import javax.faces.component.html.HtmlInputText; import javax.faces.context.FacesContext; +import org.ajax4jsf.component.UIRepeat; +import java.util.HashSet; +import java.util.Set; public class UpdateBean { + HtmlInputText priceRef; + private UIRepeat repeater; + private Set<Integer> keys = null; + + /** + * @return the keys + */ + public Set getKeys() { + return keys; + } + /** + * @param keys the keys to set + */ + public void setKeys(Set keys) { + this.keys = keys; + } + + public void setRepeater(UIRepeat repeater) { + this.repeater = repeater; + } + + public UIRepeat getRepeater() { + return repeater; + } + public HtmlInputText getPriceRef() { return priceRef; } @@ -15,6 +43,11 @@ } public String change(){ + + HashSet keys = new HashSet<Integer>(); + int rowKey = getRepeater().getRowIndex(); + keys.add(rowKey); + setKeys(keys); priceRef.processValidators(FacesContext.getCurrentInstance()); priceRef.processUpdates(FacesContext.getCurrentInstance()); return null; Added: trunk/samples/richfaces-demo/src/main/webapp/richfaces/repeat/examples/UpdateBean.java =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/repeat/examples/UpdateBean.java (rev 0) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/repeat/examples/UpdateBean.java 2007-08-31 15:43:09 UTC (rev 2664) @@ -0,0 +1,55 @@ +package org.richfaces.datatable; + +import javax.faces.component.html.HtmlInputText; +import javax.faces.context.FacesContext; +import org.ajax4jsf.component.UIRepeat; +import java.util.HashSet; +import java.util.Set; + +public class UpdateBean { + + HtmlInputText priceRef; + private UIRepeat repeater; + private Set<Integer> keys = null; + + /** + * @return the keys + */ + public Set getKeys() { + return keys; + } + + /** + * @param keys the keys to set + */ + public void setKeys(Set keys) { + this.keys = keys; + } + + public void setRepeater(UIRepeat repeater) { + this.repeater = repeater; + } + + public UIRepeat getRepeater() { + return repeater; + } + + public HtmlInputText getPriceRef() { + return priceRef; + } + + public void setPriceRef(HtmlInputText priceRef) { + this.priceRef = priceRef; + } + + public String change(){ + + HashSet keys = new HashSet<Integer>(); + int rowKey = getRepeater().getRowIndex(); + keys.add(rowKey); + setKeys(keys); + priceRef.processValidators(FacesContext.getCurrentInstance()); + priceRef.processUpdates(FacesContext.getCurrentInstance()); + return null; + } +} Property changes on: trunk/samples/richfaces-demo/src/main/webapp/richfaces/repeat/examples/UpdateBean.java ___________________________________________________________________ Name: svn:executable + * Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/repeat/examples/repeater.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/repeat/examples/repeater.xhtml 2007-08-31 14:57:14 UTC (rev 2663) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/repeat/examples/repeater.xhtml 2007-08-31 15:43:09 UTC (rev 2664) @@ -17,7 +17,7 @@ <th style="width: 150px"><h:outputText value="Reason" /></th> <th><h:outputText value="Proposed Gross Margin" /></th> </tr> - <a4j:repeat value="#{salesReport.items}" var="item"> + <a4j:repeat value="#{salesReport.items}" var="item" binding="#{updateBean.repeater}"> <tr> <td align="center"> <h:outputText value="#{item.productCode}" /> @@ -26,7 +26,7 @@ <h:inputText binding="#{updateBean.priceRef}" immediate="false" value="#{item.proposedPrice}" size="7"> <a4j:support immediate="true" action="#{updateBean.change}" - event="onchange" reRender="margin,reason,table" /> + event="onchange" reRender="reason,margin" /> </h:inputText> </td> <td> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/repeat/usage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/repeat/usage.xhtml 2007-08-31 14:57:14 UTC (rev 2663) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/repeat/usage.xhtml 2007-08-31 15:43:09 UTC (rev 2664) @@ -15,7 +15,9 @@ Additionally to facelets <ui:repeat> component it allows to update a set of its children instead of the whole using AJAX reuqests. <br /> - The folowing example shows the repeat component in use: + The folowing example shows the repeat component in use. + There you could explore how to make updatable the only two concrete + cells of the table using Ajax Keys. </p> @@ -25,6 +27,11 @@ <ui:include src="/templates/include/sourceview.xhtml"> <ui:param name="sourcepath" value="/richfaces/repeat/examples/repeater.xhtml"/> </ui:include> + <ui:include src="/templates/include/sourceview.xhtml"> + <ui:param name="sourcepath" value="/richfaces/repeat/examples/UpdateBean.java"/> + <ui:param name="openlabel" value="View UpdateBean.java Source" /> + <ui:param name="sourcetype" value="java" /> + </ui:include> </div> </ui:define>

17 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r2663 - in trunk/samples/richfaces-demo/src/main: resources/org/richfaces/demo/common and 4 other directories.

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

Author: ilya_shaikovsky Date: 2007-08-31 10:57:14 -0400 (Fri, 31 Aug 2007) New Revision: 2663 Added: trunk/samples/richfaces-demo/src/main/java/org/richfaces/datatable/SalesItem.java trunk/samples/richfaces-demo/src/main/java/org/richfaces/datatable/SalesReport.java trunk/samples/richfaces-demo/src/main/java/org/richfaces/datatable/UpdateBean.java Modified: trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml trunk/samples/richfaces-demo/src/main/webapp/richfaces/repeat.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/repeat/examples/repeater.xhtml trunk/samples/richfaces-demo/src/main/webapp/richfaces/repeat/usage.xhtml Log: Added: trunk/samples/richfaces-demo/src/main/java/org/richfaces/datatable/SalesItem.java =================================================================== --- trunk/samples/richfaces-demo/src/main/java/org/richfaces/datatable/SalesItem.java (rev 0) +++ trunk/samples/richfaces-demo/src/main/java/org/richfaces/datatable/SalesItem.java 2007-08-31 14:57:14 UTC (rev 2663) @@ -0,0 +1,73 @@ +package org.richfaces.datatable; + +import java.util.ArrayList; + +import javax.faces.model.SelectItem; + +public class SalesItem { + private int productCode; + private double proposedPrice; + private double ProposedGrossMargin; + private double salesCost; + private String reason; + private ArrayList reasons; + public ArrayList getReasons() { + reasons = new ArrayList(); + if (proposedPrice != 0.0) { + if (proposedPrice <= salesCost) { + reasons.add(new SelectItem("Nobody Needs it")); + reasons.add(new SelectItem("Bad Quality")); + reasons.add(new SelectItem("Partly Broken")); + } else { + reasons.add(new SelectItem("Just Good")); + reasons.add(new SelectItem("Everybody Asks for it")); + } + } else { + //reasons.add(new SelectItem("Enter the Price")); + } + return reasons; + } + public void setReasons(ArrayList reasons) { + this.reasons = reasons; + } + public String getReason() { + return reason; + } + public void setReason(String reason) { + this.reason = reason; + } + + public SalesItem(int productCode, double salesCost) { + super(); + this.productCode = productCode; + this.salesCost = salesCost; + } + public int getProductCode() { + return productCode; + } + public void setProductCode(int productCode) { + this.productCode = productCode; + } + public double getProposedGrossMargin() { + if (proposedPrice == 0) + return 0; + else { + return (proposedPrice-salesCost)/proposedPrice ; + } + } + public void setProposedGrossMargin(double proposedGrossMargin) { + ProposedGrossMargin = proposedGrossMargin; + } + public double getProposedPrice() { + return proposedPrice; + } + public void setProposedPrice(double proposedPrice) { + this.proposedPrice = proposedPrice; + } + public double getSalesCost() { + return salesCost; + } + public void setSalesCost(double salesCost) { + this.salesCost = salesCost; + } +} Property changes on: trunk/samples/richfaces-demo/src/main/java/org/richfaces/datatable/SalesItem.java ___________________________________________________________________ Name: svn:executable + * Added: trunk/samples/richfaces-demo/src/main/java/org/richfaces/datatable/SalesReport.java =================================================================== --- trunk/samples/richfaces-demo/src/main/java/org/richfaces/datatable/SalesReport.java (rev 0) +++ trunk/samples/richfaces-demo/src/main/java/org/richfaces/datatable/SalesReport.java 2007-08-31 14:57:14 UTC (rev 2663) @@ -0,0 +1,26 @@ +package org.richfaces.datatable; + +import java.util.ArrayList; +import java.util.List; + +public class SalesReport { + List items = null; + + public List getItems() { + if (items == null) + initData(); + return items; + } + + public void setItems(List items) { + this.items = items; + } + + private void initData() { + items = new ArrayList(); + items.add(new SalesItem(1, 20.00)); + items.add(new SalesItem(2, 10.00)); + items.add(new SalesItem(3, 20.00)); + items.add(new SalesItem(4, 20.00)); + } +} Property changes on: trunk/samples/richfaces-demo/src/main/java/org/richfaces/datatable/SalesReport.java ___________________________________________________________________ Name: svn:executable + * Added: trunk/samples/richfaces-demo/src/main/java/org/richfaces/datatable/UpdateBean.java =================================================================== --- trunk/samples/richfaces-demo/src/main/java/org/richfaces/datatable/UpdateBean.java (rev 0) +++ trunk/samples/richfaces-demo/src/main/java/org/richfaces/datatable/UpdateBean.java 2007-08-31 14:57:14 UTC (rev 2663) @@ -0,0 +1,22 @@ +package org.richfaces.datatable; + +import javax.faces.component.html.HtmlInputText; +import javax.faces.context.FacesContext; + +public class UpdateBean { + HtmlInputText priceRef; + + public HtmlInputText getPriceRef() { + return priceRef; + } + + public void setPriceRef(HtmlInputText priceRef) { + this.priceRef = priceRef; + } + + public String change(){ + priceRef.processValidators(FacesContext.getCurrentInstance()); + priceRef.processUpdates(FacesContext.getCurrentInstance()); + return null; + } +} Property changes on: trunk/samples/richfaces-demo/src/main/java/org/richfaces/datatable/UpdateBean.java ___________________________________________________________________ Name: svn:executable + * Modified: trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties =================================================================== --- trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties 2007-08-31 14:25:22 UTC (rev 2662) +++ trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties 2007-08-31 14:57:14 UTC (rev 2663) @@ -58,7 +58,7 @@ include= ajaxOutput, Include, /images/ico_common.gif, /images/cn_include2.gif, RichFacesComponentsLibrary.html#include, jbossajax4jsf/freezone/docs/tlddoc/a4j/include.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIInclude.html, /richfaces/include.jsf mediaOutput= ajaxOutput, Media Output, /images/ico_common.gif, /images/cn_MediaOutput.gif, RichFacesComponentsLibrary.html#mediaOutput, jbossajax4jsf/freezone/docs/tlddoc/a4j/mediaOutput.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/resource/UIMediaOutput.html, /richfaces/mediaOutput.jsf outputPanel= ajaxOutput, Output Panel, /images/ico_common.gif, /images/cn_OutputPanel.gif, RichFacesComponentsLibrary.html#outputPanel, jbossajax4jsf/freezone/docs/tlddoc/a4j/outputPanel.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIAjaxOutputPanel.html, /richfaces/outputPanel.jsf -repeat= richDataIterators, Repeat, /images/ico_common.gif, /images/cn_Repeat.gif, RichFacesComponentsLibrary.html#repeat, jbossajax4jsf/freezone/docs/tlddoc/a4j/repeat.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/repeat/UIRepeat.html, /richfaces/comingSoon.jsf +repeat= richDataIterators, Repeat, /images/ico_common.gif, /images/cn_Repeat.gif, RichFacesComponentsLibrary.html#repeat, jbossajax4jsf/freezone/docs/tlddoc/a4j/repeat.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/repeat/UIRepeat.html, /richfaces/repeat.jsf htmlCommandLink= ajaxMisc, Html Command Link, /images/ico_common.gif, /images/cn_HtmlCommandLink.gif, RichFacesComponentsLibrary.html#htmlCommandLink, jbossajax4jsf/freezone/docs/tlddoc/a4j/htmlCommandLink.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/renderkit/html/HtmlCommandLinkRenderer.html, /richfaces/comingSoon.jsf log= ajaxMisc, Log, /images/ico_common.gif, /images/cn_Log.gif, RichFacesComponentsLibrary.html#log, jbossajax4jsf/freezone/docs/tlddoc/a4j/log.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIAjaxLog.html, /richfaces/comingSoon.jsf page= ajaxMisc, Ajax Page, /images/ico_common.gif, /images/cn_AjaxPage.gif, RichFacesComponentsLibrary.html#page, jbossajax4jsf/freezone/docs/tlddoc/a4j/page.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIAjaxRegion.html, /richfaces/comingSoon.jsf Modified: trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml 2007-08-31 14:25:22 UTC (rev 2662) +++ trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml 2007-08-31 14:57:14 UTC (rev 2663) @@ -1,248 +1,257 @@ -<?xml version="1.0"?> -<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN" - "http://java.sun.com/dtd/web-facesconfig_1_0.dtd"> -<faces-config> - <managed-bean> - <managed-bean-name>skinBean</managed-bean-name> - <managed-bean-class>org.richfaces.demo.common.SkinBean</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - <managed-property> - <property-name>skin</property-name> - <property-class>java.lang.String</property-class> - <value>blueSky</value> - </managed-property> - </managed-bean> - <managed-bean> - <managed-bean-name>ddmenu</managed-bean-name> - <managed-bean-class>org.richfaces.demo.ddmenu.Menu</managed-bean-class> - <managed-bean-scope>request</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>calendarBean</managed-bean-name> - <managed-bean-class>org.richfaces.demo.calendar.CalendarBean</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>profile</managed-bean-name> - <managed-bean-class>org.richfaces.demo.wizard.Profile</managed-bean-class> - <managed-bean-scope>request</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>userBean</managed-bean-name> - <managed-bean-class>org.richfaces.demo.ajaxsupport.UserBean</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - <managed-property> - <property-name>name</property-name> - <property-class>java.lang.String</property-class> - <value/> - </managed-property> - <managed-property> - <property-name>screenWidth</property-name> - <property-class>java.lang.Integer</property-class> - <null-value/> - </managed-property> - <managed-property> - <property-name>screenHeight</property-name> - <property-class>java.lang.Integer</property-class> - <null-value/> - </managed-property> - <managed-property> - <property-name>job</property-name> - <property-class>java.lang.String</property-class> - <null-value/> - </managed-property> - </managed-bean> - <managed-bean> - <managed-bean-name>dfsBean</managed-bean-name> - <managed-bean-class>org.richfaces.demo.datafilterslider.DemoSliderBean</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - <managed-property> - <property-name>demoInventoryList</property-name> - <value>#{inventoryList}</value> - </managed-property> - </managed-bean> - <managed-bean> - <managed-bean-name>dataTableScrollerBean</managed-bean-name> - <managed-bean-class>org.richfaces.datatablescroller.DataTableScrollerBean</managed-bean-class> - <managed-bean-scope>application</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>toggleBean</managed-bean-name> - <managed-bean-class>org.richfaces.demo.togglePanel.ToggleBean</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>inventoryList</managed-bean-name> - <managed-bean-class>org.richfaces.demo.datafilterslider.DemoInventoryList</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>suggestionBox</managed-bean-name> - <managed-bean-class>org.richfaces.demo.sb.SuggestionBox</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>gmBean</managed-bean-name> - <managed-bean-class>org.richfaces.demo.gmap.Bean</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - <managed-property> - <property-name>zoom</property-name> - <property-class>int</property-class> - <value>17</value> - </managed-property> - </managed-bean> - <managed-bean> - <managed-bean-name>environment</managed-bean-name> - <managed-bean-class>org.richfaces.demo.common.Environment</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - <managed-property> - <property-name>params</property-name> - <property-class>java.util.Map</property-class> - <map-entries> - <map-entry> - <key>devguide-location</key> - <value>http://www.jboss.org/projects/jbossrichfaces/freezone/docs/devguide</value> - </map-entry> - <map-entry> - <key>tld-doc-location</key> - <value>http://www.jboss.org/projects/jbossrichfaces/freezone/docs/tlddoc</value> - </map-entry> - <map-entry> - <key>java-doc-location</key> - <value>http://www.jboss.org/projects/jbossrichfaces/freezone/docs/apidoc</value> - </map-entry> - </map-entries> - </managed-property> - </managed-bean> - <managed-bean> - <managed-bean-name>insValueBean</managed-bean-name> - <managed-bean-class>org.richfaces.demo.inputnumberslider.ValueBean</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>componentNavigator</managed-bean-name> - <managed-bean-class>org.richfaces.demo.common.ComponentNavigator</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>report</managed-bean-name> - <managed-bean-class>org.richfaces.demo.datatable.Report</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>tbBean</managed-bean-name> - <managed-bean-class>org.richfaces.demo.toolBar.TbBean</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>paintBean</managed-bean-name> - <managed-bean-class>org.richfaces.demo.paint2d.PaintBean</managed-bean-class> - <managed-bean-scope>request</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>paintData</managed-bean-name> - <managed-bean-class>org.richfaces.demo.paint2d.PaintData</managed-bean-class> - <managed-bean-scope>request</managed-bean-scope> - <managed-property> - <property-name>color</property-name> - <property-class>int</property-class> - <value>1000</value> - </managed-property> - <managed-property> - <property-name>scale</property-name> - <property-class>float</property-class> - <value>2</value> - </managed-property> - <managed-property> - <property-name>text</property-name> - <property-class>java.lang.String</property-class> - <value>Paint 2D</value> - </managed-property> - </managed-bean> - <managed-bean> - <managed-bean-name>library</managed-bean-name> - <managed-bean-class>org.richfaces.demo.tree.Library</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>dndBean</managed-bean-name> - <managed-bean-class>org.richfaces.demo.dnd.DndBean</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>eventBean</managed-bean-name> - <managed-bean-class>org.richfaces.demo.dnd.EventBean</managed-bean-class> - <managed-bean-scope>request</managed-bean-scope> - <managed-property> - <property-name>dndBean</property-name> - <property-class>org.richfaces.demo.dnd.DndBean</property-class> - <value>#{dndBean}</value> - </managed-property> - </managed-bean> - <managed-bean> - <managed-bean-name>toolTipData</managed-bean-name> - <managed-bean-class>org.richfaces.demo.tooltip.ToolTipData</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>rsBean</managed-bean-name> - <managed-bean-class>org.richfaces.demo.ajaxSamples.rsBean</managed-bean-class> - <managed-bean-scope>request</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>rsBean2</managed-bean-name> - <managed-bean-class>org.richfaces.demo.ajaxSamples.rsBean</managed-bean-class> - <managed-bean-scope>request</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>auctionDataModel</managed-bean-name> - <managed-bean-class>org.richfaces.demo.extendeddatamodel.AuctionDataModel</managed-bean-class> - <managed-bean-scope>request</managed-bean-scope> - <managed-property> - <property-name>dataProvider</property-name> - <property-class>org.richfaces.demo.extendeddatamodel.AuctionDataProvider</property-class> - <value>#{auctionDataProvider}</value> - </managed-property> - </managed-bean> - <managed-bean> - <managed-bean-name>mediaBean</managed-bean-name> - <managed-bean-class>org.richfaces.demo.media.MediaBean</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>mediaData</managed-bean-name> - <managed-bean-class>org.richfaces.demo.media.MediaData</managed-bean-class> - <managed-bean-scope>request</managed-bean-scope> - </managed-bean> - <managed-bean> - <managed-bean-name>auctionDataProvider</managed-bean-name> - <managed-bean-class>org.richfaces.demo.extendeddatamodel.AuctionDataProvider</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - </managed-bean> - <navigation-rule> - <from-view-id>/richfaces/include/examples/wstep1.xhtml</from-view-id> - <navigation-case> - <from-outcome>next</from-outcome> - <to-view-id>/richfaces/include/examples/wstep2.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/richfaces/include/examples/wstep2.xhtml</from-view-id> - <navigation-case> - <from-outcome>previous</from-outcome> - <to-view-id>/richfaces/include/examples/wstep1.xhtml</to-view-id> - </navigation-case> - <navigation-case> - <from-outcome>next</from-outcome> - <to-view-id>/richfaces/include/examples/finalStep.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - <navigation-rule> - <from-view-id>/richfaces/include/examples/finalStep.xhtml</from-view-id> - <navigation-case> - <from-outcome>previous</from-outcome> - <to-view-id>/richfaces/include/examples/wstep2.xhtml</to-view-id> - </navigation-case> - </navigation-rule> - -</faces-config> +<?xml version="1.0"?> +<!DOCTYPE faces-config PUBLIC "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN" + "http://java.sun.com/dtd/web-facesconfig_1_0.dtd"> +<faces-config> + <managed-bean> + <managed-bean-name>skinBean</managed-bean-name> + <managed-bean-class>org.richfaces.demo.common.SkinBean</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + <managed-property> + <property-name>skin</property-name> + <property-class>java.lang.String</property-class> + <value>blueSky</value> + </managed-property> + </managed-bean> + <managed-bean> + <managed-bean-name>ddmenu</managed-bean-name> + <managed-bean-class>org.richfaces.demo.ddmenu.Menu</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>calendarBean</managed-bean-name> + <managed-bean-class>org.richfaces.demo.calendar.CalendarBean</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>profile</managed-bean-name> + <managed-bean-class>org.richfaces.demo.wizard.Profile</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>userBean</managed-bean-name> + <managed-bean-class>org.richfaces.demo.ajaxsupport.UserBean</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + <managed-property> + <property-name>name</property-name> + <property-class>java.lang.String</property-class> + <value/> + </managed-property> + <managed-property> + <property-name>screenWidth</property-name> + <property-class>java.lang.Integer</property-class> + <null-value/> + </managed-property> + <managed-property> + <property-name>screenHeight</property-name> + <property-class>java.lang.Integer</property-class> + <null-value/> + </managed-property> + <managed-property> + <property-name>job</property-name> + <property-class>java.lang.String</property-class> + <null-value/> + </managed-property> + </managed-bean> + <managed-bean> + <managed-bean-name>dfsBean</managed-bean-name> + <managed-bean-class>org.richfaces.demo.datafilterslider.DemoSliderBean</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + <managed-property> + <property-name>demoInventoryList</property-name> + <value>#{inventoryList}</value> + </managed-property> + </managed-bean> + <managed-bean> + <managed-bean-name>dataTableScrollerBean</managed-bean-name> + <managed-bean-class>org.richfaces.datatablescroller.DataTableScrollerBean</managed-bean-class> + <managed-bean-scope>application</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>toggleBean</managed-bean-name> + <managed-bean-class>org.richfaces.demo.togglePanel.ToggleBean</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>inventoryList</managed-bean-name> + <managed-bean-class>org.richfaces.demo.datafilterslider.DemoInventoryList</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>suggestionBox</managed-bean-name> + <managed-bean-class>org.richfaces.demo.sb.SuggestionBox</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>gmBean</managed-bean-name> + <managed-bean-class>org.richfaces.demo.gmap.Bean</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + <managed-property> + <property-name>zoom</property-name> + <property-class>int</property-class> + <value>17</value> + </managed-property> + </managed-bean> + <managed-bean> + <managed-bean-name>environment</managed-bean-name> + <managed-bean-class>org.richfaces.demo.common.Environment</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + <managed-property> + <property-name>params</property-name> + <property-class>java.util.Map</property-class> + <map-entries> + <map-entry> + <key>devguide-location</key> + <value>http://www.jboss.org/projects/jbossrichfaces/freezone/docs/devguide</value> + </map-entry> + <map-entry> + <key>tld-doc-location</key> + <value>http://www.jboss.org/projects/jbossrichfaces/freezone/docs/tlddoc</value> + </map-entry> + <map-entry> + <key>java-doc-location</key> + <value>http://www.jboss.org/projects/jbossrichfaces/freezone/docs/apidoc</value> + </map-entry> + </map-entries> + </managed-property> + </managed-bean> + <managed-bean> + <managed-bean-name>insValueBean</managed-bean-name> + <managed-bean-class>org.richfaces.demo.inputnumberslider.ValueBean</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>componentNavigator</managed-bean-name> + <managed-bean-class>org.richfaces.demo.common.ComponentNavigator</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>report</managed-bean-name> + <managed-bean-class>org.richfaces.demo.datatable.Report</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>tbBean</managed-bean-name> + <managed-bean-class>org.richfaces.demo.toolBar.TbBean</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>paintBean</managed-bean-name> + <managed-bean-class>org.richfaces.demo.paint2d.PaintBean</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>paintData</managed-bean-name> + <managed-bean-class>org.richfaces.demo.paint2d.PaintData</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + <managed-property> + <property-name>color</property-name> + <property-class>int</property-class> + <value>1000</value> + </managed-property> + <managed-property> + <property-name>scale</property-name> + <property-class>float</property-class> + <value>2</value> + </managed-property> + <managed-property> + <property-name>text</property-name> + <property-class>java.lang.String</property-class> + <value>Paint 2D</value> + </managed-property> + </managed-bean> + <managed-bean> + <managed-bean-name>library</managed-bean-name> + <managed-bean-class>org.richfaces.demo.tree.Library</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>dndBean</managed-bean-name> + <managed-bean-class>org.richfaces.demo.dnd.DndBean</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>eventBean</managed-bean-name> + <managed-bean-class>org.richfaces.demo.dnd.EventBean</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + <managed-property> + <property-name>dndBean</property-name> + <property-class>org.richfaces.demo.dnd.DndBean</property-class> + <value>#{dndBean}</value> + </managed-property> + </managed-bean> + <managed-bean> + <managed-bean-name>toolTipData</managed-bean-name> + <managed-bean-class>org.richfaces.demo.tooltip.ToolTipData</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>rsBean</managed-bean-name> + <managed-bean-class>org.richfaces.demo.ajaxSamples.rsBean</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>rsBean2</managed-bean-name> + <managed-bean-class>org.richfaces.demo.ajaxSamples.rsBean</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>auctionDataModel</managed-bean-name> + <managed-bean-class>org.richfaces.demo.extendeddatamodel.AuctionDataModel</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + <managed-property> + <property-name>dataProvider</property-name> + <property-class>org.richfaces.demo.extendeddatamodel.AuctionDataProvider</property-class> + <value>#{auctionDataProvider}</value> + </managed-property> + </managed-bean> + <managed-bean> + <managed-bean-name>mediaBean</managed-bean-name> + <managed-bean-class>org.richfaces.demo.media.MediaBean</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>mediaData</managed-bean-name> + <managed-bean-class>org.richfaces.demo.media.MediaData</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>auctionDataProvider</managed-bean-name> + <managed-bean-class>org.richfaces.demo.extendeddatamodel.AuctionDataProvider</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>salesReport</managed-bean-name> + <managed-bean-class>org.richfaces.datatable.SalesReport</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>updateBean</managed-bean-name> + <managed-bean-class>org.richfaces.datatable.UpdateBean</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> + <navigation-rule> + <from-view-id>/richfaces/include/examples/wstep1.xhtml</from-view-id> + <navigation-case> + <from-outcome>next</from-outcome> + <to-view-id>/richfaces/include/examples/wstep2.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/richfaces/include/examples/wstep2.xhtml</from-view-id> + <navigation-case> + <from-outcome>previous</from-outcome> + <to-view-id>/richfaces/include/examples/wstep1.xhtml</to-view-id> + </navigation-case> + <navigation-case> + <from-outcome>next</from-outcome> + <to-view-id>/richfaces/include/examples/finalStep.xhtml</to-view-id> + </navigation-case> + </navigation-rule> + <navigation-rule> + <from-view-id>/richfaces/include/examples/finalStep.xhtml</from-view-id> + <navigation-case> + <from-outcome>previous</from-outcome> + <to-view-id>/richfaces/include/examples/wstep2.xhtml</to-view-id> + </navigation-case> + </navigation-rule> +</faces-config> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/repeat/examples/repeater.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/repeat/examples/repeater.xhtml 2007-08-31 14:25:22 UTC (rev 2662) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/repeat/examples/repeater.xhtml 2007-08-31 14:57:14 UTC (rev 2663) @@ -1,45 +1,55 @@ <ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> - - <h:form> - <rich:spacer height="30" /> - <rich:scrollableDataTable rowKeyVar="rkv" frozenColCount="1" height="400px" - width="700px" id="carList" rows="40" columnClasses="col" - value="#{dataTableScrollerBean.allCars}" var="category" sortMode="single"> - <rich:column id="make"> - <f:facet name="header"><h:outputText styleClass="headerText" value="Make" /></f:facet> - <h:outputText value="#{category.make}" /> - </rich:column> - <rich:column id="model"> - <f:facet name="header"><h:outputText styleClass="headerText" value="Model" /></f:facet> - <h:outputText value="#{category.model}" /> - </rich:column> - <rich:column id="price"> - <f:facet name="header"><h:outputText styleClass="headerText" value="Price" /></f:facet> - <h:outputText value="#{category.price}" /> - </rich:column> - <rich:column id="mileage"> - <f:facet name="header"><h:outputText styleClass="headerText" value="Mileage" /></f:facet> - <h:outputText value="#{category.mileage}" /> - </rich:column> - <rich:column width="200px" id="vin"> - <f:facet name="header"><h:outputText styleClass="headerText" value="VIN" /></f:facet> - <h:outputText value="#{category.vin}" /> - </rich:column> - <rich:column id="stock"> - <f:facet name="header"><h:outputText styleClass="headerText" value="Stock" /></f:facet> - <h:outputText value="#{category.stock}" /> - </rich:column> + <h:form> + <a4j:outputPanel id="table"> + <table border="1"> + <tbody> + <tr> + <th><h:outputText value="Product Code" /></th> + <th><h:outputText value="Proposed Price" /></th> + <th><h:outputText value="Sales Cost" /></th> + <th style="width: 150px"><h:outputText value="Reason" /></th> + <th><h:outputText value="Proposed Gross Margin" /></th> + </tr> + <a4j:repeat value="#{salesReport.items}" var="item"> + <tr> + <td align="center"> + <h:outputText value="#{item.productCode}" /> + </td> + <td> + <h:inputText binding="#{updateBean.priceRef}" + immediate="false" value="#{item.proposedPrice}" size="7"> + <a4j:support immediate="true" action="#{updateBean.change}" + event="onchange" reRender="margin,reason,table" /> + </h:inputText> + </td> + <td> + <h:outputText value="#{item.salesCost}" /> + </td> + <td> + <h:selectOneMenu id="reason" required="true" + value="#{item.reason}"> + <f:selectItems value="#{item.reasons}" /> + </h:selectOneMenu> + </td> + <td> + <h:outputText id="margin" + value="#{item.proposedGrossMargin}"> + <f:convertNumber pattern="$###0.000" /> + </h:outputText> + </td> + </tr> + </a4j:repeat> + </tbody> + </table> + </a4j:outputPanel> + <rich:messages /> + </h:form> - - - </rich:scrollableDataTable> - </h:form> - </ui:composition> \ No newline at end of file Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/repeat/usage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/repeat/usage.xhtml 2007-08-31 14:25:22 UTC (rev 2662) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/repeat/usage.xhtml 2007-08-31 14:57:14 UTC (rev 2663) @@ -21,9 +21,9 @@ <div class="sample-container" > - <ui:include src="/richfaces/dataTable/examples/repeater.xhtml"/> + <ui:include src="/richfaces/repeat/examples/repeater.xhtml"/> <ui:include src="/templates/include/sourceview.xhtml"> - <ui:param name="sourcepath" value="/richfaces/dataTable/examples/repeater.xhtml"/> + <ui:param name="sourcepath" value="/richfaces/repeat/examples/repeater.xhtml"/> </ui:include> </div> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/repeat.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/repeat.xhtml 2007-08-31 14:25:22 UTC (rev 2662) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/repeat.xhtml 2007-08-31 14:57:14 UTC (rev 2663) @@ -5,14 +5,14 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:rich="http://richfaces.org/rich"> <ui:composition template="/templates/main.xhtml"> - <ui:define name="title">RichFaces - Open Source Rich JSF Components - Data Grid</ui:define> + <ui:define name="title">RichFaces - Open Source Rich JSF Components - Repeat</ui:define> <ui:define name="body"> <rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> <rich:tab label="Usage"> <ui:include src="/richfaces/repeat/usage.xhtml"/> </rich:tab> <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="rich/repeat"/> + <ui:param name="path" value="richfaces/repeat/examples/repeater.xhtml"/> </ui:include> </rich:tabPanel> </ui:define>

17 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r2662 - trunk/ui/suggestionbox/src/main/resources/org/richfaces/renderkit/html/scripts.

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

Author: a.izobov Date: 2007-08-31 10:25:22 -0400 (Fri, 31 Aug 2007) New Revision: 2662 Modified: trunk/ui/suggestionbox/src/main/resources/org/richfaces/renderkit/html/scripts/suggestionbox.js Log: http://jira.jboss.com/jira/browse/RF-760 Modified: trunk/ui/suggestionbox/src/main/resources/org/richfaces/renderkit/html/scripts/suggestionbox.js =================================================================== --- trunk/ui/suggestionbox/src/main/resources/org/richfaces/renderkit/html/scripts/suggestionbox.js 2007-08-31 14:19:39 UTC (rev 2661) +++ trunk/ui/suggestionbox/src/main/resources/org/richfaces/renderkit/html/scripts/suggestionbox.js 2007-08-31 14:25:22 UTC (rev 2662) @@ -795,7 +795,7 @@ } ret["x"] = left; - ret["y"] = top + element.clientHeight; + ret["y"] = top + element.offsetHeight; return ret; },

17 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r2661 - trunk/docs/userguide/en/src/main/docbook/included.

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

Author: smukhina Date: 2007-08-31 10:19:39 -0400 (Fri, 31 Aug 2007) New Revision: 2661 Modified: trunk/docs/userguide/en/src/main/docbook/included/calendar.xml Log: http://jira.jboss.com/jira/browse/RF-398 some spelling mistakes are corrected Modified: trunk/docs/userguide/en/src/main/docbook/included/calendar.xml =================================================================== --- trunk/docs/userguide/en/src/main/docbook/included/calendar.xml 2007-08-31 14:19:18 UTC (rev 2660) +++ trunk/docs/userguide/en/src/main/docbook/included/calendar.xml 2007-08-31 14:19:39 UTC (rev 2661) @@ -419,7 +419,7 @@ </listitem> <listitem> - <para>Add to a user's style sheets <emphasis> + <para>Add to your style sheets <emphasis> <property>style classes</property> </emphasis> used by a <emphasis role="bold"> <property><rich:calendar></property>

17 years, 3 months

1
0
0 / 0

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

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

Author: abelevich Date: 2007-08-31 10:19:18 -0400 (Fri, 31 Aug 2007) New Revision: 2660 Modified: trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java Log: remove span from td in table layout Modified: trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java =================================================================== --- trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java 2007-08-31 14:16:42 UTC (rev 2659) +++ trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java 2007-08-31 14:19:18 UTC (rev 2660) @@ -180,10 +180,10 @@ if(isWroteTable){ writer.startElement(HTML.td_ELEM,uiMessages); + }else{ + writer.startElement(HTML.SPAN_ELEM, uiMessages); } - - writer.startElement(HTML.SPAN_ELEM, uiMessages); - + getUtils().writeAttribute(writer, HTML.class_ATTRIBUTE,labelClass); getUtils().writeAttribute(writer, HTML.style_ATTRIBUTE, labelStyle); @@ -219,11 +219,11 @@ } - writer.endElement(HTML.SPAN_ELEM); - if(isWroteTable){ writer.endElement(HTML.td_ELEM); - } + }else{ + writer.endElement(HTML.SPAN_ELEM); + } } public void renderMarkerHtml(UIComponent component, UIComponent markerFacet, FacesContext context,

17 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r2659 - trunk/ui/message/src/main/java/org/richfaces/component.

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

Author: abelevich Date: 2007-08-31 10:16:42 -0400 (Fri, 31 Aug 2007) New Revision: 2659 Modified: trunk/ui/message/src/main/java/org/richfaces/component/UIRichMessages.java Log: Modified: trunk/ui/message/src/main/java/org/richfaces/component/UIRichMessages.java =================================================================== --- trunk/ui/message/src/main/java/org/richfaces/component/UIRichMessages.java 2007-08-31 14:06:50 UTC (rev 2658) +++ trunk/ui/message/src/main/java/org/richfaces/component/UIRichMessages.java 2007-08-31 14:16:42 UTC (rev 2659) @@ -14,14 +14,7 @@ */ public abstract class UIRichMessages extends UIMessages implements AjaxOutput{ - public static String HEADER_LOCATION_LEFT = "left"; - public static String HEADER_LOCATION_TOP = "top"; - - public static String HEADER_LOCATION_BOTTOM = "bottom"; - - public static String HEADER_LOCATION_RIGHT = "right"; - private boolean isPassed = false; @@ -29,20 +22,10 @@ return isPassed; } - public abstract void setHeaderLocation(String headerLocation); - - public abstract String getHeaderLocation(); - - /* (non-Javadoc) - * @see org.ajax4jsf.component.AjaxOutput#isAjaxRendered() - */ public boolean isAjaxRendered() { return true; } - /* (non-Javadoc) - * @see org.ajax4jsf.component.AjaxOutput#setAjaxRendered(boolean) - */ public void setAjaxRendered(boolean ajaxRendered){ if(!ajaxRendered){ new IllegalArgumentException();

17 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r2658 - trunk/ui/effect/src/main/config/component.

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

Author: nbelaevski Date: 2007-08-31 10:06:50 -0400 (Fri, 31 Aug 2007) New Revision: 2658 Modified: trunk/ui/effect/src/main/config/component/effect.xml Log: http://jira.jboss.com/jira/browse/RF-620 Modified: trunk/ui/effect/src/main/config/component/effect.xml =================================================================== --- trunk/ui/effect/src/main/config/component/effect.xml 2007-08-31 14:06:03 UTC (rev 2657) +++ trunk/ui/effect/src/main/config/component/effect.xml 2007-08-31 14:06:50 UTC (rev 2658) @@ -83,7 +83,7 @@ <defaultvalue>false</defaultvalue> </property> - <property el="false" > + <property> <name>event</name> <classname>java.lang.String</classname> <description>

17 years, 3 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits August 2007