You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2005/05/19 17:46:28 UTC
svn commit: r170948 -
/lenya/trunk/src/java/org/apache/lenya/cms/site/tree/TreeSiteManager.java
Author: andreas
Date: Thu May 19 08:46:27 2005
New Revision: 170948
URL: http://svn.apache.org/viewcvs?rev=170948&view=rev
Log:
tree site manager: return all language versions in getAncestors
Modified:
lenya/trunk/src/java/org/apache/lenya/cms/site/tree/TreeSiteManager.java
Modified: lenya/trunk/src/java/org/apache/lenya/cms/site/tree/TreeSiteManager.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/site/tree/TreeSiteManager.java?rev=170948&r1=170947&r2=170948&view=diff
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/site/tree/TreeSiteManager.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/site/tree/TreeSiteManager.java Thu May 19 08:46:27 2005
@@ -90,11 +90,18 @@
Document parent;
try {
parent = resource.getIdentityMap().getParent(resource);
- } catch (DocumentBuildException e) {
+ if (parent != null) {
+ String[] languages = parent.getLanguages();
+ for (int i = 0; i < languages.length; i++) {
+ Document version = resource.getIdentityMap().getLanguageVersion(parent,
+ languages[i]);
+ ancestors.add(version);
+ }
+ }
+ } catch (Exception e) {
throw new SiteException(e);
}
if (parent != null) {
- ancestors.add(parent);
ancestors.addAll(getAncestors(parent));
}
return ancestors;
@@ -390,7 +397,8 @@
* @see org.apache.lenya.cms.site.SiteManager#getSiteStructure(org.apache.lenya.cms.publication.DocumentIdentityMap,
* org.apache.lenya.cms.publication.Publication, java.lang.String)
*/
- public SiteStructure getSiteStructure(DocumentIdentityMap map, Publication publiation,
+ public SiteStructure getSiteStructure(DocumentIdentityMap map,
+ Publication publiation,
String area) throws SiteException {
return getTree(map, publiation, area);
}
@@ -456,4 +464,4 @@
return documentId;
}
-}
+}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org