svn commit: r938283 - in /myfaces/core/branches/1.2.x/impl/src/main/java/org/apache/myfaces/el: VariableResolverImpl.java unified/resolver/FacesCompositeELResolver.java

[lu...@apache.org]

Author: lu4242
Date: Tue Apr 27 01:18:21 2010
New Revision: 938283

URL: http://svn.apache.org/viewvc?rev=938283&view=rev
Log:
MYFACES-2679 Use a constant to identify FacesCompositeELResolver.Scope value

Modified:
    myfaces/core/branches/1.2.x/impl/src/main/java/org/apache/myfaces/el/VariableResolverImpl.java
    myfaces/core/branches/1.2.x/impl/src/main/java/org/apache/myfaces/el/unified/resolver/FacesCompositeELResolver.java

Modified: myfaces/core/branches/1.2.x/impl/src/main/java/org/apache/myfaces/el/VariableResolverImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/1.2.x/impl/src/main/java/org/apache/myfaces/el/VariableResolverImpl.java?rev=938283&r1=938282&r2=938283&view=diff
==============================================================================
--- myfaces/core/branches/1.2.x/impl/src/main/java/org/apache/myfaces/el/VariableResolverImpl.java (original)
+++ myfaces/core/branches/1.2.x/impl/src/main/java/org/apache/myfaces/el/VariableResolverImpl.java Tue Apr 27 01:18:21 2010
@@ -18,8 +18,6 @@
  */
 package org.apache.myfaces.el;
 
-import org.apache.myfaces.el.unified.resolver.FacesCompositeELResolver.Scope;
-
 import javax.el.ELContext;
 import javax.el.ELException;
 import javax.el.ValueExpression;
@@ -28,6 +26,9 @@ import javax.faces.context.FacesContext;
 import javax.faces.el.EvaluationException;
 import javax.faces.el.VariableResolver;
 
+import org.apache.myfaces.el.unified.resolver.FacesCompositeELResolver;
+import org.apache.myfaces.el.unified.resolver.FacesCompositeELResolver.Scope;
+
 /**
  * This variable resolver will be used for legacy variable resolvers which are registered through the faces config. If
  * it is invoked through the faces chain it will use the el resolver of {@link Application#getELResolver()}. If it is
@@ -82,6 +83,6 @@ public final class VariableResolverImpl 
 
     protected Scope getScope(final FacesContext context)
     {
-        return (Scope) context.getExternalContext().getRequestMap().get(Scope.class.getName());
+        return (Scope) context.getExternalContext().getRequestMap().get(FacesCompositeELResolver.SCOPE);
     }
 }
\ No newline at end of file

Modified: myfaces/core/branches/1.2.x/impl/src/main/java/org/apache/myfaces/el/unified/resolver/FacesCompositeELResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/1.2.x/impl/src/main/java/org/apache/myfaces/el/unified/resolver/FacesCompositeELResolver.java?rev=938283&r1=938282&r2=938283&view=diff
==============================================================================
--- myfaces/core/branches/1.2.x/impl/src/main/java/org/apache/myfaces/el/unified/resolver/FacesCompositeELResolver.java (original)
+++ myfaces/core/branches/1.2.x/impl/src/main/java/org/apache/myfaces/el/unified/resolver/FacesCompositeELResolver.java Tue Apr 27 01:18:21 2010
@@ -53,6 +53,8 @@ public final class FacesCompositeELResol
     {
         Faces, JSP
     }
+    
+    public static final String SCOPE = "org.apache.myfaces.el.unified.resolver.FacesCompositeELResolver.Scope";
 
     public FacesCompositeELResolver(final Scope scope)
     {
@@ -188,11 +190,11 @@ public final class FacesCompositeELResol
 
     private void setScope(final Map<String, Object> requestMap)
     {
-        requestMap.put(Scope.class.getName(), _scope);
+        requestMap.put(SCOPE, _scope);
     }
 
     private static void unsetScope(final Map<String, Object> requestMap)
     {
-        requestMap.remove(Scope.class.getName());
+        requestMap.remove(SCOPE);
     }
 }