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

[Gavin King]

  User: gavin   
  Date: 07/03/08 21:14:16

  Modified:    src/ui/org/jboss/seam/ui    HtmlButton.java HtmlLink.java
                        UIConversationId.java
  Log:
  fix another bug in natural conversation ids
  
  Revision  Changes    Path
  1.12      +2 -2      jboss-seam/src/ui/org/jboss/seam/ui/HtmlButton.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: HtmlButton.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/ui/org/jboss/seam/ui/HtmlButton.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -b -r1.11 -r1.12
  --- HtmlButton.java	9 Mar 2007 00:59:57 -0000	1.11
  +++ HtmlButton.java	9 Mar 2007 02:14:16 -0000	1.12
  @@ -120,7 +120,7 @@
         boolean conversationIdEncoded = false;
         Page page = Pages.instance().getPage(viewId);
         
  -      for (Object child: getChildren())
  +      for ( Object child: getChildren() )
         {
            if (child instanceof UIParameter)
            {
  @@ -130,7 +130,7 @@
                  encodedUrl += getParameterString(characterEncoding, uip, first);
                  first = false;
                  
  -               if (uip.getName().equals(page.getConversationIdParameter().getParameterName()))
  +               if ( uip.getName().equals( page.getConversationIdParameter().getParameterName() ) )
                  {
                     conversationIdEncoded = true;
                  }
  
  
  
  1.32      +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.31
  retrieving revision 1.32
  diff -u -b -r1.31 -r1.32
  --- HtmlLink.java	9 Mar 2007 00:59:57 -0000	1.31
  +++ HtmlLink.java	9 Mar 2007 02:14:16 -0000	1.32
  @@ -104,7 +104,7 @@
         boolean conversationIdEncoded = false;
         Page page = Pages.instance().getPage(viewId);
         
  -      for (Object child: getChildren())
  +      for ( Object child: getChildren() )
         {
            if (child instanceof UIParameter)
            {
  @@ -114,7 +114,7 @@
                  encodedUrl += getParameterString(characterEncoding, uip, first);
                  first = false;
                  
  -               if (uip.getName().equals(page.getConversationIdParameter().getParameterName()))
  +               if ( uip.getName().equals( page.getConversationIdParameter().getParameterName() ) )
                  {
                     conversationIdEncoded = true;
                  }
  
  
  
  1.6       +3 -2      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.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- UIConversationId.java	9 Mar 2007 00:59:57 -0000	1.5
  +++ UIConversationId.java	9 Mar 2007 02:14:16 -0000	1.6
  @@ -16,8 +16,9 @@
         Conversation conversation = Conversation.instance();
         if (viewId!=null && ( !conversation.isNested() || conversation.isLongRunning() ) )
         {
  -         Page page = Pages.instance().getPage(viewId);
  -         return page.getConversationIdParameter().getParameterName();
  +         return Pages.instance().getPage(viewId)
  +                     .getConversationIdParameter()
  +                     .getParameterName();
         }
         else
         {