You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2012/02/29 14:18:27 UTC
svn commit: r1295089 - in
/myfaces/tobago/branches/tobago-tree-table/tobago-example:
tobago-example-demo/src/main/webapp/
tobago-example-demo/src/main/webapp/content/03-tree/
tobago-example-demo/src/main/webapp/content/03-tree/00/
tobago-example-demo/s...
Author: lofwyr
Date: Wed Feb 29 13:18:27 2012
New Revision: 1295089
URL: http://svn.apache.org/viewvc?rev=1295089&view=rev
Log:
TOBAGO-1049: Tree inside of the Sheet (aka TreeTable)
- remove the tc:treeData tag in the examples
Added:
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/webapp/tc/treeMenu/treeMenu-command.xhtml
- copied, changed from r1244387, myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/webapp/tc/treeMenu/treeMenu-simple.xhtml
Modified:
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/00/tree-editor.xhtml
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/01/treeMenu-different-types.xhtml
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/tree.xhtml
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/src/main/webapp/navigation.jsp
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/src/main/webapp/navigation.xhtml
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/webapp/navigation.xhtml
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/webapp/tc/sheet/sheet-tree.xhtml
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/webapp/tc/tree/tree-show-attributes.xhtml
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/webapp/tc/treeListbox/treeListbox.xhtml
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/webapp/tc/treeMenu/treeMenu-simple.xhtml
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/00/tree-editor.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/00/tree-editor.xhtml?rev=1295089&r1=1295088&r2=1295089&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/00/tree-editor.xhtml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/00/tree-editor.xhtml Wed Feb 29 13:18:27 2012
@@ -42,19 +42,19 @@
<tc:tree id="tree"
showRootJunction="true"
- showRoot="true">
- <tc:treeData value="#{treeEditor.categoryTree}" var="node" id="cat">
- <tc:treeNode id="template"
- expanded="#{node.userObject.expanded}"
- markup="#{node.userObject.markup}"
- tip="#{node.userObject.tip}"
- disabled="#{node.userObject.disabled}"
- treeExpansionListener="#{node.userObject.expansionListener}">
- <tc:treeIndent showJunctions="true"/>
- <tc:treeIcon value="image/feather.png"/>
- <tc:treeSelect value="#{node.userObject.selected}" label="#{node.userObject.name}"/>
- </tc:treeNode>
- </tc:treeData>
+ showRoot="true"
+ value="#{treeEditor.categoryTree}"
+ var="node">
+ <tc:treeNode id="template"
+ expanded="#{node.userObject.expanded}"
+ markup="#{node.userObject.markup}"
+ tip="#{node.userObject.tip}"
+ disabled="#{node.userObject.disabled}"
+ treeExpansionListener="#{node.userObject.expansionListener}">
+ <tc:treeIndent showJunctions="true"/>
+ <tc:treeIcon value="image/feather.png"/>
+ <tc:treeSelect value="#{node.userObject.selected}" label="#{node.userObject.name}"/>
+ </tc:treeNode>
</tc:tree>
</tc:panel>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/01/treeMenu-different-types.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/01/treeMenu-different-types.xhtml?rev=1295089&r1=1295088&r2=1295089&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/01/treeMenu-different-types.xhtml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/01/treeMenu-different-types.xhtml Wed Feb 29 13:18:27 2012
@@ -25,17 +25,15 @@
xmlns:f="http://java.sun.com/jsf/core">
<ui:param name="title" value="Tree - Different Command Types"/>
- <tc:treeMenu>
- <tc:treeData value="#{treeController.mixed}" var="node" id="data">
- <tc:treeNode id="template" expanded="true">
- <tc:treeCommand label="#{node.name}" rendered="#{node.childCount == 0}"
- action="#{node.action}"
- actionListener="#{node.actionListener}"
- link="#{node.url}"
- onclick="#{node.script}"/>
- <tc:treeLabel value="#{node.name}" rendered="#{node.childCount > 0}"/>
- </tc:treeNode>
- </tc:treeData>
- </tc:treeMenu>
+ <tc:treeMenu value="#{treeController.mixed}" var="node" id="data">
+ <tc:treeNode id="template" expanded="true">
+ <tc:treeCommand label="#{node.name}" rendered="#{node.childCount == 0}"
+ action="#{node.action}"
+ actionListener="#{node.actionListener}"
+ link="#{node.url}"
+ onclick="#{node.script}"/>
+ <tc:treeLabel value="#{node.name}" rendered="#{node.childCount > 0}"/>
+ </tc:treeNode>
+ </tc:treeMenu>
</ui:composition>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/tree.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/tree.xhtml?rev=1295089&r1=1295088&r2=1295089&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/tree.xhtml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/src/main/webapp/content/03-tree/tree.xhtml Wed Feb 29 13:18:27 2012
@@ -25,109 +25,104 @@
xmlns:f="http://java.sun.com/jsf/core">
<ui:param name="title" value="#{overviewBundle.tree}"/>
- <tc:panel>
- <f:facet name="layout">
- <tc:gridLayout rows="9*;16*"/>
- </f:facet>
+ <tc:panel>
+ <f:facet name="layout">
+ <tc:gridLayout rows="9*;16*"/>
+ </f:facet>
+
+ <tc:out escape="false" value="(UNDER CONSTRUCTION) #{overviewBundle.tree_text}"/>
+
+ <tc:tabGroup selectedIndex="#{overviewController.treeTabsState}" switchType="reloadPage">
+ <tc:tab label="#{overviewBundle.treeLabel}">
+ <f:facet name="layout">
+ <tc:gridLayout columns="2*;1*"/>
+ </f:facet>
+
+ <tc:tree id="tree"
+ showRootJunction="#{demo.showRootJunction}"
+ showRoot="#{demo.showRoot}"
+ value="#{demo.tree}"
+ var="node">
+ <tc:treeNode id="template" expanded="true">
+ <tc:treeIndent showJunctions="#{demo.showJunctions}"/>
+ <tc:treeIcon value="image/feather.png" rendered="#{demo.showIcons}"/>
+ <tc:treeLabel value="#{node.userObject.name}"/>
+ </tc:treeNode>
+ <!--
+ todo: tree editor
+ todo: events instead of state
+ todo: test action listener
+
+ actionListener="org.apache.myfaces.tobago.example.demo.actionlistener.TreeEditor"
+ markup="#{node.userObject.markup}"
+ tip="#{node.userObject.tip}"
+ action="#{node.userObject.action}"
+ disabled="#{node.userObject.disabled}"
+ -->
+ </tc:tree>
- <tc:out escape="false" value="(UNDER CONSTRUCTION) #{overviewBundle.tree_text}"/>
-
- <tc:tabGroup selectedIndex="#{overviewController.treeTabsState}" switchType="reloadPage">
- <tc:tab label="#{overviewBundle.treeLabel}">
+ <tc:panel>
<f:facet name="layout">
- <tc:gridLayout columns="2*;1*"/>
+ <tc:gridLayout rows="auto;auto;auto;auto;1*;auto;auto;auto"/>
</f:facet>
- <tc:tree id="tree"
- showRootJunction="#{demo.showRootJunction}"
- showRoot="#{demo.showRoot}">
- <tc:treeData value="#{demo.tree}" var="node" id="data">
- <tc:treeNode id="template" expanded="true">
- <tc:treeIndent showJunctions="#{demo.showJunctions}"/>
- <tc:treeIcon value="image/feather.png" rendered="#{demo.showIcons}"/>
- <tc:treeLabel value="#{node.userObject.name}"/>
- </tc:treeNode>
- <!--
- todo: tree editor
- todo: events instead of state
- todo: test action listener
-
- actionListener="org.apache.myfaces.tobago.example.demo.actionlistener.TreeEditor"
- markup="#{node.userObject.markup}"
- tip="#{node.userObject.tip}"
- action="#{node.userObject.action}"
- disabled="#{node.userObject.disabled}"
- -->
- </tc:treeData>
- </tc:tree>
-
- <tc:panel>
- <f:facet name="layout">
- <tc:gridLayout rows="auto;auto;auto;auto;1*;auto;auto;auto"/>
- </f:facet>
-
- <tc:selectBooleanCheckbox label="#{overviewBundle.treeShowIcons}"
- value="#{demo.showIcons}"
- disabled="#{overviewController.treeTabsState != 0}"/>
- <tc:selectBooleanCheckbox label="#{overviewBundle.treeShowJunctions}"
- value="#{demo.showJunctions}"
- disabled="#{overviewController.treeTabsState != 0}"/>
- <tc:selectBooleanCheckbox label="#{overviewBundle.treeShowRootJunction}"
- value="#{demo.showRootJunction}"
- disabled="#{overviewController.treeTabsState != 0}"/>
- <tc:selectBooleanCheckbox label="#{overviewBundle.treeShowRoot}"
- value="#{demo.showRoot}"
- disabled="#{overviewController.treeTabsState != 0}"/>
- <tc:cell/>
- <tc:selectOneChoice value="#{overviewController.treeSelectMode}">
- <f:selectItems value="#{overviewController.treeSelectModeItems}"/>
- </tc:selectOneChoice>
-
- <tc:selectBooleanCheckbox label="#{overviewBundle.treeMutable}"
- value="#{demo.mutable}"
- disabled="#{overviewController.treeTabsState != 0}"/>
- <tc:button action="redisplay" label="#{overviewBundle.submit}"/>
- </tc:panel>
+ <tc:selectBooleanCheckbox label="#{overviewBundle.treeShowIcons}"
+ value="#{demo.showIcons}"
+ disabled="#{overviewController.treeTabsState != 0}"/>
+ <tc:selectBooleanCheckbox label="#{overviewBundle.treeShowJunctions}"
+ value="#{demo.showJunctions}"
+ disabled="#{overviewController.treeTabsState != 0}"/>
+ <tc:selectBooleanCheckbox label="#{overviewBundle.treeShowRootJunction}"
+ value="#{demo.showRootJunction}"
+ disabled="#{overviewController.treeTabsState != 0}"/>
+ <tc:selectBooleanCheckbox label="#{overviewBundle.treeShowRoot}"
+ value="#{demo.showRoot}"
+ disabled="#{overviewController.treeTabsState != 0}"/>
+ <tc:cell/>
+ <tc:selectOneChoice value="#{overviewController.treeSelectMode}">
+ <f:selectItems value="#{overviewController.treeSelectModeItems}"/>
+ </tc:selectOneChoice>
+
+ <tc:selectBooleanCheckbox label="#{overviewBundle.treeMutable}"
+ value="#{demo.mutable}"
+ disabled="#{overviewController.treeTabsState != 0}"/>
+ <tc:button action="redisplay" label="#{overviewBundle.submit}"/>
+ </tc:panel>
+
+ </tc:tab>
+ <tc:tab label="#{overviewBundle.treeLabel} as Menu"><!-- todo i18n -->
+ <f:facet name="layout">
+ <tc:gridLayout columns="2*;1*"/>
+ </f:facet>
+
+ <tc:treeMenu id="treeMenu" showRoot="#{demo.showRoot}" value="#{demo.tree}" var="node">
+ <tc:treeNode id="template" expanded="true">
+ <tc:treeLabel value="#{node.userObject.name}"/>
+ </tc:treeNode>
+ </tc:treeMenu>
- </tc:tab>
- <tc:tab label="#{overviewBundle.treeLabel} as Menu"><!-- todo i18n -->
+ <tc:panel>
<f:facet name="layout">
- <tc:gridLayout columns="2*;1*"/>
+ <tc:gridLayout rows="auto;*;auto"/>
</f:facet>
- <tc:treeMenu id="treeMenu" showRoot="#{demo.showRoot}">
- <tc:treeData value="#{demo.tree}" var="node" id="data">
- <tc:treeNode id="template" expanded="true">
- <tc:treeLabel value="#{node.userObject.name}"/>
- </tc:treeNode>
-
- </tc:treeData>
- </tc:treeMenu>
-
- <tc:panel>
- <f:facet name="layout">
- <tc:gridLayout rows="auto;*;auto"/>
- </f:facet>
-
- <tc:selectBooleanCheckbox label="#{overviewBundle.treeShowRoot}"
- value="#{demo.showRoot}"/>
- <tc:cell/>
- <tc:button action="redisplay" label="#{overviewBundle.submit}"/>
- </tc:panel>
-
- </tc:tab>
- <tc:tab label="#{overviewBundle.treeListboxLabel} (todo)">
-
- <tc:treeListbox id="tree">
- <tc:treeData value="#{demo.tree}" var="node" id="data">
- <tc:treeNode id="template" expanded="true">
- <tc:treeLabel value="#{node.userObject.name}"/>
- </tc:treeNode>
- </tc:treeData>
- </tc:treeListbox>
+ <tc:selectBooleanCheckbox label="#{overviewBundle.treeShowRoot}"
+ value="#{demo.showRoot}"/>
+ <tc:cell/>
+ <tc:button action="redisplay" label="#{overviewBundle.submit}"/>
+ </tc:panel>
+
+ </tc:tab>
+ <tc:tab label="#{overviewBundle.treeListboxLabel} (todo)">
+
+ <tc:treeListbox id="tree" value="#{demo.tree}" var="node">
+ <tc:treeNode id="template" expanded="true">
+ <tc:treeLabel value="#{node.userObject.name}"/>
+ </tc:treeNode>
+ </tc:treeListbox>
- </tc:tab>
- </tc:tabGroup>
+ </tc:tab>
+ </tc:tabGroup>
- </tc:panel>
+ </tc:panel>
</ui:composition>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/src/main/webapp/navigation.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/src/main/webapp/navigation.jsp?rev=1295089&r1=1295088&r2=1295089&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/src/main/webapp/navigation.jsp (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/src/main/webapp/navigation.jsp Wed Feb 29 13:18:27 2012
@@ -23,15 +23,13 @@
<tc:gridLayout rows="*"/>
</f:facet>
- <tc:treeMenu id="nav">
- <tc:treeData value="#{navigation.tree}" var="node" id="data">
- <tc:treeNode expanded="#{node.expanded}">
- <tc:treeCommand
- label="#{node.title}"
- action="#{node.action}"
- immediate="true"/>
- </tc:treeNode>
- </tc:treeData>
+ <tc:treeMenu id="nav" value="#{navigation.tree}" var="node">
+ <tc:treeNode expanded="#{node.expanded}">
+ <tc:treeCommand
+ label="#{node.title}"
+ action="#{node.action}"
+ immediate="true"/>
+ </tc:treeNode>
</tc:treeMenu>
</tc:panel>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/src/main/webapp/navigation.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/src/main/webapp/navigation.xhtml?rev=1295089&r1=1295088&r2=1295089&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/src/main/webapp/navigation.xhtml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-demo/src/main/webapp/navigation.xhtml Wed Feb 29 13:18:27 2012
@@ -20,15 +20,13 @@
<f:subview id="navigator"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:tc="http://myfaces.apache.org/tobago/component">
- <tc:treeMenu id="nav">
- <tc:treeData value="#{navigation.tree}" var="node" id="data">
- <tc:treeNode expanded="#{node.expanded}" marked="#{node.marked}" id="node">
- <tc:treeCommand
- id="cmd"
- label="#{node.title}"
- action="#{node.action}"
- immediate="true"/>
- </tc:treeNode>
- </tc:treeData>
- </tc:treeMenu>
+ <tc:treeMenu id="nav" value="#{navigation.tree}" var="node">
+ <tc:treeNode expanded="#{node.expanded}" marked="#{node.marked}" id="node">
+ <tc:treeCommand
+ id="cmd"
+ label="#{node.title}"
+ action="#{node.action}"
+ immediate="true"/>
+ </tc:treeNode>
+ </tc:treeMenu>
</f:subview>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/webapp/navigation.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/webapp/navigation.xhtml?rev=1295089&r1=1295088&r2=1295089&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/webapp/navigation.xhtml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/webapp/navigation.xhtml Wed Feb 29 13:18:27 2012
@@ -45,16 +45,14 @@
<tc:button action="#{clientConfig.submit}" label="OK"/>
</tc:panel>
- <tc:tree>
- <tc:treeData value="#{browser.tree}" var="node">
- <tc:treeNode expanded="true" disabled="#{node.disabled}">
- <tc:treeIndent/>
- <tc:treeIcon/>
- <tc:treeCommand link="#{node.resource}" label="#{node.label}" target="page:content"
- rendered="#{node.childCount == 0}" markup="#{node.markup}"/>
- <tc:treeLabel value="#{node.label}" rendered="#{node.childCount > 0}"/>
- </tc:treeNode>
- </tc:treeData>
+ <tc:tree value="#{browser.tree}" var="node">
+ <tc:treeNode expanded="true" disabled="#{node.disabled}">
+ <tc:treeIndent/>
+ <tc:treeIcon/>
+ <tc:treeCommand link="#{node.resource}" label="#{node.label}" target="page:content"
+ rendered="#{node.childCount == 0}" markup="#{node.markup}"/>
+ <tc:treeLabel value="#{node.label}" rendered="#{node.childCount > 0}"/>
+ </tc:treeNode>
</tc:tree>
</tc:panel>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/webapp/tc/sheet/sheet-tree.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/webapp/tc/sheet/sheet-tree.xhtml?rev=1295089&r1=1295088&r2=1295089&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/webapp/tc/sheet/sheet-tree.xhtml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/webapp/tc/sheet/sheet-tree.xhtml Wed Feb 29 13:18:27 2012
@@ -45,14 +45,12 @@
</tc:sheet>
<!--
- <tc:tree showRoot="true">
- <tc:treeData value="#{tree.tree}" var="row">
+ <tc:tree showRoot="true" value="#{tree.tree}" var="row">
- <tc:treeNode expanded="true">
- <tc:treeIndent/>
- <tc:treeLabel value="#{row.userObject.name}"/>
- </tc:treeNode>
- </tc:treeData>
+ <tc:treeNode expanded="true">
+ <tc:treeIndent/>
+ <tc:treeLabel value="#{row.userObject.name}"/>
+ </tc:treeNode>
</tc:tree>
-->
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/webapp/tc/tree/tree-show-attributes.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/webapp/tc/tree/tree-show-attributes.xhtml?rev=1295089&r1=1295088&r2=1295089&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/webapp/tc/tree/tree-show-attributes.xhtml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/webapp/tc/tree/tree-show-attributes.xhtml Wed Feb 29 13:18:27 2012
@@ -73,14 +73,13 @@
<tc:box
label="#{showRoot}, #{showRootJunction}, #{showJunctions}, #{showIcons}"
tip="show root = #{showRoot}, show root junctions = #{showRootJunction}, show junctions = #{showJunctions}, show icons = #{showIcons}">
- <tc:tree showRoot="#{showRoot}" showRootJunction="#{showRootJunction}">
- <tc:treeData value="#{tree.small}" var="node" id="data">
+ <tc:tree showRoot="#{showRoot}" showRootJunction="#{showRootJunction}"
+ value="#{tree.small}" var="node">
<tc:treeNode id="template" expanded="true">
<tc:treeIndent showJunctions="#{showJunctions}"/>
<tc:treeIcon rendered="#{showIcons}"/>
<tc:treeCommand label="#{node.userObject.name}" action="#{node.userObject.action}"/>
</tc:treeNode>
- </tc:treeData>
</tc:tree>
</tc:box>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/webapp/tc/treeListbox/treeListbox.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/webapp/tc/treeListbox/treeListbox.xhtml?rev=1295089&r1=1295088&r2=1295089&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/webapp/tc/treeListbox/treeListbox.xhtml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/webapp/tc/treeListbox/treeListbox.xhtml Wed Feb 29 13:18:27 2012
@@ -25,12 +25,10 @@
<tc:page>
<tc:gridLayoutConstraint width="600px" height="300px"/>
- <tc:treeListbox id="tree">
- <tc:treeData value="#{tree.tree}" var="node" id="data">
- <tc:treeNode id="template" expanded="true">
- <tc:treeLabel value="#{node.userObject.name}"/>
- </tc:treeNode>
- </tc:treeData>
+ <tc:treeListbox id="tree" value="#{tree.tree}" var="node">
+ <tc:treeNode id="template" expanded="true">
+ <tc:treeLabel value="#{node.userObject.name}"/>
+ </tc:treeNode>
</tc:treeListbox>
</tc:page>
Copied: myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/webapp/tc/treeMenu/treeMenu-command.xhtml (from r1244387, myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/webapp/tc/treeMenu/treeMenu-simple.xhtml)
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/webapp/tc/treeMenu/treeMenu-command.xhtml?p2=myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/webapp/tc/treeMenu/treeMenu-command.xhtml&p1=myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/webapp/tc/treeMenu/treeMenu-simple.xhtml&r1=1244387&r2=1295089&rev=1295089&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/webapp/tc/treeMenu/treeMenu-simple.xhtml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/webapp/tc/treeMenu/treeMenu-command.xhtml Wed Feb 29 13:18:27 2012
@@ -22,15 +22,18 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core">
- <tc:page>
+ <tc:page id="page">
<tc:gridLayoutConstraint width="600px" height="300px"/>
+ <f:facet name="layout">
+ <tc:gridLayout rows="auto;*"/>
+ </f:facet>
- <tc:treeMenu id="tree" showRoot="true">
- <tc:treeData value="#{tree.tree}" var="node" id="data">
- <tc:treeNode id="template" expanded="true">
- <tc:treeLabel value="#{node.userObject.name}"/>
- </tc:treeNode>
- </tc:treeData>
+ <tc:out value="Tree Menu with commands as nodes:"/>
+
+ <tc:treeMenu id="tree" value="#{tree.tree}" var="node" showRoot="true">
+ <tc:treeNode id="node" expanded="true">
+ <tc:treeCommand label="#{node.userObject.name}" action="#{node.userObject.action}"/>
+ </tc:treeNode>
</tc:treeMenu>
</tc:page>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/webapp/tc/treeMenu/treeMenu-simple.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/webapp/tc/treeMenu/treeMenu-simple.xhtml?rev=1295089&r1=1295088&r2=1295089&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/webapp/tc/treeMenu/treeMenu-simple.xhtml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-test/src/main/webapp/tc/treeMenu/treeMenu-simple.xhtml Wed Feb 29 13:18:27 2012
@@ -22,15 +22,18 @@
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core">
- <tc:page>
+ <tc:page id="page">
<tc:gridLayoutConstraint width="600px" height="300px"/>
+ <f:facet name="layout">
+ <tc:gridLayout rows="auto;*"/>
+ </f:facet>
- <tc:treeMenu id="tree" showRoot="true">
- <tc:treeData value="#{tree.tree}" var="node" id="data">
- <tc:treeNode id="template" expanded="true">
- <tc:treeLabel value="#{node.userObject.name}"/>
- </tc:treeNode>
- </tc:treeData>
+ <tc:out value="Simple Tree Menu:"/>
+
+ <tc:treeMenu id="tree" showRoot="true" value="#{tree.tree}" var="node">
+ <tc:treeNode id="template" expanded="true">
+ <tc:treeLabel value="#{node.userObject.name}"/>
+ </tc:treeNode>
</tc:treeMenu>
</tc:page>