Author: ppitonak(a)redhat.com Date: 2010-11-03 08:43:47 -0400 (Wed, 03 Nov 2010) New Revision: 19909 Added: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInplaceSelectBean.java modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect/ modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect/list.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect/simple.xhtml Modified: modules/tests/metamer/trunk/application/ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/Model.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/components2.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components2.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components2.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richSubTable/components2.xhtml Log: https://jira.jboss.org/browse/RF-9037 * added 1 page for rich:inplaceSelect * inplace select added to rich:dataTable, h:dataTable, rich:extendedDataTable and rich:subTable * added new model - job titles Property changes on: modules/tests/metamer/trunk/application ___________________________________________________________________ Name: svn:ignore - .checkstyle .classpath .project .settings target nbactions.xml nb-configuration.xml + .checkstyle .classpath .project .settings target nbactions.xml nb-configuration.xml .pom.xml.swp Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/Model.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/Model.java 2010-11-03 09:11:50 UTC (rev 19908) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/Model.java 2010-11-03 12:43:47 UTC (rev 19909) @@ -25,12 +25,16 @@ import org.richfaces.tests.metamer.model.*; import java.net.URL; +import java.util.ArrayList; +import java.util.HashSet; import java.util.List; +import java.util.Set; import javax.annotation.PostConstruct; import javax.faces.FacesException; import javax.faces.bean.ApplicationScoped; import javax.faces.bean.ManagedBean; +import javax.faces.model.SelectItem; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; import javax.xml.bind.annotation.XmlElement; @@ -50,6 +54,8 @@ private List<Capital> capitalsList; private List<Employee> employeesList; + private Set<String> jobTitles; + private List<SelectItem> jobTitlesSelectItems; private Logger logger; @PostConstruct @@ -142,4 +148,37 @@ return employeesList; } + + /** + * Model containing various job titles, e.g. CEO, President, Director. + * + * @return set of job titles + */ + public synchronized Set<String> getJobTitles() { + if (jobTitles == null) { + jobTitles = new HashSet<String>(); + for (Employee e : getEmployees()) { + jobTitles.add(e.getTitle()); + } + } + + return jobTitles; + } + + /** + * Model containing select items with various job titles. + * + * @return set of job titles + */ + public synchronized List<SelectItem> getJobTitlesSelectItems() { + if (jobTitlesSelectItems == null) { + jobTitlesSelectItems = new ArrayList<SelectItem>(); + + for (String title : getJobTitles()) { + jobTitlesSelectItems.add(new SelectItem(title, title)); + } + } + + return jobTitlesSelectItems; + } } Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java 2010-11-03 09:11:50 UTC (rev 19908) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichBean.java 2010-11-03 12:43:47 UTC (rev 19909) @@ -125,6 +125,7 @@ components.put("richExtendedDataTable", "Rich Extended Data Table"); components.put("richFunctions", "Rich Functions"); components.put("richInplaceInput", "Rich Inplace Input"); + components.put("richInplaceSelect", "Rich Inplace Select"); components.put("richInputNumberSlider", "Rich Input Number Slider"); components.put("richInputNumberSpinner", "Rich Input Number Spinner"); components.put("richJQuery", "Rich jQuery"); Added: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInplaceSelectBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInplaceSelectBean.java (rev 0) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInplaceSelectBean.java 2010-11-03 12:43:47 UTC (rev 19909) @@ -0,0 +1,105 @@ +/******************************************************************************* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + *******************************************************************************/ +package org.richfaces.tests.metamer.bean; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.PostConstruct; +import javax.faces.bean.ManagedBean; +import javax.faces.bean.ManagedProperty; +import javax.faces.bean.SessionScoped; +import javax.faces.event.ValueChangeEvent; +import javax.faces.model.SelectItem; +import org.richfaces.component.UIInplaceSelect; + +import org.richfaces.tests.metamer.Attributes; +import org.richfaces.tests.metamer.model.Capital; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Managed bean for rich:inplaceSelect. + * + * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a> + * @version $Revision$ + */ +@ManagedBean(name = "richInplaceSelectBean") +@SessionScoped +public class RichInplaceSelectBean implements Serializable { + + private static final long serialVersionUID = -1L; + private static Logger logger; + private Attributes attributes; + @ManagedProperty(value = "#{model.capitals}") + private List<Capital> capitals; + private List<SelectItem> capitalsOptions = null; + + /** + * Initializes the managed bean. + */ + @PostConstruct + public void init() { + logger = LoggerFactory.getLogger(getClass()); + logger.debug("initializing bean " + getClass().getName()); + + capitalsOptions = new ArrayList<SelectItem>(); + for (Capital capital : capitals) { + capitalsOptions.add(new SelectItem(capital.getState(), capital.getState())); + } + + attributes = Attributes.getUIComponentAttributes(UIInplaceSelect.class, getClass(), false); + + attributes.setAttribute("defaultLabel", "Click here to edit"); + attributes.setAttribute("editEvent", "click"); + attributes.setAttribute("rendered", true); + + // TODO has to be tested in another way + attributes.remove("converter"); + attributes.remove("validator"); + } + + public Attributes getAttributes() { + return attributes; + } + + public void setAttributes(Attributes attributes) { + this.attributes = attributes; + } + + public void setCapitals(List<Capital> capitals) { + this.capitals = capitals; + } + + public List<SelectItem> getCapitalsOptions() { + return capitalsOptions; + } + + public void setCapitalsOptions(List<SelectItem> capitalsOptions) { + this.capitalsOptions = capitalsOptions; + } + + public void listener(ValueChangeEvent event) { + RichBean.logToPage("* value changed: " + event.getOldValue() + " -> " + event.getNewValue()); + } +} Property changes on: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInplaceSelectBean.java ___________________________________________________________________ Name: svn:keywords + Revision Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/components2.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/components2.xhtml 2010-11-03 09:11:50 UTC (rev 19908) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/hDataTable/components2.xhtml 2010-11-03 12:43:47 UTC (rev 19909) @@ -131,7 +131,10 @@ <h:outputText id="columnHeaderTitleComponent" value="rich:comboBox" /> </f:facet> - <h:outputText value="#{record.title}" /> + <rich:inplaceSelect id="titleInput" value="#{record.title}"> + <f:selectItems value="#{model.jobTitlesSelectItems}"/> + </rich:inplaceSelect> + <f:facet name="footer"> <h:outputText id="columnFooterTitle" value="Title" /> </f:facet> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components2.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components2.xhtml 2010-11-03 09:11:50 UTC (rev 19908) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richDataTable/components2.xhtml 2010-11-03 12:43:47 UTC (rev 19909) @@ -106,7 +106,7 @@ </f:facet> <rich:inplaceInput id="nameInput" value="#{record.name}" defaultLabel="Click here to edit"> - <a4j:ajax event="change"/> + <a4j:ajax event="inputchange" render="@this"/> </rich:inplaceInput> <f:facet name="footer"> @@ -118,10 +118,13 @@ <f:facet name="header"> <h:outputText id="columnHeaderTitle" value="Title" /> <br/> - <h:outputText id="columnHeaderTitleComponent" value="rich:comboBox" /> + <h:outputText id="columnHeaderTitleComponent" value="rich:inplaceSelect" /> </f:facet> - <h:outputText value="#{record.title}" /> + <rich:inplaceSelect id="titleInput" value="#{record.title}"> + <f:selectItems value="#{model.jobTitlesSelectItems}"/> + </rich:inplaceSelect> + <f:facet name="footer"> <h:outputText id="columnFooterTitle" value="Title" /> </f:facet> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components2.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components2.xhtml 2010-11-03 09:11:50 UTC (rev 19908) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richExtendedDataTable/components2.xhtml 2010-11-03 12:43:47 UTC (rev 19909) @@ -154,7 +154,7 @@ </f:facet> <rich:inplaceInput id="nameInput" value="#{record.name}" defaultLabel="Click here to edit"> - <a4j:ajax event="change"/> + <a4j:ajax event="inputchange" render="@this"/> </rich:inplaceInput> <f:facet name="footer"> @@ -169,7 +169,10 @@ <h:outputText id="columnHeaderTitleComponent" value="rich:inplaceSelect" /> </f:facet> - <h:outputText value="#{record.title}" /> + <rich:inplaceSelect id="titleInput" value="#{record.title}"> + <f:selectItems value="#{model.jobTitlesSelectItems}"/> + </rich:inplaceSelect> + <f:facet name="footer"> <h:outputText id="columnFooterTitle" value="Title" /> </f:facet> Added: modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect/list.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect/list.xhtml (rev 0) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect/list.xhtml 2010-11-03 12:43:47 UTC (rev 19909) @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:metamer="http://java.sun.com/jsf/composite/metamer"> + + <!-- +JBoss, Home of Professional Open Source +Copyright 2010, Red Hat, Inc. and individual contributors +by the @authors tag. See the copyright.txt in the distribution for a +full listing of individual contributors. + +This is free software; you can redistribute it and/or modify it +under the terms of the GNU Lesser General Public License as +published by the Free Software Foundation; either version 2.1 of +the License, or (at your option) any later version. + +This software is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this software; if not, write to the Free +Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +02110-1301 USA, or see the FSF site: http://www.fsf.org. + --> + + <ui:composition template="/templates/list.xhtml"> + + <ui:define name="pageTitle">Rich Inplace Select</ui:define> + + <ui:define name="links"> + + <metamer:testPageLink id="simple" outcome="simple" value="Simple"> + Simple page that contains <b>rich:inplaceSelect</b> and input boxes for all its attributes. + </metamer:testPageLink> + + </ui:define> + + </ui:composition> + +</html> Added: modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect/simple.xhtml (rev 0) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richInplaceSelect/simple.xhtml 2010-11-03 12:43:47 UTC (rev 19909) @@ -0,0 +1,122 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:metamer="http://java.sun.com/jsf/composite/metamer" + xmlns:rich="http://richfaces.org/rich" xmlns:a4j="http://richfaces.org/a4j"> + + <!-- +JBoss, Home of Professional Open Source +Copyright 2010, Red Hat, Inc. and individual contributors +by the @authors tag. See the copyright.txt in the distribution for a +full listing of individual contributors. + +This is free software; you can redistribute it and/or modify it +under the terms of the GNU Lesser General Public License as +published by the Free Software Foundation; either version 2.1 of +the License, or (at your option) any later version. + +This software is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this software; if not, write to the Free +Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +02110-1301 USA, or see the FSF site: http://www.fsf.org. + --> + + <ui:composition template="/templates/template.xhtml"> + + <ui:define name="head"> + <f:metadata> + <f:viewParam name="templates" value="#{templateBean.templates}"> + <f:converter converterId="templatesListConverter" /> + </f:viewParam> + </f:metadata> + </ui:define> + + <ui:define name="outOfTemplateBefore"> + </ui:define> + + <ui:define name="component"> + <rich:inplaceSelect id="inplaceSelect" + converterMessage="#{richInplaceSelectBean.attributes['converterMessage'].value}" + defaultLabel="#{richInplaceSelectBean.attributes['defaultLabel'].value}" + editEvent="#{richInplaceSelectBean.attributes['editEvent'].value}" + enableManualInput="#{richInplaceSelectBean.attributes['editManualInput'].value}" + immediate="#{richInplaceSelectBean.attributes['immediate'].value}" + itemClass="#{richInplaceSelectBean.attributes['itemClass'].value}" + listClass="#{richInplaceSelectBean.attributes['listClass'].value}" + listHeight="#{richInplaceSelectBean.attributes['listHeight'].value}" + listWidth="#{richInplaceSelectBean.attributes['listWidth'].value}" + onblur="#{richInplaceSelectBean.attributes['onblur'].value}" + onchange="#{richInplaceSelectBean.attributes['onchange'].value}" + onclick="#{richInplaceSelectBean.attributes['onclick'].value}" + ondblclick="#{richInplaceSelectBean.attributes['ondblclick'].value}" + onfocus="#{richInplaceSelectBean.attributes['onfocus'].value}" + oninputblur="#{richInplaceSelectBean.attributes['oninputblur'].value}" + oninputclick="#{richInplaceSelectBean.attributes['oninputclick'].value}" + oninputdblclick="#{richInplaceSelectBean.attributes['oninputdblclick'].value}" + oninputfocus="#{richInplaceSelectBean.attributes['oninputfocus'].value}" + oninputkeydown="#{richInplaceSelectBean.attributes['oninputkeydown'].value}" + oninputkeypress="#{richInplaceSelectBean.attributes['oninputkeypress'].value}" + oninputkeyup="#{richInplaceSelectBean.attributes['oninputkeyup'].value}" + oninputmousedown="#{richInplaceSelectBean.attributes['oninputmousedown'].value}" + oninputmousemove="#{richInplaceSelectBean.attributes['oninputmousemove'].value}" + oninputmouseout="#{richInplaceSelectBean.attributes['oninputmouseout'].value}" + oninputmouseover="#{richInplaceSelectBean.attributes['oninputmouseover'].value}" + oninputmouseup="#{richInplaceSelectBean.attributes['oninputmouseup'].value}" + oninputselect="#{richInplaceSelectBean.attributes['oninputselect'].value}" + onkeydown="#{richInplaceSelectBean.attributes['onkeydown'].value}" + onkeypress="#{richInplaceSelectBean.attributes['onkeypress'].value}" + onkeyup="#{richInplaceSelectBean.attributes['onkeyup'].value}" + onlistclick="#{richInplaceSelectBean.attributes['onlistclick'].value}" + onlistdblclick="#{richInplaceSelectBean.attributes['onlistdblclick'].value}" + onlistkeydown="#{richInplaceSelectBean.attributes['onlistkeydown'].value}" + onlistkeypress="#{richInplaceSelectBean.attributes['onlistkeypress'].value}" + onlistkeyup="#{richInplaceSelectBean.attributes['onlistkeyup'].value}" + onlistmousedown="#{richInplaceSelectBean.attributes['onlistmousedown'].value}" + onlistmousemove="#{richInplaceSelectBean.attributes['onlistmousemove'].value}" + onlistmouseout="#{richInplaceSelectBean.attributes['onlistmouseout'].value}" + onlistmouseover="#{richInplaceSelectBean.attributes['onlistmouseover'].value}" + onlistmouseup="#{richInplaceSelectBean.attributes['onlistmouseup'].value}" + onmousedown="#{richInplaceSelectBean.attributes['onmousedown'].value}" + onmousemove="#{richInplaceSelectBean.attributes['onmousemove'].value}" + onmouseout="#{richInplaceSelectBean.attributes['onmouseout'].value}" + onmouseover="#{richInplaceSelectBean.attributes['onmouseover'].value}" + onmouseup="#{richInplaceSelectBean.attributes['onmouseup'].value}" + onselect="#{richInplaceSelectBean.attributes['onselect'].value}" + openOnEdit="#{richInplaceSelectBean.attributes['openOnEdit'].value}" + rendered="#{richInplaceSelectBean.attributes['rendered'].value}" + required="#{richInplaceSelectBean.attributes['required'].value}" + requiredMessage="#{richInplaceSelectBean.attributes['requiredMessage'].value}" + saveOnBlur="#{richInplaceSelectBean.attributes['saveOnBlur'].value}" + saveOnSelect="#{richInplaceSelectBean.attributes['saveOnSelect'].value}" + selectFirst="#{richInplaceSelectBean.attributes['selectFirst'].value}" + selectItemClass="#{richInplaceSelectBean.attributes['selectItemClass'].value}" + showButton="#{richInplaceSelectBean.attributes['showButton'].value}" + showControls="#{richInplaceSelectBean.attributes['showControls'].value}" + state="#{richInplaceSelectBean.attributes['state'].value}" + validatorMessage="#{richInplaceSelectBean.attributes['validatorMessage'].value}" + value="#{richInplaceSelectBean.attributes['value'].value}" + valueChangeListener="#{richInplaceSelectBean.listener}" + > + + <f:selectItems value="#{richInplaceSelectBean.capitalsOptions}" /> + <!-- TODO change event to "change" as soon as implemented --> + <a4j:ajax event="select" render="output"/> + + </rich:inplaceSelect> + + <br/><br/> + + output: <h:outputText id="output" value="#{richInplaceSelectBean.attributes['value'].value}"/> + </ui:define> + + <ui:define name="outOfTemplateAfter"> + <metamer:attributes value="#{richInplaceSelectBean.attributes}" id="attributes" /> + </ui:define> + + </ui:composition> +</html> \ No newline at end of file Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richSubTable/components2.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richSubTable/components2.xhtml 2010-11-03 09:11:50 UTC (rev 19908) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richSubTable/components2.xhtml 2010-11-03 12:43:47 UTC (rev 19909) @@ -119,11 +119,13 @@ </rich:column> <rich:column id="columnName"> <rich:inplaceInput id="nameInput" value="#{item.name}" defaultLabel="Click here to edit"> - <a4j:ajax event="change"/> + <a4j:ajax event="inputchange" render="@this"/> </rich:inplaceInput> </rich:column> <rich:column id="columnTitle"> - <h:outputText value="#{item.title}" /> + <rich:inplaceSelect id="titleInput" value="#{item.title}"> + <f:selectItems value="#{model.jobTitlesSelectItems}"/> + </rich:inplaceSelect> </rich:column> <rich:column id="columnBirthdate"> <h:outputText value="#{item.birthdate}" />