svn commit: r593690 - /myfaces/trinidad/branches/1.2.3.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java

[so...@apache.org]

Author: sobryan
Date: Fri Nov  9 15:13:58 2007
New Revision: 593690

URL: http://svn.apache.org/viewvc?rev=593690&view=rev
Log:
Undo of previous changes.  They did not work for some Trinidad extensions.

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

Modified: myfaces/trinidad/branches/1.2.3.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.3.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java?rev=593690&r1=593689&r2=593690&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.3.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java (original)
+++ myfaces/trinidad/branches/1.2.3.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java Fri Nov  9 15:13:58 2007
@@ -51,8 +51,6 @@
 // Imported only for a String constant - so no runtime dependency
 import com.sun.facelets.FaceletViewHandler;
 
-import javax.faces.application.StateManagerWrapper;
-
 /**
  * StateManager that handles a hybrid client/server strategy:  a
  * SerializedView is stored on the server, and only a small token
@@ -84,7 +82,7 @@
  * <p>
  * @version $Name:  $ ($Revision: adfrt/faces/adf-faces-impl/src/main/java/oracle/adfinternal/view/faces/application/StateManagerImpl.java#2 $) $Date: 18-nov-2005.16:12:04 $
  */
-public class StateManagerImpl extends StateManagerWrapper
+public class StateManagerImpl extends StateManager
 {
   static public final String USE_APPLICATION_VIEW_CACHE_INIT_PARAM =
     "org.apache.myfaces.trinidad.USE_APPLICATION_VIEW_CACHE";
@@ -125,7 +123,7 @@
   public StateManagerImpl(
     StateManager delegate)
   {
-    _delegate  = delegate;
+    _delegate = delegate;
   }
 
   /**
@@ -223,7 +221,7 @@
   public SerializedView saveSerializedView(FacesContext context)
   {
     if (!isSavingStateInClient(context))
-      return getWrapped().saveSerializedView(context);
+      return _delegate.saveSerializedView(context);
 
     SerializedView view = _getCachedSerializedView(context);
     if (view != null)
@@ -431,7 +429,7 @@
   public void writeState(FacesContext context,
                          SerializedView state) throws IOException
   {
-    getWrapped().writeState(context, state);
+    _delegate.writeState(context, state);
   }
 
   @SuppressWarnings("unchecked")
@@ -440,7 +438,7 @@
                                 String renderKitId)
   {
     if (!isSavingStateInClient(context))
-      return getWrapped().restoreView(context, viewId, renderKitId);
+      return _delegate.restoreView(context, viewId, renderKitId);
 
     final Object structure;
     final Object state;
@@ -599,7 +597,7 @@
   @Override
   public boolean isSavingStateInClient(FacesContext context)
   {
-    return getWrapped().isSavingStateInClient(context);
+    return _delegate.isSavingStateInClient(context);
   }
 
   //
@@ -894,9 +892,17 @@
                                                      state);
   }
 
-  protected StateManager getWrapped()
+  @Override
+  public Object saveView(FacesContext facesContext)
+  {
+    return super.saveView(facesContext);
+  }
+
+  @Override
+  public void writeState(FacesContext facesContext, Object object)
+    throws IOException
   {
-    return _delegate;
+    super.writeState(facesContext, object);
   }
 
   private static final class PageState implements Serializable