myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tandrasc...@apache.org
Subject [myfaces] branch master updated: cosmetics
Date Tue, 09 Apr 2019 12:12:08 GMT
This is an automated email from the ASF dual-hosted git repository.

tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces.git


The following commit(s) were added to refs/heads/master by this push:
     new d6517ba  cosmetics
d6517ba is described below

commit d6517ba733618814d607e5e9f667d1f87e360188
Author: Thomas Andraschko <tandraschko@apache.org>
AuthorDate: Tue Apr 9 14:11:59 2019 +0200

    cosmetics
---
 .../apache/myfaces/spi/impl/DefaultFacesFlowProviderFactory.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesFlowProviderFactory.java
b/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesFlowProviderFactory.java
index 3e4328e..5d3b4b5 100644
--- a/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesFlowProviderFactory.java
+++ b/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesFlowProviderFactory.java
@@ -21,6 +21,7 @@ package org.apache.myfaces.spi.impl;
 import org.apache.myfaces.spi.FacesFlowProvider;
 import org.apache.myfaces.spi.FacesFlowProviderFactory;
 import javax.faces.context.ExternalContext;
+import org.apache.myfaces.flow.cdi.DefaultCDIFacesFlowProvider;
 import org.apache.myfaces.flow.impl.DefaultFacesFlowProvider;
 import org.apache.myfaces.util.ClassUtils;
 import org.apache.myfaces.util.ExternalSpecifications;
@@ -31,22 +32,22 @@ import org.apache.myfaces.util.ExternalSpecifications;
 public class DefaultFacesFlowProviderFactory extends FacesFlowProviderFactory
 {
 
-    public static final String FACES_CONFIGURATION_MERGER = FacesFlowProvider.class.getName();
-    public static final String FACES_CONFIGURATION_MERGER_INSTANCE_KEY = FACES_CONFIGURATION_MERGER
+ ".INSTANCE";
+    public static final String FACES_FLOW_PROVIDER = FacesFlowProvider.class.getName();
+    public static final String FACES_FLOW_PROVIDER_INSTANCE_KEY = FACES_FLOW_PROVIDER + ".INSTANCE";
 
     @Override
     public FacesFlowProvider getFacesFlowProvider(ExternalContext externalContext)
     {
         // check for cached instance
         FacesFlowProvider returnValue = (FacesFlowProvider)
-                externalContext.getApplicationMap().get(FACES_CONFIGURATION_MERGER_INSTANCE_KEY);
+                externalContext.getApplicationMap().get(FACES_FLOW_PROVIDER_INSTANCE_KEY);
 
         if (returnValue == null)
         {
             if (ExternalSpecifications.isCDIAvailable(externalContext))
             {
                 returnValue = (FacesFlowProvider) ClassUtils.newInstance(
-                    "org.apache.myfaces.flow.cdi.DefaultCDIFacesFlowProvider");
+                        DefaultCDIFacesFlowProvider.class.getName());
             }
             else
             {


Mime
View raw message