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

[Gavin King]

  User: gavin   
  Date: 07/02/10 19:42:14

  Modified:    src/main/org/jboss/seam/pages  
                        RedirectNavigationHandler.java
                        RenderNavigationHandler.java
  Log:
  JBSEAM-780
  
  Revision  Changes    Path
  1.5       +6 -2      jboss-seam/src/main/org/jboss/seam/pages/RedirectNavigationHandler.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: RedirectNavigationHandler.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/pages/RedirectNavigationHandler.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- RedirectNavigationHandler.java	5 Feb 2007 06:45:37 -0000	1.4
  +++ RedirectNavigationHandler.java	11 Feb 2007 00:42:14 -0000	1.5
  @@ -7,6 +7,7 @@
   import java.util.List;
   import java.util.Map;
   
  +import javax.faces.application.FacesMessage.Severity;
   import javax.faces.context.FacesContext;
   
   public final class RedirectNavigationHandler extends NavigationHandler
  @@ -14,18 +15,20 @@
      private final String viewId;
      private final List<Param> params;
      private final String message;
  +   private final Severity severity;
   
  -   public RedirectNavigationHandler(String viewId, List<Param> params, String message)
  +   public RedirectNavigationHandler(String viewId, List<Param> params, String message, Severity severity)
      {
         this.viewId = viewId;
         this.params = params;
         this.message = message;
  +      this.severity = severity;
      }
   
      @Override
      public boolean navigate(FacesContext context)
      {
  -      addFacesMessage(message);
  +      addFacesMessage(message, severity);
         Map<String, Object> parameters = new HashMap<String, Object>();
         for ( Param pageParameter: params )
         {
  @@ -41,4 +44,5 @@
         redirect(viewId, parameters);
         return true;
      }
  +
   }
  \ No newline at end of file
  
  
  
  1.4       +5 -2      jboss-seam/src/main/org/jboss/seam/pages/RenderNavigationHandler.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: RenderNavigationHandler.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/pages/RenderNavigationHandler.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- RenderNavigationHandler.java	5 Feb 2007 06:45:37 -0000	1.3
  +++ RenderNavigationHandler.java	11 Feb 2007 00:42:14 -0000	1.4
  @@ -3,23 +3,26 @@
    */
   package org.jboss.seam.pages;
   
  +import javax.faces.application.FacesMessage.Severity;
   import javax.faces.context.FacesContext;
   
   public final class RenderNavigationHandler extends NavigationHandler
   {
      private final String viewId;
      private final String message;
  +   private final Severity severity;
   
  -   public RenderNavigationHandler(String viewId, String message)
  +   public RenderNavigationHandler(String viewId, String message, Severity severity)
      {
         this.viewId = viewId;
         this.message = message;
  +      this.severity = severity;
      }
   
      @Override
      public boolean navigate(FacesContext context)
      {
  -      addFacesMessage(message);
  +      addFacesMessage(message, severity);
         render(viewId);
         return true;
      }