You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2007/08/15 12:22:07 UTC

svn commit: r566091 - /myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/LoadBundleHandler.java

Author: bommel
Date: Wed Aug 15 03:22:01 2007
New Revision: 566091

URL: http://svn.apache.org/viewvc?view=rev&rev=566091
Log:
loadbundle in facelets should support valueBinding for basename

Modified:
    myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/LoadBundleHandler.java

Modified: myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/LoadBundleHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/LoadBundleHandler.java?view=diff&rev=566091&r1=566090&r2=566091
==============================================================================
--- myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/LoadBundleHandler.java (original)
+++ myfaces/tobago/trunk/contrib/facelets/src/main/java/org/apache/myfaces/tobago/facelets/LoadBundleHandler.java Wed Aug 15 03:22:01 2007
@@ -49,7 +49,12 @@
 
   public void apply(FaceletContext faceletContext, UIComponent parent)
       throws IOException, FacesException, ELException {
-    String name = basename.getValue(faceletContext);
+    String name;
+    if (basename.isLiteral()) {
+      name = basename.getValue(faceletContext);
+    } else {
+      name = (String) basename.getValueExpression(faceletContext, String.class).getValue(faceletContext);
+    }
     BundleMapWrapper map = new BundleMapWrapper(name);
     FacesContext facesContext = faceletContext.getFacesContext();
     // TODO find a better way