[richfaces-svn-commits] JBoss Rich Faces SVN: r16267 - branches/enterprise/3.3.X/ui/tree/src/main/java/org/richfaces/component/state.

Author: konstantin.mishin Date: 2010-01-12 13:03:56 -0500 (Tue, 12 Jan 2010) New Revision: 16267 Modified: branches/enterprise/3.3.X/ui/tree/src/main/java/org/richfaces/component/state/TreeState.java Log: RFPL-234 porting RF-7273 to enterprise branch Modified: branches/enterprise/3.3.X/ui/tree/src/main/java/org/richfaces/component/state/TreeState.java =================================================================== --- branches/enterprise/3.3.X/ui/tree/src/main/java/org/richfaces/component/state/TreeState.java 2010-01-12 18:02:21 UTC (rev 16266) +++ branches/enterprise/3.3.X/ui/tree/src/main/java/org/richfaces/component/state/TreeState.java 2010-01-12 18:03:56 UTC (rev 16267) @@ -97,9 +97,9 @@ if (rowKey == null) { return true; } - - return expandedNodes.contains(rowKey) || - NodeState.EXPANDED.equals(queuedNodeStates.get(rowKey)); + NodeState queuedNodeState = queuedNodeStates.get(rowKey); + return expandedNodes.contains(rowKey) && !NodeState.COLLAPSED.equals(queuedNodeState) || + NodeState.EXPANDED.equals(queuedNodeState); } public boolean isSelected(TreeRowKey rowKey) {