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

[Gavin King]

  User: gavin   
  Date: 07/02/12 11:47:29

  Modified:    src/main/org/jboss/seam/interceptors  
                        ConversationalInterceptor.java
                        ValidationInterceptor.java
  Log:
  JBSEAM-818, JBSEAM-825
  
  Revision  Changes    Path
  1.15      +2 -2      jboss-seam/src/main/org/jboss/seam/interceptors/ConversationalInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ConversationalInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/interceptors/ConversationalInterceptor.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -b -r1.14 -r1.15
  --- ConversationalInterceptor.java	11 Feb 2007 19:48:12 -0000	1.14
  +++ ConversationalInterceptor.java	12 Feb 2007 16:47:29 -0000	1.15
  @@ -1,4 +1,4 @@
  -//$Id: ConversationalInterceptor.java,v 1.14 2007/02/11 19:48:12 gavin Exp $
  +//$Id: ConversationalInterceptor.java,v 1.15 2007/02/12 16:47:29 gavin Exp $
   package org.jboss.seam.interceptors;
   
   import java.lang.reflect.Method;
  @@ -61,7 +61,7 @@
                  {
                     log.debug( "no long-running conversation for @Conversational bean: " + getComponent().getName() );
                  }
  -               FacesMessages.instance().addFromResourceBundle( 
  +               FacesMessages.instance().addFromResourceBundleOrDefault( 
                        FacesMessage.SEVERITY_WARN, 
                        "org.jboss.seam.NoConversation", 
                        "No conversation" 
  
  
  
  1.29      +2 -2      jboss-seam/src/main/org/jboss/seam/interceptors/ValidationInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ValidationInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/interceptors/ValidationInterceptor.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -b -r1.28 -r1.29
  --- ValidationInterceptor.java	11 Feb 2007 19:48:12 -0000	1.28
  +++ ValidationInterceptor.java	12 Feb 2007 16:47:29 -0000	1.29
  @@ -1,4 +1,4 @@
  -//$Id: ValidationInterceptor.java,v 1.28 2007/02/11 19:48:12 gavin Exp $
  +//$Id: ValidationInterceptor.java,v 1.29 2007/02/12 16:47:29 gavin Exp $
   package org.jboss.seam.interceptors;
   
   import java.lang.reflect.Method;
  @@ -58,7 +58,7 @@
                  {
                     refreshInvalidEntity( ifInvalid, iv.getBean() );
                  }
  -               FacesMessages.instance().add(iv);
  +               FacesMessages.instance().addToControl(iv);
               }
               String outcome = ifInvalid.outcome();
               return Outcome.REDISPLAY.equals(outcome) ? null : outcome;