Author: mvitenkov Date: 2009-03-17 12:25:07 -0400 (Tue, 17 Mar 2009) New Revision: 12990 Added: trunk/test-applications/facelets/src/main/java/colorPicker/ trunk/test-applications/facelets/src/main/java/colorPicker/ColorPicker.java trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-ColorPicker.xml Modified: trunk/test-applications/facelets/src/main/java/rich/RichBean.java trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Converter.xml trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml Log: Add colorPicker Added: trunk/test-applications/facelets/src/main/java/colorPicker/ColorPicker.java =================================================================== --- trunk/test-applications/facelets/src/main/java/colorPicker/ColorPicker.java (rev 0) +++ trunk/test-applications/facelets/src/main/java/colorPicker/ColorPicker.java 2009-03-17 16:25:07 UTC (rev 12990) @@ -0,0 +1,200 @@ +package colorPicker; + +import javax.faces.application.FacesMessage; +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; +import javax.faces.convert.Converter; +import javax.faces.convert.ConverterException; +import javax.faces.event.ActionEvent; +import javax.faces.event.ValueChangeEvent; +import javax.faces.validator.Validator; +import javax.faces.validator.ValidatorException; + +import org.richfaces.component.html.HtmlColorPicker; + +import util.componentInfo.ComponentInfo; + +public class ColorPicker implements Validator, Converter { + private HtmlColorPicker component; + private String colorMode;// hex, rgb + private String converterMessage; + private boolean disabled; + private boolean flat; + private boolean immediate; + private boolean localValueSet; + private boolean rendered; + private boolean required; + private String requiredMessage; + private boolean valid; + private String validatorMessage; + private String value; + private String bindLabel; + + public ColorPicker() { + colorMode = "rgb"; + converterMessage = "custom converter message"; + disabled = false; + flat = false; + immediate = false; + localValueSet = true; + rendered = true; + required = false; + requiredMessage = "custom required message"; + valid = true; + validatorMessage = "custom validator message"; + value = "rgb(255, 250, 240)"; + bindLabel = "Click Binding"; + } + + public void checkBinding(ActionEvent e){ + FacesContext context = FacesContext.getCurrentInstance(); + bindLabel = component.getClientId(context); + } + + public void changeValue(ValueChangeEvent e) { + System.out.println("old value:" + e.getOldValue() + " new value:" + + e.getNewValue()); + } + + public void addColorPicker() { + ComponentInfo info = ComponentInfo.getInstance(); + info.addField(component); + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public void validate(FacesContext context, UIComponent component, + Object value) throws ValidatorException { + String str = value.toString(); + if (str.startsWith("rgb")) { + if (str.indexOf("100") != -1) + throw new ValidatorException(new FacesMessage( + "Test validator: 100 is restricted!")); + } + } + + public Object getAsObject(FacesContext context, UIComponent component, + String value) throws ConverterException { + if (value.indexOf("100") != -1) + throw new ConverterException(new FacesMessage("Test converter(getAsObject): 100 is restricted!")); + return new String(value + " converted"); + } + + public String getAsString(FacesContext context, UIComponent component, + Object value) throws ConverterException { + if (value.toString().indexOf("100") != -1) + throw new ConverterException(new FacesMessage("Test converter(getAsString): 100 is restricted!")); + return value.toString(); + } + + public HtmlColorPicker getComponent() { + return component; + } + + public void setComponent(HtmlColorPicker component) { + this.component = component; + } + + public String getColorMode() { + return colorMode; + } + + public void setColorMode(String colorMode) { + this.colorMode = colorMode; + } + + public String getConverterMessage() { + return converterMessage; + } + + public void setConverterMessage(String converterMessage) { + this.converterMessage = converterMessage; + } + + public boolean isDisabled() { + return disabled; + } + + public void setDisabled(boolean disabled) { + this.disabled = disabled; + } + + public boolean isFlat() { + return flat; + } + + public void setFlat(boolean flat) { + this.flat = flat; + } + + public boolean isImmediate() { + return immediate; + } + + public void setImmediate(boolean immediate) { + this.immediate = immediate; + } + + public boolean isLocalValueSet() { + return localValueSet; + } + + public void setLocalValueSet(boolean localValueSet) { + this.localValueSet = localValueSet; + } + + public boolean isRendered() { + return rendered; + } + + public void setRendered(boolean rendered) { + this.rendered = rendered; + } + + public boolean isRequired() { + return required; + } + + public void setRequired(boolean required) { + this.required = required; + } + + public String getRequiredMessage() { + return requiredMessage; + } + + public void setRequiredMessage(String requiredMessage) { + this.requiredMessage = requiredMessage; + } + + public boolean isValid() { + return valid; + } + + public void setValid(boolean valid) { + this.valid = valid; + } + + public String getValidatorMessage() { + return validatorMessage; + } + + public void setValidatorMessage(String validatorMessage) { + this.validatorMessage = validatorMessage; + } + + public String getBindLabel() { + return bindLabel; + } + + public void setBindLabel(String bindLabel) { + this.bindLabel = bindLabel; + } + +} Modified: trunk/test-applications/facelets/src/main/java/rich/RichBean.java =================================================================== --- trunk/test-applications/facelets/src/main/java/rich/RichBean.java 2009-03-17 16:23:56 UTC (rev 12989) +++ trunk/test-applications/facelets/src/main/java/rich/RichBean.java 2009-03-17 16:25:07 UTC (rev 12990) @@ -77,6 +77,7 @@ map.add("Editor", add("/Editor/Editor", new boolean [] {true, true, false})); map.add("Queue", add("/Queue/Queue", new boolean [] {false, true, true})); map.add("tTree", add("/tTree/tTree", new boolean [] {true, true, true})); + map.add("ColorPicker", add("/ColorPicker/ColorPicker", new boolean [] {false, true, false})); Iterator<String> iterator = map.getSet().iterator(); while(iterator.hasNext()){ list.add(new SelectItem(iterator.next())); Added: trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-ColorPicker.xml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-ColorPicker.xml (rev 0) +++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-ColorPicker.xml 2009-03-17 16:25:07 UTC (rev 12990) @@ -0,0 +1,10 @@ +<?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>colorPicker</managed-bean-name> + <managed-bean-class>colorPicker.ColorPicker</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> +</faces-config> \ No newline at end of file Modified: trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Converter.xml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Converter.xml 2009-03-17 16:23:56 UTC (rev 12989) +++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/faces-config-Converter.xml 2009-03-17 16:25:07 UTC (rev 12990) @@ -14,4 +14,8 @@ <converter-id>inplaceInputConverter</converter-id> <converter-class>util.converter.InplaceInputConverter</converter-class> </converter> + <converter> + <converter-id>colorPickerConverter</converter-id> + <converter-class>colorPicker.ColorPicker</converter-class> + </converter> </faces-config> Modified: trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml 2009-03-17 16:23:56 UTC (rev 12989) +++ trunk/test-applications/facelets/src/main/webapp/WEB-INF/web.xml 2009-03-17 16:25:07 UTC (rev 12990) @@ -1,90 +1,104 @@ <?xml version="1.0"?> <web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> - <description>RichFaces Test-Application</description> - <display-name>test-application</display-name> - <context-param> - <param-name>org.ajax4jsf.SKIN</param-name> - <param-value>#{skinBean.skin}</param-value> - </context-param> - <context-param> - <param-name>org.richfaces.CONTROL_SKINNING_CLASSES</param-name> - <param-value>#{skinning.skinningClass}</param-value> - </context-param> - <context-param> - <param-name>org.richfaces.CONTROL_SKINNING</param-name> - <param-value>#{skinning.skinning}</param-value> - </context-param> - <context-param> - <param-name>javax.faces.DEFAULT_SUFFIX</param-name> - <param-value>.xhtml</param-value> - </context-param> - <context-param> - <param-name>facelets.REFRESH_PERIOD</param-name> - <param-value>2</param-value> - </context-param> - <context-param> - <param-name>facelets.DEVELOPMENT</param-name> - <param-value>true</param-value> - </context-param> - <context-param> - <param-name>javax.faces.STATE_SAVING_METHOD</param-name> - <param-value>client</param-value> - </context-param> - <context-param> - <param-name>com.sun.faces.validateXml</param-name> - <param-value>true</param-value> - </context-param> - <context-param> - <param-name>com.sun.faces.verifyObjects</param-name> - <param-value>true</param-value> - </context-param> - <context-param> - <param-name>javax.faces.CONFIG_FILES</param-name> - <param-value>/WEB-INF/faces-config-tTree.xml,/WEB-INF/faces-config-Queue.xml,/WEB-INF/faces-config-Editor.xml,/WEB-INF/faces-config-ExtendedDataTable.xml,/WEB-INF/faces-config-DataGrid.xml,/WEB-INF/faces-config-Validator.xml,/WEB-INF/faces-config-ComponentInfo.xml,/WEB-INF/faces-config-HotKey.xml,/WEB-INF/faces-config-DataTable.xml,/WEB-INF/faces-config-SimpleTogglePanel.xml,/WEB-INF/faces-config-Panel.xml,/WEB-INF/faces-config-PanelBar.xml,/WEB-INF/faces-config-TabPanel.xml,/WEB-INF/faces-config-TogglePanel.xml,/WEB-INF/faces-config-Paint2D.xml,/WEB-INF/faces-config-InputNumberSlider.xml,/WEB-INF/faces-config-InputNumberSpinner.xml,/WEB-INF/faces-config-DDMenu.xml,/WEB-INF/faces-config-Tree.xml,/WEB-INF/faces-config-PanelMenu.xml,/WEB-INF/faces-config-Icon.xml,/WEB-INF/faces-config-ModalPanel.xml,/WEB-INF/faces-config-tooltip.xml,/WEB-INF/faces-config-Skin.xml,/WEB-INF/faces-config-Calendar.xml,/WEB-INF/faces-config-Gmap.xml,/WEB-INF/faces-config-DataFilterSlider.xml,/WE! B-INF/faces-config-Separator.xml,/WEB-INF/faces-config-Spacer.xml,/WEB-INF/faces-config-ToolBar.xml,/WEB-INF/faces-config-DataScroller.xml,/WEB-INF/faces-config-SuggestionBox.xml,/WEB-INF/faces-config-Message.xml,/WEB-INF/faces-config-VirtualEarth.xml,/WEB-INF/faces-config-Effect.xml,/WEB-INF/faces-config-Insert.xml,/WEB-INF/faces-config-RichBean.xml,/WEB-INF/faces-config-ScrollableDataTable.xml,/WEB-INF/faces-config-jQuery.xml,/WEB-INF/faces-config-DragAndDrop.xml,/WEB-INF/faces-config-OrderingList.xml,/WEB-INF/faces-config-DataOrderedList.xml,/WEB-INF/faces-config-DataDefinitionList.xml,/WEB-INF/faces-config-ContextMenu.xml,/WEB-INF/faces-config-ListShuttle.xml,/WEB-INF/faces-config-Converter.xml,/WEB-INF/faces-config-ComponentControl.xml,/WEB-INF/faces-config-Columns.xml,/WEB-INF/faces-config-PickList.xml,/WEB-INF/faces-config-Combobox.xml,/WEB-INF/faces-config-PTComponent.xml,/WEB-INF/faces-config-Event.xml,/WEB-INF/faces-config-ProgressBar.xml,/WEB-INF/faces-config-Opt! ions.xml,/WEB-INF/faces-config-SortingAndFiltering.xml,/WEB-INF/faces- config-Style.xml,/WEB-INF/faces-config-FileUpload.xml,/WEB-INF/faces-config-InplaceSelect.xml,/WEB-INF/faces-config-InplaceInput.xml,/WEB-INF/faces-config-Skinning.xml,/WEB-INF/faces-config-Custom.xml</param-value> - </context-param> - <context-param> - <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name> - <param-value>false</param-value> - </context-param> - <context-param> - <param-name>org.ajax4jsf.xmlparser.ORDER</param-name> - <param-value>NONE</param-value> -</context-param> -<context-param> - <param-name>org.jboss.jbossfaces.WAR_BUNDLES_JSF_IMPL</param-name> - <param-value>true</param-value> -</context-param> - <filter> - <display-name>Ajax4jsf Filter</display-name> - <filter-name>ajax4jsf</filter-name> - <filter-class>org.ajax4jsf.Filter</filter-class> - <init-param> - <param-name>createTempFiles</param-name> - <param-value>true</param-value> - </init-param> - <init-param> - <param-name>maxRequestSize</param-name> - <param-value>143482880</param-value> - </init-param> - </filter> - <filter-mapping> - <filter-name>ajax4jsf</filter-name> - <servlet-name>Faces Servlet</servlet-name> - <dispatcher>FORWARD</dispatcher> - <dispatcher>REQUEST</dispatcher> - <dispatcher>INCLUDE</dispatcher> - </filter-mapping> - <servlet> - <servlet-name>Faces Servlet</servlet-name> - <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> - <load-on-startup>1</load-on-startup> - </servlet> - <servlet-mapping> - <servlet-name>Faces Servlet</servlet-name> - <url-pattern>*.jsf</url-pattern> - </servlet-mapping> - <login-config> - <auth-method>BASIC</auth-method> - </login-config> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> + <description>RichFaces Test-Application</description> + <display-name>test-application</display-name> + <context-param> + <param-name>org.ajax4jsf.SKIN</param-name> + <param-value>#{skinBean.skin}</param-value> + </context-param> + <context-param> + <param-name>org.richfaces.CONTROL_SKINNING_CLASSES</param-name> + <param-value>#{skinning.skinningClass}</param-value> + </context-param> + <context-param> + <param-name>org.richfaces.CONTROL_SKINNING</param-name> + <param-value>#{skinning.skinning}</param-value> + </context-param> + <context-param> + <param-name>javax.faces.DEFAULT_SUFFIX</param-name> + <param-value>.xhtml</param-value> + </context-param> + <context-param> + <param-name>facelets.REFRESH_PERIOD</param-name> + <param-value>2</param-value> + </context-param> + <context-param> + <param-name>facelets.DEVELOPMENT</param-name> + <param-value>true</param-value> + </context-param> + <context-param> + <param-name>javax.faces.STATE_SAVING_METHOD</param-name> + <param-value>client</param-value> + </context-param> + <context-param> + <param-name>org.ajax4jsf.handleViewExpiredOnClient</param-name> + <param-value>true</param-value> + </context-param> + <context-param> + <param-name>com.sun.faces.validateXml</param-name> + <param-value>true</param-value> + </context-param> + <context-param> + <param-name>com.sun.faces.verifyObjects</param-name> + <param-value>true</param-value> + </context-param> + <context-param> + <param-name>javax.faces.CONFIG_FILES</param-name> + <param-value> + /WEB-INF/faces-config-ColorPicker.xml,/WEB-INF/faces-config-tTree.xml,/WEB-INF/faces-config-Queue.xml,/WEB-INF/faces-config-Editor.xml,/WEB-INF/faces-config-ExtendedDataTable.xml,/WEB-INF/faces-config-DataGrid.xml,/WEB-INF/faces-config-Validator.xml,/WEB-INF/faces-config-ComponentInfo.xml,/WEB-INF/faces-config-HotKey.xml,/WEB-INF/faces-config-DataTable.xml,/WEB-INF/faces-config-SimpleTogglePanel.xml,/WEB-INF/faces-config-Panel.xml,/WEB-INF/faces-config-PanelBar.xml,/WEB-INF/faces-config-TabPanel.xml,/WEB-INF/faces-config-TogglePanel.xml,/WEB-INF/faces-config-Paint2D.xml,/WEB-INF/faces-config-InputNumberSlider.xml,/WEB-INF/faces-config-InputNumberSpinner.xml,/WEB-INF/faces-config-DDMenu.xml,/WEB-INF/faces-config-Tree.xml,/WEB-INF/faces-config-PanelMenu.xml,/WEB-INF/faces-config-Icon.xml,/WEB-INF/faces-config-ModalPanel.xml,/WEB-INF/faces-config-tooltip.xml,/WEB-INF/faces-config-Skin.xml,/WEB-INF/faces-config-Calendar.xml,/WEB-INF/faces-config-Gmap.xml,/WEB-INF/faces-confi! g-DataFilterSlider.xml,/WEB-INF/faces-config-Separator.xml,/WEB-INF/faces-config-Spacer.xml,/WEB-INF/faces-config-ToolBar.xml,/WEB-INF/faces-config-DataScroller.xml,/WEB-INF/faces-config-SuggestionBox.xml,/WEB-INF/faces-config-Message.xml,/WEB-INF/faces-config-VirtualEarth.xml,/WEB-INF/faces-config-Effect.xml,/WEB-INF/faces-config-Insert.xml,/WEB-INF/faces-config-RichBean.xml,/WEB-INF/faces-config-ScrollableDataTable.xml,/WEB-INF/faces-config-jQuery.xml,/WEB-INF/faces-config-DragAndDrop.xml,/WEB-INF/faces-config-OrderingList.xml,/WEB-INF/faces-config-DataOrderedList.xml,/WEB-INF/faces-config-DataDefinitionList.xml,/WEB-INF/faces-config-ContextMenu.xml,/WEB-INF/faces-config-ListShuttle.xml,/WEB-INF/faces-config-Converter.xml,/WEB-INF/faces-config-ComponentControl.xml,/WEB-INF/faces-config-Columns.xml,/WEB-INF/faces-config-PickList.xml,/WEB-INF/faces-config-Combobox.xml,/WEB-INF/faces-config-PTComponent.xml,/WEB-INF/faces-config-Event.xml,/WEB-INF/faces-config-ProgressBar.xml! ,/WEB-INF/faces-config-Options.xml,/WEB-INF/faces-config-SortingAndFil tering.xml,/WEB-INF/faces-config-Style.xml,/WEB-INF/faces-config-FileUpload.xml,/WEB-INF/faces-config-InplaceSelect.xml,/WEB-INF/faces-config-InplaceInput.xml,/WEB-INF/faces-config-Skinning.xml,/WEB-INF/faces-config-Custom.xml + </param-value> + </context-param> + <context-param> + <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name> + <param-value>true</param-value> + </context-param> + <context-param> + <param-name>org.ajax4jsf.xmlparser.ORDER</param-name> + <param-value>NONE</param-value> + </context-param> + <context-param> + <param-name> + org.jboss.jbossfaces.WAR_BUNDLES_JSF_IMPL + </param-name> + <param-value>true</param-value> + </context-param> + <filter> + <display-name>Ajax4jsf Filter</display-name> + <filter-name>ajax4jsf</filter-name> + <filter-class>org.ajax4jsf.Filter</filter-class> + <init-param> + <param-name>createTempFiles</param-name> + <param-value>true</param-value> + </init-param> + <init-param> + <param-name>maxRequestSize</param-name> + <param-value>143482880</param-value> + </init-param> + </filter> + <filter-mapping> + <filter-name>ajax4jsf</filter-name> + <servlet-name>Faces Servlet</servlet-name> + <dispatcher>FORWARD</dispatcher> + <dispatcher>REQUEST</dispatcher> + <dispatcher>INCLUDE</dispatcher> + </filter-mapping> + + <session-config> + <session-timeout>500</session-timeout> + </session-config> + + <servlet> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>*.jsf</url-pattern> + </servlet-mapping> + <login-config> + <auth-method>BASIC</auth-method> + </login-config> </web-app>