[richfaces-svn-commits] JBoss Rich Faces SVN: r13690 - in trunk/test-applications/jsp/src/main: webapp/TreeAll and 1 other directory.

[richfaces-svn-commits at lists.jboss.org]

Author: adubovsky
Date: 2009-04-20 09:22:41 -0400 (Mon, 20 Apr 2009)
New Revision: 13690

Modified:
   trunk/test-applications/jsp/src/main/java/tTree/TTreeRNA.java
   trunk/test-applications/jsp/src/main/webapp/TreeAll/tTreeStraightforward.jsp
Log:
+ recursionOrder test for RecursiveTreeNodesAdaptor

Modified: trunk/test-applications/jsp/src/main/java/tTree/TTreeRNA.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/tTree/TTreeRNA.java	2009-04-20 12:57:10 UTC (rev 13689)
+++ trunk/test-applications/jsp/src/main/java/tTree/TTreeRNA.java	2009-04-20 13:22:41 UTC (rev 13690)
@@ -7,8 +7,12 @@
 
 public class TTreeRNA {
 	private ArrayList<Dir> treeRNAroots;
+	
+	private String recursionOrder;
 
 	public TTreeRNA() {
+		recursionOrder = "first";
+		
 		treeRNAroots = new ArrayList<Dir>();
 		ArrayList<Dir> dirsArr = new ArrayList<Dir>();
 		ArrayList<Dir> subDirsArr = new ArrayList<Dir>();
@@ -17,15 +21,15 @@
 
 		treeRNAroots.clear();
 		dirsArr.clear();
-		for (int j = 0; j < 4; j++) {
+		for (int j = 0; j < 2; j++) {
 			packArr.clear();
 			subDirsArr.clear();
-			for (int k = 0; k < 5; k++) {
+			for (int k = 0; k < 3; k++) {
 				packArr.add(new Package("package #" + j + " " + k));
 			}
-			for (int f = 0; f < 4; f++) {
+			for (int f = 0; f < 2; f++) {
 				subPackArr.clear();
-				for (int l = 0; l < 5; l++) {
+				for (int l = 0; l < 3; l++) {
 					subPackArr.add(new Package("subPackage #" + j + " " + f
 							+ " " + l));
 				}
@@ -38,6 +42,14 @@
 		treeRNAroots.add(new Dir("*** root ***", null, dirsArr));
 	}
 
+	public String getRecursionOrder() {
+		return recursionOrder;
+	}
+
+	public void setRecursionOrder(String recursionOrder) {
+		this.recursionOrder = recursionOrder;
+	}
+
 	public ArrayList<Dir> getTreeRNAroots() {
 		return treeRNAroots;
 	}

Modified: trunk/test-applications/jsp/src/main/webapp/TreeAll/tTreeStraightforward.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/TreeAll/tTreeStraightforward.jsp	2009-04-20 12:57:10 UTC (rev 13689)
+++ trunk/test-applications/jsp/src/main/webapp/TreeAll/tTreeStraightforward.jsp	2009-04-20 13:22:41 UTC (rev 13690)
@@ -31,18 +31,41 @@
 						<h:outputText value="#{root.name}" />
 					</rich:treeNode>
 					<rich:recursiveTreeNodesAdaptor var="dir" roots="#{root.dirs}"
-						nodes="#{dir.dirs}">
-						<rich:treeNodesAdaptor nodes="#{dir.packages}" var="package">
+						nodes="#{dir.dirs}" recursionOrder="#{tTreeRNA.recursionOrder}">
+						<rich:treeNode>
+							<h:outputText value="Node 1 - #{dir.name}" />
+						</rich:treeNode>
+						<rich:treeNodesAdaptor id="adapt1" nodes="#{dir.packages}"
+							var="package1">
 							<rich:treeNode>
-								<h:outputText value="#{package.name}" />
+								<h:outputText value="Adaptor 1 - #{package1.name}" />
 							</rich:treeNode>
 						</rich:treeNodesAdaptor>
-						<rich:treeNode>
-							<h:outputText value="#{dir.name}" />
-						</rich:treeNode>
+						<rich:treeNodesAdaptor id="adapt2" nodes="#{dir.packages}"
+							var="package2">
+							<rich:treeNode>
+								<h:outputText value="Adaptor 2 - #{package2.name}" />
+							</rich:treeNode>
+						</rich:treeNodesAdaptor>
+						<rich:treeNodesAdaptor id="adapt3" nodes="#{dir.packages}"
+							var="package3">
+							<rich:treeNode>
+								<h:outputText value="Adaptor 3 - #{package3.name}" />
+							</rich:treeNode>
+						</rich:treeNodesAdaptor>
 					</rich:recursiveTreeNodesAdaptor>
 				</rich:treeNodesAdaptor>
 			</rich:tree>
+			<rich:separator></rich:separator>
+			<h:panelGrid columns="2">
+				<h:outputText value="recursionOrder: " />
+				<h:selectOneRadio value="#{tTreeRNA.recursionOrder}"
+					onchange="submit();">
+					<f:selectItem itemLabel="first" itemValue="first" />
+					<f:selectItem itemLabel="last" itemValue="last" />
+					<f:selectItem itemLabel="Adaptor 2" itemValue="adapt2" />
+				</h:selectOneRadio>
+			</h:panelGrid>
 			<rich:separator height="10" />
 		</h:panelGrid>
 	</a4j:outputPanel>