svn commit: r233390 - /myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tree2/UITreeData.java

[sc...@apache.org]

Author: schof
Date: Thu Aug 18 15:37:31 2005
New Revision: 233390

URL: http://svn.apache.org/viewcvs?rev=233390&view=rev
Log:
Fixes MYFACES-423 (Thanks to Mathias Werlitz for the patch)

Modified:
    myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tree2/UITreeData.java

Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tree2/UITreeData.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tree2/UITreeData.java?rev=233390&r1=233389&r2=233390&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tree2/UITreeData.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tree2/UITreeData.java Thu Aug 18 15:37:31 2005
@@ -81,13 +81,12 @@
         return COMPONENT_FAMILY;
     }
 
-    // see superclass for documentation
+    //  see superclass for documentation
     public Object saveState(FacesContext context)
     {
-        Object values[] = new Object[4];
+        Object values[] = new Object[3];
         values[0] = super.saveState(context);
-        values[1] = _model;
-        values[2] = _var;
+        values[1] = _var;
         
         TreeState t = getDataModel().getTreeState();
         if ( t == null)
@@ -97,7 +96,7 @@
         }
         
         // save the state with the component, unless it should explicitly not saved eg. session-scoped model and state            
-        values[3] = (t.isTransient()) ? null : t; 
+        values[2] = (t.isTransient()) ? null : t; 
         return ((Object) (values));
     }
 
@@ -108,9 +107,8 @@
         Object values[] = (Object[]) state;
         super.restoreState(context, values[0]);
 
-        _model = (TreeModel)values[1];
-        _var = (String)values[2];
-        _restoredState = (TreeState) values[3];
+        _var = (String)values[1];
+        _restoredState = (TreeState) values[2];
     }