Author: abelevich
Date: 2009-12-03 11:46:51 -0500 (Thu, 03 Dec 2009)
New Revision: 16061
Modified:
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UISubTable.java
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/state/DataTableState.java
Log:
use componentState from parent class
Modified:
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UISubTable.java
===================================================================
---
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UISubTable.java 2009-12-03
16:14:50 UTC (rev 16060)
+++
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/UISubTable.java 2009-12-03
16:46:51 UTC (rev 16061)
@@ -61,7 +61,7 @@
private SubTableVisualModel visualModel;
- private SubTableState componentState;
+// private SubTableState componentState;
enum PropertyKeys {
switchType, expanded, toggleExpression, childState, visualModel
@@ -178,93 +178,21 @@
}
if(componentState == null) {
- componentState = dataTableState.getSubTableState(getClientId());
+ componentState = dataTableState.getChildState(getClientId());
}
if(componentState == null) {
- Object state = createComponentState();
- if(state instanceof SubTableState) {
- componentState = (SubTableState)state;
- }
+ componentState = createComponentState();
}
if(expression != null && !expression.isReadOnly(elContext)) {
expression.setValue(elContext, componentState);
}
}
-
- dataTableState.addSubTableState(componentState);
+ dataTableState.addChildState(componentState);
return componentState;
}
- @Override
- public Object getIterationState() {
- return new Object [] { super.getIterationState(), this.componentState};
- }
-
- @Override
- public void setIterationState(Object stateObject) {
- Object [] state = (Object [])stateObject;
- if(state != null) {
- super.setIterationState(state[0]);
- this.componentState = (SubTableState)state[1];
- } else {
- super.setIterationState(state);
- this.componentState = null;
- }
- }
-
-/* @Override
- public Object saveState(FacesContext context) {
-
- // TODO handle model serialization - "execute" model
- Boolean componentStateIsStateHolder = null;
- Object savedComponentState = null;
-
- // TODO - partial state saving handling
- if (componentState instanceof StateHolder) {
- componentStateIsStateHolder = Boolean.TRUE;
-
- StateHolder stateHolder = (StateHolder) componentState;
-
- if (!stateHolder.isTransient()) {
- savedComponentState = stateHolder.saveState(context);
- }
- } else {
- componentStateIsStateHolder = Boolean.FALSE;
-
- if (componentState instanceof Serializable) {
- savedComponentState = componentState;
- }
- }
-
- return new Object[] {super.saveState(context), savedComponentState,
componentStateIsStateHolder};
- }
-
-
- @Override
- public void restoreState(FacesContext context, Object stateObject) {
- Object[] state = (Object[]) stateObject;
-
- // TODO Auto-generated method stub
- super.restoreState(context, state[0]);
-
- Object savedComponentState = state[1];
-
- if (savedComponentState != null) {
- boolean componentStateIsStateHolder = ((Boolean) state[2]).booleanValue();
-
- if (componentStateIsStateHolder) {
- componentState = (SubTableState)createComponentState();
- ((StateHolder) componentState).restoreState(context,
savedComponentState);
- } else {
- componentState = (SubTableState) restoreAttachedState(context,
savedComponentState);
- }
-
- // TODO update state model binding
- }
- }
- */
public void setExpanded(boolean expanded) {
this.expanded = expanded;
}
Modified:
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/state/DataTableState.java
===================================================================
---
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/state/DataTableState.java 2009-12-03
16:14:50 UTC (rev 16060)
+++
root/ui-sandbox/trunk/components/tables/ui/src/main/java/org/richfaces/component/state/DataTableState.java 2009-12-03
16:46:51 UTC (rev 16061)
@@ -6,6 +6,7 @@
import javax.faces.component.StateHolder;
import javax.faces.context.FacesContext;
+import org.ajax4jsf.model.DataComponentState;
import org.ajax4jsf.model.RepeatState;
import org.richfaces.model.visual.DataTableVisualModel;
@@ -74,4 +75,14 @@
return this.subTableStates.get(id);
}
+ public void addChildState(DataComponentState childState) {
+ if(childState instanceof SubTableState) {
+ addSubTableState((SubTableState)childState);
+ }
+ }
+
+ public DataComponentState getChildState(String id) {
+ DataComponentState state = getSubTableState(id);
+ return state;
+ }
}
Show replies by date