Author: abelevich
Date: 2007-10-03 13:21:07 -0400 (Wed, 03 Oct 2007)
New Revision: 3235
Modified:
trunk/ui/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java
Log:
add savedTab != null check
Modified: trunk/ui/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java
===================================================================
--- trunk/ui/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java 2007-10-03
16:45:17 UTC (rev 3234)
+++ trunk/ui/tabPanel/src/main/java/org/richfaces/component/UITabPanel.java 2007-10-03
17:21:07 UTC (rev 3235)
@@ -46,6 +46,14 @@
}
protected Iterator getSwitchedFacetsAndChildren() {
+
+// if(this.restoredRenderedValue == null){
+// RF-1047 (getRenderedValue() again if value attribute is bound to a Seam
+// conversation-scoped component because conversation-scoped components are not
available
+// during the RestoreView phase)
+// this.restoredRenderedValue = getRenderedValue();
+// }
+
final Object renderedValue = this.restoredRenderedValue;
return new FilterIterator(getRenderedTabs(), new Predicate() {
@@ -122,12 +130,10 @@
List children = getChildren();
for (Iterator iterator = children.iterator(); iterator.hasNext();) {
UIComponent childComponent = (UIComponent) iterator.next();
-
if(childComponent instanceof UITab &&
((UITab)childComponent).getName().equals(tabName)){
return (UITab)childComponent;
}
}
-
return null;
}
@@ -211,25 +217,28 @@
if (event instanceof SwitchablePanelSwitchEvent &&
this.equals(event.getComponent())) {
SwitchablePanelSwitchEvent switchEvent = (SwitchablePanelSwitchEvent) event;
UIComponent component = switchEvent.getEventSource();
- UITab savedTab = getTabWithName(getValue());
- if((component instanceof UITab) && ((UITab)savedTab).isImmediate() ||
isImmediate()){
- setImmediate(true);
- }else{
- setImmediate(false);
- }
+ UITab savedTab = getTabWithName(getValue());
+ if(savedTab != null){
+ if((component instanceof UITab) && ((UITab)savedTab).isImmediate() ||
isImmediate()){
+ setImmediate(true);
+ }else{
+ setImmediate(false);
+ }
+ }
}
// redefine phaseId of ActionEvent RF-843
if(event instanceof ActionEvent ){
UIComponent component = event.getComponent();
UITab savedTab = getTabWithName(getValue());
-
- if((component instanceof UITab) && ((UITab)savedTab).isImmediate() ||
isImmediate()){
- setImmediate(true);
- processedEvent.setPhaseId(PhaseId.APPLY_REQUEST_VALUES);
- }else{
- setImmediate(false);
- processedEvent.setPhaseId(PhaseId.INVOKE_APPLICATION);
- }
+ if(savedTab != null){
+ if((component instanceof UITab) && ((UITab)savedTab).isImmediate() ||
isImmediate()){
+ setImmediate(true);
+ processedEvent.setPhaseId(PhaseId.APPLY_REQUEST_VALUES);
+ }else{
+ setImmediate(false);
+ processedEvent.setPhaseId(PhaseId.INVOKE_APPLICATION);
+ }
+ }
}
super.queueEvent(processedEvent);
Show replies by date