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 2008/10/30 09:30:18 UTC

svn commit: r709114 - /myfaces/tobago/trunk/example/demo/src/main/webapp/overview/tree.jsp

Author: lofwyr
Date: Thu Oct 30 01:30:17 2008
New Revision: 709114

URL: http://svn.apache.org/viewvc?rev=709114&view=rev
Log:
TOBAGO-377: Tree
* remove old tree

Modified:
    myfaces/tobago/trunk/example/demo/src/main/webapp/overview/tree.jsp

Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/overview/tree.jsp
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/overview/tree.jsp?rev=709114&r1=709113&r2=709114&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/overview/tree.jsp (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/overview/tree.jsp Thu Oct 30 01:30:17 2008
@@ -20,101 +20,114 @@
 <%@ taglib tagdir="/WEB-INF/tags/layout" prefix="layout" %>
 
 <layout:overview>
-  <jsp:body>
-    <tc:panel>
+<jsp:body>
+<tc:panel>
+<f:facet name="layout">
+  <tc:gridLayout rows="9*;16*"/>
+</f:facet>
+
+<tc:out escape="false" value="#{overviewBundle.tree_text}"/>
+
+<%-- column --%>
+
+<tc:box label="#{overviewBundle.tree_sampleTitle}">
+  <tc:tabGroup state="#{overviewController.treeTabsState}" switchType="reloadPage">
+    <tc:tab label="#{overviewBundle.treeLabel}">
       <f:facet name="layout">
-        <tc:gridLayout rows="9*;16*" />
-        <%-- <tc:gridLayout rows="8*;17*" />--%>
+        <tc:gridLayout columns="2*;1*"/>
       </f:facet>
 
-        <tc:out escape="false" value="#{overviewBundle.tree_text}" />
+      <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 label="#{node.userObject.name}"
+                       id="template"
+                       expanded="true"
+                       value="#{node}"
+                       image="image/feather.png">
+            <f:actionListener type="org.apache.myfaces.tobago.example.demo.actionlistener.TreeEditor"/>
+          </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>
 
-      <%-- column --%>
+      <tc:panel>
+        <f:facet name="layout">
+          <tc:gridLayout rows="fixed;fixed;fixed;fixed;1*;fixed;fixed;fixed"/>
+        </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:box label="#{overviewBundle.tree_sampleTitle}" >
-        <tc:tabGroup state="#{overviewController.treeTabsState}" switchType="reloadPage">
-          <tc:tab label="#{overviewBundle.treeLabel}">
+    </tc:tab>
+    <tc:tab label="#{overviewBundle.treeListboxLabel}">
+
+      <f:facet name="layout">
+        <tc:gridLayout columns="2*;1*"/>
+      </f:facet>
+
+      <tc:treeListbox value="#{demo.tree}" state="#{demo.treeState}" id="treeListbox"
+                      idReference="userObject.id"
+                      nameReference="userObject.name"
+                      selectable="#{overviewController.treeListboxSelectMode}"
+                      tipReference="userObject.name">
+      </tc:treeListbox>
+
+      <tc:panel>
         <f:facet name="layout">
-          <tc:gridLayout columns="2*;1*" />
+          <tc:gridLayout rows="1*;fixed;20px;fixed"/>
         </f:facet>
 
-            <tc:treeOld value="#{demo.tree}" state="#{demo.treeState}" id="tree"
-                idReference="userObject.id"
-                nameReference="userObject.name"
-                showIcons="#{demo.showIcons}"
-                showJunctions="#{demo.showJunctions}"
-                showRootJunction="#{demo.showRootJunction}"
-                showRoot="#{demo.showRoot}"
-                selectable="#{overviewController.treeSelectMode}"
-                mutable="#{demo.mutable}"
-                tipReference="userObject.name"                
-                >
-              <f:actionListener type="org.apache.myfaces.tobago.example.demo.actionlistener.TreeEditor" />
-            </tc:treeOld>
-
-            <tc:panel>
-              <f:facet name="layout">
-                <tc:gridLayout rows="fixed;fixed;fixed;fixed;1*;fixed;fixed;fixed" />
-              </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:tab>
-          <tc:tab label="#{overviewBundle.treeListboxLabel}">
-
-            <f:facet name="layout">
-              <tc:gridLayout columns="2*;1*" />
-            </f:facet>
-
-            <tc:treeListbox value="#{demo.tree}" state="#{demo.treeState}" id="treeListbox"
-                idReference="userObject.id"
-                nameReference="userObject.name"
-                selectable="#{overviewController.treeListboxSelectMode}"
-                tipReference="userObject.name"
-                >
-            </tc:treeListbox>
-
-            <tc:panel>
-              <f:facet name="layout">
-                <tc:gridLayout rows="1*;fixed;20px;fixed" />
-              </f:facet>
-
-              <tc:cell />
-
-              <tc:selectOneChoice value="#{overviewController.treeListboxSelectMode}">
-                <f:selectItems value="#{overviewController.treeListboxSelectModeItems}" />
-              </tc:selectOneChoice>
-
-              <tc:cell />
-
-              <tc:button action="redisplay" label="#{overviewBundle.submit}" />
-            </tc:panel>
-          </tc:tab>
-        </tc:tabGroup>
+        <tc:cell/>
+
+        <tc:selectOneChoice value="#{overviewController.treeListboxSelectMode}">
+          <f:selectItems value="#{overviewController.treeListboxSelectModeItems}"/>
+        </tc:selectOneChoice>
+
+        <tc:cell/>
+
+        <tc:button action="redisplay" label="#{overviewBundle.submit}"/>
+      </tc:panel>
+    </tc:tab>
+  </tc:tabGroup>
 
-      </tc:box>
+</tc:box>
 
-    </tc:panel>
-  </jsp:body>
+</tc:panel>
+</jsp:body>
 </layout:overview>