Author: lfryc(a)redhat.com Date: 2011-02-15 05:43:22 -0500 (Tue, 15 Feb 2011) New Revision: 21662 Added: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableTogglerBean.java Removed: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableTogglerlBean.java Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableBean.java 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/RichTreeBean.java modules/tests/metamer/trunk/application/src/main/webapp/WEB-INF/web.xml Log: @ManagedProperty replaced with obtaining from static reference Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableBean.java 2011-02-15 10:42:18 UTC (rev 21661) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableBean.java 2011-02-15 10:43:22 UTC (rev 21662) @@ -29,7 +29,6 @@ import javax.annotation.PostConstruct; import javax.faces.bean.ManagedBean; -import javax.faces.bean.ManagedProperty; import javax.faces.bean.ViewScoped; import org.richfaces.component.UICollapsibleSubTable; @@ -54,8 +53,8 @@ private static final long serialVersionUID = -1L; private static Logger logger; private Attributes attributes; - @ManagedProperty(value = "#{model.employees}") - private List<Employee> employees; + // FIXME: @ManagedProperty(value = "#{model.employees}") + private List<Employee> employees = Model.unmarshallEmployees(); private List<List<Employee>> lists; private UICollapsibleSubTable binding; // true = model, false = empty table Copied: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableTogglerBean.java (from rev 21661, modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableTogglerlBean.java) =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableTogglerBean.java (rev 0) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableTogglerBean.java 2011-02-15 10:43:22 UTC (rev 21662) @@ -0,0 +1,122 @@ +/******************************************************************************* + * JBoss, Home of Professional Open Source + * Copyright 2010-2011, 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.ViewScoped; + +import org.richfaces.component.UICollapsibleSubTableToggleControl; +import org.richfaces.tests.metamer.Attributes; +import org.richfaces.tests.metamer.model.Employee; +import org.richfaces.tests.metamer.model.Employee.Sex; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Managed bean for rich:collapsibleSubTableToggler. + * + * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a> + * @version $Revision$ + */ +@ManagedBean(name="richSubTableTogglerBean") +@ViewScoped +public class RichCollapsibleSubTableTogglerBean implements Serializable { + + private static final long serialVersionUID = -1L; + private static Logger logger; + private Attributes attributes; + // FIXME: @ManagedProperty(value = "#{model.employees}") + private List<Employee> employees = Model.unmarshallEmployees(); + private List<List<Employee>> lists; + // true = model, false = empty table + private boolean state; + + /** + * Initializes the managed bean. + */ + @PostConstruct + public void init() { + logger = LoggerFactory.getLogger(getClass()); + logger.debug("initializing bean " + getClass().getName()); + + attributes = Attributes.getComponentAttributesFromFacesConfig(UICollapsibleSubTableToggleControl.class, getClass()); + attributes.setAttribute("event", "click"); + attributes.setAttribute("rendered", true); + // TODO these attributes have to be tested in another way + attributes.remove("for"); + + List<Employee> men = new ArrayList<Employee>(); + List<Employee> women = new ArrayList<Employee>(); + + for (Employee e : employees) { + if (e.getSex() == Sex.MALE) { + men.add(e); + } else { + women.add(e); + } + } + + lists = new ArrayList<List<Employee>>(); + lists.add(men); + lists.add(women); + + state = true; + } + + public Attributes getAttributes() { + return attributes; + } + + public void setAttributes(Attributes attributes) { + this.attributes = attributes; + } + + public List<Employee> getEmployees() { + return employees; + } + + public void setEmployees(List<Employee> employees) { + this.employees = employees; + } + + public List<List<Employee>> getLists() { + return lists; + } + + public void setLists(List<List<Employee>> lists) { + this.lists = lists; + } + + public boolean isState() { + return state; + } + + public void setState(boolean state) { + this.state = state; + } + +} Deleted: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableTogglerlBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableTogglerlBean.java 2011-02-15 10:42:18 UTC (rev 21661) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableTogglerlBean.java 2011-02-15 10:43:22 UTC (rev 21662) @@ -1,123 +0,0 @@ -/******************************************************************************* - * JBoss, Home of Professional Open Source - * Copyright 2010-2011, 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.ViewScoped; - -import org.richfaces.component.UICollapsibleSubTableToggleControl; -import org.richfaces.tests.metamer.Attributes; -import org.richfaces.tests.metamer.model.Employee; -import org.richfaces.tests.metamer.model.Employee.Sex; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Managed bean for rich:collapsibleSubTableToggler. - * - * @author <a href="mailto:ppitonak@redhat.com">Pavol Pitonak</a> - * @version $Revision$ - */ -@ManagedBean(name="richSubTableTogglerBean") -@ViewScoped -public class RichCollapsibleSubTableTogglerlBean implements Serializable { - - private static final long serialVersionUID = -1L; - private static Logger logger; - private Attributes attributes; - @ManagedProperty(value = "#{model.employees}") - private List<Employee> employees; - private List<List<Employee>> lists; - // true = model, false = empty table - private boolean state; - - /** - * Initializes the managed bean. - */ - @PostConstruct - public void init() { - logger = LoggerFactory.getLogger(getClass()); - logger.debug("initializing bean " + getClass().getName()); - - attributes = Attributes.getComponentAttributesFromFacesConfig(UICollapsibleSubTableToggleControl.class, getClass()); - attributes.setAttribute("event", "click"); - attributes.setAttribute("rendered", true); - // TODO these attributes have to be tested in another way - attributes.remove("for"); - - List<Employee> men = new ArrayList<Employee>(); - List<Employee> women = new ArrayList<Employee>(); - - for (Employee e : employees) { - if (e.getSex() == Sex.MALE) { - men.add(e); - } else { - women.add(e); - } - } - - lists = new ArrayList<List<Employee>>(); - lists.add(men); - lists.add(women); - - state = true; - } - - public Attributes getAttributes() { - return attributes; - } - - public void setAttributes(Attributes attributes) { - this.attributes = attributes; - } - - public List<Employee> getEmployees() { - return employees; - } - - public void setEmployees(List<Employee> employees) { - this.employees = employees; - } - - public List<List<Employee>> getLists() { - return lists; - } - - public void setLists(List<List<Employee>> lists) { - this.lists = lists; - } - - public boolean isState() { - return state; - } - - public void setState(boolean state) { - this.state = state; - } - -} Modified: 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 2011-02-15 10:42:18 UTC (rev 21661) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichInplaceSelectBean.java 2011-02-15 10:43:22 UTC (rev 21662) @@ -27,7 +27,6 @@ import javax.annotation.PostConstruct; import javax.faces.bean.ManagedBean; -import javax.faces.bean.ManagedProperty; import javax.faces.bean.ViewScoped; import javax.faces.event.ValueChangeEvent; import javax.faces.model.SelectItem; @@ -51,8 +50,8 @@ private static final long serialVersionUID = -1L; private static Logger logger; private Attributes attributes; - @ManagedProperty(value = "#{model.capitals}") - private List<Capital> capitals; + // FIXME: @ManagedProperty(value = "#{model.capitals}") + private List<Capital> capitals = Model.unmarshallCapitals(); private List<SelectItem> capitalsOptions = null; /** Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeBean.java 2011-02-15 10:42:18 UTC (rev 21661) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichTreeBean.java 2011-02-15 10:43:22 UTC (rev 21662) @@ -31,7 +31,6 @@ import javax.annotation.PostConstruct; import javax.faces.bean.ManagedBean; -import javax.faces.bean.ManagedProperty; import javax.faces.bean.ViewScoped; import javax.faces.event.ComponentSystemEvent; import javax.swing.tree.TreeNode; @@ -59,8 +58,8 @@ private List<TreeNode> root = new ArrayList<TreeNode>(); private Collection<Object> selection; - @ManagedProperty(value = "#{model}") - private Model model; + // FIXME: @ManagedProperty(value = "#{model}") + // private Model model; private Map<String, Country> countriesCache = new HashMap<String, Country>(); private Map<String, Company> companiesCache = new HashMap<String, Company>(); @@ -92,7 +91,7 @@ attributes.remove("stateVar"); attributes.remove("nodeType"); - for (CompactDiscXmlDescriptor descriptor : model.getCompactDiscs()) { + for (CompactDiscXmlDescriptor descriptor : Model.unmarshallCompactDiscs()) { createCompactDisc(descriptor); } } @@ -144,10 +143,6 @@ return country; } - public void setModel(Model model) { - this.model = model; - } - public List<TreeNode> getRoot() { return root; Modified: modules/tests/metamer/trunk/application/src/main/webapp/WEB-INF/web.xml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/WEB-INF/web.xml 2011-02-15 10:42:18 UTC (rev 21661) +++ modules/tests/metamer/trunk/application/src/main/webapp/WEB-INF/web.xml 2011-02-15 10:43:22 UTC (rev 21662) @@ -14,7 +14,7 @@ </context-param> <context-param> <param-name>org.jboss.jbossfaces.WAR_BUNDLES_JSF_IMPL</param-name> - <param-value>false</param-value> + <param-value>true</param-value> </context-param> <context-param> <param-name>org.richfaces.skin</param-name>