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 2010/08/12 17:34:48 UTC
svn commit: r984837 - in /myfaces/tobago/trunk:
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/
tobago-example/tobago-example-demo/src/main/webapp/overview/
tobago-example/tobago-example-demo/src/main/webapp/reference/tre...
Author: lofwyr
Date: Thu Aug 12 15:34:47 2010
New Revision: 984837
URL: http://svn.apache.org/viewvc?rev=984837&view=rev
Log:
TOBAGO-377: new tree
- apply the last changes on "showJunctions" into the examples
Modified:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeTagDeclaration.java
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/overview/tree.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/tree/tree-ajax.jsp
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/tree/tree-normal-2.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/tree/tree-normal-3.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/tree/tree-normal.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/tree/tree-select.jsp
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/tree/tree-state.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/navigation.xhtml
myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/tree/tree-select.xhtml
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeTagDeclaration.java?rev=984837&r1=984836&r2=984837&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TreeTagDeclaration.java Thu Aug 12 15:34:47 2010
@@ -75,10 +75,6 @@ public interface TreeTagDeclaration
@TagAttribute
@UIComponentTagAttribute(type = "boolean", defaultValue = "false")
- void setShowJunctions(String showJunctions);
-
- @TagAttribute
- @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
void setShowRoot(String showRoot);
/**
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/overview/tree.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/overview/tree.xhtml?rev=984837&r1=984836&r2=984837&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/overview/tree.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/overview/tree.xhtml Thu Aug 12 15:34:47 2010
@@ -41,12 +41,11 @@
<tc:tree id="tree"
showIcons="#{demo.showIcons}"
- showJunctions="#{demo.showJunctions}"
showRootJunction="#{demo.showRootJunction}"
showRoot="#{demo.showRoot}">
<tc:treeData value="#{demo.tree}" var="node" id="data">
<tc:treeNode id="template" expanded="true">
- <tc:treeIndent showJunctions="true"/>
+ <tc:treeIndent showJunctions="#{demo.showJunctions}"/>
<tc:treeIcon value="image/feather.png"/>
<tc:treeLabel value="#{node.userObject.name}"/>
</tc:treeNode>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/tree/tree-ajax.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/tree/tree-ajax.jsp?rev=984837&r1=984836&r2=984837&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/tree/tree-ajax.jsp (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/tree/tree-ajax.jsp Thu Aug 12 15:34:47 2010
@@ -36,7 +36,6 @@
<tc:tree state="#{controller.state}" id="tree"
showIcons="true"
- showJunctions="true"
showRootJunction="true"
showRoot="true"
>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/tree/tree-normal-2.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/tree/tree-normal-2.xhtml?rev=984837&r1=984836&r2=984837&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/tree/tree-normal-2.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/tree/tree-normal-2.xhtml Thu Aug 12 15:34:47 2010
@@ -31,7 +31,7 @@
</f:facet>
<tc:out value="A tree with a mixed model of static and dynamic nodes. It uses the tree event mechanism."/>
- <tc:tree id="tree" showRoot="true" showJunctions="true" showIcons="true" showRootJunction="true">
+ <tc:tree id="tree" showRoot="true" showIcons="true" showRootJunction="true">
<tc:treeData value="#{treeController.tree}" var="node" id="data">
<tc:treeNode id="template"
expanded="#{node.userObject.expanded}"
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/tree/tree-normal-3.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/tree/tree-normal-3.xhtml?rev=984837&r1=984836&r2=984837&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/tree/tree-normal-3.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/tree/tree-normal-3.xhtml Thu Aug 12 15:34:47 2010
@@ -33,7 +33,6 @@
<tc:tree id="tree"
showIcons="true"
- showJunctions="true"
showRootJunction="true"
showRoot="true">
<tc:treeNode id="root" expanded="true" >
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/tree/tree-normal.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/tree/tree-normal.xhtml?rev=984837&r1=984836&r2=984837&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/tree/tree-normal.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/tree/tree-normal.xhtml Thu Aug 12 15:34:47 2010
@@ -33,7 +33,6 @@
<tc:tree id="tree"
showIcons="true"
- showJunctions="true"
showRootJunction="true"
showRoot="true">
<tc:treeNode id="root" expanded="true">
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/tree/tree-select.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/tree/tree-select.jsp?rev=984837&r1=984836&r2=984837&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/tree/tree-select.jsp (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/tree/tree-select.jsp Thu Aug 12 15:34:47 2010
@@ -29,7 +29,6 @@
<tc:tree id="sel"
showIcons="true"
- showJunctions="true"
showRootJunction="true"
showRoot="true"
selectable="single">
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/tree/tree-state.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/tree/tree-state.xhtml?rev=984837&r1=984836&r2=984837&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/tree/tree-state.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/reference/tree/tree-state.xhtml Thu Aug 12 15:34:47 2010
@@ -32,7 +32,6 @@
<tc:out value="A tree with a mixed model of static and dynamic nodes. It uses the tree state mechanism." />
<tc:tree id="tree"
showIcons="true"
- showJunctions="true"
showRootJunction="true"
showRoot="true"
state="#{demo.treeState}">
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/navigation.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/navigation.xhtml?rev=984837&r1=984836&r2=984837&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/navigation.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/navigation.xhtml Thu Aug 12 15:34:47 2010
@@ -46,7 +46,7 @@
<tc:button action="#{clientConfig.submit}" label="OK"/>
</tc:panel>
- <tc:tree showJunctions="true" showIcons="true">
+ <tc:tree showIcons="true">
<tc:treeData value="#{browser.tree}" var="node">
<tc:treeNode link="#{node.resource}" label="#{node.label}" target="page:content"/>
</tc:treeData>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/tree/tree-select.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/tree/tree-select.xhtml?rev=984837&r1=984836&r2=984837&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/tree/tree-select.xhtml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/tree/tree-select.xhtml Thu Aug 12 15:34:47 2010
@@ -26,7 +26,7 @@
<tc:page>
<tc:gridLayoutConstraint width="600px" height="300px"/>
- <tc:tree id="tree" selectable="single" showIcons="true" showJunctions="true" showRoot="true" showRootJunction="true">
+ <tc:tree id="tree" selectable="single" showIcons="true" showRoot="true" showRootJunction="true">
<tc:treeData value="#{tree.tree}" var="node" id="data">
<tc:treeNode label="#{node.userObject.name}"
id="template"