[jboss-cvs] jboss-seam/src/main/org/jboss/seam/jsf ...

[Gavin King]

  User: gavin   
  Date: 07/06/08 12:57:07

  Modified:    src/main/org/jboss/seam/jsf 
                        SeamApplicationMessageBundle.java
  Log:
  JBSEAM-1366
  
  Revision  Changes    Path
  1.2       +5 -2      jboss-seam/src/main/org/jboss/seam/jsf/SeamApplicationMessageBundle.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SeamApplicationMessageBundle.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/jsf/SeamApplicationMessageBundle.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- SeamApplicationMessageBundle.java	5 May 2007 12:21:10 -0000	1.1
  +++ SeamApplicationMessageBundle.java	8 Jun 2007 16:57:07 -0000	1.2
  @@ -6,7 +6,7 @@
   import java.util.Enumeration;
   import java.util.ResourceBundle;
   
  -import org.jboss.seam.core.Messages;
  +import org.jboss.seam.core.Interpolator;
   
   /**
    * Adaptor allow use of #{messages} for JSF application messages - 
  @@ -25,7 +25,10 @@
      @Override
      protected Object handleGetObject(String key)
      {
  -      return Messages.instance().get(key);
  +      Object resource = org.jboss.seam.core.ResourceBundle.instance().getObject(key);
  +      return resource!=null && ( resource instanceof String ) ?
  +            Interpolator.instance().interpolate( (String) resource ) :
  +            resource;
      }
   
   }
  \ No newline at end of file