svn commit: r1035344 - /myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/VariableResolverUtils.java

[lo...@apache.org]

Author: lofwyr
Date: Mon Nov 15 16:33:16 2010
New Revision: 1035344

URL: http://svn.apache.org/viewvc?rev=1035344&view=rev
Log:
udpate to JSF 1.2

Modified:
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/VariableResolverUtils.java

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/VariableResolverUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/VariableResolverUtils.java?rev=1035344&r1=1035343&r2=1035344&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/VariableResolverUtils.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/VariableResolverUtils.java Mon Nov 15 16:33:16 2010
@@ -19,6 +19,7 @@ package org.apache.myfaces.tobago.util;
 
 import org.apache.myfaces.tobago.context.ClientProperties;
 
+import javax.el.ELContext;
 import javax.faces.application.Application;
 import javax.faces.context.FacesContext;
 import javax.faces.el.ValueBinding;
@@ -34,9 +35,14 @@ public final class VariableResolverUtils
    * Returns the requested object configured in the faces-config or from library.
    */
   public static Object resolveVariable(FacesContext context, String variable) {
-    Application application = context.getApplication();
-    VariableResolver variableResolver = application.getVariableResolver();
-    return variableResolver.resolveVariable(context, variable);
+    if (FacesVersion.supports12()) {
+      final ELContext elContext = context.getELContext();
+      return elContext.getELResolver().getValue(elContext, null, variable);
+    } else {
+      final Application application = context.getApplication();
+      final VariableResolver variableResolver = application.getVariableResolver();
+      return variableResolver.resolveVariable(context, variable);
+    }
   }
 
   /**
@@ -53,8 +59,13 @@ public final class VariableResolverUtils
    * Also useful to enforce a new creation of a managed-bean.
    */
   public static void clearVariable(FacesContext context, String variable) {
-    Application application = context.getApplication();
-    ValueBinding valueBinding = application.createValueBinding("#{" + variable + "}");
-    valueBinding.setValue(context, null);
+    if (FacesVersion.supports12()) {
+      final ELContext elContext = context.getELContext();
+      elContext.getELResolver().setValue(elContext, null, variable, null);
+    } else {
+      final Application application = context.getApplication();
+      final ValueBinding valueBinding = application.createValueBinding("#{" + variable + "}");
+      valueBinding.setValue(context, null);
+    }
   }
 }