svn commit: r887415 - in /myfaces/core/trunk/api/src/main/java/javax/faces: application/StateManagerWrapper.java application/ViewHandlerWrapper.java context/ResponseWriterWrapper.java

[lu...@apache.org]

Author: lu4242
Date: Fri Dec  4 22:51:15 2009
New Revision: 887415

URL: http://svn.apache.org/viewvc?rev=887415&view=rev
Log:
MYFACES-2448 Wrappers created in 1.2 version should wrap new methods added in 2.0

Modified:
    myfaces/core/trunk/api/src/main/java/javax/faces/application/StateManagerWrapper.java
    myfaces/core/trunk/api/src/main/java/javax/faces/application/ViewHandlerWrapper.java
    myfaces/core/trunk/api/src/main/java/javax/faces/context/ResponseWriterWrapper.java

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/application/StateManagerWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/application/StateManagerWrapper.java?rev=887415&r1=887414&r2=887415&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/application/StateManagerWrapper.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/application/StateManagerWrapper.java Fri Dec  4 22:51:15 2009
@@ -100,4 +100,10 @@
         getWrapped().restoreComponentState(context, viewRoot, renderKitId);
     }
 
+    @Override
+    public String getViewState(FacesContext context)
+    {
+        return getWrapped().getViewState(context);
+    }
+
 }

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/application/ViewHandlerWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/application/ViewHandlerWrapper.java?rev=887415&r1=887414&r2=887415&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/application/ViewHandlerWrapper.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/application/ViewHandlerWrapper.java Fri Dec  4 22:51:15 2009
@@ -20,12 +20,15 @@
 package javax.faces.application;
 
 import java.io.IOException;
+import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 
 import javax.faces.FacesException;
 import javax.faces.FacesWrapper;
 import javax.faces.component.UIViewRoot;
 import javax.faces.context.FacesContext;
+import javax.faces.view.ViewDeclarationLanguage;
 
 /**
  * see Javadoc of <a href="http://java.sun.com/j2ee/javaserverfaces/1.2/docs/api/index.html">JSF Specification</a>
@@ -98,4 +101,32 @@
         return getWrapped().createView(context, viewId);
     }
 
+    @Override
+    public String deriveViewId(FacesContext context, String input)
+    {
+        return getWrapped().deriveViewId(context, input);
+    }
+
+    @Override
+    public String getBookmarkableURL(FacesContext context, String viewId,
+            Map<String, List<String>> parameters, boolean includeViewParams)
+    {
+        return getWrapped().getBookmarkableURL(context, viewId, parameters, includeViewParams);
+    }
+
+    @Override
+    public String getRedirectURL(FacesContext context, String viewId,
+            Map<String, List<String>> parameters, boolean includeViewParams)
+    {
+        return getWrapped().getRedirectURL(context, viewId, parameters, includeViewParams);
+    }
+
+    @Override
+    public ViewDeclarationLanguage getViewDeclarationLanguage(
+            FacesContext context, String viewId)
+    {
+        return getWrapped().getViewDeclarationLanguage(context, viewId);
+    }
+
+    
 }

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/context/ResponseWriterWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/context/ResponseWriterWrapper.java?rev=887415&r1=887414&r2=887415&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/context/ResponseWriterWrapper.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/context/ResponseWriterWrapper.java Fri Dec  4 22:51:15 2009
@@ -144,4 +144,48 @@
     {
         getWrapped().endCDATA();
     }
+
+    @Override
+    public Writer append(char c) throws IOException
+    {
+        return getWrapped().append(c);
+    }
+
+    @Override
+    public Writer append(CharSequence csq, int start, int end)
+            throws IOException
+    {
+        return getWrapped().append(csq, start, end);
+    }
+
+    @Override
+    public Writer append(CharSequence csq) throws IOException
+    {
+        return getWrapped().append(csq);
+    }
+
+    @Override
+    public void write(char[] cbuf) throws IOException
+    {
+        getWrapped().write(cbuf);
+    }
+
+    @Override
+    public void write(int c) throws IOException
+    {
+        getWrapped().write(c);
+    }
+
+    @Override
+    public void write(String str, int off, int len) throws IOException
+    {
+        getWrapped().write(str, off, len);
+    }
+
+    @Override
+    public void write(String str) throws IOException
+    {
+        getWrapped().write(str);
+    }
+
 }