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

[Gavin King]

  User: gavin   
  Date: 07/02/06 01:20:12

  Modified:    src/main/org/jboss/seam/core  Manager.java
  Log:
  comments
  
  Revision  Changes    Path
  1.139     +7 -2      jboss-seam/src/main/org/jboss/seam/core/Manager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Manager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Manager.java,v
  retrieving revision 1.138
  retrieving revision 1.139
  diff -u -b -r1.138 -r1.139
  --- Manager.java	4 Feb 2007 06:30:07 -0000	1.138
  +++ Manager.java	6 Feb 2007 06:20:12 -0000	1.139
  @@ -41,7 +41,7 @@
    *
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.138 $
  + * @version $Revision: 1.139 $
    */
   @Scope(ScopeType.EVENT)
   @Name("org.jboss.seam.core.manager")
  @@ -71,6 +71,7 @@
      private String parentConversationIdParameter = "parentConversationId";
      private String conversationIsLongRunningParameter = "conversationIsLongRunning";
   
  +   // DONT BREAK, icefaces uses this
      public String getCurrentConversationId()
      {
         return currentConversationId;
  @@ -225,6 +226,7 @@
               null : currentConversationIdStack.get( currentConversationIdStack.size()-1 );
      }
   
  +   // DONT BREAK, icefaces uses this
      public boolean isLongRunningConversation()
      {
         return isLongRunningConversation;
  @@ -783,6 +785,7 @@
       */
      public void beforeRedirect()
      {
  +      //DONT BREAK, icefaces uses this
         if (!destroyBeforeRedirect)
         {
            ConversationEntry ce = getCurrentConversationEntry();
  @@ -799,7 +802,9 @@
      /**
       * Add the conversation id to a URL, if necessary
       */
  -   public String encodeConversationId(String url) {
  +   public String encodeConversationId(String url) 
  +   {
  +      //DONT BREAK, icefaces uses this
         if ( Seam.isSessionInvalid() )
         {
            return url;