Author: ilya_shaikovsky Date: 2010-11-01 18:33:11 -0400 (Mon, 01 Nov 2010) New Revision: 19865 Added: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tree/ trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tree/CDParser.java trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tree/SimpleTreeBean.java trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tree/model/ trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tree/model/Artist.java trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tree/model/CD.java trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tree/model/Company.java trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tree/model/Country.java trunk/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/tree/ trunk/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/tree/CDCatalog.xml trunk/examples/richfaces-showcase/src/main/webapp/richfaces/tree/ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/tree/samples/ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/tree/samples/tree-sample.xhtml trunk/examples/richfaces-showcase/src/main/webapp/richfaces/tree/tree.xhtml Modified: trunk/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/data/common/navigation.xml Log: https://jira.jboss.org/browse/RF-9611 Added: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tree/CDParser.java =================================================================== --- trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tree/CDParser.java (rev 0) +++ trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tree/CDParser.java 2010-11-01 22:33:11 UTC (rev 19865) @@ -0,0 +1,54 @@ +package org.richfaces.demo.tree; + +import java.net.URL; +import java.util.List; + +import javax.faces.FacesException; +import javax.faces.bean.ApplicationScoped; +import javax.faces.bean.ManagedBean; +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBException; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; + +import org.richfaces.demo.tree.model.CD; + +@ManagedBean(name="cdsParser") +@ApplicationScoped +public class CDParser { + + private List<CD> cdsList; + + @XmlRootElement(name = "CATALOG") + private static final class CDsHolder { + + private List<CD> cds; + + @XmlElement(name = "CD") + public List<CD> getCds() { + return cds; + } + + @SuppressWarnings("unused") + public void setCds(List<CD> cds) { + this.cds = cds; + } + } + + public synchronized List<CD> getCdsList() { + if (cdsList == null) { + ClassLoader ccl = Thread.currentThread().getContextClassLoader(); + URL resource = ccl.getResource("org/richfaces/demo/tree/CDCatalog.xml"); + JAXBContext context; + try { + context = JAXBContext.newInstance(CDsHolder.class); + CDsHolder cdsHolder = (CDsHolder) context.createUnmarshaller().unmarshal(resource); + cdsList = cdsHolder.getCds(); + } catch (JAXBException e) { + throw new FacesException(e.getMessage(), e); + } + } + + return cdsList; + } +} Added: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tree/SimpleTreeBean.java =================================================================== --- trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tree/SimpleTreeBean.java (rev 0) +++ trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tree/SimpleTreeBean.java 2010-11-01 22:33:11 UTC (rev 19865) @@ -0,0 +1,58 @@ +/* + * 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.demo.tree; + +import java.io.Serializable; +import java.util.List; + +import javax.annotation.PostConstruct; +import javax.faces.bean.ManagedBean; +import javax.faces.bean.ManagedProperty; +import javax.faces.bean.SessionScoped; + +import org.richfaces.demo.tree.model.CD; + +/** + * @author Ilya Shaikovsky + * + */ +@ManagedBean(name = "treeBean") +@SessionScoped +public class SimpleTreeBean implements Serializable { + @ManagedProperty(value = "#{cdsParser.cdsList}") + private List<CD> cds; + @PostConstruct + public void init() { + for (CD cd : cds) { + + } + } + + public List<CD> getCds() { + return cds; + } + + public void setCds(List<CD> cds) { + this.cds = cds; + } + +} Added: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tree/model/Artist.java =================================================================== --- trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tree/model/Artist.java (rev 0) +++ trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tree/model/Artist.java 2010-11-01 22:33:11 UTC (rev 19865) @@ -0,0 +1,44 @@ +package org.richfaces.demo.tree.model; + +import java.util.Enumeration; + +import javax.swing.tree.TreeNode; + +public class Artist implements TreeNode{ + + public TreeNode getChildAt(int childIndex) { + // TODO Auto-generated method stub + return null; + } + + public int getChildCount() { + // TODO Auto-generated method stub + return 0; + } + + public TreeNode getParent() { + // TODO Auto-generated method stub + return null; + } + + public int getIndex(TreeNode node) { + // TODO Auto-generated method stub + return 0; + } + + public boolean getAllowsChildren() { + // TODO Auto-generated method stub + return false; + } + + public boolean isLeaf() { + // TODO Auto-generated method stub + return false; + } + + public Enumeration children() { + // TODO Auto-generated method stub + return null; + } + +} Added: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tree/model/CD.java =================================================================== --- trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tree/model/CD.java (rev 0) +++ trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tree/model/CD.java 2010-11-01 22:33:11 UTC (rev 19865) @@ -0,0 +1,69 @@ +package org.richfaces.demo.tree.model; + +import java.io.Serializable; + +import javax.xml.bind.annotation.XmlElement; + +public class CD implements Serializable { + private String artist; + private String title; + private String country; + private String company; + private float price; + private int year; + + @XmlElement(name = "ARTIST") + public String getArtist() { + return artist; + } + + public void setArtist(String artist) { + this.artist = artist; + } + + @XmlElement(name = "TITLE") + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + @XmlElement(name = "COUNTRY") + public String getCountry() { + return country; + } + + public void setCountry(String country) { + this.country = country; + } + + @XmlElement(name = "COMPANY") + public String getCompany() { + return company; + } + + public void setCompany(String company) { + this.company = company; + } + + @XmlElement(name = "PRICE") + public float getPrice() { + return price; + } + + public void setPrice(float price) { + this.price = price; + } + + @XmlElement(name = "YEAR") + public int getYear() { + return year; + } + + public void setYear(int year) { + this.year = year; + } + +} Added: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tree/model/Company.java =================================================================== --- trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tree/model/Company.java (rev 0) +++ trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tree/model/Company.java 2010-11-01 22:33:11 UTC (rev 19865) @@ -0,0 +1,44 @@ +package org.richfaces.demo.tree.model; + +import java.util.Enumeration; + +import javax.swing.tree.TreeNode; + +public class Company implements TreeNode{ + + public TreeNode getChildAt(int childIndex) { + // TODO Auto-generated method stub + return null; + } + + public int getChildCount() { + // TODO Auto-generated method stub + return 0; + } + + public TreeNode getParent() { + // TODO Auto-generated method stub + return null; + } + + public int getIndex(TreeNode node) { + // TODO Auto-generated method stub + return 0; + } + + public boolean getAllowsChildren() { + // TODO Auto-generated method stub + return false; + } + + public boolean isLeaf() { + // TODO Auto-generated method stub + return false; + } + + public Enumeration children() { + // TODO Auto-generated method stub + return null; + } + +} Added: trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tree/model/Country.java =================================================================== --- trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tree/model/Country.java (rev 0) +++ trunk/examples/richfaces-showcase/src/main/java/org/richfaces/demo/tree/model/Country.java 2010-11-01 22:33:11 UTC (rev 19865) @@ -0,0 +1,43 @@ +package org.richfaces.demo.tree.model; + +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.List; + +import javax.swing.tree.TreeNode; + +import com.google.common.collect.Iterators; + +public class Country implements TreeNode { + private String name; + private List<Company> companies = new ArrayList<Company>(); + + public TreeNode getChildAt(int childIndex) { + return companies.get(childIndex); + } + + public int getChildCount() { + return companies.size(); + } + + public TreeNode getParent() { + return null; + } + + public int getIndex(TreeNode node) { + return companies.indexOf(node); + } + + public boolean getAllowsChildren() { + return true; + } + + public boolean isLeaf() { + return companies.isEmpty(); + } + + public Enumeration<Company> children() { + return Iterators.asEnumeration(companies.iterator()); + } + +} Modified: trunk/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/data/common/navigation.xml =================================================================== --- trunk/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/data/common/navigation.xml 2010-11-01 22:21:36 UTC (rev 19864) +++ trunk/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/data/common/navigation.xml 2010-11-01 22:33:11 UTC (rev 19865) @@ -290,6 +290,21 @@ </demo> </demos> </group> + <!-- group> + <name>Trees</name> + <demos> + <demo new="true"> + <id>tree</id> + <name>rich:tree</name> + <samples> + <sample> + <id>tree</id> + <name>Simple tree from XML</name> + </sample> + </samples> + </demo> + </demos> + </group--> <group> <name>Output/Panels</name> <demos> Added: trunk/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/tree/CDCatalog.xml =================================================================== --- trunk/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/tree/CDCatalog.xml (rev 0) +++ trunk/examples/richfaces-showcase/src/main/resources/org/richfaces/demo/tree/CDCatalog.xml 2010-11-01 22:33:11 UTC (rev 19865) @@ -0,0 +1,211 @@ +<?xml version="1.0" encoding="ISO8859-1" ?> +<CATALOG> + <CD> + <TITLE>Empire Burlesque</TITLE> + <ARTIST>Bob Dylan</ARTIST> + <COUNTRY>USA</COUNTRY> + <COMPANY>Columbia</COMPANY> + <PRICE>10.90</PRICE> + <YEAR>1985</YEAR> + </CD> + <CD> + <TITLE>Hide your heart</TITLE> + <ARTIST>Bonnie Tylor</ARTIST> + <COUNTRY>UK</COUNTRY> + <COMPANY>CBS Records</COMPANY> + <PRICE>9.90</PRICE> + <YEAR>1988</YEAR> + </CD> + <CD> + <TITLE>Greatest Hits</TITLE> + <ARTIST>Dolly Parton</ARTIST> + <COUNTRY>USA</COUNTRY> + <COMPANY>RCA</COMPANY> + <PRICE>9.90</PRICE> + <YEAR>1982</YEAR> + </CD> + <CD> + <TITLE>Still got the blues</TITLE> + <ARTIST>Gary More</ARTIST> + <COUNTRY>UK</COUNTRY> + <COMPANY>Virgin redords</COMPANY> + <PRICE>10.20</PRICE> + <YEAR>1990</YEAR> + </CD> + <CD> + <TITLE>Eros</TITLE> + <ARTIST>Eros Ramazzotti</ARTIST> + <COUNTRY>EU</COUNTRY> + <COMPANY>BMG</COMPANY> + <PRICE>9.90</PRICE> + <YEAR>1997</YEAR> + </CD> + <CD> + <TITLE>One night only</TITLE> + <ARTIST>Bee Gees</ARTIST> + <COUNTRY>UK</COUNTRY> + <COMPANY>Polydor</COMPANY> + <PRICE>10.90</PRICE> + <YEAR>1998</YEAR> + </CD> + <CD> + <TITLE>Sylvias Mother</TITLE> + <ARTIST>Dr.Hook</ARTIST> + <COUNTRY>UK</COUNTRY> + <COMPANY>CBS</COMPANY> + <PRICE>8.10</PRICE> + <YEAR>1973</YEAR> + </CD> + <CD> + <TITLE>Maggie May</TITLE> + <ARTIST>Rod Stewart</ARTIST> + <COUNTRY>UK</COUNTRY> + <COMPANY>Pickwick</COMPANY> + <PRICE>8.50</PRICE> + <YEAR>1990</YEAR> + </CD> + <CD> + <TITLE>Romanza</TITLE> + <ARTIST>Andrea Bocelli</ARTIST> + <COUNTRY>EU</COUNTRY> + <COMPANY>Polydor</COMPANY> + <PRICE>10.80</PRICE> + <YEAR>1996</YEAR> + </CD> + <CD> + <TITLE>When a man loves a woman</TITLE> + <ARTIST>Percy Sledge</ARTIST> + <COUNTRY>USA</COUNTRY> + <COMPANY>Atlantic</COMPANY> + <PRICE>8.70</PRICE> + <YEAR>1987</YEAR> + </CD> + <CD> + <TITLE>Black angel</TITLE> + <ARTIST>Savage Rose</ARTIST> + <COUNTRY>EU</COUNTRY> + <COMPANY>Mega</COMPANY> + <PRICE>10.90</PRICE> + <YEAR>1995</YEAR> + </CD> + <CD> + <TITLE>1999 Grammy Nominees</TITLE> + <ARTIST>Many</ARTIST> + <COUNTRY>USA</COUNTRY> + <COMPANY>Grammy</COMPANY> + <PRICE>10.20</PRICE> + <YEAR>1999</YEAR> + </CD> + <CD> + <TITLE>For the good times</TITLE> + <ARTIST>Kenny Rogers</ARTIST> + <COUNTRY>UK</COUNTRY> + <COMPANY>Mucik Master</COMPANY> + <PRICE>8.70</PRICE> + <YEAR>1995</YEAR> + </CD> + <CD> + <TITLE>Big Willie style</TITLE> + <ARTIST>Will Smith</ARTIST> + <COUNTRY>USA</COUNTRY> + <COMPANY>Columbia</COMPANY> + <PRICE>9.90</PRICE> + <YEAR>1997</YEAR> + </CD> + <CD> + <TITLE>Tupelo Honey</TITLE> + <ARTIST>Van Morrison</ARTIST> + <COUNTRY>UK</COUNTRY> + <COMPANY>Polydor</COMPANY> + <PRICE>8.20</PRICE> + <YEAR>1971</YEAR> + </CD> + <CD> + <TITLE>Soulsville</TITLE> + <ARTIST>Jorn Hoel</ARTIST> + <COUNTRY>Norway</COUNTRY> + <COMPANY>WEA</COMPANY> + <PRICE>7.90</PRICE> + <YEAR>1996</YEAR> + </CD> + <CD> + <TITLE>The very best of</TITLE> + <ARTIST>Cat Stevens</ARTIST> + <COUNTRY>UK</COUNTRY> + <COMPANY>Island</COMPANY> + <PRICE>8.90</PRICE> + <YEAR>1990</YEAR> + </CD> + <CD> + <TITLE>Stop</TITLE> + <ARTIST>Sam Brown</ARTIST> + <COUNTRY>UK</COUNTRY> + <COMPANY>A and M</COMPANY> + <PRICE>8.90</PRICE> + <YEAR>1988</YEAR> + </CD> + <CD> + <TITLE>Bridge of Spies</TITLE> + <ARTIST>T`Pau</ARTIST> + <COUNTRY>UK</COUNTRY> + <COMPANY>Siren</COMPANY> + <PRICE>7.90</PRICE> + <YEAR>1987</YEAR> + </CD> + <CD> + <TITLE>Private Dancer</TITLE> + <ARTIST>Tina Turner</ARTIST> + <COUNTRY>UK</COUNTRY> + <COMPANY>Capitol</COMPANY> + <PRICE>8.90</PRICE> + <YEAR>1983</YEAR> + </CD> + <CD> + <TITLE>Midt om natten</TITLE> + <ARTIST>Kim Larsen</ARTIST> + <COUNTRY>EU</COUNTRY> + <COMPANY>Medley</COMPANY> + <PRICE>7.80</PRICE> + <YEAR>1983</YEAR> + </CD> + <CD> + <TITLE>Pavarotti Gala Concert</TITLE> + <ARTIST>Luciano Pavarotti</ARTIST> + <COUNTRY>UK</COUNTRY> + <COMPANY>DECCA</COMPANY> + <PRICE>9.90</PRICE> + <YEAR>1991</YEAR> + </CD> + <CD> + <TITLE>The dock of the bay</TITLE> + <ARTIST>Otis Redding</ARTIST> + <COUNTRY>USA</COUNTRY> + <COMPANY>Atlantic</COMPANY> + <PRICE>7.90</PRICE> + <YEAR>1987</YEAR> + </CD> + <CD> + <TITLE>Picture book</TITLE> + <ARTIST>Simply Red</ARTIST> + <COUNTRY>EU</COUNTRY> + <COMPANY>Elektra</COMPANY> + <PRICE>7.20</PRICE> + <YEAR>1985</YEAR> + </CD> + <CD> + <TITLE>Red</TITLE> + <ARTIST>The Communards</ARTIST> + <COUNTRY>UK</COUNTRY> + <COMPANY>London</COMPANY> + <PRICE>7.80</PRICE> + <YEAR>1987</YEAR> + </CD> + <CD> + <TITLE>Unchain my heart</TITLE> + <ARTIST>Joe Cocker</ARTIST> + <COUNTRY>USA</COUNTRY> + <COMPANY>EMI</COMPANY> + <PRICE>8.20</PRICE> + <YEAR>1987</YEAR> + </CD> +</CATALOG> Added: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/tree/samples/tree-sample.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/tree/samples/tree-sample.xhtml (rev 0) +++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/tree/samples/tree-sample.xhtml 2010-11-01 22:33:11 UTC (rev 19865) @@ -0,0 +1,26 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition 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:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + <h:form id="form"> + <a4j:repeat value="#{treeBean.cds}" var="cd">#{cd.artist}</a4j:repeat> + <ui:remove> + <rich:tree id="tree" nodeType="#{node.parent == null ? 'rootNode': 'childNode'}" var="node" value="#{treeBean.rootNodes}" + selectionType="#{treeBean.selectionType}" toggleType="#{treeBean.toggleType}"> + <rich:treeNode type="rootNode"> + <h:panelGroup id="rootNodeGroup"> + Root node: #{node.data} - + </h:panelGroup> + </rich:treeNode> + <rich:treeNode type="childNode"> + <h:panelGroup id="childNodeGroup"> + #{node.data} - + </h:panelGroup> + </rich:treeNode> + </rich:tree> + </ui:remove> + </h:form> +</ui:composition> \ No newline at end of file Added: trunk/examples/richfaces-showcase/src/main/webapp/richfaces/tree/tree.xhtml =================================================================== --- trunk/examples/richfaces-showcase/src/main/webapp/richfaces/tree/tree.xhtml (rev 0) +++ trunk/examples/richfaces-showcase/src/main/webapp/richfaces/tree/tree.xhtml 2010-11-01 22:33:11 UTC (rev 19865) @@ -0,0 +1,19 @@ +<!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"> + +<ui:composition> + <p>DESC</p> + + <ui:include src="#{demoNavigator.sampleIncludeURI}" /> + <ui:include src="/templates/includes/source-view.xhtml"> + <ui:param name="src" value="#{demoNavigator.sampleIncludeURI}" /> + <ui:param name="sourceType" value="xhtml" /> + <ui:param name="openLabel" value="View Source" /> + <ui:param name="hideLabel" value="Hide Source" /> + </ui:include> +</ui:composition> + +</html> \ No newline at end of file