Author: ilya_shaikovsky Date: 2007-11-15 11:15:12 -0500 (Thu, 15 Nov 2007) New Revision: 4012 Added: trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/ trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/Capital.java trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/CapitalsBean.java trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/capitals-rules.xml trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/capitals.xml trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/digester-rules.dtd trunk/samples/richfaces-demo/src/main/webapp/images/capitals/ trunk/samples/richfaces-demo/src/main/webapp/images/capitals/alabama.gif trunk/samples/richfaces-demo/src/main/webapp/images/capitals/alaska.gif trunk/samples/richfaces-demo/src/main/webapp/images/capitals/arizona.gif trunk/samples/richfaces-demo/src/main/webapp/images/capitals/arkansas.gif trunk/samples/richfaces-demo/src/main/webapp/images/capitals/california.gif trunk/samples/richfaces-demo/src/main/webapp/images/capitals/colorado.gif trunk/samples/richfaces-demo/src/main/webapp/images/capitals/connecticut.gif trunk/samples/richfaces-demo/src/main/webapp/images/capitals/delaware.gif trunk/samples/richfaces-demo/src/main/webapp/images/capitals/florida.gif trunk/samples/richfaces-demo/src/main/webapp/images/capitals/georgia.gif trunk/samples/richfaces-demo/src/main/webapp/images/capitals/hawaii.gif trunk/samples/richfaces-demo/src/main/webapp/images/capitals/idaho.gif trunk/samples/richfaces-demo/src/main/webapp/images/capitals/illinois.gif trunk/samples/richfaces-demo/src/main/webapp/images/capitals/indiana.gif trunk/samples/richfaces-demo/src/main/webapp/images/capitals/iowa.gif trunk/samples/richfaces-demo/src/main/webapp/images/capitals/kansas.gif trunk/samples/richfaces-demo/src/main/webapp/images/capitals/kentucky.gif trunk/samples/richfaces-demo/src/main/webapp/images/capitals/louisiana.gif trunk/samples/richfaces-demo/src/main/webapp/images/capitals/maine.gif trunk/samples/richfaces-demo/src/main/webapp/images/capitals/maryland.gif trunk/samples/richfaces-demo/src/main/webapp/images/capitals/massachusetts.gif trunk/samples/richfaces-demo/src/main/webapp/images/capitals/michigan.gif trunk/samples/richfaces-demo/src/main/webapp/images/capitals/minnesota.gif trunk/samples/richfaces-demo/src/main/webapp/images/capitals/mississippi.gif trunk/samples/richfaces-demo/src/main/webapp/images/capitals/missouri.gif trunk/samples/richfaces-demo/src/main/webapp/images/capitals/montana.gif trunk/samples/richfaces-demo/src/main/webapp/images/capitals/nebraska.gif trunk/samples/richfaces-demo/src/main/webapp/images/capitals/nevada.gif trunk/samples/richfaces-demo/src/main/webapp/images/capitals/newhampshire.gif trunk/samples/richfaces-demo/src/main/webapp/images/capitals/newjersey.gif trunk/samples/richfaces-demo/src/main/webapp/images/capitals/newmexico.gif trunk/samples/richfaces-demo/src/main/webapp/images/capitals/newyork.gif trunk/samples/richfaces-demo/src/main/webapp/images/capitals/northcarolina.gif trunk/samples/richfaces-demo/src/main/webapp/images/capitals/northdakota.gif trunk/samples/richfaces-demo/src/main/webapp/images/capitals/ohio.gif trunk/samples/richfaces-demo/src/main/webapp/images/capitals/oklahoma.gif trunk/samples/richfaces-demo/src/main/webapp/images/capitals/oregon.gif trunk/samples/richfaces-demo/src/main/webapp/images/capitals/pennsylvania.gif trunk/samples/richfaces-demo/src/main/webapp/images/capitals/rhodeisland.gif trunk/samples/richfaces-demo/src/main/webapp/images/capitals/southcarolina.gif trunk/samples/richfaces-demo/src/main/webapp/images/capitals/southdakota.gif trunk/samples/richfaces-demo/src/main/webapp/images/capitals/tennessee.gif trunk/samples/richfaces-demo/src/main/webapp/images/capitals/texas.gif trunk/samples/richfaces-demo/src/main/webapp/images/capitals/utah.gif trunk/samples/richfaces-demo/src/main/webapp/images/capitals/vermont.gif trunk/samples/richfaces-demo/src/main/webapp/images/capitals/virginia.gif trunk/samples/richfaces-demo/src/main/webapp/images/capitals/washington.gif trunk/samples/richfaces-demo/src/main/webapp/images/capitals/westvirginia.gif trunk/samples/richfaces-demo/src/main/webapp/images/capitals/wisconsin.gif trunk/samples/richfaces-demo/src/main/webapp/images/capitals/wyoming.gif Modified: trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/sb/SuggestionBox.java trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml trunk/samples/richfaces-demo/src/main/webapp/richfaces/suggestionBox/examples/custom.xhtml Log: RF-1344 Added: trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/Capital.java =================================================================== --- trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/Capital.java (rev 0) +++ trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/Capital.java 2007-11-15 16:15:12 UTC (rev 4012) @@ -0,0 +1,55 @@ +package org.richfaces.demo.capitals; + +import java.io.Serializable; + +public class Capital implements Serializable { + /** + * + */ + private static final long serialVersionUID = -1042449580199397136L; + private boolean checked=false; + private String name; + private String state; + private String timeZone; + + private final static String FILE_EXT = ".gif"; + public Capital() { + setName("Name"); + setState(null); + } + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + public String getState() { + return state; + } + public void setState(String state) { + this.state = state; + } + + private String stateNameToFileName() { + return state.replaceAll("\\s", "").toLowerCase(); + } + + public String getStateFlag() { + return "/images/capitals/" + stateNameToFileName() + FILE_EXT; + } + + public String getTimeZone() { + return timeZone; + } + public void setTimeZone(String timeZone) { + this.timeZone = timeZone; + } + public boolean isChecked() { + return checked; + } + public void setChecked(boolean checked) { + System.out.println(checked); + System.out.println(this.checked); + this.checked = checked; + } +} Property changes on: trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/Capital.java ___________________________________________________________________ Name: svn:executable + * Added: 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 (rev 0) +++ trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/CapitalsBean.java 2007-11-15 16:15:12 UTC (rev 4012) @@ -0,0 +1,66 @@ +package org.richfaces.demo.capitals; + +import java.io.IOException; +import java.net.URL; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import javax.faces.FacesException; + +import org.apache.commons.digester.Digester; +import org.apache.commons.digester.xmlrules.DigesterLoader; +import org.xml.sax.SAXException; + +public class CapitalsBean { + private ArrayList<Capital> capitals = new ArrayList<Capital>(); + private String capital = ""; + + public List<Capital> autocomplete(Object suggest) { + String pref = (String)suggest; + ArrayList<Capital> result = new ArrayList<Capital>(); + + Iterator<Capital> iterator = getCapitals().iterator(); + while (iterator.hasNext()) { + Capital elem = ((Capital) iterator.next()); + if ((elem.getName() != null && elem.getName().toLowerCase().indexOf(pref.toLowerCase()) == 0) || "".equals(pref)) + { + result.add(elem); + } + } + return result; + } + + public CapitalsBean() { + URL rulesUrl = getClass().getResource("capitals-rules.xml"); + Digester digester = DigesterLoader.createDigester(rulesUrl); + digester.push(this); + try { + digester.parse(getClass().getResourceAsStream("capitals.xml")); + } catch (IOException e) { + throw new FacesException(e); + } catch (SAXException e) { + throw new FacesException(e); + } + + } + + public String addCapital(Capital capital) { + capitals.add(capital); + return null; + } + + public ArrayList<Capital> getCapitals() { + System.out.println(capitals.size()); + return capitals; + } + + public String getCapital() { + return capital; + } + + public void setCapital(String capital) { + this.capital = capital; + } + +} Property changes on: trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/CapitalsBean.java ___________________________________________________________________ Name: svn:executable + * Added: trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/capitals-rules.xml =================================================================== --- trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/capitals-rules.xml (rev 0) +++ trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/capitals-rules.xml 2007-11-15 16:15:12 UTC (rev 4012) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + <!DOCTYPE digester-rules SYSTEM "digester-rules.dtd"> +--> + +<digester-rules> + <pattern value="*/capital"> + <object-create-rule classname="org.richfaces.demo.capitals.Capital" /> + <bean-property-setter-rule pattern="name" propertyname="name"/> + <bean-property-setter-rule pattern="state" propertyname="state"/> + <bean-property-setter-rule pattern="timeZone" propertyname="timeZone"/> + <set-next-rule methodname="addCapital"/> + </pattern> +</digester-rules> \ No newline at end of file Property changes on: trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/capitals-rules.xml ___________________________________________________________________ Name: svn:executable + * Added: trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/capitals.xml =================================================================== --- trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/capitals.xml (rev 0) +++ trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/capitals.xml 2007-11-15 16:15:12 UTC (rev 4012) @@ -0,0 +1,253 @@ +<?xml version="1.0" encoding="UTF-8"?> +<capitals> + <capital> + <state>Alabama</state> + <name>Montgomery</name> + <timeZone>GMT-6</timeZone> + </capital> + <capital> + <state>Alaska</state> + <name>Juneau</name> + <timeZone>GMT-9</timeZone> + </capital> + <capital> + <state>Arizona</state> + <name>Phoenix</name> + <timeZone>GMT-7</timeZone> + </capital> + <capital> + <state>Arkansas</state> + <name>Little Rock</name> + <timeZone>GMT-6</timeZone> + </capital> + <capital> + <state>California</state> + <name>Sacramento</name> + <timeZone>GMT-8</timeZone> + </capital> + <capital> + <state>Colorado</state> + <name>Denver</name> + <timeZone>GMT-7</timeZone> + </capital> + <capital> + <state>Connecticut</state> + <name>Hartford</name> + <timeZone>GMT-5</timeZone> + </capital> + <capital> + <state>Delaware</state> + <name>Dover</name> + <timeZone>GMT-5</timeZone> + </capital> + <capital> + <state>Florida</state> + <name>Tallahassee</name> + <timeZone>GMT-5</timeZone> + </capital> + <capital> + <state>Georgia</state> + <name>Atlanta</name> + <timeZone>GMT-5</timeZone> + </capital> + <capital> + <state>Hawaii</state> + <name>Honolulu</name> + <timeZone>GMT-10</timeZone> + </capital> + <capital> + <state>Idaho</state> + <name>Boise</name> + <timeZone>GMT-8</timeZone> + </capital> + <capital> + <state>Illinois</state> + <name>Springfield</name> + <timeZone>GMT-6</timeZone> + </capital> + <capital> + <state>Indiana</state> + <name>Indianapolis</name> + <timeZone>GMT-5</timeZone> + </capital> + <capital> + <state>Iowa</state> + <name>Des Moines</name> + <timeZone>GMT-6</timeZone> + </capital> + <capital> + <state>Kansas</state> + <name>Topeka</name> + <timeZone>GMT-6</timeZone> + </capital> + <capital> + <state>Kentucky</state> + <name>Frankfort</name> + <timeZone>GMT-5</timeZone> + </capital> + <capital> + <state>Louisiana</state> + <name>Baton Rouge</name> + <timeZone>GMT-6</timeZone> + </capital> + <capital> + <state>Maine</state> + <name>Augusta</name> + <timeZone>GMT-5</timeZone> + </capital> + <capital> + <state>Maryland</state> + <name>Annapolis</name> + <timeZone>GMT-5</timeZone> + </capital> + <capital> + <state>Massachusetts</state> + <name>Boston</name> + <timeZone>GMT-5</timeZone> + </capital> + <capital> + <state>Michigan</state> + <name>Lansing</name> + <timeZone>GMT-5</timeZone> + </capital> + <capital> + <state>Minnesota</state> + <name>St. Paul</name> + <timeZone>GMT-6</timeZone> + </capital> + <capital> + <state>Mississippi</state> + <name>Jackson</name> + <timeZone>GMT-6</timeZone> + </capital> + <capital> + <state>Missouri</state> + <name>Jefferson City</name> + <timeZone>GMT-6</timeZone> + </capital> + <capital> + <state>Montana</state> + <name>Helena</name> + <timeZone>GMT-7</timeZone> + </capital> + <capital> + <state>Nebraska</state> + <name>Lincoln</name> + <timeZone>GMT-6</timeZone> + </capital> + <capital> + <state>Nevada</state> + <name>Carson City</name> + <timeZone>GMT-8</timeZone> + </capital> + <capital> + <state>New Hampshire</state> + <name>Concord</name> + <timeZone>GMT-5</timeZone> + </capital> + <capital> + <state>New Jersey</state> + <name>Trenton</name> + <timeZone>GMT-5</timeZone> + </capital> + <capital> + <state>New Mexico</state> + <name>Santa Fe</name> + <timeZone>GMT-7</timeZone> + </capital> + <capital> + <state>New York</state> + <name>Albany</name> + <timeZone>GMT-5</timeZone> + </capital> + <capital> + <state>North Carolina</state> + <name>Raleigh</name> + <timeZone>GMT-5</timeZone> + </capital> + <capital> + <state>North Dakota</state> + <name>Bismarck</name> + <timeZone>GMT-6</timeZone> + </capital> + <capital> + <state>Ohio</state> + <name>Columbus</name> + <timeZone>GMT-5</timeZone> + </capital> + <capital> + <state>Oklahoma</state> + <name>Oklahoma City</name> + <timeZone>GMT-6</timeZone> + </capital> + <capital> + <state>Oregon</state> + <name>Salem</name> + <timeZone>GMT-8</timeZone> + </capital> + <capital> + <state>Pennsylvania</state> + <name>Harrisburg</name> + <timeZone>GMT-5</timeZone> + </capital> + <capital> + <state>Rhode Island</state> + <name>Providence</name> + <timeZone>GMT-5</timeZone> + </capital> + <capital> + <state>South Carolina</state> + <name>Columbia</name> + <timeZone>GMT-5</timeZone> + </capital> + <capital> + <state>South Dakota</state> + <name>Pierre</name> + <timeZone>GMT-6</timeZone> + </capital> + <capital> + <state>Tennessee</state> + <name>Nashville</name> + <timeZone>GMT-5</timeZone> + </capital> + <capital> + <state>Texas</state> + <name>Austin</name> + <timeZone>GMT-6</timeZone> + </capital> + <capital> + <state>Utah</state> + <name>Salt Lake City</name> + <timeZone>GMT-7</timeZone> + </capital> + <capital> + <state>Vermont</state> + <name>Montpelier</name> + <timeZone>GMT-5</timeZone> + </capital> + <capital> + <state>Virginia</state> + <name>Richmond</name> + <timeZone>GMT-5</timeZone> + </capital> + <capital> + <state>Washington</state> + <name>Olympia</name> + <timeZone>GMT-8</timeZone> + </capital> + <capital> + <state>West Virginia</state> + <name>Charleston</name> + <timeZone>GMT-5</timeZone> + </capital> + <capital> + <state>Wisconsin</state> + <name>Madison</name> + <timeZone>GMT-6</timeZone> + </capital> + <capital> + <state>Wyoming</state> + <name>Cheyenne</name> + <timeZone>GMT-7</timeZone> + </capital> +</capitals> \ No newline at end of file Property changes on: trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/capitals.xml ___________________________________________________________________ Name: svn:executable + * Added: trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/digester-rules.dtd =================================================================== --- trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/digester-rules.dtd (rev 0) +++ trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/digester-rules.dtd 2007-11-15 16:15:12 UTC (rev 4012) @@ -0,0 +1,146 @@ +<?xml version="1.0" encoding="UTF-8" ?> + +<!-- + "Digester" component of the Jakarta Commons Subproject + DTD for the definition of Digester rules in XML. + $Id: digester-rules.dtd,v 1.8 2003/03/27 18:54:45 rdonkin Exp $ +--> + +<!-- This document type defines an XML format for defining Digester rules. + Digester is a framework for pattern-matching-based parsing of XML into + Java objects. See http://jakarta.apache.org/commons/digester.html. --> + +<!ENTITY % rule-elements "bean-property-setter-rule | call-method-rule | call-param-rule | + factory-create-rule | object-create-rule | + set-properties-rule | set-property-rule | set-top-rule | + set-next-rule" > + +<!-- digester-rules is the root element. --> +<!ELEMENT digester-rules (pattern | include | bean-property-setter-rule | call-method-rule | call-param-rule | factory-create-rule | object-create-rule | set-properties-rule | set-property-rule | set-top-rule | set-next-rule )*> + + +<!-- <pattern> defines a matching pattern, or part of a matching pattern. Any + rule nested in a pattern element prepends its parent's to its pattern. + Patterns may be recursively nested. + Example: + <pattern value="foo"> + <pattern value="bar"> + <object-create-rule pattern="baz" classname="Fubar" /> + </pattern> + </pattern> + + The above sample fragment defines an ObjectCreateRule associated + with the pattern "foo/bar/baz". + + Note that the use of pattern elements is optional; an alternative is for + each rule element to contain a 'pattern' attribute. --> +<!ELEMENT pattern (pattern | include | bean-property-setter-rule | call-method-rule | call-param-rule | + factory-create-rule | object-create-rule | + set-properties-rule | set-property-rule | set-top-rule | + set-next-rule )*> +<!ATTLIST pattern + value CDATA #REQUIRED> + + +<!-- + <include> allows one set of digester rules to be included inside + another. The 'path' attribute contains the URI of the document to + include. Inclusion behaves as if the included rules document is + 'macro-expanded' within the outer document. + Programmatically initialized rules can be included as well, via the + 'class' attribute. The 'class' attribute should contain the name + of a class that implements + org.apache.commons.digester.xmlrules.DigesterRulesSource. +--> +<!ELEMENT include EMPTY> +<!ATTLIST include + path CDATA #IMPLIED + class CDATA #IMPLIED> + + +<!-- Each 'rule' element below corresponds to a concrete subclass + of org.apache.framework.digester.Rule. + Each 'rule' element has an optional 'pattern' attribute, which + defines the pattern for that rule instance. If the rule element + is nested inside one or more <pattern> elements, those patterns + will be prepended to the pattern specified in the rule's 'pattern' + attribute. --> + +<!-- Bean Property Setter Rule --> +<!ELEMENT bean-property-setter-rule EMPTY> +<!ATTLIST bean-property-setter-rule + pattern CDATA #IMPLIED + propertyname CDATA #IMPLIED> + +<!-- CallMethodRule --> +<!ELEMENT call-method-rule EMPTY> +<!ATTLIST call-method-rule + pattern CDATA #IMPLIED + methodname CDATA #REQUIRED + paramcount CDATA #IMPLIED + paramtypes CDATA #IMPLIED> + +<!-- + CallParamRule + attrname - set param from attribute value (cannot be combined with from-stack) + from-stack - set param from stack (cannot be combined with attrname) + --> +<!ELEMENT call-param-rule EMPTY> +<!ATTLIST call-param-rule + pattern CDATA #IMPLIED + paramnumber CDATA #REQUIRED + attrname CDATA #IMPLIED + from-stack CDATA #IMPLIED> + +<!-- + FactoryCreateRule + + ignore-exceptions - if this attribute is (ignore case) 'true' then any exceptions + thrown by the object create rule will be ignore. + This will allow processing to continue. + --> +<!ELEMENT factory-create-rule EMPTY> +<!ATTLIST factory-create-rule + pattern CDATA #IMPLIED + classname CDATA #REQUIRED + attrname CDATA #IMPLIED + ignore-exceptions CDATA #IMPLIED> + +<!-- ObjectCreateRule --> +<!ELEMENT object-create-rule EMPTY> +<!ATTLIST object-create-rule + pattern CDATA #IMPLIED + classname CDATA #REQUIRED + attrname CDATA #IMPLIED> + +<!-- SetPropertiesRule --> +<!ELEMENT set-properties-rule (alias)*> +<!ATTLIST factory-create-rule + pattern CDATA #IMPLIED> + +<!-- An alias is a custom attribute->property name mapping --> +<!ELEMENT alias EMPTY> +<!ATTLIST alias + attr-name CDATA #REQUIRED + prop-name CDATA #IMPLIED> + +<!-- SetPropertyRule --> +<!ELEMENT set-property-rule EMPTY> +<!ATTLIST set-property-rule + pattern CDATA #IMPLIED + name CDATA #IMPLIED + value CDATA #IMPLIED> + +<!-- SetTopRule --> +<!ELEMENT set-top-rule EMPTY> +<!ATTLIST set-top-rule + pattern CDATA #IMPLIED + methodname CDATA #REQUIRED + paramtype CDATA #IMPLIED> + +<!-- SetNextRule --> +<!ELEMENT set-next-rule EMPTY> +<!ATTLIST set-next-rule + pattern CDATA #IMPLIED + methodname CDATA #REQUIRED + paramtype CDATA #IMPLIED> Property changes on: trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/capitals/digester-rules.dtd ___________________________________________________________________ Name: svn:executable + * Modified: trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/sb/SuggestionBox.java =================================================================== --- trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/sb/SuggestionBox.java 2007-11-15 16:07:56 UTC (rev 4011) +++ trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/sb/SuggestionBox.java 2007-11-15 16:15:12 UTC (rev 4012) @@ -13,11 +13,6 @@ */ private static final long serialVersionUID = 1L; - private String property; - - private ArrayList cities; - - private ArrayList data; private ArrayList tokens; private String rows; @@ -30,12 +25,10 @@ private boolean check; private String shadowDepth = Integer.toString(SuggestionBoxRenderer.SHADOW_DEPTH); private String border = "1"; - private String width = "200"; + private String width = "250"; private String height = "150"; private String shadowOpacity = "4"; - private static final String [] cit = {"Abba", "Abbeville", "Acworth", "Adairsville", "Adel", "Adrian", "Ailey", "Alamo", "Alapaha", "Albany", "Allenhurst", "Alma", "Alpharetta", "Alston", "Amboy", "Ambrose", "Americus", "Appling", "Arlington", "Ashburn", "Athens", "Athens-Clarke County", "Atkinson", "Atlanta", "Attapulgus", "Auburn", "Augusta", "Augusta-Richmond County", "Austell", "Avondale Estates", "Axson"}; - public SuggestionBox() { this.rows = "0"; this.first = "0"; @@ -45,57 +38,8 @@ this.frequency = "0"; this.rules = "none"; - setCities(getAllData()); } - public List autocomplete(Object suggest) { - String pref = (String)suggest; - ArrayList result = new ArrayList(); - - Iterator iterator = getAllData().iterator(); - while (iterator.hasNext()) { - Data elem = (Data) iterator.next(); - if ((elem != null && elem.getText().toLowerCase().indexOf(pref.toLowerCase()) == 0) || "".equals(pref)) - { - result.add(elem); - } - } - return result; - } - - public ArrayList getCities() { - return cities; - } - - public void setCities(ArrayList cities) { - this.cities = cities; - } - - public ArrayList getAllData() { - ArrayList result = new ArrayList(); - for (int i = 0; i < cit.length; i++) { - Data data = new Data(cit[i], String.valueOf(i + 1)); - result.add(data); - } - return result; - } - - public ArrayList getData() { - return data; - } - - public void setData(ArrayList data) { - this.data = data; - } - - public String getProperty() { - return property; - } - - public void setProperty(String property) { - this.property = property; - } - public String getCellpadding() { return cellpadding; } 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-11-15 16:07:56 UTC (rev 4011) +++ trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml 2007-11-15 16:15:12 UTC (rev 4012) @@ -13,10 +13,15 @@ </managed-property> </managed-bean> <managed-bean> + <managed-bean-name>capitalsBean</managed-bean-name> + <managed-bean-class>org.richfaces.demo.capitals.CapitalsBean</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </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> <managed-bean-name>calendarBean</managed-bean-name> <managed-bean-class>org.richfaces.demo.calendar.CalendarBean</managed-bean-class> Added: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/alabama.gif =================================================================== (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/alabama.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/alaska.gif =================================================================== (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/alaska.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/arizona.gif =================================================================== (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/arizona.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/arkansas.gif =================================================================== (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/arkansas.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/california.gif =================================================================== (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/california.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/colorado.gif =================================================================== (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/colorado.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/connecticut.gif =================================================================== (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/connecticut.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/delaware.gif =================================================================== (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/delaware.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/florida.gif =================================================================== (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/florida.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/georgia.gif =================================================================== (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/georgia.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/hawaii.gif =================================================================== (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/hawaii.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/idaho.gif =================================================================== (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/idaho.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/illinois.gif =================================================================== (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/illinois.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/indiana.gif =================================================================== (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/indiana.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/iowa.gif =================================================================== (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/iowa.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/kansas.gif =================================================================== (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/kansas.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/kentucky.gif =================================================================== (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/kentucky.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/louisiana.gif =================================================================== (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/louisiana.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/maine.gif =================================================================== (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/maine.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/maryland.gif =================================================================== (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/maryland.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/massachusetts.gif =================================================================== (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/massachusetts.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/michigan.gif =================================================================== (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/michigan.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/minnesota.gif =================================================================== (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/minnesota.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/mississippi.gif =================================================================== (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/mississippi.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/missouri.gif =================================================================== (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/missouri.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/montana.gif =================================================================== (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/montana.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/nebraska.gif =================================================================== (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/nebraska.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/nevada.gif =================================================================== (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/nevada.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/newhampshire.gif =================================================================== (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/newhampshire.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/newjersey.gif =================================================================== (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/newjersey.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/newmexico.gif =================================================================== (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/newmexico.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/newyork.gif =================================================================== (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/newyork.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/northcarolina.gif =================================================================== (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/northcarolina.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/northdakota.gif =================================================================== (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/northdakota.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/ohio.gif =================================================================== (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/ohio.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/oklahoma.gif =================================================================== (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/oklahoma.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/oregon.gif =================================================================== (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/oregon.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/pennsylvania.gif =================================================================== (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/pennsylvania.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/rhodeisland.gif =================================================================== (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/rhodeisland.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/southcarolina.gif =================================================================== (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/southcarolina.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/southdakota.gif =================================================================== (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/southdakota.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/tennessee.gif =================================================================== (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/tennessee.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/texas.gif =================================================================== (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/texas.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/utah.gif =================================================================== (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/utah.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/vermont.gif =================================================================== (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/vermont.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/virginia.gif =================================================================== (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/virginia.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/washington.gif =================================================================== (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/washington.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/westvirginia.gif =================================================================== (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/westvirginia.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/wisconsin.gif =================================================================== (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/wisconsin.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/wyoming.gif =================================================================== (Binary files differ) Property changes on: trunk/samples/richfaces-demo/src/main/webapp/images/capitals/wyoming.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/suggestionBox/examples/custom.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/suggestionBox/examples/custom.xhtml 2007-11-15 16:07:56 UTC (rev 4011) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/suggestionBox/examples/custom.xhtml 2007-11-15 16:15:12 UTC (rev 4012) @@ -6,13 +6,9 @@ xmlns:rich="http://richfaces.org/rich"> <h:form id="suggestionbox_form"> + + <rich:spacer height="30px"/> - <h:outputText - value="Simple richfaces Suggestion Box test web application." - style="font: 18px;font-weight: bold;" /> - <br /> - <br /> - <h:panelGrid columns="3" border="0" style="border: 1px solid black;"> <f:verbatim>Suggestion Box will suggest you town names if it's started with the "a" or "A" letter</f:verbatim> @@ -24,29 +20,38 @@ <f:verbatim>&#160;</f:verbatim> - <h:inputText value="#{suggestionBox.property}" id="text" /> + <h:inputText value="#{capitalsBean.capital}" id="text" /> <rich:suggestionbox id="suggestionBoxId" for="text" tokens=",[" rules="#{suggestionBox.rules}" - suggestionAction="#{suggestionBox.autocomplete}" var="result" - fetchValue="#{result.text}" rows="#{suggestionBox.intRows}" + suggestionAction="#{capitalsBean.autocomplete}" var="result" + fetchValue="#{result.name}" rows="#{suggestionBox.intRows}" first="#{suggestionBox.intFirst}" minChars="#{suggestionBox.minchars}" shadowOpacity="#{suggestionBox.shadowOpacity}" border="#{suggestionBox.border}" width="#{suggestionBox.width}" height="#{suggestionBox.height}" shadowDepth="#{suggestionBox.shadowDepth}" - cellpadding="#{suggestionBox.cellpadding}"> - <h:column> - <h:outputText value="#{result.text}" /> + cellpadding="#{suggestionBox.cellpadding}" + nothingLabel="No capitals found" columnClasses="center"> + <h:column> + <f:facet name="header"> + <h:outputText value="123"></h:outputText> + </f:facet> + <h:graphicImage value="#{result.stateFlag}" /> </h:column> + <h:column> + <h:outputText value="#{result.name}" /> + </h:column> + <h:column> + <h:outputText value="#{result.state}" style="font-style:italic"/> + </h:column> </rich:suggestionbox> </h:panelGrid> + + <rich:spacer height="30px"/> - <br /> - <br /> - - <h:panelGrid columns="2" border="0" style="border: 1px solid black;"> - + <h:panelGrid columns="2" border="0" > + <h:outputText value="Border" /> <rich:inputNumberSlider minValue="1" maxValue="5"