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

[Gavin King]

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

  Modified:    src/main/org/jboss/seam/exceptions   
                        AnnotationRedirectHandler.java
                        ConfigRedirectHandler.java RedirectHandler.java
  Log:
  JBSEAM-780
  
  Revision  Changes    Path
  1.5       +9 -0      jboss-seam/src/main/org/jboss/seam/exceptions/AnnotationRedirectHandler.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AnnotationRedirectHandler.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/exceptions/AnnotationRedirectHandler.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- AnnotationRedirectHandler.java	4 Feb 2007 17:03:33 -0000	1.4
  +++ AnnotationRedirectHandler.java	11 Feb 2007 00:42:14 -0000	1.5
  @@ -3,6 +3,9 @@
    */
   package org.jboss.seam.exceptions;
   
  +import javax.faces.application.FacesMessage;
  +import javax.faces.application.FacesMessage.Severity;
  +
   import org.jboss.seam.annotations.Redirect;
   
   public class AnnotationRedirectHandler extends RedirectHandler
  @@ -20,6 +23,12 @@
      }
      
      @Override
  +   protected Severity getMessageSeverity(Exception e)
  +   {
  +      return FacesMessage.SEVERITY_INFO;
  +   }
  +   
  +   @Override
      protected String getViewId(Exception e)
      {
         return e.getClass().getAnnotation(Redirect.class).viewId();
  
  
  
  1.5       +11 -1     jboss-seam/src/main/org/jboss/seam/exceptions/ConfigRedirectHandler.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ConfigRedirectHandler.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/exceptions/ConfigRedirectHandler.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- ConfigRedirectHandler.java	4 Feb 2007 17:03:33 -0000	1.4
  +++ ConfigRedirectHandler.java	11 Feb 2007 00:42:14 -0000	1.5
  @@ -3,6 +3,8 @@
    */
   package org.jboss.seam.exceptions;
   
  +import javax.faces.application.FacesMessage.Severity;
  +
   
   public final class ConfigRedirectHandler extends RedirectHandler
   {
  @@ -10,13 +12,15 @@
      private final Class clazz;
      private final boolean conversation;
      private final String message;
  +   private final Severity messageSeverity;
   
  -   public ConfigRedirectHandler(String id, Class clazz, boolean conversation, String message)
  +   public ConfigRedirectHandler(String id, Class clazz, boolean conversation, String message, Severity messageSeverity)
      {
         this.id = id;
         this.clazz = clazz;
         this.conversation = conversation;
         this.message = message;
  +      this.messageSeverity = messageSeverity;
      }
   
      @Override
  @@ -43,4 +47,10 @@
         return conversation;
      }
   
  +   @Override
  +   public Severity getMessageSeverity(Exception e)
  +   {
  +      return messageSeverity;
  +   }
  +
   }
  \ No newline at end of file
  
  
  
  1.8       +3 -1      jboss-seam/src/main/org/jboss/seam/exceptions/RedirectHandler.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: RedirectHandler.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/exceptions/RedirectHandler.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- RedirectHandler.java	5 Feb 2007 06:45:37 -0000	1.7
  +++ RedirectHandler.java	11 Feb 2007 00:42:14 -0000	1.8
  @@ -1,5 +1,6 @@
   package org.jboss.seam.exceptions;
   
  +import javax.faces.application.FacesMessage.Severity;
   import javax.faces.context.FacesContext;
   import javax.servlet.http.HttpServletRequest;
   
  @@ -18,6 +19,7 @@
      protected abstract String getViewId(Exception e);
      protected abstract String getMessage(Exception e);
      protected abstract boolean isEnd(Exception e);
  +   protected abstract Severity getMessageSeverity(Exception e);
   
      @Override
      public void handle(Exception e) throws Exception
  @@ -31,7 +33,7 @@
            viewId = servletPath.substring(0, servletPath.lastIndexOf('.')) + Pages.getSuffix();
         }
         
  -      addFacesMessage( getDisplayMessage(e, getMessage(e)) );
  +      addFacesMessage( getDisplayMessage(e, getMessage(e)), getMessageSeverity(e), e );
         
         if ( Contexts.isConversationContextActive() && isEnd(e) ) 
         {