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

[Gavin King]

  User: gavin   
  Date: 07/02/21 15:13:22

  Modified:    src/main/org/jboss/seam/core   Exceptions.java Pages.java
  Log:
  oops, make severity work
  
  Revision  Changes    Path
  1.32      +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.31
  retrieving revision 1.32
  diff -u -b -r1.31 -r1.32
  --- Exceptions.java	11 Feb 2007 00:42:13 -0000	1.31
  +++ Exceptions.java	21 Feb 2007 20:13:22 -0000	1.32
  @@ -130,7 +130,7 @@
            final String viewId = redirect.attributeValue("view-id");
            Element messageElement = redirect.element("message");
            final String message = messageElement==null ? null : messageElement.getTextTrim();
  -         Element severityElement = redirect.element("severity");
  +         Element severityElement = messageElement==null ? null : messageElement.element("severity");
            Severity severity = severityElement==null ? 
                     FacesMessage.SEVERITY_INFO : 
                     (Severity) FacesMessage.VALUES_MAP.get( severityElement.getText().toUpperCase() );
  
  
  
  1.86      +2 -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.85
  retrieving revision 1.86
  diff -u -b -r1.85 -r1.86
  --- Pages.java	21 Feb 2007 18:33:08 -0000	1.85
  +++ Pages.java	21 Feb 2007 20:13:22 -0000	1.86
  @@ -1016,7 +1016,7 @@
            final String viewId = render.attributeValue("view-id");
            Element messageElement = render.element("message");
            String message = messageElement==null ? null : messageElement.getTextTrim();
  -         Element severityElement = render.element("severity");
  +         Element severityElement = messageElement==null ? null : messageElement.element("severity");
            Severity severity = severityElement==null ? 
                     FacesMessage.SEVERITY_INFO : 
                     (Severity) FacesMessage.VALUES_MAP.get( severityElement.getText().toUpperCase() );
  @@ -1034,7 +1034,7 @@
            final String viewId = redirect.attributeValue("view-id");
            Element messageElement = redirect.element("message");
            String message = messageElement==null ? null : messageElement.getTextTrim();
  -         Element severityElement = redirect.element("severity");
  +         Element severityElement = messageElement==null ? null : messageElement.element("severity");
            Severity severity = severityElement==null ? 
                     FacesMessage.SEVERITY_INFO : 
                     (Severity) FacesMessage.VALUES_MAP.get( severityElement.getText().toUpperCase() );