Author: alexsmirnov Date: 2007-09-12 18:15:32 -0400 (Wed, 12 Sep 2007) New Revision: 2921 Added: tags/3.1.0/samples/richfaces-demo/src/main/java/org/richfaces/demo/pmenu/ tags/3.1.0/samples/richfaces-demo/src/main/java/org/richfaces/demo/pmenu/PanelMenu.java tags/3.1.0/samples/richfaces-demo/src/main/java/org/richfaces/treemodeladaptor/ tags/3.1.0/samples/richfaces-demo/src/main/java/org/richfaces/treemodeladaptor/FileSystemBean.java tags/3.1.0/samples/richfaces-demo/src/main/java/org/richfaces/treemodeladaptor/FileSystemNode.java tags/3.1.0/samples/richfaces-demo/src/main/java/org/richfaces/treemodeladaptor/PostbackPhaseListener.java tags/3.1.0/samples/richfaces-demo/src/main/java/org/richfaces/treemodeladaptor/TreeDemoStateAdvisor.java tags/3.1.0/samples/richfaces-demo/src/main/webapp/images/cn_recursiveTreeNodesAdaptor.gif tags/3.1.0/samples/richfaces-demo/src/main/webapp/images/cn_treeNodesAdaptor.gif tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/ tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/data.xhtml tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/eventqueue.xhtml tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/reRender1.xhtml tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/reRender2.xhtml tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/reRender3.xhtml tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/calendar/examples/reRender2.xhtml tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/page/snippets/ tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/page/snippets/gen.xhtml tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/page/snippets/page.xhtml tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/panelMenu.xhtml tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/panelMenu/ tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/panelMenu/examples/ tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/panelMenu/examples/example.xhtml tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/panelMenu/usage.xhtml tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/treeNodesAdaptor.xhtml tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/treeNodesAdaptor/ tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/treeNodesAdaptor/examples/ tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/treeNodesAdaptor/examples/recursiveAdaptor.xhtml tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/treeNodesAdaptor/snippets/ tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/treeNodesAdaptor/snippets/sample.xhtml tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/treeNodesAdaptor/usage.xhtml Removed: tags/3.1.0/samples/richfaces-demo/src/main/java/org/richfaces/demo/pmenu/PanelMenu.java tags/3.1.0/samples/richfaces-demo/src/main/java/org/richfaces/treemodeladaptor/FileSystemBean.java tags/3.1.0/samples/richfaces-demo/src/main/java/org/richfaces/treemodeladaptor/FileSystemNode.java tags/3.1.0/samples/richfaces-demo/src/main/java/org/richfaces/treemodeladaptor/PostbackPhaseListener.java tags/3.1.0/samples/richfaces-demo/src/main/java/org/richfaces/treemodeladaptor/TreeDemoStateAdvisor.java tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/data.xhtml tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/eventqueue.xhtml tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/reRender1.xhtml tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/reRender2.xhtml tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/reRender3.xhtml tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/page/snippets/gen.xhtml tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/page/snippets/page.xhtml tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/panelMenu/examples/ tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/panelMenu/examples/example.xhtml tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/panelMenu/usage.xhtml tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/treeNodesAdaptor/examples/ tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/treeNodesAdaptor/examples/recursiveAdaptor.xhtml tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/treeNodesAdaptor/snippets/ tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/treeNodesAdaptor/snippets/sample.xhtml tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/treeNodesAdaptor/usage.xhtml Modified: tags/3.1.0/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentNavigator.java tags/3.1.0/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties tags/3.1.0/samples/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml tags/3.1.0/samples/richfaces-demo/src/main/webapp/css/common.css tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/usage.xhtml tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/examples/extendedDataModel.xhtml tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/form/usage.xhtml tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/htmlCommandLink/usage.xhtml tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/page/usage.xhtml tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/panel/look-customization.xhtml tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/panelBar/examples/example.xhtml tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/push/usage.xhtml tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/style/usage.xhtml tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/tabPanel/look-customization.xhtml tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/tree/examples/simple-tree-data.properties tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/tree/simple-tree.xhtml tags/3.1.0/samples/richfaces-demo/src/main/webapp/templates/include/components-navigation.xhtml tags/3.1.0/samples/richfaces-demo/src/main/webapp/welcome.xhtml Log: merge demo from trunk Modified: tags/3.1.0/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentNavigator.java =================================================================== --- tags/3.1.0/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentNavigator.java 2007-09-12 22:09:01 UTC (rev 2920) +++ tags/3.1.0/samples/richfaces-demo/src/main/java/org/richfaces/demo/common/ComponentNavigator.java 2007-09-12 22:15:32 UTC (rev 2921) @@ -127,6 +127,9 @@ public List getRichMenu() { return getFilteredComponents("richMenu"); } + public List getRichTree() { + return getFilteredComponents("richTree"); + } public List getRichInputs() { return getFilteredComponents("richInputs"); } Copied: tags/3.1.0/samples/richfaces-demo/src/main/java/org/richfaces/demo/pmenu (from rev 2920, trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/pmenu) Deleted: tags/3.1.0/samples/richfaces-demo/src/main/java/org/richfaces/demo/pmenu/PanelMenu.java =================================================================== --- trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/pmenu/PanelMenu.java 2007-09-12 22:09:01 UTC (rev 2920) +++ tags/3.1.0/samples/richfaces-demo/src/main/java/org/richfaces/demo/pmenu/PanelMenu.java 2007-09-12 22:15:32 UTC (rev 2921) @@ -1,38 +0,0 @@ -package org.richfaces.demo.pmenu; - -import javax.faces.context.FacesContext; -import javax.faces.event.ActionEvent; - -import org.richfaces.component.UIPanelMenuItem; - -public class PanelMenu { - private String current; - private boolean singleMode; - public boolean isSingleMode() { - return singleMode; - } - - public void setSingleMode(boolean singleMode) { - this.singleMode = singleMode; - } - - public PanelMenu() { - } - - public String getCurrent() { - return this.current; - } - - public void setCurrent(String current) { - this.current = current; - } - public String updateCurrent() { - FacesContext context=FacesContext.getCurrentInstance(); - setCurrent(context.getExternalContext().getRequestParameterMap().get("current")); - System.out.println("fake called."); - return null; - } - public void updateCurrent(ActionEvent event) { - setCurrent(((UIPanelMenuItem)event.getComponent()).getLabel().toString()); - } -} Copied: tags/3.1.0/samples/richfaces-demo/src/main/java/org/richfaces/demo/pmenu/PanelMenu.java (from rev 2920, trunk/samples/richfaces-demo/src/main/java/org/richfaces/demo/pmenu/PanelMenu.java) =================================================================== --- tags/3.1.0/samples/richfaces-demo/src/main/java/org/richfaces/demo/pmenu/PanelMenu.java (rev 0) +++ tags/3.1.0/samples/richfaces-demo/src/main/java/org/richfaces/demo/pmenu/PanelMenu.java 2007-09-12 22:15:32 UTC (rev 2921) @@ -0,0 +1,38 @@ +package org.richfaces.demo.pmenu; + +import javax.faces.context.FacesContext; +import javax.faces.event.ActionEvent; + +import org.richfaces.component.UIPanelMenuItem; + +public class PanelMenu { + private String current; + private boolean singleMode; + public boolean isSingleMode() { + return singleMode; + } + + public void setSingleMode(boolean singleMode) { + this.singleMode = singleMode; + } + + public PanelMenu() { + } + + public String getCurrent() { + return this.current; + } + + public void setCurrent(String current) { + this.current = current; + } + public String updateCurrent() { + FacesContext context=FacesContext.getCurrentInstance(); + setCurrent(context.getExternalContext().getRequestParameterMap().get("current")); + System.out.println("fake called."); + return null; + } + public void updateCurrent(ActionEvent event) { + setCurrent(((UIPanelMenuItem)event.getComponent()).getLabel().toString()); + } +} Copied: tags/3.1.0/samples/richfaces-demo/src/main/java/org/richfaces/treemodeladaptor (from rev 2920, trunk/samples/richfaces-demo/src/main/java/org/richfaces/treemodeladaptor) Deleted: tags/3.1.0/samples/richfaces-demo/src/main/java/org/richfaces/treemodeladaptor/FileSystemBean.java =================================================================== --- trunk/samples/richfaces-demo/src/main/java/org/richfaces/treemodeladaptor/FileSystemBean.java 2007-09-12 22:09:01 UTC (rev 2920) +++ tags/3.1.0/samples/richfaces-demo/src/main/java/org/richfaces/treemodeladaptor/FileSystemBean.java 2007-09-12 22:15:32 UTC (rev 2921) @@ -1,16 +0,0 @@ -package org.richfaces.treemodeladaptor; - - -public class FileSystemBean { - private static String SRC_PATH = "/WEB-INF/src"; - - private FileSystemNode[] srcRoots; - - public synchronized FileSystemNode[] getSourceRoots() { - if (srcRoots == null) { - srcRoots = new FileSystemNode(SRC_PATH).getNodes(); - } - - return srcRoots; - } -} Copied: tags/3.1.0/samples/richfaces-demo/src/main/java/org/richfaces/treemodeladaptor/FileSystemBean.java (from rev 2920, trunk/samples/richfaces-demo/src/main/java/org/richfaces/treemodeladaptor/FileSystemBean.java) =================================================================== --- tags/3.1.0/samples/richfaces-demo/src/main/java/org/richfaces/treemodeladaptor/FileSystemBean.java (rev 0) +++ tags/3.1.0/samples/richfaces-demo/src/main/java/org/richfaces/treemodeladaptor/FileSystemBean.java 2007-09-12 22:15:32 UTC (rev 2921) @@ -0,0 +1,16 @@ +package org.richfaces.treemodeladaptor; + + +public class FileSystemBean { + private static String SRC_PATH = "/WEB-INF/src"; + + private FileSystemNode[] srcRoots; + + public synchronized FileSystemNode[] getSourceRoots() { + if (srcRoots == null) { + srcRoots = new FileSystemNode(SRC_PATH).getNodes(); + } + + return srcRoots; + } +} Deleted: tags/3.1.0/samples/richfaces-demo/src/main/java/org/richfaces/treemodeladaptor/FileSystemNode.java =================================================================== --- trunk/samples/richfaces-demo/src/main/java/org/richfaces/treemodeladaptor/FileSystemNode.java 2007-09-12 22:09:01 UTC (rev 2920) +++ tags/3.1.0/samples/richfaces-demo/src/main/java/org/richfaces/treemodeladaptor/FileSystemNode.java 2007-09-12 22:15:32 UTC (rev 2921) @@ -1,55 +0,0 @@ -package org.richfaces.treemodeladaptor; - -import java.util.Set; - -import javax.faces.context.ExternalContext; -import javax.faces.context.FacesContext; - -public class FileSystemNode { - private String path; - - private static FileSystemNode[] CHILDREN_ABSENT = new FileSystemNode[0]; - - private FileSystemNode[] children; - - private String shortPath; - - public FileSystemNode(String path) { - this.path = path; - int idx = path.lastIndexOf('/'); - if (idx != -1) { - shortPath = path.substring(idx + 1); - } else { - shortPath = path; - } - } - - public synchronized FileSystemNode[] getNodes() { - if (children == null) { - FacesContext facesContext = FacesContext.getCurrentInstance(); - ExternalContext externalContext = facesContext.getExternalContext(); - Set resourcePaths = externalContext.getResourcePaths(this.path); - if (resourcePaths != null) { - Object[] nodes = (Object[]) resourcePaths.toArray(); - children = new FileSystemNode[nodes.length]; - - for (int i = 0; i < nodes.length; i++) { - String nodePath = nodes[i].toString(); - if (nodePath.endsWith("/")) { - nodePath = nodePath.substring(0, nodePath.length() - 1); - } - children[i] = new FileSystemNode(nodePath); - } - } else { - children = CHILDREN_ABSENT; - } - } - - return children; - } - - public String toString() { - return shortPath; - } - -} \ No newline at end of file Copied: tags/3.1.0/samples/richfaces-demo/src/main/java/org/richfaces/treemodeladaptor/FileSystemNode.java (from rev 2920, trunk/samples/richfaces-demo/src/main/java/org/richfaces/treemodeladaptor/FileSystemNode.java) =================================================================== --- tags/3.1.0/samples/richfaces-demo/src/main/java/org/richfaces/treemodeladaptor/FileSystemNode.java (rev 0) +++ tags/3.1.0/samples/richfaces-demo/src/main/java/org/richfaces/treemodeladaptor/FileSystemNode.java 2007-09-12 22:15:32 UTC (rev 2921) @@ -0,0 +1,55 @@ +package org.richfaces.treemodeladaptor; + +import java.util.Set; + +import javax.faces.context.ExternalContext; +import javax.faces.context.FacesContext; + +public class FileSystemNode { + private String path; + + private static FileSystemNode[] CHILDREN_ABSENT = new FileSystemNode[0]; + + private FileSystemNode[] children; + + private String shortPath; + + public FileSystemNode(String path) { + this.path = path; + int idx = path.lastIndexOf('/'); + if (idx != -1) { + shortPath = path.substring(idx + 1); + } else { + shortPath = path; + } + } + + public synchronized FileSystemNode[] getNodes() { + if (children == null) { + FacesContext facesContext = FacesContext.getCurrentInstance(); + ExternalContext externalContext = facesContext.getExternalContext(); + Set resourcePaths = externalContext.getResourcePaths(this.path); + if (resourcePaths != null) { + Object[] nodes = (Object[]) resourcePaths.toArray(); + children = new FileSystemNode[nodes.length]; + + for (int i = 0; i < nodes.length; i++) { + String nodePath = nodes[i].toString(); + if (nodePath.endsWith("/")) { + nodePath = nodePath.substring(0, nodePath.length() - 1); + } + children[i] = new FileSystemNode(nodePath); + } + } else { + children = CHILDREN_ABSENT; + } + } + + return children; + } + + public String toString() { + return shortPath; + } + +} \ No newline at end of file Deleted: tags/3.1.0/samples/richfaces-demo/src/main/java/org/richfaces/treemodeladaptor/PostbackPhaseListener.java =================================================================== --- trunk/samples/richfaces-demo/src/main/java/org/richfaces/treemodeladaptor/PostbackPhaseListener.java 2007-09-12 22:09:01 UTC (rev 2920) +++ tags/3.1.0/samples/richfaces-demo/src/main/java/org/richfaces/treemodeladaptor/PostbackPhaseListener.java 2007-09-12 22:15:32 UTC (rev 2921) @@ -1,41 +0,0 @@ -package org.richfaces.treemodeladaptor; - -import java.util.Map; - -import javax.faces.context.ExternalContext; -import javax.faces.context.FacesContext; -import javax.faces.event.PhaseEvent; -import javax.faces.event.PhaseId; -import javax.faces.event.PhaseListener; - -public class PostbackPhaseListener implements PhaseListener { - - public static final String POSTBACK_ATTRIBUTE_NAME = PostbackPhaseListener.class.getName(); - - public void afterPhase(PhaseEvent event) { - } - - public void beforePhase(PhaseEvent event) { - FacesContext facesContext = event.getFacesContext(); - Map requestMap = facesContext.getExternalContext().getRequestMap(); - requestMap.put(POSTBACK_ATTRIBUTE_NAME, Boolean.TRUE); - } - - public PhaseId getPhaseId() { - return PhaseId.APPLY_REQUEST_VALUES; - } - - public static boolean isPostback() { - FacesContext facesContext = FacesContext.getCurrentInstance(); - if (facesContext != null) { - ExternalContext externalContext = facesContext.getExternalContext(); - if (externalContext != null) { - return Boolean.TRUE.equals( - externalContext.getRequestMap().get(POSTBACK_ATTRIBUTE_NAME)); - } - } - - return false; - } - -} Copied: tags/3.1.0/samples/richfaces-demo/src/main/java/org/richfaces/treemodeladaptor/PostbackPhaseListener.java (from rev 2920, trunk/samples/richfaces-demo/src/main/java/org/richfaces/treemodeladaptor/PostbackPhaseListener.java) =================================================================== --- tags/3.1.0/samples/richfaces-demo/src/main/java/org/richfaces/treemodeladaptor/PostbackPhaseListener.java (rev 0) +++ tags/3.1.0/samples/richfaces-demo/src/main/java/org/richfaces/treemodeladaptor/PostbackPhaseListener.java 2007-09-12 22:15:32 UTC (rev 2921) @@ -0,0 +1,41 @@ +package org.richfaces.treemodeladaptor; + +import java.util.Map; + +import javax.faces.context.ExternalContext; +import javax.faces.context.FacesContext; +import javax.faces.event.PhaseEvent; +import javax.faces.event.PhaseId; +import javax.faces.event.PhaseListener; + +public class PostbackPhaseListener implements PhaseListener { + + public static final String POSTBACK_ATTRIBUTE_NAME = PostbackPhaseListener.class.getName(); + + public void afterPhase(PhaseEvent event) { + } + + public void beforePhase(PhaseEvent event) { + FacesContext facesContext = event.getFacesContext(); + Map requestMap = facesContext.getExternalContext().getRequestMap(); + requestMap.put(POSTBACK_ATTRIBUTE_NAME, Boolean.TRUE); + } + + public PhaseId getPhaseId() { + return PhaseId.APPLY_REQUEST_VALUES; + } + + public static boolean isPostback() { + FacesContext facesContext = FacesContext.getCurrentInstance(); + if (facesContext != null) { + ExternalContext externalContext = facesContext.getExternalContext(); + if (externalContext != null) { + return Boolean.TRUE.equals( + externalContext.getRequestMap().get(POSTBACK_ATTRIBUTE_NAME)); + } + } + + return false; + } + +} Deleted: tags/3.1.0/samples/richfaces-demo/src/main/java/org/richfaces/treemodeladaptor/TreeDemoStateAdvisor.java =================================================================== --- trunk/samples/richfaces-demo/src/main/java/org/richfaces/treemodeladaptor/TreeDemoStateAdvisor.java 2007-09-12 22:09:01 UTC (rev 2920) +++ tags/3.1.0/samples/richfaces-demo/src/main/java/org/richfaces/treemodeladaptor/TreeDemoStateAdvisor.java 2007-09-12 22:15:32 UTC (rev 2921) @@ -1,25 +0,0 @@ -package org.richfaces.treemodeladaptor; - -import org.richfaces.component.UITree; -import org.richfaces.component.state.TreeStateAdvisor; -import org.richfaces.model.TreeRowKey; - -public class TreeDemoStateAdvisor implements TreeStateAdvisor { - - public Boolean adviseNodeOpened(UITree tree) { - if (!PostbackPhaseListener.isPostback()) { - Object key = tree.getRowKey(); - TreeRowKey treeRowKey = (TreeRowKey) key; - if (treeRowKey == null || treeRowKey.depth() <= 2) { - return Boolean.TRUE; - } - } - - return null; - } - - public Boolean adviseNodeSelected(UITree tree) { - return null; - } - -} Copied: tags/3.1.0/samples/richfaces-demo/src/main/java/org/richfaces/treemodeladaptor/TreeDemoStateAdvisor.java (from rev 2920, trunk/samples/richfaces-demo/src/main/java/org/richfaces/treemodeladaptor/TreeDemoStateAdvisor.java) =================================================================== --- tags/3.1.0/samples/richfaces-demo/src/main/java/org/richfaces/treemodeladaptor/TreeDemoStateAdvisor.java (rev 0) +++ tags/3.1.0/samples/richfaces-demo/src/main/java/org/richfaces/treemodeladaptor/TreeDemoStateAdvisor.java 2007-09-12 22:15:32 UTC (rev 2921) @@ -0,0 +1,25 @@ +package org.richfaces.treemodeladaptor; + +import org.richfaces.component.UITree; +import org.richfaces.component.state.TreeStateAdvisor; +import org.richfaces.model.TreeRowKey; + +public class TreeDemoStateAdvisor implements TreeStateAdvisor { + + public Boolean adviseNodeOpened(UITree tree) { + if (!PostbackPhaseListener.isPostback()) { + Object key = tree.getRowKey(); + TreeRowKey treeRowKey = (TreeRowKey) key; + if (treeRowKey == null || treeRowKey.depth() <= 2) { + return Boolean.TRUE; + } + } + + return null; + } + + public Boolean adviseNodeSelected(UITree tree) { + return null; + } + +} Modified: tags/3.1.0/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties =================================================================== --- tags/3.1.0/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties 2007-09-12 22:09:01 UTC (rev 2920) +++ tags/3.1.0/samples/richfaces-demo/src/main/resources/org/richfaces/demo/common/components.properties 2007-09-12 22:15:32 UTC (rev 2921) @@ -24,9 +24,9 @@ dropSupport= richDragDrop, Drop Support, /images/ico_DropSupport.gif, /images/cn_DropSupport.gif, RichFacesComponentsLibrary.html#dropSupport, jbossrichfaces/freezone/docs/tlddoc/rich/dropSupport.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIDropSupport.html, /richfaces/dragSupport.jsf dndParam= richDragDrop, Drag-Drop Parameter, /images/ico_DropSupport.gif, /images/cn_DragDropParameter.gif, RichFacesComponentsLibrary.html#dndParam, jbossrichfaces/freezone/docs/tlddoc/rich/dndParam.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIDndParam.html, /richfaces/dragSupport.jsf panelBar= richOutputs, Panel Bar, /images/ico_PanelBar.gif, /images/cn_PanelBar.gif, RichFacesComponentsLibrary.html#panelBar, jbossrichfaces/freezone/docs/tlddoc/rich/panelBar.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIPanelBar.html, /richfaces/panelBar.jsf -tree= richOutputs, Tree, /images/ico_Tree.gif, /images/cn_tree.gif, RichFacesComponentsLibrary.html#tree, jbossrichfaces/freezone/docs/tlddoc/rich/tree.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UITree.html, /richfaces/tree.jsf modalPanel= richOutputs, Modal Panel, /images/ico_ModalPanel.gif, /images/cn_ModalPanel.gif, RichFacesComponentsLibrary.html#modalPanel, jbossrichfaces/freezone/docs/tlddoc/rich/modalPanel.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIModalPanel.html, /richfaces/modalPanel.jsf togglePanel= richOutputs, Toggle Panel, /images/ico_TogglePanel.gif, /images/cn_TogglePanel.gif, RichFacesComponentsLibrary.html#togglePanel, jbossrichfaces/freezone/docs/tlddoc/rich/togglePanel.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UITogglePanel.html, /richfaces/togglePanel.jsf +panelMenu= richOutputs, Panel Menu, /images/ico_panelMenu.gif, /images/cn_PanelMenu.gif, RichFacesComponentsLibrary.html#panelMenu, jbossrichfaces/freezone/docs/tlddoc/rich/panelMenu.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIPanelMenu.html, /richfaces/panelMenu.jsf suggestionBox= richInputs, Suggestion Box, /images/ico_SuggestionBox.gif, /images/cn_SuggestionBox.gif, RichFacesComponentsLibrary.html#suggestionbox, jbossrichfaces/freezone/docs/tlddoc/rich/suggestionbox.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UISuggestionBox.html, /richfaces/suggestionBox.jsf dataTableScroller= richDataIterators, Data Table Scroller, /images/ico_DataTableScroller.gif, /images/cn_DataTableScroller.gif, RichFacesComponentsLibrary.html#datascroller, jbossrichfaces/freezone/docs/tlddoc/rich/datascroller.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIDatascroller.html, /richfaces/dataTableScroller.jsf dropDownMenu= richMenu, Drop Down Menu, /images/ico_dropDownMenu.gif, /images/cn_DropDownMenu.gif, RichFacesComponentsLibrary.html#dropDownMenu, jbossrichfaces/freezone/docs/tlddoc/rich/dropDownMenu.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIDropDownMenu.html, /richfaces/dropDownMenu.jsf @@ -38,7 +38,10 @@ messages= richMisc, Messages, /images/ico_common.gif, /images/cn_Messages.gif, RichFacesComponentsLibrary.html#messages, jbossrichfaces/freezone/docs/tlddoc/rich/messages.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIMessages.html, /richfaces/messages.jsf virtualEarth= richMisc, Virtual Earth, /images/ico_VirtualEarth.gif, /images/cn_VirtualEarth.gif, RichFacesComponentsLibrary.html#virtualEarth, jbossrichfaces/freezone/docs/tlddoc/rich/virtualEarth.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIVirtualEarth.html, /richfaces/virtualEarth.jsf insert= richMisc, Insert, /images/ico_common.gif, /images/cn_insert.gif, RichFacesComponentsLibrary.html#insert, jbossrichfaces/freezone/docs/tlddoc/rich/insert.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIInsert.html, /richfaces/insert.jsf -scrollableDataTable= richDataIterators, Scrollable Data Table, /images/ico_common.gif, /images/cn_ScrollableDataTable.gif, RichFacesComponentsLibrary.html#scrollableDataTable, jbossrichfaces/freezone/docs/tlddoc/rich/scrollableDataTable, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIscrollableDataTable.html, /richfaces/scrollableDataTable.jsf +scrollableDataTable= richDataIterators, Scrollable Data Table, /images/ico_common.gif, /images/cn_ScrollableDataTable.gif, RichFacesComponentsLibrary.html#scrollableDataTable, jbossrichfaces/freezone/docs/tlddoc/rich/scrollableDataTable.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIScrollableDataTable.html, /richfaces/scrollableDataTable.jsf +tree= richTree, Tree, /images/ico_Tree.gif, /images/cn_tree.gif, RichFacesComponentsLibrary.html#tree, jbossrichfaces/freezone/docs/tlddoc/rich/tree.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UITree.html, /richfaces/tree.jsf +treeNodesAdaptor= richTree, Tree Adaptor, /images/ico_Tree.gif, /images/cn_treeNodesAdaptor.gif, RichFacesComponentsLibrary.html#treeNodesAdaptor, jbossrichfaces/freezone/docs/tlddoc/rich/treeNodesAdaptor.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UITreeNodesAdaptor.html, /richfaces/treeNodesAdaptor.jsf +recursiveTreeNodesAdaptor= richTree, Recursive Tree Adaptor, /images/ico_Tree.gif, /images/cn_recursiveTreeNodesAdaptor.gif, RichFacesComponentsLibrary.html#recursiveTreeNodesAdaptor, jbossrichfaces/freezone/docs/tlddoc/rich/recursiveTreeNodesAdaptor.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIRecursiveTreeNodesAdaptor.html, /richfaces/treeNodesAdaptor.jsf ajaxattributes= ajaxSupport, Ajax Attributes, /images/ico_common.gif, /images/cn_ajaxAttributes.gif, ArchitectureOverview.html, jbossajax4jsf/freezone/docs/tlddoc/overview-summary.html, jbossajax4jsf/freezone/docs/apidoc/overview-summary.html, /richfaces/ajaxAttributes.jsf actionparam= ajaxSupport, Action Parameter, /images/ico_common.gif, /images/cn_actionParameter.gif, RichFacesComponentsLibrary.html#actionparam, jbossajax4jsf/freezone/docs/tlddoc/a4j/actionparam.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIActionParameter.html, /richfaces/actionparam.jsf commandButton= ajaxSupport, Command Button, /images/ico_common.gif, /images/cn_commandButton.gif, RichFacesComponentsLibrary.html#commandButton, jbossajax4jsf/freezone/docs/tlddoc/a4j/commandButton.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIAjaxCommandButton.html, /richfaces/commandButton.jsf @@ -63,4 +66,4 @@ log= ajaxMisc, Log, /images/ico_common.gif, /images/cn_Log.gif, RichFacesComponentsLibrary.html#log, jbossajax4jsf/freezone/docs/tlddoc/a4j/log.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIAjaxLog.html, /richfaces/log.jsf page= ajaxMisc, Ajax Page, /images/ico_common.gif, /images/cn_AjaxPage.gif, RichFacesComponentsLibrary.html#page, jbossajax4jsf/freezone/docs/tlddoc/a4j/page.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIAjaxRegion.html, /richfaces/page.jsf portlet= ajaxMisc, Ajax Portlet, /images/ico_common.gif, /images/cn_AjaxPortlet.gif, RichFacesComponentsLibrary.html#portlet, jbossajax4jsf/freezone/docs/tlddoc/a4j/portlet.html, jbossajax4jsf/freezone/docs/apidoc/org/ajax4jsf/ajax/UIPortlet.html, /richfaces/portlet.jsf -effect= richMisc, Effect, /images/ico_common.gif, /images/cn_Effect.gif, ArchitectureOverview.html, jbossrichfaces/freezone/docs/tlddoc/overview-summary.html, jbossrichfaces/freezone/docs/apidoc/overview-summary.html, /richfaces/effect.jsf +effect= richMisc, Effect, /images/ico_common.gif, /images/cn_Effect.gif, RichFacesComponentsLibrary.html#effect, jbossrichfaces/freezone/docs/tlddoc/effect.html, jbossrichfaces/freezone/docs/apidoc/org/richfaces/component/UIeffect.html, /richfaces/effect.jsf Modified: tags/3.1.0/samples/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- tags/3.1.0/samples/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml 2007-09-12 22:09:01 UTC (rev 2920) +++ tags/3.1.0/samples/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml 2007-09-12 22:15:32 UTC (rev 2921) @@ -160,16 +160,26 @@ </managed-property> </managed-bean> <managed-bean> - <managed-bean-name>simpleTreeBean</managed-bean-name> - <managed-bean-class>org.richfaces.demo.tree.SimpleTreeBean</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> - </managed-bean> + <managed-bean-name>treeDemoStateAdvisor</managed-bean-name> + <managed-bean-class>org.richfaces.treemodeladaptor.TreeDemoStateAdvisor</managed-bean-class> + <managed-bean-scope>application</managed-bean-scope> + </managed-bean> <managed-bean> - <managed-bean-name>library</managed-bean-name> - <managed-bean-class>org.richfaces.demo.tree.Library</managed-bean-class> - <managed-bean-scope>session</managed-bean-scope> + <managed-bean-name>fileSystemBean</managed-bean-name> + <managed-bean-class>org.richfaces.treemodeladaptor.FileSystemBean</managed-bean-class> + <managed-bean-scope>application</managed-bean-scope> </managed-bean> <managed-bean> + <managed-bean-name>simpleTreeBean</managed-bean-name> + <managed-bean-class>org.richfaces.demo.tree.SimpleTreeBean</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> + <managed-bean> + <managed-bean-name>library</managed-bean-name> + <managed-bean-class>org.richfaces.demo.tree.Library</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + </managed-bean> + <managed-bean> <managed-bean-name>dndBean</managed-bean-name> <managed-bean-class>org.richfaces.demo.dnd.DndBean</managed-bean-class> <managed-bean-scope>session</managed-bean-scope> @@ -234,6 +244,21 @@ <managed-bean-class>org.richfaces.datatable.UpdateBean</managed-bean-class> <managed-bean-scope>session</managed-bean-scope> </managed-bean> + <managed-bean> + <managed-bean-name>panelMenu</managed-bean-name> + <managed-bean-class>org.richfaces.demo.pmenu.PanelMenu</managed-bean-class> + <managed-bean-scope>session</managed-bean-scope> + <managed-property> + <property-name>current</property-name> + <property-class>java.lang.String</property-class> + <value>Nothing</value> + </managed-property> + <managed-property> + <property-name>singleMode</property-name> + <property-class>java.lang.Boolean</property-class> + <value>true</value> + </managed-property> + </managed-bean> <navigation-rule> <from-view-id>/richfaces/include/examples/wstep1.xhtml</from-view-id> <navigation-case> @@ -258,5 +283,8 @@ <from-outcome>previous</from-outcome> <to-view-id>/richfaces/include/examples/wstep2.xhtml</to-view-id> </navigation-case> - </navigation-rule> + </navigation-rule> + <lifecycle> + <phase-listener>org.richfaces.treemodeladaptor.PostbackPhaseListener</phase-listener> + </lifecycle> </faces-config> Modified: tags/3.1.0/samples/richfaces-demo/src/main/webapp/css/common.css =================================================================== --- tags/3.1.0/samples/richfaces-demo/src/main/webapp/css/common.css 2007-09-12 22:09:01 UTC (rev 2920) +++ tags/3.1.0/samples/richfaces-demo/src/main/webapp/css/common.css 2007-09-12 22:15:32 UTC (rev 2921) @@ -198,7 +198,11 @@ } .ico{ cursor : pointer; - padding:1px 3px 1px 3px; + padding-top:1px; + padding-right:3px; + padding-bottom:1px; + padding-left:3px; + } .component_name{ Copied: tags/3.1.0/samples/richfaces-demo/src/main/webapp/images/cn_recursiveTreeNodesAdaptor.gif (from rev 2920, trunk/samples/richfaces-demo/src/main/webapp/images/cn_recursiveTreeNodesAdaptor.gif) =================================================================== (Binary files differ) Copied: tags/3.1.0/samples/richfaces-demo/src/main/webapp/images/cn_treeNodesAdaptor.gif (from rev 2920, trunk/samples/richfaces-demo/src/main/webapp/images/cn_treeNodesAdaptor.gif) =================================================================== (Binary files differ) Copied: tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets (from rev 2920, trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets) Deleted: tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/data.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/data.xhtml 2007-09-12 22:09:01 UTC (rev 2920) +++ tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/data.xhtml 2007-09-12 22:15:32 UTC (rev 2921) @@ -1 +0,0 @@ -<a4j:commandButton value="Update" data="#{userBean.name}" oncomplete="showTheName(data.name)" /> Copied: tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/data.xhtml (from rev 2920, trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/data.xhtml) =================================================================== --- tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/data.xhtml (rev 0) +++ tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/data.xhtml 2007-09-12 22:15:32 UTC (rev 2921) @@ -0,0 +1 @@ +<a4j:commandButton value="Update" data="#{userBean.name}" oncomplete="showTheName(data.name)" /> Deleted: tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/eventqueue.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/eventqueue.xhtml 2007-09-12 22:09:01 UTC (rev 2920) +++ tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/eventqueue.xhtml 2007-09-12 22:15:32 UTC (rev 2921) @@ -1,3 +0,0 @@ -<h:inputText value="#{userBean.name}"> - <a4j:support event="onkeyup" eventsQueue="foo" reRender="bar" /> -</h:inputText> \ No newline at end of file Copied: tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/eventqueue.xhtml (from rev 2920, trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/eventqueue.xhtml) =================================================================== --- tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/eventqueue.xhtml (rev 0) +++ tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/eventqueue.xhtml 2007-09-12 22:15:32 UTC (rev 2921) @@ -0,0 +1,3 @@ +<h:inputText value="#{userBean.name}"> + <a4j:support event="onkeyup" eventsQueue="foo" reRender="bar" /> +</h:inputText> \ No newline at end of file Deleted: tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/reRender1.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/reRender1.xhtml 2007-09-12 22:09:01 UTC (rev 2920) +++ tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/reRender1.xhtml 2007-09-12 22:15:32 UTC (rev 2921) @@ -1,3 +0,0 @@ -<a4j:outputPanel ajaxRendered="true"> - <h:messages /> -</a4j:outputPanel> Copied: tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/reRender1.xhtml (from rev 2920, trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/reRender1.xhtml) =================================================================== --- tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/reRender1.xhtml (rev 0) +++ tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/reRender1.xhtml 2007-09-12 22:15:32 UTC (rev 2921) @@ -0,0 +1,3 @@ +<a4j:outputPanel ajaxRendered="true"> + <h:messages /> +</a4j:outputPanel> Deleted: tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/reRender2.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/reRender2.xhtml 2007-09-12 22:09:01 UTC (rev 2920) +++ tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/reRender2.xhtml 2007-09-12 22:15:32 UTC (rev 2921) @@ -1,7 +0,0 @@ -... -<a4j:commandButton value="update" reRender="infoBlock"/> - .... -<h:panelGrid id="infoBlock"> - ..... -</h:panelGrid> -..... \ No newline at end of file Copied: tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/reRender2.xhtml (from rev 2920, trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/reRender2.xhtml) =================================================================== --- tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/reRender2.xhtml (rev 0) +++ tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/reRender2.xhtml 2007-09-12 22:15:32 UTC (rev 2921) @@ -0,0 +1,7 @@ +... +<a4j:commandButton value="update" reRender="infoBlock"/> + .... +<h:panelGrid id="infoBlock"> + ..... +</h:panelGrid> +..... \ No newline at end of file Deleted: tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/reRender3.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/reRender3.xhtml 2007-09-12 22:09:01 UTC (rev 2920) +++ tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/reRender3.xhtml 2007-09-12 22:15:32 UTC (rev 2921) @@ -1,17 +0,0 @@ -..... -<h:form id="form1"> - .... - <a4j:commandButton value="Usual Way" reRender="infoBlock, infoBlock2" /> - <a4j:commandButton value="Shortcut" reRender=":infoBlockl,:sv:infoBlock2" /> - ..... -</h:form> -<h:panelGrid id="infoBlock"> - ..... -</h:panelGrid> -..... -<f:subview id="sv"> - <h:panelGrid id="infoBlock2"> - ..... - </h:panelGrid> - ..... -</f:subview> \ No newline at end of file Copied: tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/reRender3.xhtml (from rev 2920, trunk/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/reRender3.xhtml) =================================================================== --- tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/reRender3.xhtml (rev 0) +++ tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/snippets/reRender3.xhtml 2007-09-12 22:15:32 UTC (rev 2921) @@ -0,0 +1,17 @@ +..... +<h:form id="form1"> + .... + <a4j:commandButton value="Usual Way" reRender="infoBlock, infoBlock2" /> + <a4j:commandButton value="Shortcut" reRender=":infoBlockl,:sv:infoBlock2" /> + ..... +</h:form> +<h:panelGrid id="infoBlock"> + ..... +</h:panelGrid> +..... +<f:subview id="sv"> + <h:panelGrid id="infoBlock2"> + ..... + </h:panelGrid> + ..... +</f:subview> \ No newline at end of file Modified: tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/usage.xhtml =================================================================== --- tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/usage.xhtml 2007-09-12 22:09:01 UTC (rev 2920) +++ tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/ajaxAttributes/usage.xhtml 2007-09-12 22:15:32 UTC (rev 2921) @@ -7,6 +7,21 @@ xmlns:rich="http://richfaces.org/rich"> <ui:composition template="/templates/component-sample.xhtml"> <ui:define name="sample"> + <style> + .viewsourcepanel { + padding-bottom:0px; + width:100%; + overflow:auto; + border-width:0; + background-color:#FFFFE7; + } + .viewsourcebody { + padding:0; + } + ol{ + font-size:12px !important; + } + </style> <p>This section overviews the attributes that are common for Ajax components such as a4j:support, a4j:commandButton, a4j:jsFunction, a4j:poll, a4j:push and so @@ -26,17 +41,9 @@ attribute is an id of the JSF component or an id list. This is a simple example: </p> - <div class="esample"> - <pre> -... -&lt;a4j:commandButton value="update" reRender="<b>infoBlock</b>" /&gt; -.... -&lt;h:panelGrid id="<b>infoBlock</b>"&gt; -..... -&lt;/h:panelGrid&gt; -..... - </pre> - </div> + <rich:panel styleClass="viewsourcepanel" bodyClass="viewsourcebody"> + <rich:insert src="/richfaces/ajaxAttributes/snippets/reRender2.xhtml" highlight="xhtml"></rich:insert> + </rich:panel> <p> reRender uses <a target="_blank" href="http://java.sun.com/javaee/javaserverfaces/1.2_MR1/docs/api/ja... UIComponent.findComponent()</a> algorithm (with some additional exceptions) @@ -46,28 +53,9 @@ found mentioning it more precisely. The following example shows the difference in approaches (both buttons will work successfully): </p> - <div class="esample"> - <pre> -..... -&lt;h:form id="form1"&gt; - .... - &lt;a4j:commandButton value="Usual Way" reRender="<b>infoBlock</b>, <b>infoBlock2</b>" /&gt; - &lt;a4j:commandButton value="Shortcut" reRender="<b>:infoBlockl</b>,<b>:sv:infoBlock2</b>" /&gt; -..... -&lt;/h:form&gt; -&lt;h:panelGrid id="<b>infoBlock</b>"&gt; -..... -&lt;/h:panelGrid&gt; -..... -&lt;f:subview id="<b>sv</b>"&gt; -&lt;h:panelGrid id="<b>infoBlock2</b>"&gt; -..... -&lt;/h:panelGrid&gt; -..... -&lt;/f:subview&gt; - </pre> - </div> - + <rich:panel styleClass="viewsourcepanel" bodyClass="viewsourcebody"> + <rich:insert src="/richfaces/ajaxAttributes/snippets/reRender3.xhtml" highlight="xhtml"></rich:insert> + </rich:panel> <p> You can use JSF EL expression as a value of the reRender attribute. It might be a property of types Set, Collection, Array or simple String. The EL for reRender is resolved right before the @@ -88,14 +76,10 @@ explicitly. It might be useful if you have an area on a page that should be updated as a response on any Ajax request. For example, the following code allows to output error messages regardless of what Ajax request causes the Validation phase failed. - </p> - <div class="esample"> - <pre> -&lt;a4j:outputPanel <b>ajaxRendered="true"</b>&gt; - &lt;h:messages /&gt; -&lt;/a4j:outputPanel&gt; - </pre> - </div> + </p> + <rich:panel styleClass="viewsourcepanel" bodyClass="viewsourcebody"> + <rich:insert src="/richfaces/ajaxAttributes/snippets/reRender1.xhtml" highlight="xhtml"></rich:insert> + </rich:panel> <p> <b>limitToList</b> attribute allows to dismiss the behavior of the a4j:outputPanel ajaxRendered attribute. limitToList = "false" means to update only the area(s) that mentioned in the @@ -119,14 +103,10 @@ the requests produced by the same event. For example, according to the following code, only the newest request will be sent to the server if a user types very fast and has typed the several characters already before the previous Ajax Response is back. - </p> -<div class="esample"> - <pre> -&lt;h:inputText value="<span>#</span>{userBean.name}"&gt; - &lt;a4j:support event="onkeyup" <b>eventsQueue="foo"</b> reRender="bar" /&gt; -&lt;/h:inputText&gt; - </pre> - </div> + </p> + <rich:panel styleClass="viewsourcepanel" bodyClass="viewsourcebody"> + <rich:insert src="/richfaces/ajaxAttributes/snippets/eventqueue.xhtml" highlight="xhtml"></rich:insert> + </rich:panel> <p><b>requestDelay</b> attribute defines the time (in ms.) that the request will be wait in the queue before it is ready to send. When the delay time is over, the request will be sent to the server or removed if the newest 'similar' request is in a queue already . @@ -200,7 +180,7 @@ the Validation phase is passed successfully, you can replace h:commandButton with a4j:commandButton and point to the action method that navigates to the next page. If Validation process fails, the partial page update will occur and a user will see an error message. Otherwize, the application - proceeds to the next page. Make sure, you define &lt;redirect /%gt; option for the navigation rule to + proceeds to the next page. Make sure, you define &lt;redirect /&gt; option for the navigation rule to avoid memory leaks. </li> </ol> @@ -237,11 +217,9 @@ will be serialized in JSON format and be available on the client side. You can refer to it using the 'data' variable. For example: </p> - <div class="esample"> - <pre> -&lt;a4j:commandButton value="Update" data="<span>#</span>{userBean.name}" oncomplete="showTheName(data.name)" /&gt; - </pre> - </div> + <rich:panel styleClass="viewsourcepanel" bodyClass="viewsourcebody"> + <rich:insert src="/richfaces/ajaxAttributes/snippets/data.xhtml" highlight="xhtml"></rich:insert> + </rich:panel> <p> Richfaces allows to serialize not only primitive types into JSON format, but also complex types including arrays and collections. The beans should be serializable to be refered Copied: tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/calendar/examples/reRender2.xhtml (from rev 2920, trunk/samples/richfaces-demo/src/main/webapp/richfaces/calendar/examples/reRender2.xhtml) =================================================================== --- tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/calendar/examples/reRender2.xhtml (rev 0) +++ tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/calendar/examples/reRender2.xhtml 2007-09-12 22:15:32 UTC (rev 2921) @@ -0,0 +1,7 @@ +... +<a4j:commandButton value="update" reRender="infoBlock"/> + .... +<h:panelGrid id="<b>infoBlock</b>"> + ..... +</h:panelGrid> +..... \ No newline at end of file Modified: tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/examples/extendedDataModel.xhtml =================================================================== --- tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/examples/extendedDataModel.xhtml 2007-09-12 22:09:01 UTC (rev 2920) +++ tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/dataTable/examples/extendedDataModel.xhtml 2007-09-12 22:15:32 UTC (rev 2921) @@ -4,11 +4,30 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.org/rich"> - <rich:messages /> + + <style type="text/css"> + .rich-message-label { + color:red; + } + .col1 { + width:240px; + } + .col2 { + width:80px; + } + .col4 { + width:80px; + } + </style> + + + + <h:form> <rich:datascroller for="auction" maxPages="5"/> <rich:spacer height="30" /> - <rich:dataTable id="auction" value="#{auctionDataModel}" var="item" rows="10"> + <rich:dataTable id="auction" value="#{auctionDataModel}" columnClasses="col1,col2,col3,col4" + var="item" rows="10" width="100%"> <rich:column> <f:facet name="header"> <h:outputText value="Description"/> @@ -27,12 +46,14 @@ <f:facet name="header"> <h:outputText value="Your Bid"/> </f:facet> - <h:inputText id="bid" value="#{item.bid}"> + + <rich:message for="bid" /><br/> + <h:inputText id="bid" value="#{item.bid}" label="Bid"> <f:convertNumber /> + <f:validateLongRange minimum = "0" maximum = "1000000"/> </h:inputText> <a4j:commandLink id="bid_link" actionListener="#{item.placeBid}" value="Place a bid!" reRender="bid,amount,highestBid" /> - <rich:message for="bid_link" /> - <rich:message for="bid" /> + </rich:column> <rich:column> <f:facet name="header"> Modified: tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/form/usage.xhtml =================================================================== --- tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/form/usage.xhtml 2007-09-12 22:09:01 UTC (rev 2920) +++ tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/form/usage.xhtml 2007-09-12 22:15:32 UTC (rev 2921) @@ -9,6 +9,17 @@ <ui:define name="sample"> <style type="text/css"> + .viewsourcepanel { + padding-bottom:0px; + width:100%; + overflow:auto; + border-width:0; + background-color:#FFFFE7; + } + .viewsourcebody { + padding:0; + } + input[type="button"], input[type="submit"] { background-color:#{a4jSkin.trimColor}; } @@ -30,7 +41,9 @@ when user clicks this link later. The example of problematic code is below. To fix the code, you need to replace h:form with a4j:form and h:commandLink with a4j:htmlCommandLink. - <rich:insert src="/richfaces/form/snippets/commandLinkProblem.xhtml" highlight="xhtml"/> + <rich:panel styleClass="viewsourcepanel" bodyClass="viewsourcebody"> + <rich:insert src="/richfaces/form/snippets/commandLinkProblem.xhtml" highlight="xhtml"/> + </rich:panel> </p> Modified: tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/htmlCommandLink/usage.xhtml =================================================================== --- tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/htmlCommandLink/usage.xhtml 2007-09-12 22:09:01 UTC (rev 2920) +++ tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/htmlCommandLink/usage.xhtml 2007-09-12 22:15:32 UTC (rev 2921) @@ -7,7 +7,22 @@ xmlns:rich="http://richfaces.org/rich"> <ui:composition template="/templates/component-sample.xhtml"> <ui:define name="sample"> + <style type="text/css"> + .viewsourcepanel { + padding-bottom:0px; + width:100%; + overflow:auto; + border-width:0; + background-color:#FFFFE7; + } + .viewsourcebody { + padding:0; + } + input[type="button"], input[type="submit"] { + background-color:#{a4jSkin.trimColor}; + } + </style> <p>a4j:htmlCommandLink functionality is similar to the standard h:commandLink component except the additional feature. </p> @@ -22,7 +37,9 @@ then updated via Ajax. Such problems could be solved with the a4j:htmlCommandLink usage. Necessary fields are encoded even when the link is not rendered initially. Hence it may be Ajax updated and parameters work correctly. </p> - <rich:insert highlight="xhtml" src="/richfaces/htmlCommandLink/snippets/commandLinkProblem.xhtml"></rich:insert> + <rich:panel styleClass="viewsourcepanel" bodyClass="viewsourcebody"> + <rich:insert highlight="xhtml" src="/richfaces/htmlCommandLink/snippets/commandLinkProblem.xhtml"></rich:insert> + </rich:panel> </ui:define> </ui:composition> Copied: tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/page/snippets (from rev 2920, trunk/samples/richfaces-demo/src/main/webapp/richfaces/page/snippets) Deleted: tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/page/snippets/gen.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/page/snippets/gen.xhtml 2007-09-12 22:09:01 UTC (rev 2920) +++ tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/page/snippets/gen.xhtml 2007-09-12 22:15:32 UTC (rev 2921) @@ -1,8 +0,0 @@ -<html> - <head> - <!--...Head Content here--> - </head> - <body> - <!--...Page Content Here--> - </body> -</html> \ No newline at end of file Copied: tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/page/snippets/gen.xhtml (from rev 2920, trunk/samples/richfaces-demo/src/main/webapp/richfaces/page/snippets/gen.xhtml) =================================================================== --- tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/page/snippets/gen.xhtml (rev 0) +++ tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/page/snippets/gen.xhtml 2007-09-12 22:15:32 UTC (rev 2921) @@ -0,0 +1,8 @@ +<html> + <head> + <!--...Head Content here--> + </head> + <body> + <!--...Page Content Here--> + </body> +</html> \ No newline at end of file Deleted: tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/page/snippets/page.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/page/snippets/page.xhtml 2007-09-12 22:09:01 UTC (rev 2920) +++ tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/page/snippets/page.xhtml 2007-09-12 22:15:32 UTC (rev 2921) @@ -1,8 +0,0 @@ -<f:view> - <a4j:page> - <f:facet name="head"> - <!--...Head Content here--> - </f:facet> - <!--...Page Content here--> - </a4j:page> -</f:view> \ No newline at end of file Copied: tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/page/snippets/page.xhtml (from rev 2920, trunk/samples/richfaces-demo/src/main/webapp/richfaces/page/snippets/page.xhtml) =================================================================== --- tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/page/snippets/page.xhtml (rev 0) +++ tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/page/snippets/page.xhtml 2007-09-12 22:15:32 UTC (rev 2921) @@ -0,0 +1,8 @@ +<f:view> + <a4j:page> + <f:facet name="head"> + <!--...Head Content here--> + </f:facet> + <!--...Page Content here--> + </a4j:page> +</f:view> \ No newline at end of file Modified: tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/page/usage.xhtml =================================================================== --- tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/page/usage.xhtml 2007-09-12 22:09:01 UTC (rev 2920) +++ tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/page/usage.xhtml 2007-09-12 22:15:32 UTC (rev 2921) @@ -7,6 +7,22 @@ xmlns:rich="http://richfaces.org/rich"> <ui:composition template="/templates/component-sample.xhtml"> <ui:define name="sample"> + <style type="text/css"> + .viewsourcepanel { + padding-bottom:0px; + width:100%; + overflow:auto; + border-width:0; + background-color:#FFFFE7; + } + .viewsourcebody { + padding:0; + } + + input[type="button"], input[type="submit"] { + background-color:#{a4jSkin.trimColor}; + } + </style> <p> <b>&lt;a4j:page&gt;</b> is a deprecated component used for solving of incompatibility problems in early Ajax4jsf and MyFaces versions. @@ -19,29 +35,15 @@ <p> This component should be defined as a child component for &lt;f:view&gt; For example: </p> - <p> -<pre>&lt;f:view&gt; - &lt;a4j:page&gt; - &lt;f:facet name="head"&gt; - &lt;!--...Head Content here--&gt; - &lt;/f:facet&gt; - &lt;!--...Page Content here--&gt; - &lt;/a4j:page&gt; -&lt;/f:view&gt;</pre> - </p> - <p> + <rich:panel styleClass="viewsourcepanel" bodyClass="viewsourcebody"> + <rich:insert src="/richfaces/page/snippets/page.xhtml" highlight="xhtml"></rich:insert> + </rich:panel> + <p> Will be rendered as: </p> - <p> -<pre>&lt;HTML&gt; - &lt;HEAD&gt; - &lt;!--...Head Content here--&gt; - &lt;/HEAD&gt; -&lt;body &gt; - &lt;!--...Page Content Here--&gt; -&lt;/body&gt; -&lt;/HTML&gt;</pre> - </p> + <rich:panel styleClass="viewsourcepanel" bodyClass="viewsourcebody"> + <rich:insert src="/richfaces/page/snippets/gen.xhtml" highlight="xhtml"></rich:insert> + </rich:panel> </ui:define> </ui:composition> Modified: tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/panel/look-customization.xhtml =================================================================== --- tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/panel/look-customization.xhtml 2007-09-12 22:09:01 UTC (rev 2920) +++ tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/panel/look-customization.xhtml 2007-09-12 22:15:32 UTC (rev 2921) @@ -7,7 +7,7 @@ <ui:composition template="/templates/component-sample.xhtml"> <ui:define name="sample"> <p> - This is a demo of stylesheets usage and skinability features to adjust a panel look. + This is a demo of stylesheets usage and skinnability features to adjust a panel look. </p> <ui:include src="/richfaces/panel/examples/lookCustom.xhtml"/> Modified: tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/panelBar/examples/example.xhtml =================================================================== --- tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/panelBar/examples/example.xhtml 2007-09-12 22:09:01 UTC (rev 2920) +++ tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/panelBar/examples/example.xhtml 2007-09-12 22:15:32 UTC (rev 2921) @@ -22,7 +22,7 @@ Resource framework can generate images on-the-fly so that it becomes possible to create images using the familiar approach of the Java graphic2D library. </rich:panelBarItem> <rich:panelBarItem label="Create a modern rich user interface look-and-feel with skins-based technology"> - Ajax4jsf provides a skinability feature that allows easily define and manage different color schemes and other parameters of the UI with the help of named skin parameters. Hence it is possible to access the skin parameters from JSP code and the Java code (e.g. to adjust generated on-the-fly images based on the text parts of the UI). Note: skinability is not an equivalent of traditional CSS, but a complement. + Ajax4jsf provides a skinnability feature that allows easily define and manage different color schemes and other parameters of the UI with the help of named skin parameters. Hence it is possible to access the skin parameters from JSP code and the Java code (e.g. to adjust generated on-the-fly images based on the text parts of the UI). Note: skinnability is not an equivalent of traditional CSS, but a complement. </rich:panelBarItem> <rich:panelBarItem label="Test the components, actions, listeners, and pages as you are creating them"> An automated testing facility is in our roadmap for the near future. This facility will generate test cases for your component as soon as you develop it. The testing framework will not just test the components, but also any other server-side or client-side functionality including JavaScript code. What is more, it will do all of this without deploying the test application into the Servlet container. Copied: tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/panelMenu (from rev 2920, trunk/samples/richfaces-demo/src/main/webapp/richfaces/panelMenu) Copied: tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/panelMenu/examples (from rev 2920, trunk/samples/richfaces-demo/src/main/webapp/richfaces/panelMenu/examples) Deleted: tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/panelMenu/examples/example.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/panelMenu/examples/example.xhtml 2007-09-12 22:09:01 UTC (rev 2920) +++ tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/panelMenu/examples/example.xhtml 2007-09-12 22:15:32 UTC (rev 2921) @@ -1,76 +0,0 @@ -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> - - - <style> - .cols{ - vertical-align:top; - width:50%; - } - </style> - <h:form id="form"> - <h:panelGrid columns="2" columnClasses="cols" width="100%"> - <rich:panelMenu style="width:200px" mode="ajax" - iconExpandedGroup="disc" iconCollapsedGroup="disc" - iconExpandedTopGroup="chevronUp" iconGroupTopPosition="right" - iconCollapsedTopGroup="chevronDown" iconCollapsedTopPosition="right" > - <rich:panelMenuGroup label="Group 1"> - <rich:panelMenuItem label="Item 1.1" action="#{panelMenu.updateCurrent}"> - <f:param name="current" value="Item 1.1"/> - </rich:panelMenuItem> - <rich:panelMenuItem label="Item 1.2" action="#{panelMenu.updateCurrent}"> - <f:param name="current" value="Item 1.2"/> - </rich:panelMenuItem> - <rich:panelMenuItem label="Item 1.3" action="#{panelMenu.updateCurrent}"> - <f:param name="current" value="Item 1.3"/> - </rich:panelMenuItem> - </rich:panelMenuGroup> - <rich:panelMenuGroup label="Group 2"> - <rich:panelMenuItem label="Item 2.1" action="#{panelMenu.updateCurrent}"> - <f:param name="current" value="Item 2.1"/> - </rich:panelMenuItem> - <rich:panelMenuItem label="Item 2.2" action="#{panelMenu.updateCurrent}"> - <f:param name="current" value="Item 2.2"/> - </rich:panelMenuItem> - <rich:panelMenuItem label="Item 2.3" action="#{panelMenu.updateCurrent}"> - <f:param name="current" value="Item 2.3"/> - </rich:panelMenuItem> - <rich:panelMenuGroup label="Group 2.4"> - <rich:panelMenuItem label="Item 2.4.1" action="#{panelMenu.updateCurrent}"> - <f:param name="current" value="Item 2.4.1"/> - </rich:panelMenuItem> - <rich:panelMenuItem label="Item 2.4.2" action="#{panelMenu.updateCurrent}"> - <f:param name="current" value="Item 2.4.2"/> - </rich:panelMenuItem> - <rich:panelMenuItem label="Item 2.4.3" action="#{panelMenu.updateCurrent}"> - <f:param name="current" value="Item 2.4.3"/> - </rich:panelMenuItem> - </rich:panelMenuGroup> - <rich:panelMenuItem label="Item 2.5" action="#{panelMenu.updateCurrent}"> - <f:param name="current" value="Item 2.5"/> - </rich:panelMenuItem> - </rich:panelMenuGroup> - <rich:panelMenuGroup label="Group 3"> - <rich:panelMenuItem label="Item 3.1" action="#{panelMenu.updateCurrent}"> - <f:param name="current" value="Item 3.1"/> - </rich:panelMenuItem> - <rich:panelMenuItem label="Item 3.2" action="#{panelMenu.updateCurrent}"> - <f:param name="current" value="Item 3.2"/> - </rich:panelMenuItem> - <rich:panelMenuItem label="Item 3.3" action="#{panelMenu.updateCurrent}"> - <f:param name="current" value="Item 3.3"/> - </rich:panelMenuItem> - </rich:panelMenuGroup> - </rich:panelMenu> - <rich:panel> - <a4j:outputPanel ajaxRendered="true"> - <h:outputText value="#{panelMenu.current} selected" id="current"/> - </a4j:outputPanel> - </rich:panel> - </h:panelGrid> - </h:form> -</ui:composition> \ No newline at end of file Copied: tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/panelMenu/examples/example.xhtml (from rev 2920, trunk/samples/richfaces-demo/src/main/webapp/richfaces/panelMenu/examples/example.xhtml) =================================================================== --- tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/panelMenu/examples/example.xhtml (rev 0) +++ tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/panelMenu/examples/example.xhtml 2007-09-12 22:15:32 UTC (rev 2921) @@ -0,0 +1,76 @@ +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + + + <style> + .cols{ + vertical-align:top; + width:50%; + } + </style> + <h:form id="form"> + <h:panelGrid columns="2" columnClasses="cols" width="100%"> + <rich:panelMenu style="width:200px" mode="ajax" + iconExpandedGroup="disc" iconCollapsedGroup="disc" + iconExpandedTopGroup="chevronUp" iconGroupTopPosition="right" + iconCollapsedTopGroup="chevronDown" iconCollapsedTopPosition="right" > + <rich:panelMenuGroup label="Group 1"> + <rich:panelMenuItem label="Item 1.1" action="#{panelMenu.updateCurrent}"> + <f:param name="current" value="Item 1.1"/> + </rich:panelMenuItem> + <rich:panelMenuItem label="Item 1.2" action="#{panelMenu.updateCurrent}"> + <f:param name="current" value="Item 1.2"/> + </rich:panelMenuItem> + <rich:panelMenuItem label="Item 1.3" action="#{panelMenu.updateCurrent}"> + <f:param name="current" value="Item 1.3"/> + </rich:panelMenuItem> + </rich:panelMenuGroup> + <rich:panelMenuGroup label="Group 2"> + <rich:panelMenuItem label="Item 2.1" action="#{panelMenu.updateCurrent}"> + <f:param name="current" value="Item 2.1"/> + </rich:panelMenuItem> + <rich:panelMenuItem label="Item 2.2" action="#{panelMenu.updateCurrent}"> + <f:param name="current" value="Item 2.2"/> + </rich:panelMenuItem> + <rich:panelMenuItem label="Item 2.3" action="#{panelMenu.updateCurrent}"> + <f:param name="current" value="Item 2.3"/> + </rich:panelMenuItem> + <rich:panelMenuGroup label="Group 2.4"> + <rich:panelMenuItem label="Item 2.4.1" action="#{panelMenu.updateCurrent}"> + <f:param name="current" value="Item 2.4.1"/> + </rich:panelMenuItem> + <rich:panelMenuItem label="Item 2.4.2" action="#{panelMenu.updateCurrent}"> + <f:param name="current" value="Item 2.4.2"/> + </rich:panelMenuItem> + <rich:panelMenuItem label="Item 2.4.3" action="#{panelMenu.updateCurrent}"> + <f:param name="current" value="Item 2.4.3"/> + </rich:panelMenuItem> + </rich:panelMenuGroup> + <rich:panelMenuItem label="Item 2.5" action="#{panelMenu.updateCurrent}"> + <f:param name="current" value="Item 2.5"/> + </rich:panelMenuItem> + </rich:panelMenuGroup> + <rich:panelMenuGroup label="Group 3"> + <rich:panelMenuItem label="Item 3.1" action="#{panelMenu.updateCurrent}"> + <f:param name="current" value="Item 3.1"/> + </rich:panelMenuItem> + <rich:panelMenuItem label="Item 3.2" action="#{panelMenu.updateCurrent}"> + <f:param name="current" value="Item 3.2"/> + </rich:panelMenuItem> + <rich:panelMenuItem label="Item 3.3" action="#{panelMenu.updateCurrent}"> + <f:param name="current" value="Item 3.3"/> + </rich:panelMenuItem> + </rich:panelMenuGroup> + </rich:panelMenu> + <rich:panel> + <a4j:outputPanel ajaxRendered="true"> + <h:outputText value="#{panelMenu.current} selected" id="current"/> + </a4j:outputPanel> + </rich:panel> + </h:panelGrid> + </h:form> +</ui:composition> \ No newline at end of file Deleted: tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/panelMenu/usage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/panelMenu/usage.xhtml 2007-09-12 22:09:01 UTC (rev 2920) +++ tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/panelMenu/usage.xhtml 2007-09-12 22:15:32 UTC (rev 2921) @@ -1,51 +0,0 @@ -<!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:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:rich="http://richfaces.org/rich"> - <ui:composition template="/templates/component-sample.xhtml"> - <ui:define name="sample"> - - <p> - The rich:panelMenu component is used to define a collapsible side-menu panel. The component has a pre-defined - skinable look-n-feel. You can customize it with styles and a set of component attributes. The folowing demo - shows the example of rich:panelMenu - </p> - - - <div class="sample-container" > - - <ui:include src="/richfaces/panelMenu/examples/example.xhtml"/> - <ui:include src="/templates/include/sourceview.xhtml"> - <ui:param name="sourcepath" value="/richfaces/panelMenu/examples/example.xhtml"/> - </ui:include> - </div> - - <p> - Switching mode could be chosen with the <b>mode</b> attribute for all panelMenu items except ones where - this attribute was redefined. By default all items send custom request. - </p> - <p> - The <b>expandMode</b> attribute defines the submission modes for all collapsing/expanding panelMenu - groups except ones where this attribute was redefined. - </p> - <p> - The <b>mode</b> and <b>expandMode</b> attributes could be used with three possible parameters: - <ul> - <li>server (default) - - The common submission of the form is performed and a page is completely refreshed.</li> - <li>ajax - - An Ajax form submission is performed, and additionally specified elements in the "reRender" attribute - are reRendered </li> - <li>none - - "Action" and "ActionListener" attributes are ignored. Items don't fire any submits itself. Behavior is completely - defined by the components nested to items. Groups expand on the client side.</li> - </ul> - </p> - - </ui:define> - - - </ui:composition> -</html> Copied: tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/panelMenu/usage.xhtml (from rev 2920, trunk/samples/richfaces-demo/src/main/webapp/richfaces/panelMenu/usage.xhtml) =================================================================== --- tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/panelMenu/usage.xhtml (rev 0) +++ tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/panelMenu/usage.xhtml 2007-09-12 22:15:32 UTC (rev 2921) @@ -0,0 +1,51 @@ +<!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:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:rich="http://richfaces.org/rich"> + <ui:composition template="/templates/component-sample.xhtml"> + <ui:define name="sample"> + + <p> + The rich:panelMenu component is used to define a collapsible side-menu panel. The component has a pre-defined + skinable look-n-feel. You can customize it with styles and a set of component attributes. The folowing demo + shows the example of rich:panelMenu + </p> + + + <div class="sample-container" > + + <ui:include src="/richfaces/panelMenu/examples/example.xhtml"/> + <ui:include src="/templates/include/sourceview.xhtml"> + <ui:param name="sourcepath" value="/richfaces/panelMenu/examples/example.xhtml"/> + </ui:include> + </div> + + <p> + Switching mode could be chosen with the <b>mode</b> attribute for all panelMenu items except ones where + this attribute was redefined. By default all items send custom request. + </p> + <p> + The <b>expandMode</b> attribute defines the submission modes for all collapsing/expanding panelMenu + groups except ones where this attribute was redefined. + </p> + <p> + The <b>mode</b> and <b>expandMode</b> attributes could be used with three possible parameters: + <ul> + <li>server (default) - + The common submission of the form is performed and a page is completely refreshed.</li> + <li>ajax - + An Ajax form submission is performed, and additionally specified elements in the "reRender" attribute + are reRendered </li> + <li>none - + "Action" and "ActionListener" attributes are ignored. Items don't fire any submits itself. Behavior is completely + defined by the components nested to items. Groups expand on the client side.</li> + </ul> + </p> + + </ui:define> + + + </ui:composition> +</html> Copied: tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/panelMenu.xhtml (from rev 2920, trunk/samples/richfaces-demo/src/main/webapp/richfaces/panelMenu.xhtml) =================================================================== --- tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/panelMenu.xhtml (rev 0) +++ tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/panelMenu.xhtml 2007-09-12 22:15:32 UTC (rev 2921) @@ -0,0 +1,22 @@ +<!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:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:rich="http://richfaces.org/rich"> + +<ui:composition template="/templates/main.xhtml"> + <ui:define name="title">RichFaces - Open Source Rich JSF Components - Panel Menu</ui:define> + <ui:define name="current">panel</ui:define> + <ui:define name="body"> + <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> + <rich:tab label="Usage"> + <ui:include src="/richfaces/panelMenu/usage.xhtml"/> + </rich:tab> + <ui:include src="/templates/include/tagInfo.xhtml"> + <ui:param name="path" value="rich/panelMenu"/> + </ui:include> + </rich:tabPanel> + </ui:define> +</ui:composition> +</html> Modified: tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/push/usage.xhtml =================================================================== --- tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/push/usage.xhtml 2007-09-12 22:09:01 UTC (rev 2920) +++ tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/push/usage.xhtml 2007-09-12 22:15:32 UTC (rev 2921) @@ -7,6 +7,19 @@ xmlns:rich="http://richfaces.org/rich"> <ui:composition template="/templates/component-sample.xhtml"> <ui:define name="sample"> + <style> + .viewsourcepanel { + padding-bottom:0px; + width:100%; + overflow:auto; + border-width:0; + background-color:#FFFFE7; + } + .viewsourcebody { + padding:0; + } + + </style> <p> The &lt;a4j:push&gt; periodically perform AJAX request to server, to simulate 'push' data. </p> @@ -22,16 +35,22 @@ for call push request. Simple example of usage: </p> <p> - Page code: - <rich:insert highlight="xhtml" src="/richfaces/push/snippets/page.xhtml"/> + <i>Page code:</i> + <rich:panel styleClass="viewsourcepanel" bodyClass="viewsourcebody"> + <rich:insert highlight="xhtml" src="/richfaces/push/snippets/page.xhtml"/> + </rich:panel> </p> <p> - Code for registration of listener: - <rich:insert highlight="java" src="/richfaces/push/snippets/listenerReg.java"/> + <i>Code for registration of listener:</i> + <rich:panel styleClass="viewsourcepanel" bodyClass="viewsourcebody"> + <rich:insert highlight="java" src="/richfaces/push/snippets/listenerReg.java"/> + </rich:panel> </p> <p> - Component can get message using current code: - <rich:insert highlight="java" src="/richfaces/push/snippets/listenermessage.java"/> + <i>Component can get message using current code:</i> + <rich:panel styleClass="viewsourcepanel" bodyClass="viewsourcebody"> + <rich:insert highlight="java" src="/richfaces/push/snippets/listenermessage.java"/> + </rich:panel> </p> <p> Thus, component 'push' uses asynchronous model instead of polls. Modified: tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/style/usage.xhtml =================================================================== --- tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/style/usage.xhtml 2007-09-12 22:09:01 UTC (rev 2920) +++ tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/style/usage.xhtml 2007-09-12 22:15:32 UTC (rev 2921) @@ -27,7 +27,7 @@ </pre> <p> Richfaces allows to have a dynamically generated css file based on RichFaces - skinability feature. xcss is an XML formated css with some additional extensions. + skinnability feature. xcss is an XML formated css with some additional extensions. The following example shows how the look-n-feel of non-RichFaces components might be changed based on the selected skin. The panel with the form elements consists only of non-Richfaces component, but it is sensitive to the current skin. @@ -40,6 +40,10 @@ <ui:include src="/templates/include/sourceview.xhtml"> <ui:param name="sourcepath" value="/richfaces/style/examples/skinedPanel.xhtml"/> </ui:include> + <ui:include src="/templates/include/sourceview.xhtml"> + <ui:param name="sourcepath" value="/WEB-INF/classes/org/richfaces/demo/ajaxSamples/rspanel.xcss"/> + <ui:param name="openlabel" value="View rspanel.xcss file" /> + </ui:include> </div> </ui:define> Modified: tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/tabPanel/look-customization.xhtml =================================================================== --- tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/tabPanel/look-customization.xhtml 2007-09-12 22:09:01 UTC (rev 2920) +++ tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/tabPanel/look-customization.xhtml 2007-09-12 22:15:32 UTC (rev 2921) @@ -7,7 +7,7 @@ <ui:composition template="/templates/component-sample.xhtml"> <ui:define name="sample"> <p> - This is a demo of how to use stylesheets and skinability features in order to adjust tab panel appearance. Here we use pre-defined classes for the tab panel + This is a demo of how to use stylesheets and skinnability features in order to adjust tab panel appearance. Here we use pre-defined classes for the tab panel "rich-tab-inactive", "rich-tab-active" and "rich-tabpanel-content" to adjust tab panel appearance. Note how appearance of tabs above could be also affected. </p> Modified: tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/tree/examples/simple-tree-data.properties =================================================================== --- tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/tree/examples/simple-tree-data.properties 2007-09-12 22:09:01 UTC (rev 2920) +++ tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/tree/examples/simple-tree-data.properties 2007-09-12 22:15:32 UTC (rev 2921) @@ -1,6 +1,25 @@ 1=Daniel Defo 1.1=Robinson Crusoe 1.1.1=Start In Life +1.1.2=Slavery And Escape +1.1.3=Wrecked On A Desert Island +1.1.4=First Weeks On The Island +1.1.5=Builds A House - The Journal +1.1.6=Ill And Conscience-Stricken +1.1.7=Agricultural Experience +1.1.8=Surveys His Position +1.1.9=A Boat +1.1.10=Tames Goats +1.1.11=Finds Print Of Man's Foot On The Sand +1.1.12=A Cave Retreat +1.1.13=Wreck Of A Spanish Ship +1.1.14=A Dream Realised +1.1.15=Friday's Education +1.1.16=Rescue Of Prisoners From Cannibals +1.1.17=Visit Of Mutineers +1.1.18=The Ship Recovered +1.1.19=Return To England +1.1.20=Fight Between Friday And A Bear 2=Edgar Allan Poe 2.1=Plays 2.1.1=Politian @@ -24,6 +43,22 @@ 3.1.5=IV. Hiawatha and Mudjekeewis 3.1.6=V. Hiawatha's Fasting 3.1.7=VI. Hiawatha's Friends +3.1.8=VII. Hiawatha's Sailing +3.1.9=VIII. Hiawatha's Fishing +3.1.10=IX. Hiawatha and the Pearl-Feather +3.1.11=X. Hiawatha's Wooing +3.1.12=XI. Hiawatha's Wedding-Feast +3.1.13=XII. The Son of the Evening Star +3.1.14=XIII. Blessing the Cornfields +3.1.15=XIV. Picture-Writing +3.1.16=XV. Hiawatha's Lamentation +3.1.17=XVI. Pau-Puk-Keewis +3.1.18=XVII. The Hunting of Pau-Puk-Keewis +3.1.19=XVIII. The Death of Kwasind +3.1.20=XIX. The Ghosts +3.1.21=XX. The Famine +3.1.22=XXI. The White Man's Foot +3.1.23=XXII. Hiawatha's Departure 3.2=Poetry 3.2.1=A Psalm Of Life 3.2.2=Birds Of Passage Modified: tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/tree/simple-tree.xhtml =================================================================== --- tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/tree/simple-tree.xhtml 2007-09-12 22:09:01 UTC (rev 2920) +++ tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/tree/simple-tree.xhtml 2007-09-12 22:15:32 UTC (rev 2921) @@ -9,7 +9,7 @@ <ui:define name="sample"> <p>RichFaces Tree has a default Data Model that allows to show a simple tree without creating - the set on your own tree model classes. The follwing demo shows how to create a tree based on the + a set on your own tree model classes. The following demo shows how to create a tree based on the data from the properties file. </p> Copied: tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/treeNodesAdaptor (from rev 2920, trunk/samples/richfaces-demo/src/main/webapp/richfaces/treeNodesAdaptor) Copied: tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/treeNodesAdaptor/examples (from rev 2920, trunk/samples/richfaces-demo/src/main/webapp/richfaces/treeNodesAdaptor/examples) Deleted: tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/treeNodesAdaptor/examples/recursiveAdaptor.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/treeNodesAdaptor/examples/recursiveAdaptor.xhtml 2007-09-12 22:09:01 UTC (rev 2920) +++ tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/treeNodesAdaptor/examples/recursiveAdaptor.xhtml 2007-09-12 22:15:32 UTC (rev 2921) @@ -1,16 +0,0 @@ -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> - - <rich:separator height="1" style="padding:10px 0" /> - <h:form> - <rich:tree style="width:300px" switchType="ajax" stateAdvisor="#{treeDemoStateAdvisor}"> - <rich:recursiveTreeNodesAdaptor roots="#{fileSystemBean.sourceRoots}" var="item" nodes="#{item.nodes}" /> - </rich:tree> - </h:form> - <rich:separator height="1" style="padding:10px 0" /> - -</ui:composition> \ No newline at end of file Copied: tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/treeNodesAdaptor/examples/recursiveAdaptor.xhtml (from rev 2920, trunk/samples/richfaces-demo/src/main/webapp/richfaces/treeNodesAdaptor/examples/recursiveAdaptor.xhtml) =================================================================== --- tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/treeNodesAdaptor/examples/recursiveAdaptor.xhtml (rev 0) +++ tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/treeNodesAdaptor/examples/recursiveAdaptor.xhtml 2007-09-12 22:15:32 UTC (rev 2921) @@ -0,0 +1,16 @@ +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + + <rich:separator height="1" style="padding:10px 0" /> + <h:form> + <rich:tree style="width:300px" switchType="ajax" stateAdvisor="#{treeDemoStateAdvisor}"> + <rich:recursiveTreeNodesAdaptor roots="#{fileSystemBean.sourceRoots}" var="item" nodes="#{item.nodes}" /> + </rich:tree> + </h:form> + <rich:separator height="1" style="padding:10px 0" /> + +</ui:composition> \ No newline at end of file Copied: tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/treeNodesAdaptor/snippets (from rev 2920, trunk/samples/richfaces-demo/src/main/webapp/richfaces/treeNodesAdaptor/snippets) Deleted: tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/treeNodesAdaptor/snippets/sample.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/treeNodesAdaptor/snippets/sample.xhtml 2007-09-12 22:09:01 UTC (rev 2920) +++ tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/treeNodesAdaptor/snippets/sample.xhtml 2007-09-12 22:15:32 UTC (rev 2921) @@ -1,69 +0,0 @@ -<rich:tree adviseNodeOpened="#{treeModelBean.adviseNodeOpened}" switchType="client"> - <rich:treeNodesAdaptor id="project" nodes="#{loaderBean.projects}" var="project"> - <rich:treeNode> - <h:commandLink action="#{project.click}" value="Project: #{project.name}" /> - </rich:treeNode> - - <rich:treeNodesAdaptor id="srcDir" var="srcDir" nodes="#{project.srcDirs}"> - <rich:treeNode> - <h:commandLink action="#{srcDir.click}" value="Source directory: #{srcDir.name}" /> - </rich:treeNode> - - <rich:treeNodesAdaptor id="pkg" var="pkg" nodes="#{srcDir.packages}"> - <rich:treeNode> - <h:commandLink action="#{pkg.click}" value="Package: #{pkg.name}" /> - </rich:treeNode> - - <rich:treeNodesAdaptor id="class" var="class" nodes="#{pkg.classes}"> - <rich:treeNode> - <h:commandLink action="#{class.click}" value="Class: #{class.name}" /> - </rich:treeNode> - </rich:treeNodesAdaptor> - </rich:treeNodesAdaptor> - - <rich:treeNodesAdaptor id="pkg1" var="pkg" nodes="#{srcDir.packages}"> - <rich:treeNode> - <h:commandLink action="#{pkg.click}" value="Package1: #{pkg.name}" /> - </rich:treeNode> - - <rich:treeNodesAdaptor id="class1" var="class" nodes="#{pkg.classes}"> - <rich:treeNode> - <h:commandLink action="#{class.click}" value="Class1: #{class.name}" /> - </rich:treeNode> - </rich:treeNodesAdaptor> - </rich:treeNodesAdaptor> - </rich:treeNodesAdaptor> - - <rich:recursiveTreeNodesAdaptor id="dir" var="dir" - roots="#{project.dirs}" nodes="#{dir.directories}"> - <rich:treeNode> - <h:commandLink action="#{dir.click}" value="Directory: #{dir.name}" /> - </rich:treeNode> - - <rich:treeNodesAdaptor id="file" var="file" nodes="#{dir.files}"> - <rich:treeNode> - <h:commandLink action="#{file.click}" value="File: #{file.name}" /> - </rich:treeNode> - </rich:treeNodesAdaptor> - - <rich:treeNodesAdaptor id="file1" var="file" nodes="#{dir.files}"> - <rich:treeNode> - <h:commandLink action="#{file.click}" value="File1: #{file.name}" /> - </rich:treeNode> - </rich:treeNodesAdaptor> - - <rich:recursiveTreeNodesAdaptor id="archiveEntry" var="archiveEntry" - roots="#{dir.files}" nodes="#{archiveEntry.archiveEntries}" - includedRoot="#{archiveEntry.class.simpleName == 'ArchiveFile'}" - includedNode="#{archiveEntry.class.simpleName == 'ArchiveEntry'}"> - - <rich:treeNode id="archiveEntryNode"> - <h:commandLink action="#{archiveEntry.click}" value="Archive entry: #{archiveEntry.name}" /> - </rich:treeNode> - - </rich:recursiveTreeNodesAdaptor> - - </rich:recursiveTreeNodesAdaptor> - - </rich:treeNodesAdaptor> -</rich:tree> Copied: tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/treeNodesAdaptor/snippets/sample.xhtml (from rev 2920, trunk/samples/richfaces-demo/src/main/webapp/richfaces/treeNodesAdaptor/snippets/sample.xhtml) =================================================================== --- tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/treeNodesAdaptor/snippets/sample.xhtml (rev 0) +++ tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/treeNodesAdaptor/snippets/sample.xhtml 2007-09-12 22:15:32 UTC (rev 2921) @@ -0,0 +1,69 @@ +<rich:tree adviseNodeOpened="#{treeModelBean.adviseNodeOpened}" switchType="client"> + <rich:treeNodesAdaptor id="project" nodes="#{loaderBean.projects}" var="project"> + <rich:treeNode> + <h:commandLink action="#{project.click}" value="Project: #{project.name}" /> + </rich:treeNode> + + <rich:treeNodesAdaptor id="srcDir" var="srcDir" nodes="#{project.srcDirs}"> + <rich:treeNode> + <h:commandLink action="#{srcDir.click}" value="Source directory: #{srcDir.name}" /> + </rich:treeNode> + + <rich:treeNodesAdaptor id="pkg" var="pkg" nodes="#{srcDir.packages}"> + <rich:treeNode> + <h:commandLink action="#{pkg.click}" value="Package: #{pkg.name}" /> + </rich:treeNode> + + <rich:treeNodesAdaptor id="class" var="class" nodes="#{pkg.classes}"> + <rich:treeNode> + <h:commandLink action="#{class.click}" value="Class: #{class.name}" /> + </rich:treeNode> + </rich:treeNodesAdaptor> + </rich:treeNodesAdaptor> + + <rich:treeNodesAdaptor id="pkg1" var="pkg" nodes="#{srcDir.packages}"> + <rich:treeNode> + <h:commandLink action="#{pkg.click}" value="Package1: #{pkg.name}" /> + </rich:treeNode> + + <rich:treeNodesAdaptor id="class1" var="class" nodes="#{pkg.classes}"> + <rich:treeNode> + <h:commandLink action="#{class.click}" value="Class1: #{class.name}" /> + </rich:treeNode> + </rich:treeNodesAdaptor> + </rich:treeNodesAdaptor> + </rich:treeNodesAdaptor> + + <rich:recursiveTreeNodesAdaptor id="dir" var="dir" + roots="#{project.dirs}" nodes="#{dir.directories}"> + <rich:treeNode> + <h:commandLink action="#{dir.click}" value="Directory: #{dir.name}" /> + </rich:treeNode> + + <rich:treeNodesAdaptor id="file" var="file" nodes="#{dir.files}"> + <rich:treeNode> + <h:commandLink action="#{file.click}" value="File: #{file.name}" /> + </rich:treeNode> + </rich:treeNodesAdaptor> + + <rich:treeNodesAdaptor id="file1" var="file" nodes="#{dir.files}"> + <rich:treeNode> + <h:commandLink action="#{file.click}" value="File1: #{file.name}" /> + </rich:treeNode> + </rich:treeNodesAdaptor> + + <rich:recursiveTreeNodesAdaptor id="archiveEntry" var="archiveEntry" + roots="#{dir.files}" nodes="#{archiveEntry.archiveEntries}" + includedRoot="#{archiveEntry.class.simpleName == 'ArchiveFile'}" + includedNode="#{archiveEntry.class.simpleName == 'ArchiveEntry'}"> + + <rich:treeNode id="archiveEntryNode"> + <h:commandLink action="#{archiveEntry.click}" value="Archive entry: #{archiveEntry.name}" /> + </rich:treeNode> + + </rich:recursiveTreeNodesAdaptor> + + </rich:recursiveTreeNodesAdaptor> + + </rich:treeNodesAdaptor> +</rich:tree> Deleted: tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/treeNodesAdaptor/usage.xhtml =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/treeNodesAdaptor/usage.xhtml 2007-09-12 22:09:01 UTC (rev 2920) +++ tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/treeNodesAdaptor/usage.xhtml 2007-09-12 22:15:32 UTC (rev 2921) @@ -1,75 +0,0 @@ -<!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:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:rich="http://richfaces.org/rich"> - <ui:composition template="/templates/component-sample.xhtml"> - <ui:define name="sample"> - - <p> - Both recursiveTreeNodesAdaptor &amp; treeNodesAdaptor (model adaptor components further in the text) - components allow defining data model declaratively and binding treeNode components to tree model nodes. - treeNodesAdaptor has a "nodes" attribute that's used to define a collection of elements to iterate through. - Collections are allowed to include: lists, arrays, maps, XML NodeList &amp; NamedNodeMap either as single - object. The current collection element is accessible via a request-scoped variable named as "var" - attribute value. - </p> - <p>recursiveTreeNodesAdaptor is an extension of a treeNodesAdaptor component that allows you to define two - different value expressions: the first, assigned by "roots" attribute is used at the top of recursion, - the second "nodes" is used on another recursion levels (the second level and deeper). - </p> - - <h:panelGroup rendered="#{not empty fileSystemBean.sourceRoots}"> - <div class="sample-container" > - <ui:include src="/richfaces/treeNodesAdaptor/examples/recursiveAdaptor.xhtml"/> - <ui:include src="/templates/include/sourceview.xhtml"> - <ui:param name="sourcepath" value="/richfaces/treeNodesAdaptor/examples/recursiveAdaptor.xhtml"/> - </ui:include> - <ui:include src="/templates/include/sourceview.xhtml"> - <ui:param name="sourcepath" value="/WEB-INF/src/org/richfaces/treemodeladaptor/FileSystemBean.java"/> - <ui:param name="openlabel" value="View FileSystemBean.java Source" /> - <ui:param name="sourcetype" value="java" /> - </ui:include> - <ui:include src="/templates/include/sourceview.xhtml"> - <ui:param name="sourcepath" value="/WEB-INF/src/org/richfaces/treemodeladaptor/FileSystemNode.java"/> - <ui:param name="openlabel" value="View FileSystemNode.java Source" /> - <ui:param name="sourcetype" value="java" /> - </ui:include> - <ui:include src="/templates/include/sourceview.xhtml"> - <ui:param name="sourcepath" value="/WEB-INF/src/org/richfaces/treemodeladaptor/PostbackPhaseListener.java"/> - <ui:param name="openlabel" value="View PostbackPhaseListener.java Source" /> - <ui:param name="sourcetype" value="java" /> - </ui:include> - <ui:include src="/templates/include/sourceview.xhtml"> - <ui:param name="sourcepath" value="/WEB-INF/src/org/richfaces/treemodeladaptor/TreeDemoStateAdvisor.java"/> - <ui:param name="openlabel" value="View TreeDemoStateAdvisor.java Source" /> - <ui:param name="sourcetype" value="java" /> - </ui:include> - </div> - </h:panelGroup> - <f:verbatim rendered="#{empty fileSystemBean.sourceRoots}"> - The information for this demo is generated and incorporated in the richfaces-demo.war - file with Maven process. Demo artifacts are located under /WEB-INF/src folder.<br/> - As soon as you read this text, you have no such folder in your run-time enviroment - right now.<br /> - If you use Jetty to run, use 'mvn jetty:run-war' command. - </f:verbatim> - - <p>Model adaptor components can be nested without any limitations. The following code-snippet - shows an example of using Nodes Adapter along with rich:tree</p> - <div class="sample-container"> - <rich:insert src="/richfaces/treeNodesAdaptor/snippets/sample.xhtml" highlight="xhtml" /> - </div> - - <p>Data model nodes are wired to treeNode components by nesting treeNode components with a "type" - attribute not defined inside model adaptor components. The first rendered one is used, or the default - one if all treeNode components are non-rendered. - </p> - - - </ui:define> - - - </ui:composition> -</html> Copied: tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/treeNodesAdaptor/usage.xhtml (from rev 2920, trunk/samples/richfaces-demo/src/main/webapp/richfaces/treeNodesAdaptor/usage.xhtml) =================================================================== --- tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/treeNodesAdaptor/usage.xhtml (rev 0) +++ tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/treeNodesAdaptor/usage.xhtml 2007-09-12 22:15:32 UTC (rev 2921) @@ -0,0 +1,75 @@ +<!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:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:rich="http://richfaces.org/rich"> + <ui:composition template="/templates/component-sample.xhtml"> + <ui:define name="sample"> + + <p> + Both recursiveTreeNodesAdaptor &amp; treeNodesAdaptor (model adaptor components further in the text) + components allow defining data model declaratively and binding treeNode components to tree model nodes. + treeNodesAdaptor has a "nodes" attribute that's used to define a collection of elements to iterate through. + Collections are allowed to include: lists, arrays, maps, XML NodeList &amp; NamedNodeMap either as single + object. The current collection element is accessible via a request-scoped variable named as "var" + attribute value. + </p> + <p>recursiveTreeNodesAdaptor is an extension of a treeNodesAdaptor component that allows you to define two + different value expressions: the first, assigned by "roots" attribute is used at the top of recursion, + the second "nodes" is used on another recursion levels (the second level and deeper). + </p> + + <h:panelGroup rendered="#{not empty fileSystemBean.sourceRoots}"> + <div class="sample-container" > + <ui:include src="/richfaces/treeNodesAdaptor/examples/recursiveAdaptor.xhtml"/> + <ui:include src="/templates/include/sourceview.xhtml"> + <ui:param name="sourcepath" value="/richfaces/treeNodesAdaptor/examples/recursiveAdaptor.xhtml"/> + </ui:include> + <ui:include src="/templates/include/sourceview.xhtml"> + <ui:param name="sourcepath" value="/WEB-INF/src/org/richfaces/treemodeladaptor/FileSystemBean.java"/> + <ui:param name="openlabel" value="View FileSystemBean.java Source" /> + <ui:param name="sourcetype" value="java" /> + </ui:include> + <ui:include src="/templates/include/sourceview.xhtml"> + <ui:param name="sourcepath" value="/WEB-INF/src/org/richfaces/treemodeladaptor/FileSystemNode.java"/> + <ui:param name="openlabel" value="View FileSystemNode.java Source" /> + <ui:param name="sourcetype" value="java" /> + </ui:include> + <ui:include src="/templates/include/sourceview.xhtml"> + <ui:param name="sourcepath" value="/WEB-INF/src/org/richfaces/treemodeladaptor/PostbackPhaseListener.java"/> + <ui:param name="openlabel" value="View PostbackPhaseListener.java Source" /> + <ui:param name="sourcetype" value="java" /> + </ui:include> + <ui:include src="/templates/include/sourceview.xhtml"> + <ui:param name="sourcepath" value="/WEB-INF/src/org/richfaces/treemodeladaptor/TreeDemoStateAdvisor.java"/> + <ui:param name="openlabel" value="View TreeDemoStateAdvisor.java Source" /> + <ui:param name="sourcetype" value="java" /> + </ui:include> + </div> + </h:panelGroup> + <f:verbatim rendered="#{empty fileSystemBean.sourceRoots}"> + The information for this demo is generated and incorporated in the richfaces-demo.war + file with Maven process. Demo artifacts are located under /WEB-INF/src folder.<br/> + As soon as you read this text, you have no such folder in your run-time enviroment + right now.<br /> + If you use Jetty to run, use 'mvn jetty:run-war' command. + </f:verbatim> + + <p>Model adaptor components can be nested without any limitations. The following code-snippet + shows an example of using Nodes Adapter along with rich:tree</p> + <div class="sample-container"> + <rich:insert src="/richfaces/treeNodesAdaptor/snippets/sample.xhtml" highlight="xhtml" /> + </div> + + <p>Data model nodes are wired to treeNode components by nesting treeNode components with a "type" + attribute not defined inside model adaptor components. The first rendered one is used, or the default + one if all treeNode components are non-rendered. + </p> + + + </ui:define> + + + </ui:composition> +</html> Copied: tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/treeNodesAdaptor.xhtml (from rev 2920, trunk/samples/richfaces-demo/src/main/webapp/richfaces/treeNodesAdaptor.xhtml) =================================================================== --- tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/treeNodesAdaptor.xhtml (rev 0) +++ tags/3.1.0/samples/richfaces-demo/src/main/webapp/richfaces/treeNodesAdaptor.xhtml 2007-09-12 22:15:32 UTC (rev 2921) @@ -0,0 +1,22 @@ +<!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:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:rich="http://richfaces.org/rich"> + +<ui:composition template="/templates/main.xhtml"> + <ui:define name="title">RichFaces - Open Source Rich JSF Components - Tree Nodes Adaptor</ui:define> + <ui:define name="current">panel</ui:define> + <ui:define name="body"> + <rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab"> + <rich:tab label="Usage"> + <ui:include src="/richfaces/treeNodesAdaptor/usage.xhtml"/> + </rich:tab> + <ui:include src="/templates/include/tagInfo.xhtml"> + <ui:param name="path" value="rich/treeNodesAdaptor"/> + </ui:include> + </rich:tabPanel> + </ui:define> +</ui:composition> +</html> Modified: tags/3.1.0/samples/richfaces-demo/src/main/webapp/templates/include/components-navigation.xhtml =================================================================== --- tags/3.1.0/samples/richfaces-demo/src/main/webapp/templates/include/components-navigation.xhtml 2007-09-12 22:09:01 UTC (rev 2920) +++ tags/3.1.0/samples/richfaces-demo/src/main/webapp/templates/include/components-navigation.xhtml 2007-09-12 22:15:32 UTC (rev 2921) @@ -7,7 +7,7 @@ <ui:composition> <rich:panel styleClass="panel_menu"> -<rich:panelBar selectedPanel="#{componentNavigator.currentComponent.group}" height="530" width="100%"> +<rich:panelBar selectedPanel="#{componentNavigator.currentComponent.group}" height="550" width="100%"> <rich:panelBarItem id="ajaxSupport" label="Ajax Support"> <ui:include src="/templates/include/components-group.xhtml" > <ui:param name="components" value="#{componentNavigator.ajaxSupport}" /> @@ -43,6 +43,11 @@ <ui:param name="components" value="#{componentNavigator.richMenu}" /> </ui:include> </rich:panelBarItem> + <rich:panelBarItem id="richTree" label="Rich Trees"> + <ui:include src="/templates/include/components-group.xhtml" > + <ui:param name="components" value="#{componentNavigator.richTree}" /> + </ui:include> + </rich:panelBarItem> <rich:panelBarItem id="richOutputs" label="Rich Output"> <ui:include src="/templates/include/components-group.xhtml" > <ui:param name="components" value="#{componentNavigator.richOutputs}" /> Modified: tags/3.1.0/samples/richfaces-demo/src/main/webapp/welcome.xhtml =================================================================== --- tags/3.1.0/samples/richfaces-demo/src/main/webapp/welcome.xhtml 2007-09-12 22:09:01 UTC (rev 2920) +++ tags/3.1.0/samples/richfaces-demo/src/main/webapp/welcome.xhtml 2007-09-12 22:15:32 UTC (rev 2921) @@ -14,15 +14,15 @@ built on an advanced open source framework (Ajax4jsf). It allows easy integration of AJAX capabilities into enterprise-level business application development.</p> <p>RichFaces enriches the Ajax4jsf framework in two important - ways. First, it expands the number of visual ready-to-use components. - Secondly, it fully implements the skinability feature of the Ajax4jsf + ways. First, it expands a number of visual ready-to-use components. + Secondly, it fully implements the skinnability feature of the Ajax4jsf framework including a large number of predefined skins. Using - skinability, it is much easier to manage the look-and-feel of an + skinnability, it is much easier to manage the look-and-feel of an application.</p> <h4>About This Demo</h4> <p>This demo Web application showcases the most important functionality available in RichFaces components. For each component - or component set selected in the left-hand sidebar, you can see it in action. Also, you can instantly see the effect of predefined + or component set selected in the left-hand sidebar, you can see it in action. Also, you can immediately see the effect of predefined skins on the application whole look-and-feel. </p> </ui:define>