[richfaces-svn-commits] JBoss Rich Faces SVN: r2826 - trunk/ui/tree/src/main/java/org/richfaces/renderkit.

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

Author: nbelaevski
Date: 2007-09-09 18:40:42 -0400 (Sun, 09 Sep 2007)
New Revision: 2826

Modified:
   trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java
Log:
fixed: children div has been drawn as visible even if no children exist

Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java
===================================================================
--- trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java	2007-09-09 20:18:05 UTC (rev 2825)
+++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java	2007-09-09 22:40:42 UTC (rev 2826)
@@ -142,6 +142,7 @@
 		public void afterUp(int levels) throws IOException {
 			Context c = droppedDownToLevelFlag.getContext();
 			if (c != null) {
+				c.setHasChildren(false);
 				openDiv(c);
 				closeDiv();
 				droppedDownToLevelFlag.setContext(null);
@@ -184,7 +185,7 @@
 
 			getUtils().writeAttribute(writer, "id", context.getClientId() + "childs");
 
-			if (!context.isExpanded()) {
+			if (!context.isExpanded() || !context.isHasChildren()) {
 				getUtils().writeAttribute(writer, "style", "display: none;");
 			} else {
 				if (tree.isShowConnectingLines()) {
@@ -241,6 +242,7 @@
 
 			Context c = flag.getContext();
 			if (c != null) {
+				c.setHasChildren(false);
 				navigator.openDiv(c);
 				navigator.closeDiv();
 			}
@@ -643,6 +645,7 @@
 	private Object rowKey;
 	private boolean expanded;
 	private boolean last;
+	private boolean hasChildren = true;
 	public String getClientId() {
 		return clientId;
 	}
@@ -667,4 +670,10 @@
 	public void setLast(boolean last) {
 		this.last = last;
 	}
+	public boolean isHasChildren() {
+		return hasChildren;
+	}
+	public void setHasChildren(boolean hasChildren) {
+		this.hasChildren = hasChildren;
+	}
 }
\ No newline at end of file