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

[Gavin King]

  User: gavin   
  Date: 07/07/10 12:46:58

  Modified:    src/main/org/jboss/seam/faces  FacesMessages.java
  Log:
  redesigned resource bundle handling
  
  Revision  Changes    Path
  1.6       +9 -6      jboss-seam/src/main/org/jboss/seam/faces/FacesMessages.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: FacesMessages.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/faces/FacesMessages.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- FacesMessages.java	21 Jun 2007 05:27:28 -0000	1.5
  +++ FacesMessages.java	10 Jul 2007 16:46:58 -0000	1.6
  @@ -9,6 +9,7 @@
   import java.util.List;
   import java.util.Map;
   import java.util.MissingResourceException;
  +import java.util.ResourceBundle;
   
   import javax.faces.application.FacesMessage;
   import javax.faces.application.FacesMessage.Severity;
  @@ -24,7 +25,7 @@
   import org.jboss.seam.annotations.intercept.BypassInterceptors;
   import org.jboss.seam.contexts.Contexts;
   import org.jboss.seam.core.Interpolator;
  -import org.jboss.seam.core.ResourceBundle;
  +import org.jboss.seam.core.SeamResourceBundle;
   import org.jboss.seam.util.Strings;
   
   /**
  @@ -68,9 +69,11 @@
         FacesMessage toFacesMessage()
         {
            Severity severity = null;
  -         for (Object o : FacesMessage.VALUES) {
  +         for (Object o : FacesMessage.VALUES) 
  +         {
               severity = (Severity) o;
  -            if (severity.getOrdinal() == severityOrdinal) {
  +            if (severity.getOrdinal() == severityOrdinal) 
  +            {
                  break;
               }
            }
  @@ -313,12 +316,12 @@
         addToTasks(id, severity, key, defaultMessageTemplate, params);
      }
   
  -   private static String interpolateBundleMessage(String key, String defaultMessageTemplate)
  +   private static String getBundleMessage(String key, String defaultMessageTemplate)
      {
         String messageTemplate = defaultMessageTemplate;
         if ( key!=null )
         {
  -         java.util.ResourceBundle resourceBundle = ResourceBundle.instance();
  +         ResourceBundle resourceBundle = SeamResourceBundle.getBundle();
            if ( resourceBundle!=null ) 
            {
               try
  @@ -370,7 +373,7 @@
      
      public static FacesMessage createFacesMessage(Severity severity, String key, String defaultMessageTemplate, Object... params)
      {
  -      String message = interpolateBundleMessage(key, defaultMessageTemplate);
  +      String message = getBundleMessage(key, defaultMessageTemplate);
         if ( !Strings.isEmpty(message) )
         {
            return createFacesMessage( severity, message, params );