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

[Gavin King]

  User: gavin   
  Date: 07/02/25 17:38:21

  Modified:    src/main/org/jboss/seam/core   Pages.java Redirect.java
  Log:
  nicer impl
  
  Revision  Changes    Path
  1.102     +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.101
  retrieving revision 1.102
  diff -u -b -r1.101 -r1.102
  --- Pages.java	23 Feb 2007 10:43:45 -0000	1.101
  +++ Pages.java	25 Feb 2007 22:38:21 -0000	1.102
  @@ -1152,7 +1152,7 @@
            Severity severity = severityName==null ? 
                     FacesMessage.SEVERITY_INFO : 
                     getFacesMessageValuesMap().get( severityName.toUpperCase() );
  -         rule.setNavigationHandler( new RenderNavigationHandler(viewId, message, severity) );
  +         rule.addNavigationHandler( new RenderNavigationHandler(viewId, message, severity) );
         }
         
         Element redirect = element.element("redirect");
  @@ -1171,7 +1171,7 @@
            Severity severity = severityName==null ? 
                     FacesMessage.SEVERITY_INFO : 
                     getFacesMessageValuesMap().get( severityName.toUpperCase() );
  -         rule.setNavigationHandler( new RedirectNavigationHandler(viewId, params, message, severity) );
  +         rule.addNavigationHandler( new RedirectNavigationHandler(viewId, params, message, severity) );
         }
         
         List<Element> childElements = element.elements("out");
  
  
  
  1.13      +24 -1     jboss-seam/src/main/org/jboss/seam/core/Redirect.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Redirect.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Redirect.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -b -r1.12 -r1.13
  --- Redirect.java	7 Feb 2007 21:17:24 -0000	1.12
  +++ Redirect.java	25 Feb 2007 22:38:21 -0000	1.13
  @@ -14,6 +14,7 @@
   import org.jboss.seam.annotations.Install;
   import org.jboss.seam.annotations.Intercept;
   import org.jboss.seam.annotations.Name;
  +import org.jboss.seam.annotations.PerNestedConversation;
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.contexts.Contexts;
   
  @@ -27,6 +28,7 @@
   @Intercept(InterceptionType.NEVER)
   @Scope(ScopeType.CONVERSATION)
   @Install(precedence=BUILT_IN)
  + at PerNestedConversation
   public class Redirect extends AbstractMutable implements Serializable
   {
      private static final long serialVersionUID = 6947384474861235210L;
  @@ -141,7 +143,7 @@
       *
       *@see Redirect#captureCurrentView()
       */
  -   public void returnToCapturedView()
  +   public boolean returnToCapturedView()
      {
         if (viewId!=null)
         {
  @@ -150,8 +152,29 @@
               Conversation.instance().end();
            }
            execute();
  +         return true;
         }
  +      else
  +      {
  +         return false;
  +      }
  +   }
  +   
  +   //TODO: replacement for Conversation.endAndRedirect()
  +   /*public boolean returnToParentView()
  +   {
  +      Manager manager = Manager.instance();
  +      String viewId = manager.getParentConversationViewId();
  +      if (viewId==null)
  +      {
  +         return false;
  +      }
  +      else
  +      {
  +         manager.redirect(viewId);
  +         return true;
      }
  +   }*/
      
      public static Redirect instance()
      {