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

[Gavin King]

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

  Modified:    src/main/org/jboss/seam/core    Exceptions.java
                        Navigator.java Pages.java
  Log:
  JBSEAM-780
  
  Revision  Changes    Path
  1.31      +8 -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.30
  retrieving revision 1.31
  diff -u -b -r1.30 -r1.31
  --- Exceptions.java	5 Feb 2007 06:45:37 -0000	1.30
  +++ Exceptions.java	11 Feb 2007 00:42:13 -0000	1.31
  @@ -7,6 +7,9 @@
   import java.util.ArrayList;
   import java.util.List;
   
  +import javax.faces.application.FacesMessage;
  +import javax.faces.application.FacesMessage.Severity;
  +
   import org.dom4j.DocumentException;
   import org.dom4j.Element;
   import org.jboss.seam.Component;
  @@ -127,7 +130,11 @@
            final String viewId = redirect.attributeValue("view-id");
            Element messageElement = redirect.element("message");
            final String message = messageElement==null ? null : messageElement.getTextTrim();
  -         return new ConfigRedirectHandler(viewId, clazz, endConversation, message);
  +         Element severityElement = redirect.element("severity");
  +         Severity severity = severityElement==null ? 
  +                  FacesMessage.SEVERITY_INFO : 
  +                  (Severity) FacesMessage.VALUES_MAP.get( severityElement.getText().toUpperCase() );
  +         return new ConfigRedirectHandler(viewId, clazz, endConversation, message, severity);
         }
         
         Element error = exception.element("http-error");
  
  
  
  1.5       +3 -2      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.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- Navigator.java	5 Feb 2007 06:45:37 -0000	1.4
  +++ Navigator.java	11 Feb 2007 00:42:13 -0000	1.5
  @@ -2,6 +2,7 @@
   
   import java.util.Map;
   
  +import javax.faces.application.FacesMessage.Severity;
   import javax.faces.component.UIViewRoot;
   import javax.faces.context.FacesContext;
   
  @@ -76,13 +77,13 @@
         }
      }
      
  -   protected static void addFacesMessage(String message)
  +   protected static void addFacesMessage(String message, Severity severity, Object... params)
      {
         if ( Contexts.isConversationContextActive() )
         {
            if ( !Strings.isEmpty(message) )
            {
  -            FacesMessages.instance().add(message);
  +            FacesMessages.instance().add(severity, message, params);
            }
         }
      }
  
  
  
  1.83      +13 -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.82
  retrieving revision 1.83
  diff -u -b -r1.82 -r1.83
  --- Pages.java	10 Feb 2007 17:26:02 -0000	1.82
  +++ Pages.java	11 Feb 2007 00:42:13 -0000	1.83
  @@ -12,7 +12,10 @@
   import java.util.Set;
   import java.util.SortedSet;
   import java.util.TreeSet;
  +
  +import javax.faces.application.FacesMessage;
   import javax.faces.application.ViewHandler;
  +import javax.faces.application.FacesMessage.Severity;
   import javax.faces.context.FacesContext;
   import org.dom4j.DocumentException;
   import org.dom4j.Element;
  @@ -847,7 +850,11 @@
            final String viewId = render.attributeValue("view-id");
            Element messageElement = render.element("message");
            String message = messageElement==null ? null : messageElement.getTextTrim();
  -         rule.setNavigationHandler( new RenderNavigationHandler(viewId, message) );
  +         Element severityElement = render.element("severity");
  +         Severity severity = severityElement==null ? 
  +                  FacesMessage.SEVERITY_INFO : 
  +                  (Severity) FacesMessage.VALUES_MAP.get( severityElement.getText().toUpperCase() );
  +         rule.setNavigationHandler( new RenderNavigationHandler(viewId, message, severity) );
         }
         Element redirect = element.element("redirect");
         if (redirect!=null)
  @@ -861,7 +868,11 @@
            final String viewId = redirect.attributeValue("view-id");
            Element messageElement = redirect.element("message");
            String message = messageElement==null ? null : messageElement.getTextTrim();
  -         rule.setNavigationHandler( new RedirectNavigationHandler(viewId, params, message) );
  +         Element severityElement = redirect.element("severity");
  +         Severity severity = severityElement==null ? 
  +                  FacesMessage.SEVERITY_INFO : 
  +                  (Severity) FacesMessage.VALUES_MAP.get( severityElement.getText().toUpperCase() );
  +         rule.setNavigationHandler( new RedirectNavigationHandler(viewId, params, message, severity) );
         }
         List<Element> childElements = element.elements("out");
         for (Element child: childElements)