[richfaces-svn-commits] JBoss Rich Faces SVN: r14920 - in branches/community/3.3.X/ui/tree/src/main/java/org/richfaces: renderkit and 1 other directory.
Author: Alex.Kolonitsky
Date: 2009-07-14 09:55:19 -0400 (Tue, 14 Jul 2009)
New Revision: 14920
Modified:
branches/community/3.3.X/ui/tree/src/main/java/org/richfaces/component/UITree.java
branches/community/3.3.X/ui/tree/src/main/java/org/richfaces/component/UITreeNode.java
branches/community/3.3.X/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java
Log:
UITree: queue expansion and collapse methods declared as throws IOException.
https://jira.jboss.org/jira/browse/RF-7509
Modified:
branches/community/3.3.X/ui/tree/src/main/java/org/richfaces/component/UITree.java
===================================================================
---
branches/community/3.3.X/ui/tree/src/main/java/org/richfaces/component/UITree.java 2009-07-14
11:23:13 UTC (rev 14919)
+++
branches/community/3.3.X/ui/tree/src/main/java/org/richfaces/component/UITree.java 2009-07-14
13:55:19 UTC (rev 14920)
@@ -721,9 +721,8 @@
*
* @param rowKey
* of the node to expand
- * @throws IOException
*/
- public void queueNodeExpand(TreeRowKey rowKey) throws IOException {
+ public void queueNodeExpand(TreeRowKey rowKey) {
new ExpandNodeCommandEvent(this, rowKey).queue();
}
@@ -733,27 +732,22 @@
*
* @param rowKey
* of the node to expand
- * @throws IOException
*/
- public void queueNodeCollapse(TreeRowKey rowKey) throws IOException {
+ public void queueNodeCollapse(TreeRowKey rowKey) {
new CollapseNodeCommandEvent(this, rowKey).queue();
}
/**
* Queues all node expansion command
- *
- * @throws IOException
*/
- public void queueExpandAll() throws IOException {
+ public void queueExpandAll() {
new ExpandAllCommandEvent(this).queue();
}
/**
* Queues all node collapsion command
- *
- * @throws IOException
*/
- public void queueCollapseAll() throws IOException {
+ public void queueCollapseAll() {
new CollapseAllCommandEvent(this).queue();
}
Modified:
branches/community/3.3.X/ui/tree/src/main/java/org/richfaces/component/UITreeNode.java
===================================================================
---
branches/community/3.3.X/ui/tree/src/main/java/org/richfaces/component/UITreeNode.java 2009-07-14
11:23:13 UTC (rev 14919)
+++
branches/community/3.3.X/ui/tree/src/main/java/org/richfaces/component/UITreeNode.java 2009-07-14
13:55:19 UTC (rev 14920)
@@ -20,6 +20,7 @@
*/
package org.richfaces.component;
+import javax.el.ValueExpression;
import javax.faces.component.UIComponent;
import javax.faces.component.UIComponentBase;
import javax.faces.component.UIViewRoot;
@@ -526,6 +527,8 @@
if (this.ajaxSingleSet) {
return this.ajaxSingle;
}
+
+ // ValueExpression ve = getValueExpression("ajaxSingle");
ValueBinding vb = getValueBinding("ajaxSingle");
if (vb != null) {
Boolean value = (Boolean) vb.getValue(getFacesContext());
Modified:
branches/community/3.3.X/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java
===================================================================
---
branches/community/3.3.X/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java 2009-07-14
11:23:13 UTC (rev 14919)
+++
branches/community/3.3.X/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java 2009-07-14
13:55:19 UTC (rev 14920)
@@ -262,7 +262,7 @@
String nodeExpandedId = id + NODE_EXPANDED_INPUT_SUFFIX;
Object nodeExpandedValue = requestMap.get(nodeExpandedId);
if (nodeExpandedValue != null) {
- boolean nodeExpanded = Boolean.valueOf(nodeExpandedValue.toString());
+ boolean nodeExpanded = Boolean.parseBoolean(nodeExpandedValue.toString());
if (tree.isExpanded() ^ nodeExpanded) {
if (nodeExpanded) {
new ExpandNodeCommandEvent(tree, key).queue();