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

[Gavin King]

  User: gavin   
  Date: 07/02/21 15:32:41

  Modified:    src/main/org/jboss/seam/core   Exceptions.java Pages.java
  Log:
  oops, make severity work
  
  Revision  Changes    Path
  1.34      +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.33
  retrieving revision 1.34
  diff -u -b -r1.33 -r1.34
  --- Exceptions.java	21 Feb 2007 20:21:57 -0000	1.33
  +++ Exceptions.java	21 Feb 2007 20:32:41 -0000	1.34
  @@ -133,7 +133,7 @@
            String severityName = messageElement==null ? null : messageElement.attributeValue("severity");
            Severity severity = severityName==null ? 
                     FacesMessage.SEVERITY_INFO : 
  -                  (Severity) FacesMessage.VALUES_MAP.get( severityName.toUpperCase() );
  +                  Pages.getFacesMessageValuesMap().get( severityName.toUpperCase() );
            return new ConfigRedirectHandler(viewId, clazz, endConversation, message, severity);
         }
         
  
  
  
  1.88      +11 -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.87
  retrieving revision 1.88
  diff -u -b -r1.87 -r1.88
  --- Pages.java	21 Feb 2007 20:21:57 -0000	1.87
  +++ Pages.java	21 Feb 2007 20:32:41 -0000	1.88
  @@ -1019,7 +1019,7 @@
            String severityName = messageElement==null ? null : messageElement.attributeValue("severity");
            Severity severity = severityName==null ? 
                     FacesMessage.SEVERITY_INFO : 
  -                  (Severity) FacesMessage.VALUES_MAP.get( severityName.toUpperCase() );
  +                  getFacesMessageValuesMap().get( severityName.toUpperCase() );
            rule.setNavigationHandler( new RenderNavigationHandler(viewId, message, severity) );
         }
         Element redirect = element.element("redirect");
  @@ -1037,7 +1037,7 @@
            String severityName = messageElement==null ? null : messageElement.attributeValue("severity");
            Severity severity = severityName==null ? 
                     FacesMessage.SEVERITY_INFO : 
  -                  (Severity) FacesMessage.VALUES_MAP.get( severityName.toUpperCase() );
  +                  getFacesMessageValuesMap().get( severityName.toUpperCase() );
            rule.setNavigationHandler( new RedirectNavigationHandler(viewId, params, message, severity) );
         }
         List<Element> childElements = element.elements("out");
  @@ -1059,6 +1059,15 @@
         }
         
      }
  +   public static Map<String, Severity> getFacesMessageValuesMap()
  +   {
  +      Map<String, Severity> result = new HashMap<String, Severity>();
  +      for (Map.Entry<String, Severity> me: (Set<Map.Entry<String, Severity>>) FacesMessage.VALUES_MAP.entrySet())
  +      {
  +         result.put( me.getKey().toUpperCase(), me.getValue() );
  +      }
  +      return result;
  +   }
      public String getLoginViewId()
      {
         return loginViewId;