svn commit: r614406 - /myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java

[so...@apache.org]

Author: sobryan
Date: Tue Jan 22 17:29:57 2008
New Revision: 614406

URL: http://svn.apache.org/viewvc?rev=614406&view=rev
Log:
TRINIDAD-798: StateManagerImpl extends StateManager rather then StateManagerWrapper

* did some minor restructuring of the StateManagerImpl to allow for
  JSF 1.1 and JSF 1.2 implementations to be somewhat consistant.

Modified:
    myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java

Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java?rev=614406&r1=614405&r2=614406&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java Tue Jan 22 17:29:57 2008
@@ -18,8 +18,6 @@
  */
 package org.apache.myfaces.trinidadinternal.application;
 
-import java.io.IOException;
-
 import java.io.Serializable;
 
 import java.util.ArrayList;
@@ -51,6 +49,8 @@
 // Imported only for a String constant - so no runtime dependency
 import com.sun.facelets.FaceletViewHandler;
 
+import java.io.IOException;
+
 /**
  * StateManager that handles a hybrid client/server strategy:  a
  * SerializedView is stored on the server, and only a small token
@@ -125,6 +125,20 @@
   {
     _delegate = delegate;
   }
+  
+  @Override
+  public SerializedView saveSerializedView(FacesContext context)
+  {
+    assert(context != null);
+    
+    if(isSavingStateInClient(context))
+    {
+      return _saveSerializedView(context);
+    }
+    
+    return _delegate.saveSerializedView(context);
+  }
+
 
   /**
    * Save a component tree as an Object.
@@ -214,15 +228,11 @@
       root.processRestoreState(context, state);
 
     return root;
-  }
+  }  
 
   @SuppressWarnings("unchecked")
-  @Override
-  public SerializedView saveSerializedView(FacesContext context)
+  private SerializedView _saveSerializedView(FacesContext context)
   {
-    if (!isSavingStateInClient(context))
-      return _delegate.saveSerializedView(context);
-
     SerializedView view = _getCachedSerializedView(context);
     if (view != null)
       return view;