[jboss-cvs] jboss-seam/src/ui/org/jboss/seam/ui ...

[Gavin King]

  User: gavin   
  Date: 06/10/08 17:32:27

  Modified:    src/ui/org/jboss/seam/ui   HtmlLink.java
                        UIConversationId.java
  Log:
  fixed JBSEAM-372, s:link with nested conversations
  
  Revision  Changes    Path
  1.18      +2 -2      jboss-seam/src/ui/org/jboss/seam/ui/HtmlLink.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: HtmlLink.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/ui/org/jboss/seam/ui/HtmlLink.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -b -r1.17 -r1.18
  --- HtmlLink.java	7 Oct 2006 17:41:41 -0000	1.17
  +++ HtmlLink.java	8 Oct 2006 21:32:27 -0000	1.18
  @@ -16,7 +16,7 @@
   import javax.faces.el.ValueBinding;
   import javax.faces.model.DataModel;
   
  -import org.jboss.seam.core.Manager;
  +import org.jboss.seam.core.Conversation;
   import org.jboss.seam.core.Pages;
   
   public class HtmlLink extends HtmlOutputLink
  @@ -150,7 +150,7 @@
         
         if ( "default".equals(propagation) || "join".equals(propagation) || "nest".equals(propagation) || "end".equals(propagation) )
         {
  -         if ( Manager.instance().isReallyLongRunningConversation() )
  +         if ( Conversation.instance().isLongRunning() || Conversation.instance().isNested() )
            {
               encodedUrl += getParameterString(characterEncoding, new UIConversationId(), first);
               first = false;
  
  
  
  1.3       +9 -1      jboss-seam/src/ui/org/jboss/seam/ui/UIConversationId.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: UIConversationId.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/ui/org/jboss/seam/ui/UIConversationId.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- UIConversationId.java	28 Jun 2006 22:23:13 -0000	1.2
  +++ UIConversationId.java	8 Oct 2006 21:32:27 -0000	1.3
  @@ -19,7 +19,15 @@
      @Override
      public Object getValue()
      {
  -      return Conversation.instance().getId();
  +      Conversation conversation = Conversation.instance();
  +      if ( !conversation.isNested() || conversation.isLongRunning() )
  +      {
  +         return conversation.getId();
  +      }
  +      else
  +      {
  +         return conversation.getParentId();
  +      }
      }
   
   }