Author: xlawrence
Date: Thu Nov 1 11:00:38 2007
New Revision: 19025
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19025&repname=
=3Djahia
Log:
correctly fix 2nd issue reported in POSTE-23
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/viewhelper/si=
temap/SiteMapViewHelper.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/viewhel=
per/sitemap/SiteMapViewHelper.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/data/viewhelper/sitemap/SiteMapViewHelper.j=
ava&rev=3D19025&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/viewhelper/si=
temap/SiteMapViewHelper.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/viewhelper/si=
temap/SiteMapViewHelper.java Thu Nov 1 11:00:38 2007
@@ -336,19 +336,19 @@
protected Iterator getPageChilds(ContentObject object) {
final ContentPage page =3D (ContentPage) object;
try {
- final Iterator pageChildsEnum =3D page.getContentPageChilds(_u=
ser, _pageInfosFlag, _languageCode, _directPageOnly);
+ final Iterator pageChildsEnum =3D page.getContentPageChilds(_u=
ser, _pageInfosFlag, null, true);
if (pageChildsEnum =3D=3D null) {
return new ArrayList(0).iterator();
}
final ProcessingContext jParams =3D Jahia.getThreadParamBean();
// We need to take care of the ranking and the sorters in orde=
r to deliver the pages in the correct order
- final TreeSet orderedPage =3D new TreeSet(new JahiaPageCompara=
tor(jParams, new HashMap()));
+ final TreeSet orderedPages =3D new TreeSet(new JahiaPageCompar=
ator(jParams, new HashMap()));
while (pageChildsEnum.hasNext()) {
- orderedPage.add(pageChildsEnum.next());
+ orderedPages.add(pageChildsEnum.next());
}
=
if (_pageInfosFlag =3D=3D (ContentPage.STAGING_PAGE_INFOS)) {
- return orderedPage.iterator(); // In this case shortcut th=
e next steps for optmization.
+ return orderedPages.iterator(); // In this case shortcut t=
he next steps for optmization.
}
=
// time based publishing state check
@@ -362,10 +362,9 @@
// Precompute what should contain the site map regarding the p=
age
// infos flag and the language code.
final Vector pageChildsList =3D new Vector();
- JahiaObjectDelegate delegate;
boolean paramBeanTest =3D ParamBean.NORMAL.equals(operationMod=
e) || ParamBean.PREVIEW.equals(operationMode);
boolean pageInfosFlagTest =3D (_pageInfosFlag =3D=3D (ContentP=
age.ACTIVE_PAGE_INFOS | ContentPage.STAGING_PAGE_INFOS));
- final Iterator iterator =3D orderedPage.iterator();
+ final Iterator iterator =3D orderedPages.iterator();
while (iterator.hasNext()) {
final ContentPage contentPage =3D (ContentPage) iterator.n=
ext();
if (_languageCode !=3D null) {
@@ -378,7 +377,7 @@
}
}
if (paramBeanTest) {
- delegate =3D jahiaObjectManager.getJahiaObjectDelegate=
(contentPage.getObjectKey());
+ JahiaObjectDelegate delegate =3D jahiaObjectManager.ge=
tJahiaObjectDelegate(contentPage.getObjectKey());
if (delegate !=3D null && !delegate.isValid()) {
continue;
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
