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

[Gavin King]

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

  Modified:    src/main/org/jboss/seam/navigation  Param.java
  Log:
  redesigned resource bundle handling
  
  Revision  Changes    Path
  1.7       +2 -8      jboss-seam/src/main/org/jboss/seam/navigation/Param.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Param.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/navigation/Param.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- Param.java	29 Jun 2007 00:48:48 -0000	1.6
  +++ Param.java	10 Jul 2007 16:46:58 -0000	1.7
  @@ -12,6 +12,7 @@
   import javax.faces.validator.ValidatorException;
   
   import org.hibernate.validator.InvalidValue;
  +import org.jboss.seam.core.SeamResourceBundle;
   import org.jboss.seam.core.Validators;
   import org.jboss.seam.core.Expressions.ValueExpression;
   import org.jboss.seam.faces.FacesMessages;
  @@ -246,14 +247,7 @@
   
      private void addRequiredMessage(FacesContext facesContext)
      {
  -      String bundleName = facesContext.getApplication().getMessageBundle();
  -      if (bundleName==null) bundleName = FacesMessage.FACES_MESSAGES;
  -      ResourceBundle resourceBundle = facesContext.getApplication().getResourceBundle(facesContext, bundleName);
  -      //TODO: this should not be necessary!
  -      if (resourceBundle==null)
  -      {
  -         resourceBundle = org.jboss.seam.core.ResourceBundle.instance();
  -      }
  +      ResourceBundle resourceBundle = SeamResourceBundle.getBundle();
         throw new ValidatorException( new FacesMessage(
                  FacesMessage.SEVERITY_ERROR, 
                  resourceBundle.getString("javax.faces.component.UIInput.REQUIRED"),