You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2009/07/09 06:23:48 UTC
svn commit: r792390 - in
/myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/application:
ResourceHandlerWrapper.java ResourceWrapper.java ViewHandlerWrapper.java
Author: lu4242
Date: Thu Jul 9 04:23:48 2009
New Revision: 792390
URL: http://svn.apache.org/viewvc?rev=792390&view=rev
Log:
Add FacesWrapper interfaces to wrappers
Modified:
myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/application/ResourceHandlerWrapper.java
myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/application/ResourceWrapper.java
myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/application/ViewHandlerWrapper.java
Modified: myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/application/ResourceHandlerWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/application/ResourceHandlerWrapper.java?rev=792390&r1=792389&r2=792390&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/application/ResourceHandlerWrapper.java (original)
+++ myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/application/ResourceHandlerWrapper.java Thu Jul 9 04:23:48 2009
@@ -18,6 +18,7 @@
*/
package javax.faces.application;
+import javax.faces.FacesWrapper;
import javax.faces.context.FacesContext;
/**
@@ -27,6 +28,7 @@
* @since 2.0
*/
public abstract class ResourceHandlerWrapper extends ResourceHandler
+ implements FacesWrapper<ResourceHandler>
{
@Override
public Resource createResource(String resourceName)
@@ -70,5 +72,5 @@
return getWrapped().libraryExists(libraryName);
}
- protected abstract ResourceHandler getWrapped();
+ public abstract ResourceHandler getWrapped();
}
Modified: myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/application/ResourceWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/application/ResourceWrapper.java?rev=792390&r1=792389&r2=792390&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/application/ResourceWrapper.java (original)
+++ myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/application/ResourceWrapper.java Thu Jul 9 04:23:48 2009
@@ -22,6 +22,7 @@
import java.net.URL;
import java.util.Map;
+import javax.faces.FacesWrapper;
import javax.faces.context.FacesContext;
/**
@@ -31,6 +32,7 @@
* @since 2.0
*/
public abstract class ResourceWrapper extends Resource
+ implements FacesWrapper<Resource>
{
@Override
public InputStream getInputStream()
@@ -62,5 +64,5 @@
return getWrapped().userAgentNeedsUpdate(context);
}
- protected abstract Resource getWrapped();
+ public abstract Resource getWrapped();
}
Modified: myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/application/ViewHandlerWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/application/ViewHandlerWrapper.java?rev=792390&r1=792389&r2=792390&view=diff
==============================================================================
--- myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/application/ViewHandlerWrapper.java (original)
+++ myfaces/core/branches/2_0_0/api/src/main/java/javax/faces/application/ViewHandlerWrapper.java Thu Jul 9 04:23:48 2009
@@ -21,7 +21,9 @@
import java.io.IOException;
import java.util.Locale;
+
import javax.faces.FacesException;
+import javax.faces.FacesWrapper;
import javax.faces.component.UIViewRoot;
import javax.faces.context.FacesContext;
@@ -31,6 +33,7 @@
* @author Stan Silvert
*/
public abstract class ViewHandlerWrapper extends ViewHandler
+ implements FacesWrapper<ViewHandler>
{
@Override
@@ -45,7 +48,7 @@
getWrapped().initView(context);
}
- protected abstract ViewHandler getWrapped();
+ public abstract ViewHandler getWrapped();
@Override
public void renderView(FacesContext context, UIViewRoot viewToRender) throws IOException, FacesException