You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by so...@apache.org on 2007/11/09 01:47:57 UTC
svn commit: r593373 -
/myfaces/trinidad/tags/trinidad-1.2.3/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java
Author: sobryan
Date: Thu Nov 8 16:47:56 2007
New Revision: 593373
URL: http://svn.apache.org/viewvc?rev=593373&view=rev
Log:
TRINIDAD-798 StateManagerImpl extends StateManager rather then StateManagerWrapper
This is a 1.2 only issue. Need to make sure it get's checked in to 1.2.4
when the branch is created.
Modified:
myfaces/trinidad/tags/trinidad-1.2.3/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java
Modified: myfaces/trinidad/tags/trinidad-1.2.3/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/tags/trinidad-1.2.3/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java?rev=593373&r1=593372&r2=593373&view=diff
==============================================================================
--- myfaces/trinidad/tags/trinidad-1.2.3/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java (original)
+++ myfaces/trinidad/tags/trinidad-1.2.3/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/application/StateManagerImpl.java Thu Nov 8 16:47:56 2007
@@ -51,6 +51,8 @@
// 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
@@ -82,7 +84,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 StateManager
+public class StateManagerImpl extends StateManagerWrapper
{
static public final String USE_APPLICATION_VIEW_CACHE_INIT_PARAM =
"org.apache.myfaces.trinidad.USE_APPLICATION_VIEW_CACHE";
@@ -123,7 +125,7 @@
public StateManagerImpl(
StateManager delegate)
{
- _delegate = delegate;
+ _delegate = delegate;
}
/**
@@ -221,7 +223,7 @@
public SerializedView saveSerializedView(FacesContext context)
{
if (!isSavingStateInClient(context))
- return _delegate.saveSerializedView(context);
+ return getWrapped().saveSerializedView(context);
SerializedView view = _getCachedSerializedView(context);
if (view != null)
@@ -429,7 +431,7 @@
public void writeState(FacesContext context,
SerializedView state) throws IOException
{
- _delegate.writeState(context, state);
+ getWrapped().writeState(context, state);
}
@SuppressWarnings("unchecked")
@@ -438,7 +440,7 @@
String renderKitId)
{
if (!isSavingStateInClient(context))
- return _delegate.restoreView(context, viewId, renderKitId);
+ return getWrapped().restoreView(context, viewId, renderKitId);
final Object structure;
final Object state;
@@ -597,7 +599,7 @@
@Override
public boolean isSavingStateInClient(FacesContext context)
{
- return _delegate.isSavingStateInClient(context);
+ return getWrapped().isSavingStateInClient(context);
}
//
@@ -890,6 +892,11 @@
{
context.getExternalContext().getRequestMap().put(_CACHED_SERIALIZED_VIEW,
state);
+ }
+
+ protected StateManager getWrapped()
+ {
+ return _delegate;
}
private static final class PageState implements Serializable