[richfaces-svn-commits] JBoss Rich Faces SVN: r2064 - in trunk/ui/treeModel/src/main: java/org/richfaces/component and 1 other directory.

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

Author: nbelaevski
Date: 2007-08-05 19:48:07 -0400 (Sun, 05 Aug 2007)
New Revision: 2064

Modified:
   trunk/ui/treeModel/src/main/config/component/recursiveTreeNodes.xml
   trunk/ui/treeModel/src/main/config/component/treeNodes.xml
   trunk/ui/treeModel/src/main/java/org/richfaces/component/UIRecursiveTreeNodes.java
   trunk/ui/treeModel/src/main/java/org/richfaces/component/UITreeNodes.java
Log:
- isActiveData() method added to StackingTreeModel
- unit test for StackingTreeModel updated
- active, activeRoot, activeNodes attributes introduced for UITreeNodes & UIRecursiveTreeNodes
- new attributes are used in sample application

Modified: trunk/ui/treeModel/src/main/config/component/recursiveTreeNodes.xml
===================================================================
--- trunk/ui/treeModel/src/main/config/component/recursiveTreeNodes.xml	2007-08-04 23:19:21 UTC (rev 2063)
+++ trunk/ui/treeModel/src/main/config/component/recursiveTreeNodes.xml	2007-08-05 23:48:07 UTC (rev 2064)
@@ -54,5 +54,25 @@
 			<description>
 			</description>
 		</property>
+		<property hidden="true">
+			<name>activeBoth</name>
+			<classname>boolean</classname>
+			<defaultvalue>true</defaultvalue>
+		</property>
+		<property exist="true">
+			<name>active</name>
+			<classname>boolean</classname>
+			<defaultvalue>true</defaultvalue>
+		</property>
+		<property>
+			<name>activeRoot</name>
+			<classname>boolean</classname>
+			<defaultvalue>true</defaultvalue>
+		</property>
+		<property>
+			<name>activeNodes</name>
+			<classname>boolean</classname>
+			<defaultvalue>true</defaultvalue>
+		</property>
 	</component>
 </components>

Modified: trunk/ui/treeModel/src/main/config/component/treeNodes.xml
===================================================================
--- trunk/ui/treeModel/src/main/config/component/treeNodes.xml	2007-08-04 23:19:21 UTC (rev 2063)
+++ trunk/ui/treeModel/src/main/config/component/treeNodes.xml	2007-08-05 23:48:07 UTC (rev 2064)
@@ -48,5 +48,10 @@
 			<description>
 			</description>
 		</property>
+		<property>
+			<name>active</name>
+			<classname>boolean</classname>
+			<defaultvalue>true</defaultvalue>
+		</property>
 	</component>
 </components>

Modified: trunk/ui/treeModel/src/main/java/org/richfaces/component/UIRecursiveTreeNodes.java
===================================================================
--- trunk/ui/treeModel/src/main/java/org/richfaces/component/UIRecursiveTreeNodes.java	2007-08-04 23:19:21 UTC (rev 2063)
+++ trunk/ui/treeModel/src/main/java/org/richfaces/component/UIRecursiveTreeNodes.java	2007-08-05 23:48:07 UTC (rev 2064)
@@ -8,6 +8,7 @@
 
 import javax.faces.context.FacesContext;
 import javax.faces.el.PropertyNotFoundException;
+import javax.faces.el.ValueBinding;
 
 import org.apache.commons.collections.iterators.IteratorChain;
 import org.richfaces.model.StackingTreeModel;
@@ -27,12 +28,33 @@
 	public abstract Object getRoot();
 	public abstract void setRoot(Object root);
 
+	public abstract boolean isActiveBoth();
+	public abstract void setActiveBoth(boolean active);
+
+	public abstract boolean isActiveRoot();
+	public abstract void setActiveRoot(boolean active);
+	
+	public abstract boolean isActiveNodes();
+	public abstract void setActiveNodes(boolean active);
+	
+	public boolean isActive() {
+		return isActiveBoth() && isActiveRoot();
+	}
+
+	public void setActive(boolean active) {
+		setActiveBoth(active);
+	}
+	
+	public void setValueBinding(String name, ValueBinding binding) {
+		if ("active".equals(name)) {
+			super.setValueBinding("activeBoth", binding);
+		} else {
+			super.setValueBinding(name, binding);
+		}
+	}
+		
 	public Object getData() {
-		try {
-			return getRoot();
-		} catch (PropertyNotFoundException e) {
-			return new Object[0];
-		}
+		return getRoot();
  	}
 	
 	public abstract String getVar();
@@ -44,11 +66,7 @@
 		StackingTreeModel recursiveModel = new StackingTreeModel(getId(), getVar(), new StackingTreeModelDataProvider() {
 
 			public Object getData() {
-				try {
-					return UIRecursiveTreeNodes.this.getNodes();
-				} catch (PropertyNotFoundException e) {
-					return new Object[0];
-				}
+				return UIRecursiveTreeNodes.this.getNodes();
 			}
 			
 		}) {
@@ -78,6 +96,10 @@
 			protected boolean isActive() {
 				return UIRecursiveTreeNodes.this.isRendered();
 			}
+			
+			protected boolean isActiveData() {
+				return UIRecursiveTreeNodes.this.isActiveBoth() && UIRecursiveTreeNodes.this.isActiveNodes();
+			}
 		};
 		stackingModel.addStackingModel(recursiveModel);
 		

Modified: trunk/ui/treeModel/src/main/java/org/richfaces/component/UITreeNodes.java
===================================================================
--- trunk/ui/treeModel/src/main/java/org/richfaces/component/UITreeNodes.java	2007-08-04 23:19:21 UTC (rev 2063)
+++ trunk/ui/treeModel/src/main/java/org/richfaces/component/UITreeNodes.java	2007-08-05 23:48:07 UTC (rev 2064)
@@ -24,6 +24,9 @@
 	public abstract String getVar();
 	public abstract void setVar(String var);
 	
+	public abstract boolean isActive();
+	public abstract void setActive(boolean active);
+	
 	protected StackingTreeModel createStackingTreeModel() {
 		StackingTreeModel treeModel = new StackingTreeModel(getId(), getVar(), new StackingTreeModelDataProvider() {
 
@@ -40,6 +43,10 @@
 			protected boolean isActive() {
 				return UITreeNodes.this.isRendered();
 			}
+			
+			protected boolean isActiveData() {
+				return UITreeNodes.this.isActive();
+			}
 		};
 		
 		return treeModel;