You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gr...@apache.org on 2006/11/10 00:23:41 UTC
svn commit: r473137 - in
/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree2:
HtmlTree.java UITreeData.java
Author: grantsmith
Date: Thu Nov 9 15:23:38 2006
New Revision: 473137
URL: http://svn.apache.org/viewvc?view=rev&rev=473137
Log:
TOMAHAWK-521: Patch applied.
Modified:
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree2/HtmlTree.java
myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree2/UITreeData.java
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree2/HtmlTree.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree2/HtmlTree.java?view=diff&rev=473137&r1=473136&r2=473137
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree2/HtmlTree.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree2/HtmlTree.java Thu Nov 9 15:23:38 2006
@@ -60,6 +60,17 @@
_showLines = Boolean.TRUE;
}
+ /**
+ * @see org.apache.myfaces.custom.tree2.UITreeData#processNodes(javax.faces.context.FacesContext, int, org.apache.myfaces.custom.tree2.TreeWalker)
+ */
+ protected void processNodes(FacesContext context, int processAction, TreeWalker walker)
+ {
+ if (isClientSideToggle()) {
+ walker.setCheckState(false);
+ }
+ super.processNodes(context, processAction, walker);
+ }
+
// see superclass for documentation
public Object saveState(FacesContext context)
{
Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree2/UITreeData.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree2/UITreeData.java?view=diff&rev=473137&r1=473136&r2=473137
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree2/UITreeData.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tree2/UITreeData.java Thu Nov 9 15:23:38 2006
@@ -174,7 +174,7 @@
setNodeId(null);
decode(context);
- processNodes(context, PROCESS_DECODES);
+ processNodes(context, PROCESS_DECODES, getDataModel().getTreeWalker());
}
@@ -184,7 +184,7 @@
if (context == null) throw new NullPointerException("context");
if (!isRendered()) return;
- processNodes(context, PROCESS_VALIDATORS);
+ processNodes(context, PROCESS_VALIDATORS, getDataModel().getTreeWalker());
setNodeId(null);
}
@@ -196,7 +196,7 @@
if (context == null) throw new NullPointerException("context");
if (!isRendered()) return;
- processNodes(context, PROCESS_UPDATES);
+ processNodes(context, PROCESS_UPDATES, getDataModel().getTreeWalker());
setNodeId(null);
}
@@ -512,10 +512,9 @@
}
- protected void processNodes(FacesContext context, int processAction)
+ protected void processNodes(FacesContext context, int processAction, TreeWalker walker)
{
UIComponent facet = null;
- TreeWalker walker = getDataModel().getTreeWalker();
walker.reset();
walker.setTree(this);