myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lu4...@apache.org
Subject svn commit: r1584711 - in /myfaces/core/trunk/api/src/main/java/javax/faces: application/ context/
Date Fri, 04 Apr 2014 14:28:33 GMT
Author: lu4242
Date: Fri Apr  4 14:28:33 2014
New Revision: 1584711

URL: http://svn.apache.org/r1584711
Log:
MYFACES-3878 Update existing wrappers against new features in JSF 2.2 (ViewHandlerWrapper,
...)

Modified:
    myfaces/core/trunk/api/src/main/java/javax/faces/application/ApplicationWrapper.java
    myfaces/core/trunk/api/src/main/java/javax/faces/application/ConfigurableNavigationHandlerWrapper.java
    myfaces/core/trunk/api/src/main/java/javax/faces/application/ResourceWrapper.java
    myfaces/core/trunk/api/src/main/java/javax/faces/application/ViewHandlerWrapper.java
    myfaces/core/trunk/api/src/main/java/javax/faces/context/FacesContextWrapper.java
    myfaces/core/trunk/api/src/main/java/javax/faces/context/PartialViewContextWrapper.java
    myfaces/core/trunk/api/src/main/java/javax/faces/context/ResponseWriterWrapper.java

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/application/ApplicationWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/application/ApplicationWrapper.java?rev=1584711&r1=1584710&r2=1584711&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/application/ApplicationWrapper.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/application/ApplicationWrapper.java Fri
Apr  4 14:28:33 2014
@@ -43,6 +43,7 @@ import javax.faces.el.VariableResolver;
 import javax.faces.event.ActionListener;
 import javax.faces.event.SystemEvent;
 import javax.faces.event.SystemEventListener;
+import javax.faces.flow.FlowHandler;
 import javax.faces.validator.Validator;
 
 /**
@@ -431,4 +432,16 @@ public abstract class ApplicationWrapper
         getWrapped().unsubscribeFromEvent(systemEventClass, listener);
     }
 
+    @Override
+    public void setFlowHandler(FlowHandler flowHandler)
+    {
+        getWrapped().setFlowHandler(flowHandler);
+    }
+
+    @Override
+    public FlowHandler getFlowHandler()
+    {
+        return getWrapped().getFlowHandler();
+    }
+
 }

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/application/ConfigurableNavigationHandlerWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/application/ConfigurableNavigationHandlerWrapper.java?rev=1584711&r1=1584710&r2=1584711&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/application/ConfigurableNavigationHandlerWrapper.java
(original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/application/ConfigurableNavigationHandlerWrapper.java
Fri Apr  4 14:28:33 2014
@@ -68,5 +68,12 @@ public abstract class ConfigurableNaviga
         getWrapped().handleNavigation(context, fromAction, outcome, toFlowDocumentId);
     }
 
+    @Override
+    public NavigationCase getNavigationCase(FacesContext context, String fromAction, String
outcome, 
+            String toFlowDocumentId)
+    {
+        return getWrapped().getNavigationCase(context, fromAction, outcome, toFlowDocumentId);
+    }
+
     public abstract ConfigurableNavigationHandler getWrapped();
 }

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/application/ResourceWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/application/ResourceWrapper.java?rev=1584711&r1=1584710&r2=1584711&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/application/ResourceWrapper.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/application/ResourceWrapper.java Fri
Apr  4 14:28:33 2014
@@ -63,4 +63,41 @@ public abstract class ResourceWrapper ex
     }
     
     public abstract Resource getWrapped();
+
+    @Override
+    public void setResourceName(String resourceName)
+    {
+        getWrapped().setResourceName(resourceName);
+    }
+
+    @Override
+    public void setLibraryName(String libraryName)
+    {
+        getWrapped().setLibraryName(libraryName);
+    }
+
+    @Override
+    public void setContentType(String contentType)
+    {
+        getWrapped().setContentType(contentType);
+    }
+
+    @Override
+    public String getResourceName()
+    {
+        return getWrapped().getResourceName();
+    }
+
+    @Override
+    public String getLibraryName()
+    {
+        return getWrapped().getLibraryName();
+    }
+
+    @Override
+    public String getContentType()
+    {
+        return getWrapped().getContentType();
+    }
+
 }

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=1584711&r1=1584710&r2=1584711&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
Apr  4 14:28:33 2014
@@ -23,6 +23,7 @@ import java.io.IOException;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Set;
 
 import javax.faces.FacesException;
 import javax.faces.FacesWrapper;
@@ -132,5 +133,22 @@ public abstract class ViewHandlerWrapper
         return getWrapped().getViewDeclarationLanguage(context, viewId);
     }
 
-    
+    @Override
+    public Set<String> getProtectedViewsUnmodifiable()
+    {
+        return getWrapped().getProtectedViewsUnmodifiable();
+    }
+
+    @Override
+    public boolean removeProtectedView(String urlPattern)
+    {
+        return getWrapped().removeProtectedView(urlPattern);
+    }
+
+    @Override
+    public void addProtectedView(String urlPattern)
+    {
+        getWrapped().addProtectedView(urlPattern);
+    }
+
 }

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/context/FacesContextWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/context/FacesContextWrapper.java?rev=1584711&r1=1584710&r2=1584711&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/context/FacesContextWrapper.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/context/FacesContextWrapper.java Fri
Apr  4 14:28:33 2014
@@ -255,4 +255,16 @@ public abstract class FacesContextWrappe
         return getWrapped().getNamingContainerSeparatorChar();
     }
 
+    @Override
+    public void setResourceLibraryContracts(List<String> contracts)
+    {
+        getWrapped().setResourceLibraryContracts(contracts);
+    }
+
+    @Override
+    public List<String> getResourceLibraryContracts()
+    {
+        return getWrapped().getResourceLibraryContracts();
+    }
+
 }

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/context/PartialViewContextWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/context/PartialViewContextWrapper.java?rev=1584711&r1=1584710&r2=1584711&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/context/PartialViewContextWrapper.java
(original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/context/PartialViewContextWrapper.java
Fri Apr  4 14:28:33 2014
@@ -109,4 +109,11 @@ public abstract class PartialViewContext
     {
         return getWrapped().isResetValues();
     }
+
+    @Override
+    public void setPartialRequest(boolean isPartialRequest)
+    {
+        getWrapped().setPartialRequest(isPartialRequest);
+    }
+    
 }

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=1584711&r1=1584710&r2=1584711&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
Apr  4 14:28:33 2014
@@ -142,4 +142,15 @@ public abstract class ResponseWriterWrap
         getWrapped().writeURIAttribute(name, value, property);
     }
 
+    @Override
+    public void writeDoctype(String doctype) throws IOException
+    {
+        getWrapped().writeDoctype(doctype);
+    }
+
+    @Override
+    public void writePreamble(String preamble) throws IOException
+    {
+        getWrapped().writePreamble(preamble);
+    }
 }



Mime
View raw message