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

[Gavin King]

  User: gavin   
  Date: 07/03/29 15:06:01

  Modified:    src/main/org/jboss/seam/core   Navigator.java Pages.java
  Log:
  allow pages.xml to add message to a control
  
  Revision  Changes    Path
  1.7       +9 -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.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- Navigator.java	9 Mar 2007 02:14:15 -0000	1.6
  +++ Navigator.java	29 Mar 2007 19:06:01 -0000	1.7
  @@ -77,14 +77,21 @@
         }
      }
      
  -   protected static void addFacesMessage(String message, Severity severity, Object... params)
  +   protected static void addFacesMessage(String message, Severity severity, String control, Object... params)
      {
         if ( Contexts.isConversationContextActive() )
         {
            if ( !Strings.isEmpty(message) )
            {
  +            if ( Strings.isEmpty(control) )
  +            {
               FacesMessages.instance().add(severity, message, params);
            }
  +            else
  +            {
  +               FacesMessages.instance().addToControl(control, severity, message, params);
  +            }
  +         }
         }
      }
      
  
  
  
  1.110     +4 -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.109
  retrieving revision 1.110
  diff -u -b -r1.109 -r1.110
  --- Pages.java	21 Mar 2007 01:12:28 -0000	1.109
  +++ Pages.java	29 Mar 2007 19:06:01 -0000	1.110
  @@ -1212,11 +1212,12 @@
            final String viewId = render.attributeValue("view-id");
            Element messageElement = render.element("message");
            String message = messageElement==null ? null : messageElement.getTextTrim();
  +         String control = messageElement.attributeValue("for");
            String severityName = messageElement==null ? null : messageElement.attributeValue("severity");
            Severity severity = severityName==null ? 
                     FacesMessage.SEVERITY_INFO : 
                     getFacesMessageValuesMap().get( severityName.toUpperCase() );
  -         rule.addNavigationHandler( new RenderNavigationHandler(viewId, message, severity) );
  +         rule.addNavigationHandler( new RenderNavigationHandler(viewId, message, severity, control) );
         }
         
         Element redirect = element.element("redirect");
  @@ -1230,12 +1231,13 @@
            }
            final String viewId = redirect.attributeValue("view-id");
            Element messageElement = redirect.element("message");
  +         String control = messageElement.attributeValue("for");
            String message = messageElement==null ? null : messageElement.getTextTrim();
            String severityName = messageElement==null ? null : messageElement.attributeValue("severity");
            Severity severity = severityName==null ? 
                     FacesMessage.SEVERITY_INFO : 
                     getFacesMessageValuesMap().get( severityName.toUpperCase() );
  -         rule.addNavigationHandler( new RedirectNavigationHandler(viewId, params, message, severity) );
  +         rule.addNavigationHandler( new RedirectNavigationHandler(viewId, params, message, severity, control) );
         }
         
         List<Element> childElements = element.elements("out");