Author: ilya_shaikovsky Date: 2008-03-04 10:45:14 -0500 (Tue, 04 Mar 2008) New Revision: 6535 Modified: trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/CapitalsBean.java 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/WEB-INF/web.xml trunk/samples/richfaces-demo/src/main/webapp/richfaces/pickList.xhtml Log: Modified: trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/CapitalsBean.java =================================================================== --- trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/CapitalsBean.java 2008-03-04 15:39:37 UTC (rev 6534) +++ trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/CapitalsBean.java 2008-03-04 15:45:14 UTC (rev 6535) @@ -7,6 +7,7 @@ import java.util.List; import javax.faces.FacesException; +import javax.faces.model.SelectItem; import org.apache.commons.digester.Digester; import org.apache.commons.digester.xmlrules.DigesterLoader; @@ -14,6 +15,8 @@ public class CapitalsBean { private ArrayList<Capital> capitals = new ArrayList<Capital>(); + private ArrayList<String> capitalsNames = new ArrayList<String>(); + private SelectItem[] capitalsNamesOptions; private String capital = ""; public List<Capital> autocomplete(Object suggest) { @@ -42,7 +45,16 @@ } catch (SAXException e) { throw new FacesException(e); } - + capitalsNames.clear(); + for (Capital cap : capitals) { + capitalsNames.add(cap.getName()); + } + capitalsNamesOptions = new SelectItem[capitals.size()]; + for (int i=0; i<capitals.size(); i++) { + capitalsNamesOptions[i] = new SelectItem(); + capitalsNamesOptions[i].setLabel(capitals.get(i).getName()); + capitalsNamesOptions[i].setValue(capitals.get(i).getName()); + } } public String addCapital(Capital capital) { @@ -61,5 +73,13 @@ public void setCapital(String capital) { this.capital = capital; } + + public ArrayList<String> getCapitalsNames() { + return capitalsNames; + } + + public SelectItem[] getCapitalsNamesOptions() { + return capitalsNamesOptions; + } } 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 2008-03-04 15:39:37 UTC (rev 6534) +++ trunk/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties 2008-03-04 15:45:14 UTC (rev 6535) @@ -69,8 +69,11 @@ portlet= ajaxMisc, Ajax Portlet, /images/ico_common.gif, /images/cn_AjaxPortlet.gif, RichFacesComponentsLibrary.html#portlet, jbossajax4jsf/freezone/docs/tlddoc/a4j/portlet.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIPortlet.html, /richfaces/portlet.jsf effect= richMisc, Effect, /images/ico_common.gif, /images/cn_Effect.gif, RichFacesComponentsLibrary.html#effect, jbossrichfaces/freezone/docs/tlddoc/rich/effect.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIEffect.html, /richfaces/effect.jsf contextMenu= richMenu, Context Menu, /images/ico_dropDownMenu.gif, /images/cn_contextMenu.gif, RichFacesComponentsLibrary.html\#contextMenu, jbossrichfaces/freezone/docs/tlddoc/rich/contextMenu.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIContextMenu.html, /richfaces/contextMenu.jsf -componentControl= richMisc, Component Control, /images/ico_common.gif, /images/cn_componentControl.gif, RichFacesComponentsLibrary.html\#componentControl, jbossrichfaces/freezone/docs/tlddoc/rich/componentControl.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIcomponentControl.html, /richfaces/componentControl.jsf -orderingList=richSelect, Ordering List, \t /images/ico_DataTable.gif, /images/cn_orderingList.gif, RichFacesComponentsLibrary.html\#orderingList, jbossrichfaces/freezone/docs/tlddoc/rich/orderingList.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIorderingList.html, /richfaces/orderingList.jsf -listShuttle=richSelect, List Shuttle, \t\t/images/ico_DataTable.gif, /images/cn_listShuttle.gif, RichFacesComponentsLibrary.html\#listShuttle, jbossrichfaces/freezone/docs/tlddoc/rich/listShuttle.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIlistShuttle.html, /richfaces/listShuttle.jsf -pickList=richSelect, Pick List, \t\t/images/ico_DataTable.gif, /images/cn_listShuttle.gif, RichFacesComponentsLibrary.html\#pickList, jbossrichfaces/freezone/docs/tlddoc/rich/pickList.html, \t\tjbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIpickList.html, /richfaces/pickList.jsf -progressBar=richOutputs, Progress Bar, \t\t/images/ico_DataTable.gif, /images/cn_listShuttle.gif, RichFacesComponentsLibrary.html\#progressBar, jbossrichfaces/freezone/docs/tlddoc/rich/progressBar.html, \t\tjbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIprogressBar.html, /richfaces/progressBar.jsf \ No newline at end of file +componentControl=richMisc, Component Control, /images/ico_common.gif, \t\t/images/cn_componentControl.gif, RichFacesComponentsLibrary.html\#componentControl, jbossrichfaces/freezone/docs/tlddoc/rich/componentControl.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIcomponentControl.html, /richfaces/componentControl.jsf +orderingList=richSelect, Ordering List, \t \t/images/ico_DataTable.gif, \t/images/cn_orderingList.gif, RichFacesComponentsLibrary.html\#orderingList, jbossrichfaces/freezone/docs/tlddoc/rich/orderingList.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIorderingList.html, \t\t/richfaces/orderingList.jsf +listShuttle=richSelect, List Shuttle, \t\t \t\t/images/ico_DataTable.gif, /images/cn_listShuttle.gif, RichFacesComponentsLibrary.html\#listShuttle, jbossrichfaces/freezone/docs/tlddoc/rich/listShuttle.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIlistShuttle.html, \t\t/richfaces/listShuttle.jsf +pickList=richSelect, Pick List, \t\t\t\t\t/images/ico_DataTable.gif, /images/cn_listShuttle.gif, RichFacesComponentsLibrary.html\#pickList, jbossrichfaces/freezone/docs/tlddoc/rich/pickList.html, \t\tjbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIpickList.html, \t\t\t\t/richfaces/pickList.jsf +progressBar=richOutputs, Progress Bar, \t\t \t\t/images/ico_DataTable.gif, /images/cn_listShuttle.gif, RichFacesComponentsLibrary.html\#progressBar, jbossrichfaces/freezone/docs/tlddoc/rich/progressBar.html, \t\tjbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIprogressBar.html, \t/richfaces/progressBar.jsf +comboBox=richInputs, Combo Box, \t\t/images/ico_ComboBox.gif, \t\t/images/cn_ComboBox.gif, RichFacesComponentsLibrary.html\#comboBox, jbossrichfaces/freezone/docs/tlddoc/rich/comboBox.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIcomboBox.html, \t\t\t\t\t/richfaces/comboBox.jsf +inplaceInput=richInputs, Inplace Input, \t\t/images/ico_InplaceInput.gif, \t\t/images/cn_InplaceInput.gif, RichFacesComponentsLibrary.html\#inplaceInput, jbossrichfaces/freezone/docs/tlddoc/rich/inplaceInput.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIinplaceInput.html, \t\t\t\t\t/richfaces/inplaceInput.jsf +inplaceSelect=richInputs, Inplace Select, \t\t/images/ico_InplaceSelect.gif, \t\t/images/cn_InplaceSelect.gif, RichFacesComponentsLibrary.html\#inplaceSelect, jbossrichfaces/freezone/docs/tlddoc/rich/inplaceSelect.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIinplaceSelect.html, \t\t\t\t\t/richfaces/inplaceSelect.jsf \ No newline at end of file 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 2008-03-04 15:39:37 UTC (rev 6534) +++ trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml 2008-03-04 15:45:14 UTC (rev 6535) @@ -283,6 +283,16 @@ <managed-bean-class>org.richfaces.demo.progressBar.ProgressBarBean</managed-bean-class> <managed-bean-scope>session</managed-bean-scope> </managed-bean> + <managed-bean> + <managed-bean-name>comboBoxBean</managed-bean-name> + <managed-bean-class>org.richfaces.demo.comboBox.ComboBoxBean</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>inplaceComponentsBean</managed-bean-name> + <managed-bean-class>org.richfaces.demo.inplaces.InplaceComponentsBean</managed-bean-class> + <managed-bean-scope>request</managed-bean-scope> + </managed-bean> <navigation-rule> <from-view-id>/richfaces/include/examples/wstep1.xhtml</from-view-id> <navigation-case> Modified: trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml 2008-03-04 15:39:37 UTC (rev 6534) +++ trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml 2008-03-04 15:45:14 UTC (rev 6535) @@ -25,7 +25,7 @@ </context-param> <context-param> <param-name>com.sun.faces.verifyObjects</param-name> - <param-value>true</param-value> + <param-value>false</param-value> </context-param> <context-param> <param-name>org.ajax4jsf.SKIN</param-name> Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/pickList.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/pickList.xhtml 2008-03-04 15:39:37 UTC (rev 6534) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/pickList.xhtml 2008-03-04 15:45:14 UTC (rev 6535) @@ -12,7 +12,7 @@ <ui:include src="/richfaces/pickList/usage.xhtml"/> </rich:tab> <ui:include src="/templates/include/tagInfo.xhtml"> - <ui:param name="path" value="a4j/pickList"/> + <ui:param name="path" value="rich/pickList"/> </ui:include> </rich:tabPanel> </ui:define>