portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject cvs commit: jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/impl CastorXmlPageManager.java
Date Tue, 26 Oct 2004 19:04:48 GMT
taylor      2004/10/26 12:04:48

  Modified:    components/page-manager/src/java/org/apache/jetspeed/page/impl
                        CastorXmlPageManager.java
  Log:
  patch from Randy Watler,
  
  Just a micro adjustment:
  
  Force profiled page into sibling page; allows page tab to appear as selected for document
set pages/folders when displayed in the portal.
  
  To test: see that tab appears for "[USER] Top Page" when navigated to from user/user specific
Top Links document set.
  
  Revision  Changes    Path
  1.19      +6 -3      jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/impl/CastorXmlPageManager.java
  
  Index: CastorXmlPageManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/impl/CastorXmlPageManager.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- CastorXmlPageManager.java	21 Oct 2004 02:28:07 -0000	1.18
  +++ CastorXmlPageManager.java	26 Oct 2004 19:04:48 -0000	1.19
  @@ -162,7 +162,6 @@
           if (profilingEnabled)
           {
               // profile page request using profile locator
  -
               Folder [] profiledFolder = new Folder[1];
               Page [] profiledPage = new Page[1];
               List profiledFolders = new ArrayList();
  @@ -243,8 +242,12 @@
                   Comparator documentComparator = new DocumentOrderComparator(documentOrder);
   
                   // profile sibling pages by aggregating all siblings in profiled folders
  -                // using profiled general document order, (do not filter unordered siblings)
  +                // using profiled general document order, (do not filter unordered siblings);
  +                // force profiled page to exist as sibling to support pages profiled using
  +                // alternate locators that may not select page in profiled folder: the
  +                // profiled page must appear in the sibling pages collection.
                   siblingPages = new NodeSetImpl(null, documentComparator);
  +                siblingPages = addUniqueOrDescribedUrlNode((NodeSetImpl) siblingPages,
(AbstractNode) page);
                   foldersIter = profiledFolders.iterator();
                   while (foldersIter.hasNext())
                   {
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org


Mime
View raw message