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:31:40 UTC

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

Author: bommel
Date: Wed Aug 15 03:31:38 2007
New Revision: 566096

URL: http://svn.apache.org/viewvc?view=rev&rev=566096
Log:
reverted allready done by getValue(Faceletcontext)

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=566096&r1=566095&r2=566096
==============================================================================
--- 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:31:38 2007
@@ -49,12 +49,7 @@
 
   public void apply(FaceletContext faceletContext, UIComponent parent)
       throws IOException, FacesException, ELException {
-    String name;
-    if (basename.isLiteral()) {
-      name = basename.getValue(faceletContext);
-    } else {
-      name = (String) basename.getValueExpression(faceletContext, String.class).getValue(faceletContext);
-    }
+    String name = basename.getValue(faceletContext);
     BundleMapWrapper map = new BundleMapWrapper(name);
     FacesContext facesContext = faceletContext.getFacesContext();
     // TODO find a better way