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

[Gavin King]

  User: gavin   
  Date: 07/02/05 01:45:37

  Modified:    src/main/org/jboss/seam/exceptions    ErrorHandler.java
                        ExceptionHandler.java RedirectHandler.java
  Log:
  let you use <message> everywhere
  
  Revision  Changes    Path
  1.4       +4 -1      jboss-seam/src/main/org/jboss/seam/exceptions/ErrorHandler.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ErrorHandler.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/exceptions/ErrorHandler.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- ErrorHandler.java	4 Feb 2007 05:41:58 -0000	1.3
  +++ ErrorHandler.java	5 Feb 2007 06:45:37 -0000	1.4
  @@ -8,6 +8,8 @@
   {
   
      protected abstract int getCode(Exception e);
  +   protected abstract String getMessage(Exception e);
  +   protected abstract boolean isEnd(Exception e);
   
      @Override
      public void handle(Exception e) throws Exception
  @@ -17,7 +19,8 @@
            Conversation.instance().end();
         }
         
  -      error( getCode(e), Interpolator.instance().interpolate( getDisplayMessage( e, getMessage(e) ) ) );
  +      String message = Interpolator.instance().interpolate( getDisplayMessage( e, getMessage(e) ) );
  +      error( getCode(e), message );
      }
   
      @Override
  
  
  
  1.4       +0 -39     jboss-seam/src/main/org/jboss/seam/exceptions/ExceptionHandler.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ExceptionHandler.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/exceptions/ExceptionHandler.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- ExceptionHandler.java	4 Feb 2007 01:13:19 -0000	1.3
  +++ ExceptionHandler.java	5 Feb 2007 06:45:37 -0000	1.4
  @@ -3,49 +3,10 @@
    */
   package org.jboss.seam.exceptions;
   
  -import org.jboss.seam.contexts.Contexts;
  -import org.jboss.seam.core.FacesMessages;
   import org.jboss.seam.core.Navigator;
  -import org.jboss.seam.util.Strings;
   
   public abstract class ExceptionHandler extends Navigator
   {
      public abstract void handle(Exception e) throws Exception;
      public abstract boolean isHandler(Exception e);
  -   
  -   protected String getMessage(Exception e)
  -   {
  -      throw new UnsupportedOperationException();
  -   }
  -   
  -   protected boolean isEnd(Exception e)
  -   {
  -      throw new UnsupportedOperationException();
  -   }
  -
  -   public static String getDisplayMessage(Exception e, String message)
  -   {
  -      if ( Strings.isEmpty(message) && e.getMessage()!=null ) 
  -      {
  -         return e.getMessage();
  -      }
  -      else
  -      {
  -         return message;
  -      }
  -   }
  -   
  -   public static void addFacesMessage(Exception e, String message)
  -   {
  -      if ( Contexts.isConversationContextActive() )
  -      {
  -         message = getDisplayMessage(e, message);
  -         if ( !Strings.isEmpty(message) )
  -         {
  -            FacesMessages.instance().add(message);
  -         }
  -      }
  -   }
  -   
  -
   }
  \ No newline at end of file
  
  
  
  1.7       +3 -6      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.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- RedirectHandler.java	4 Feb 2007 09:42:03 -0000	1.6
  +++ RedirectHandler.java	5 Feb 2007 06:45:37 -0000	1.7
  @@ -16,6 +16,8 @@
      private static final LogProvider log = Logging.getLogProvider(RedirectHandler.class);
   
      protected abstract String getViewId(Exception e);
  +   protected abstract String getMessage(Exception e);
  +   protected abstract boolean isEnd(Exception e);
   
      @Override
      public void handle(Exception e) throws Exception
  @@ -29,12 +31,7 @@
            viewId = servletPath.substring(0, servletPath.lastIndexOf('.')) + Pages.getSuffix();
         }
         
  -      if (log.isDebugEnabled())
  -      {
  -         log.debug("redirecting to: " + viewId);
  -      }
  -      
  -      addFacesMessage( e, getMessage(e) );
  +      addFacesMessage( getDisplayMessage(e, getMessage(e)) );
         
         if ( Contexts.isConversationContextActive() && isEnd(e) ) 
         {