[richfaces-svn-commits] JBoss Rich Faces SVN: r239 - in trunk/richfaces/tree/src: test/java/org/richfaces/component and 1 other directory.

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

Author: nbelaevski
Date: 2007-04-02 20:50:12 -0400 (Mon, 02 Apr 2007)
New Revision: 239

Modified:
   trunk/richfaces/tree/src/main/java/org/richfaces/renderkit/TreeDataModelEventNavigator.java
   trunk/richfaces/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java
   trunk/richfaces/tree/src/test/java/org/richfaces/component/TreeModelTest.java
Log:
Redundant methods removed
Test for constrained walk added

Modified: trunk/richfaces/tree/src/main/java/org/richfaces/renderkit/TreeDataModelEventNavigator.java
===================================================================
--- trunk/richfaces/tree/src/main/java/org/richfaces/renderkit/TreeDataModelEventNavigator.java	2007-04-03 00:33:01 UTC (rev 238)
+++ trunk/richfaces/tree/src/main/java/org/richfaces/renderkit/TreeDataModelEventNavigator.java	2007-04-03 00:50:12 UTC (rev 239)
@@ -23,8 +23,6 @@
 
 import java.io.IOException;
 
-import javax.faces.context.FacesContext;
-
 import org.richfaces.component.LastElementAware;
 import org.richfaces.component.TreeRowKey;
 import org.richfaces.component.UITree;
@@ -45,13 +43,11 @@
 
 	private TreeRowKey rowKey;
 	private UITree tree;
-	private FacesContext facesContext;
 	
-	public TreeDataModelEventNavigator(UITree tree, FacesContext context, TreeRowKey floatingKey) {
+	public TreeDataModelEventNavigator(UITree tree, TreeRowKey floatingKey) {
 		super();
 		this.tree = tree;
 		this.rowKey = (TreeRowKey) this.tree.getRowKey();
-		this.facesContext = context;
 		this.floatingKey = floatingKey;
 	}
 	
@@ -120,10 +116,6 @@
 		return tree;
 	}
 
-	protected FacesContext getFacesContext() {
-		return facesContext;
-	}
-	
 	public void setLastElement() {
 		lastElement = true;
 	}
@@ -137,10 +129,6 @@
 		return this.rowKey;
 	}
 
-	protected boolean isLastElement() {
-		return lastElement;
-	}
-
 	protected boolean isStackedLastElement() {
 		if (stackedLast != null) {
 			return stackedLast.booleanValue();

Modified: trunk/richfaces/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java
===================================================================
--- trunk/richfaces/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java	2007-04-03 00:33:01 UTC (rev 238)
+++ trunk/richfaces/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java	2007-04-03 00:50:12 UTC (rev 239)
@@ -309,7 +309,7 @@
 
 		TreeRowKey rowKey = (TreeRowKey) key;
 		final TreeDataModelEventNavigator levelNavigator = new TreeDataModelEventNavigator(
-				input, context, rowKey) {
+				input, rowKey) {
 
 			public void afterDown() throws IOException {
 				openLevelDownTable(context, input, writer);

Modified: trunk/richfaces/tree/src/test/java/org/richfaces/component/TreeModelTest.java
===================================================================
--- trunk/richfaces/tree/src/test/java/org/richfaces/component/TreeModelTest.java	2007-04-03 00:33:01 UTC (rev 238)
+++ trunk/richfaces/tree/src/test/java/org/richfaces/component/TreeModelTest.java	2007-04-03 00:50:12 UTC (rev 239)
@@ -22,7 +22,9 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 import javax.faces.context.FacesContext;
@@ -111,6 +113,26 @@
 		model.setRowKey(new ListRowKey("testId:1:1"));
 		assertEquals(".xhtml", ((XmlNodeData) model.getRowData()).getText());
 	}
+
+	public void testWalkConstrained() throws Exception {
+		model.setWrappedData(node);
+		
+		Walker2 walker = new Walker2(model);
+		model.walk(null, walker, null, new ListRowKey("testId:4"), null, false);
+	
+		List walked = walker.getWalked();
+		assertEquals(3, walked.size());
+		
+		model.setRowKey(new ListRowKey("testId:4"));
+		assertSame(walked.get(0), model.getTreeNode());
+
+		model.setRowKey(new ListRowKey("testId:4:0"));
+		assertSame(walked.get(1), model.getTreeNode());
+
+		model.setRowKey(new ListRowKey("testId:4:1"));
+		assertSame(walked.get(2), model.getTreeNode());
+	}
+
 }
 
 abstract class Walker1 implements DataVisitor, LastElementAware {
@@ -137,3 +159,24 @@
 		return last;
 	}
 }
+
+class Walker2 implements DataVisitor {
+	private List walked = new ArrayList();
+	private AbstractTreeDataModel model;
+	
+	public Walker2(AbstractTreeDataModel model) {
+		super();
+		this.model = model;
+	}
+
+	public void process(FacesContext context, Object rowKey, Object argument)
+			throws IOException {
+
+		model.setRowKey(rowKey);
+		walked.add(model.getTreeNode());
+	}
+
+	public List getWalked() {
+		return walked;
+	}
+}