[richfaces-svn-commits] JBoss Rich Faces SVN: r21419 - in trunk/examples/input-demo/src/main: webapp/examples and 1 other directory.
Author: nbelaevski
Date: 2011-02-03 09:15:48 -0500 (Thu, 03 Feb 2011)
New Revision: 21419
Modified:
trunk/examples/input-demo/src/main/java/org/richfaces/demo/AutoCompleteBean.java
trunk/examples/input-demo/src/main/webapp/examples/autocomplete.xhtml
Log:
https://issues.jboss.org/browse/RF-10388
https://issues.jboss.org/browse/RF-10425
Modified:
trunk/examples/input-demo/src/main/java/org/richfaces/demo/AutoCompleteBean.java
===================================================================
---
trunk/examples/input-demo/src/main/java/org/richfaces/demo/AutoCompleteBean.java 2011-02-03
14:15:25 UTC (rev 21418)
+++
trunk/examples/input-demo/src/main/java/org/richfaces/demo/AutoCompleteBean.java 2011-02-03
14:15:48 UTC (rev 21419)
@@ -22,7 +22,6 @@
package org.richfaces.demo;
import java.io.Serializable;
-import java.util.Arrays;
import java.util.Locale;
import javax.faces.bean.ManagedBean;
@@ -31,7 +30,7 @@
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
-import org.richfaces.component.UIAutocomplete;
+import org.richfaces.component.AutocompleteMode;
import com.google.common.base.Predicate;
import com.google.common.collect.Collections2;
@@ -75,13 +74,13 @@
return value;
}
- private String mode = "lazyClient";
+ private AutocompleteMode mode = AutocompleteMode.lazyClient;
- public String getMode() {
+ public AutocompleteMode getMode() {
return mode;
}
- public void setMode(String mode) {
+ public void setMode(AutocompleteMode mode) {
this.mode = mode;
}
@@ -98,8 +97,14 @@
if (str.charAt(0)=='i') {
str = str.substring(1);
}*/
- String v = mode.equals("lazyClient") || mode.equals("client")
? "" : value;
- return Collections2.filter(countriesBean.getCountries(), new
CountryNamePredicate(v.toLowerCase()));
+
+ AutocompleteMode mode = (AutocompleteMode)
component.getAttributes().get("mode");
+ boolean isClient = mode == AutocompleteMode.client || mode ==
AutocompleteMode.lazyClient;
+ String v = isClient ? "" : value;
+ return Collections2.filter(countriesBean.getCountries(), new
CountryNamePredicate(v.toLowerCase(Locale.US)));
}
+ public Object getModes() {
+ return AutocompleteMode.values();
+ }
}
Modified: trunk/examples/input-demo/src/main/webapp/examples/autocomplete.xhtml
===================================================================
--- trunk/examples/input-demo/src/main/webapp/examples/autocomplete.xhtml 2011-02-03
14:15:25 UTC (rev 21418)
+++ trunk/examples/input-demo/src/main/webapp/examples/autocomplete.xhtml 2011-02-03
14:15:48 UTC (rev 21419)
@@ -25,10 +25,7 @@
<h:form id="form">
<h:selectOneMenu value="#{autoCompleteBean.mode}"
onchange="submit()">
- <f:selectItem itemValue="lazyClient"/>
- <f:selectItem itemValue="client"/>
- <f:selectItem itemValue="cachedAjax"/>
- <f:selectItem itemValue="ajax"/>
+ <f:selectItems value="#{autoCompleteBean.modes}" />
</h:selectOneMenu><br/>
<div style="height: 300px; width: 300px; overflow: auto;
float:left;">Text
block text block text block text block text block text block text