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

[Gavin King]

  User: gavin   
  Date: 06/10/31 15:09:22

  Modified:    src/main/org/jboss/seam/pageflow  Page.java
  Log:
  introduced <page switch=disabled/>
  breaking changes to how conversation switching works
  fix a bug where destroy methods caused an exception in ManagedEntityIdentityInterceptor
  
  Revision  Changes    Path
  1.5       +7 -0      jboss-seam/src/main/org/jboss/seam/pageflow/Page.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Page.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/pageflow/Page.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- Page.java	25 Oct 2006 15:14:36 -0000	1.4
  +++ Page.java	31 Oct 2006 20:09:22 -0000	1.5
  @@ -31,6 +31,7 @@
      private String description;
      private Integer timeout;
      private boolean backEnabled;
  +   private boolean switchEnabled;
      private String noConversationViewId;
   
      /**
  @@ -42,6 +43,7 @@
         viewId = pageElement.attributeValue("view-id");
         noConversationViewId = pageElement.attributeValue("no-conversation-view-id");
         backEnabled = "enabled".equals( pageElement.attributeValue("back") );
  +      switchEnabled = !"disabled".equals( pageElement.attributeValue("switch") );
         Element conversationEndElement = pageElement.element("end-conversation");
         if (conversationEndElement!=null) 
         {
  @@ -137,6 +139,11 @@
         return backEnabled;
      }
   
  +   public boolean isSwitchEnabled()
  +   {
  +      return switchEnabled;
  +   }
  +
      public String getNoConversationViewId()
      {
         return noConversationViewId;