svn commit: r986157 - in /myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified: CustomFirstELResolverComparator.java CustomLastELResolverComparator.java OpenWebBeansELResolverComparator.java ResolverBuilderBase.java

[ja...@apache.org]

Author: jakobk
Date: Mon Aug 16 23:07:17 2010
New Revision: 986157

URL: http://svn.apache.org/viewvc?rev=986157&view=rev
Log:
MYFACES-2873 Provide a way to change the order of ELResolvers (added null-check and version information)

Modified:
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/CustomFirstELResolverComparator.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/CustomLastELResolverComparator.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/OpenWebBeansELResolverComparator.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderBase.java

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/CustomFirstELResolverComparator.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/CustomFirstELResolverComparator.java?rev=986157&r1=986156&r2=986157&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/CustomFirstELResolverComparator.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/CustomFirstELResolverComparator.java Mon Aug 16 23:07:17 2010
@@ -33,6 +33,8 @@ import org.apache.myfaces.config.Runtime
  * 
  * @author Jakob Korherr (latest modification by $Author$)
  * @version $Revision$ $Date$
+ *
+ * @since 1.2.10, 2.0.2
  */
 public class CustomFirstELResolverComparator implements Comparator<ELResolver>
 {
@@ -43,6 +45,12 @@ public class CustomFirstELResolverCompar
     {
         List<ELResolver> facesConfigResolvers = _getFacesConfigElResolvers();
         
+        if (facesConfigResolvers == null)
+        {
+            // no el-resolvers in faces-config
+            return 0; // keep order
+        }
+        
         boolean r1FromFacesConfig = facesConfigResolvers.contains(r1);
         boolean r2FromFacesConfig = facesConfigResolvers.contains(r2);
         

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/CustomLastELResolverComparator.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/CustomLastELResolverComparator.java?rev=986157&r1=986156&r2=986157&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/CustomLastELResolverComparator.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/CustomLastELResolverComparator.java Mon Aug 16 23:07:17 2010
@@ -28,6 +28,8 @@ import javax.el.ELResolver;
  * 
  * @author Jakob Korherr (latest modification by $Author$)
  * @version $Revision$ $Date$
+ *
+ * @since 1.2.10, 2.0.2
  */
 public class CustomLastELResolverComparator implements Comparator<ELResolver>
 {

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/OpenWebBeansELResolverComparator.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/OpenWebBeansELResolverComparator.java?rev=986157&r1=986156&r2=986157&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/OpenWebBeansELResolverComparator.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/OpenWebBeansELResolverComparator.java Mon Aug 16 23:07:17 2010
@@ -27,6 +27,8 @@ import javax.el.ELResolver;
  * 
  * @author Jakob Korherr (latest modification by $Author$)
  * @version $Revision$ $Date$
+ *
+ * @since 1.2.10, 2.0.2
  */
 public class OpenWebBeansELResolverComparator implements Comparator<ELResolver>
 {

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderBase.java?rev=986157&r1=986156&r2=986157&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderBase.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/ResolverBuilderBase.java Mon Aug 16 23:07:17 2010
@@ -47,7 +47,7 @@ public class ResolverBuilderBase
     
     private static final Logger log = Logger.getLogger(ResolverBuilderBase.class.getName());
     
-    @JSFWebConfigParam(since = "2.0.2",
+    @JSFWebConfigParam(since = "1.2.10, 2.0.2",
             desc = "The Class of an Comparator<ELResolver> implementation.")
     public static final String EL_RESOLVER_COMPARATOR = "org.apache.myfaces.EL_RESOLVER_COMPARATOR";
     
@@ -105,6 +105,7 @@ public class ResolverBuilderBase
     /**
      * Sort the ELResolvers with a custom Comparator provided by the user.
      * @param resolvers
+     * @since 1.2.10, 2.0.2
      */
     @SuppressWarnings("unchecked")
     protected void sortELResolvers(List<ELResolver> resolvers)