You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2014/12/15 12:07:17 UTC
svn commit: r1645623 -
/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/util/RenderUtils.java
Author: weber
Date: Mon Dec 15 11:07:16 2014
New Revision: 1645623
URL: http://svn.apache.org/r1645623
Log:
TOBAGO-1431 - NPE decoding tree state [Merged from trunk: revision 1645621]
Modified:
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/util/RenderUtils.java (contents, props changed)
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/util/RenderUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/util/RenderUtils.java?rev=1645623&r1=1645622&r2=1645623&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/util/RenderUtils.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/util/RenderUtils.java Mon Dec 15 11:07:16 2014
@@ -259,27 +259,31 @@ public class RenderUtils {
final TreePath path = data.getPath();
// selected
- final SelectedState selectedState = data.getSelectedState();
- final boolean oldSelected = selectedState.isSelected(path);
- final boolean newSelected = selectedIndices.contains(rowIndex);
- if (newSelected != oldSelected) {
- if (newSelected) {
- selectedState.select(path);
- } else {
- selectedState.unselect(path);
+ if (selectedIndices != null) {
+ final SelectedState selectedState = data.getSelectedState();
+ final boolean oldSelected = selectedState.isSelected(path);
+ final boolean newSelected = selectedIndices.contains(rowIndex);
+ if (newSelected != oldSelected) {
+ if (newSelected) {
+ selectedState.select(path);
+ } else {
+ selectedState.unselect(path);
+ }
}
}
// expanded
if (expandedIndices != null) {
- final ExpandedState expandedState = data.getExpandedState();
- final boolean oldExpanded = expandedState.isExpanded(path);
- final boolean newExpanded = expandedIndices.contains(rowIndex);
- if (newExpanded != oldExpanded) {
- if (newExpanded) {
- expandedState.expand(path);
- } else {
- expandedState.collapse(path);
+ if (expandedIndices != null) {
+ final ExpandedState expandedState = data.getExpandedState();
+ final boolean oldExpanded = expandedState.isExpanded(path);
+ final boolean newExpanded = expandedIndices.contains(rowIndex);
+ if (newExpanded != oldExpanded) {
+ if (newExpanded) {
+ expandedState.expand(path);
+ } else {
+ expandedState.collapse(path);
+ }
}
}
}
Propchange: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/util/RenderUtils.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Dec 15 11:07:16 2014
@@ -0,0 +1,3 @@
+/myfaces/tobago/branches/tobago-1.5.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/util/RenderUtils.java:1356585,1357124
+/myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/util/RenderUtils.java:1226794-1341423
+/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/util/RenderUtils.java:1571193,1571804,1571816,1571941,1571945,1571962,1571966,1576730,1589960,1591854,1600239,1600818,1601860,1602151,1602154,1602343,1604224,1606201,1607642,1609696-1609697,1609718,1610942,1610948,1610970,1610989,1611011,1611259,1611264,1611276,1611329,1611338-1611339,1611571,1613015,1613032,1614827,1614853,1615053,1615114,1615121,1617310,1619789,1621101,1621107,1621134,1621156,1621264,1621282,1621332,1622222,1622243,1622508,1623934,1624033,1625968,1625972,1626270,1628899,1645621