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

[Gavin King]

  User: gavin   
  Date: 07/02/21 15:21:57

  Modified:    src/main/org/jboss/seam/core   Exceptions.java Pages.java
  Log:
  oops, make severity work
  
  Revision  Changes    Path
  1.33      +3 -3      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.32
  retrieving revision 1.33
  diff -u -b -r1.32 -r1.33
  --- Exceptions.java	21 Feb 2007 20:13:22 -0000	1.32
  +++ Exceptions.java	21 Feb 2007 20:21:57 -0000	1.33
  @@ -130,10 +130,10 @@
            final String viewId = redirect.attributeValue("view-id");
            Element messageElement = redirect.element("message");
            final String message = messageElement==null ? null : messageElement.getTextTrim();
  -         Element severityElement = messageElement==null ? null : messageElement.element("severity");
  -         Severity severity = severityElement==null ? 
  +         String severityName = messageElement==null ? null : messageElement.attributeValue("severity");
  +         Severity severity = severityName==null ? 
                     FacesMessage.SEVERITY_INFO : 
  -                  (Severity) FacesMessage.VALUES_MAP.get( severityElement.getText().toUpperCase() );
  +                  (Severity) FacesMessage.VALUES_MAP.get( severityName.toUpperCase() );
            return new ConfigRedirectHandler(viewId, clazz, endConversation, message, severity);
         }
         
  
  
  
  1.87      +6 -6      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.86
  retrieving revision 1.87
  diff -u -b -r1.86 -r1.87
  --- Pages.java	21 Feb 2007 20:13:22 -0000	1.86
  +++ Pages.java	21 Feb 2007 20:21:57 -0000	1.87
  @@ -1016,10 +1016,10 @@
            final String viewId = render.attributeValue("view-id");
            Element messageElement = render.element("message");
            String message = messageElement==null ? null : messageElement.getTextTrim();
  -         Element severityElement = messageElement==null ? null : messageElement.element("severity");
  -         Severity severity = severityElement==null ? 
  +         String severityName = messageElement==null ? null : messageElement.attributeValue("severity");
  +         Severity severity = severityName==null ? 
                     FacesMessage.SEVERITY_INFO : 
  -                  (Severity) FacesMessage.VALUES_MAP.get( severityElement.getText().toUpperCase() );
  +                  (Severity) FacesMessage.VALUES_MAP.get( severityName.toUpperCase() );
            rule.setNavigationHandler( new RenderNavigationHandler(viewId, message, severity) );
         }
         Element redirect = element.element("redirect");
  @@ -1034,10 +1034,10 @@
            final String viewId = redirect.attributeValue("view-id");
            Element messageElement = redirect.element("message");
            String message = messageElement==null ? null : messageElement.getTextTrim();
  -         Element severityElement = messageElement==null ? null : messageElement.element("severity");
  -         Severity severity = severityElement==null ? 
  +         String severityName = messageElement==null ? null : messageElement.attributeValue("severity");
  +         Severity severity = severityName==null ? 
                     FacesMessage.SEVERITY_INFO : 
  -                  (Severity) FacesMessage.VALUES_MAP.get( severityElement.getText().toUpperCase() );
  +                  (Severity) FacesMessage.VALUES_MAP.get( severityName.toUpperCase() );
            rule.setNavigationHandler( new RedirectNavigationHandler(viewId, params, message, severity) );
         }
         List<Element> childElements = element.elements("out");