Author: abelevich
Date: 2011-02-25 14:32:28 -0500 (Fri, 25 Feb 2011)
New Revision: 21941
Modified:
branches/4.0.0.CR1/ui/output/ui/src/main/java/org/richfaces/component/AbstractAccordion.java
branches/4.0.0.CR1/ui/output/ui/src/main/java/org/richfaces/component/AbstractTabPanel.java
Log:
RF-10624 tabPanel: activeItem attribute on disabled tab work incorrect
Modified:
branches/4.0.0.CR1/ui/output/ui/src/main/java/org/richfaces/component/AbstractAccordion.java
===================================================================
---
branches/4.0.0.CR1/ui/output/ui/src/main/java/org/richfaces/component/AbstractAccordion.java 2011-02-25
18:58:19 UTC (rev 21940)
+++
branches/4.0.0.CR1/ui/output/ui/src/main/java/org/richfaces/component/AbstractAccordion.java 2011-02-25
19:32:28 UTC (rev 21941)
@@ -52,6 +52,12 @@
String res = super.getActiveItem();
if (res == null) {
res = getFirstItem().getName();
+ } else {
+ AbstractTogglePanelTitledItem item =
+ (AbstractTogglePanelTitledItem)
super.getItemByIndex(super.getChildIndex(res));
+ if (item.isDisabled()) {
+ res = getFirstItem().getName();
+ }
}
return res;
}
Modified:
branches/4.0.0.CR1/ui/output/ui/src/main/java/org/richfaces/component/AbstractTabPanel.java
===================================================================
---
branches/4.0.0.CR1/ui/output/ui/src/main/java/org/richfaces/component/AbstractTabPanel.java 2011-02-25
18:58:19 UTC (rev 21940)
+++
branches/4.0.0.CR1/ui/output/ui/src/main/java/org/richfaces/component/AbstractTabPanel.java 2011-02-25
19:32:28 UTC (rev 21941)
@@ -54,6 +54,12 @@
String res = super.getActiveItem();
if (res == null) {
res = getFirstItem().getName();
+ } else {
+ AbstractTogglePanelTitledItem item =
+ (AbstractTogglePanelTitledItem)
super.getItemByIndex(super.getChildIndex(res));
+ if (item.isDisabled()) {
+ res = getFirstItem().getName();
+ }
}
return res;
}
Show replies by date