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

[Gavin King]

  User: gavin   
  Date: 06/10/10 18:37:06

  Modified:    src/main/org/jboss/seam/core  Pages.java
  Log:
  <pages no-conversation-view-id=..../>
  
  Revision  Changes    Path
  1.31      +9 -4      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.30
  retrieving revision 1.31
  diff -u -b -r1.30 -r1.31
  --- Pages.java	10 Oct 2006 03:15:27 -0000	1.30
  +++ Pages.java	10 Oct 2006 22:37:06 -0000	1.31
  @@ -50,6 +50,9 @@
      
      private static final Log log = LogFactory.getLog(Pages.class);
      
  +   private Map<String, Page> pagesByViewId = new HashMap<String, Page>();   
  +   private String noConversationViewId;
  +   
      static final class Page
      {
         Page(String viewId)
  @@ -96,10 +99,6 @@
         }
      }
      
  -   private Map<String, Page> pagesByViewId = new HashMap<String, Page>();
  -   
  -   private String noConversationViewId;
  -   
      private SortedSet<String> wildcardViewIds = new TreeSet<String>( 
            new Comparator<String>() {
               public int compare(String x, String y)
  @@ -125,6 +124,12 @@
            SAXReader saxReader = new SAXReader();
            saxReader.setMergeAdjacentText(true);
            Document doc = saxReader.read(stream);
  +         
  +         if (noConversationViewId==null) //let the setting in components.xml override the pages.xml
  +         {
  +            noConversationViewId = doc.getRootElement().attributeValue("no-conversation-view-id");
  +         }
  +         
            List<Element> elements = doc.getRootElement().elements("page");
            for (Element page: elements)
            {