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

[Gavin King]

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

  Modified:    src/main/org/jboss/seam/core    Exceptions.java
                        Navigator.java Pages.java
  Log:
  let you use <message> everywhere
  
  Revision  Changes    Path
  1.30      +1 -1      jboss-seam/src/main/org/jboss/seam/core/Exceptions.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Exceptions.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Exceptions.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -b -r1.29 -r1.30
  --- Exceptions.java	5 Feb 2007 06:06:09 -0000	1.29
  +++ Exceptions.java	5 Feb 2007 06:45:37 -0000	1.30
  @@ -136,7 +136,7 @@
            String errorCode = error.attributeValue("error-code");
            final int code = Strings.isEmpty(errorCode) ? 
                  500 : Integer.parseInt(errorCode);
  -         Element messageElement = redirect.element("message");
  +         Element messageElement = error.element("message");
            final String message = messageElement==null ? null : messageElement.getTextTrim();
            return new ConfigErrorHandler(message, endConversation, clazz, code);
         }
  
  
  
  1.4       +24 -0     jboss-seam/src/main/org/jboss/seam/core/Navigator.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Navigator.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Navigator.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- Navigator.java	17 Dec 2006 19:46:41 -0000	1.3
  +++ Navigator.java	5 Feb 2007 06:45:37 -0000	1.4
  @@ -5,6 +5,7 @@
   import javax.faces.component.UIViewRoot;
   import javax.faces.context.FacesContext;
   
  +import org.jboss.seam.contexts.Contexts;
   import org.jboss.seam.log.LogProvider;
   import org.jboss.seam.log.Logging;
   import org.jboss.seam.util.Strings;
  @@ -63,4 +64,27 @@
         facesContext.renderResponse();
      }
   
  +   protected static String getDisplayMessage(Exception e, String message)
  +   {
  +      if ( Strings.isEmpty(message) && e.getMessage()!=null ) 
  +      {
  +         return e.getMessage();
  +      }
  +      else
  +      {
  +         return message;
  +      }
  +   }
  +   
  +   protected static void addFacesMessage(String message)
  +   {
  +      if ( Contexts.isConversationContextActive() )
  +      {
  +         if ( !Strings.isEmpty(message) )
  +         {
  +            FacesMessages.instance().add(message);
  +         }
  +      }
  +   }
  +   
   }
  
  
  
  1.79      +6 -2      jboss-seam/src/main/org/jboss/seam/core/Pages.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Pages.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Pages.java,v
  retrieving revision 1.78
  retrieving revision 1.79
  diff -u -b -r1.78 -r1.79
  --- Pages.java	4 Feb 2007 02:30:48 -0000	1.78
  +++ Pages.java	5 Feb 2007 06:45:37 -0000	1.79
  @@ -813,7 +813,9 @@
         if (render!=null)
         {
            final String viewId = render.attributeValue("view-id");
  -         rule.setNavigationHandler( new RenderNavigationHandler(viewId) );
  +         Element messageElement = render.element("message");
  +         String message = messageElement==null ? null : messageElement.getTextTrim();
  +         rule.setNavigationHandler( new RenderNavigationHandler(viewId, message) );
         }
         Element redirect = element.element("redirect");
         if (redirect!=null)
  @@ -825,7 +827,9 @@
               params.add( parseParam(child) );
            }
            final String viewId = redirect.attributeValue("view-id");
  -         rule.setNavigationHandler( new RedirectNavigationHandler(viewId, params) );
  +         Element messageElement = redirect.element("message");
  +         String message = messageElement==null ? null : messageElement.getTextTrim();
  +         rule.setNavigationHandler( new RedirectNavigationHandler(viewId, params, message) );
         }
         List<Element> childElements = element.elements("out");
         for (Element child: childElements)