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/07/22 01:27:26 UTC
svn commit: r220204 -
/lenya/trunk/src/publets/sitetree/java/src/org/apache/lenya/cms/site/tree/TreeSiteManager.java
Author: andreas
Date: Thu Jul 21 16:27:23 2005
New Revision: 220204
URL: http://svn.apache.org/viewcvs?rev=220204&view=rev
Log:
TreeSiteManager returns all language versions in getDocuments(area)
Modified:
lenya/trunk/src/publets/sitetree/java/src/org/apache/lenya/cms/site/tree/TreeSiteManager.java
Modified: lenya/trunk/src/publets/sitetree/java/src/org/apache/lenya/cms/site/tree/TreeSiteManager.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/publets/sitetree/java/src/org/apache/lenya/cms/site/tree/TreeSiteManager.java?rev=220204&r1=220203&r2=220204&view=diff
==============================================================================
--- lenya/trunk/src/publets/sitetree/java/src/org/apache/lenya/cms/site/tree/TreeSiteManager.java (original)
+++ lenya/trunk/src/publets/sitetree/java/src/org/apache/lenya/cms/site/tree/TreeSiteManager.java Thu Jul 21 16:27:23 2005
@@ -219,11 +219,18 @@
Label[] labels = { label };
if (siblingDocId == null) {
- destinationTree.addNode(destinationDocument.getId(), labels, sourceNode.getHref(),
- sourceNode.getSuffix(), sourceNode.hasLink());
+ destinationTree.addNode(destinationDocument.getId(),
+ labels,
+ sourceNode.getHref(),
+ sourceNode.getSuffix(),
+ sourceNode.hasLink());
} else {
- destinationTree.addNode(destinationDocument.getId(), labels, sourceNode.getHref(),
- sourceNode.getSuffix(), sourceNode.hasLink(), siblingDocId);
+ destinationTree.addNode(destinationDocument.getId(),
+ labels,
+ sourceNode.getHref(),
+ sourceNode.getSuffix(),
+ sourceNode.hasLink(),
+ siblingDocId);
}
} else {
@@ -239,8 +246,9 @@
* @see org.apache.lenya.cms.site.SiteManager#delete(org.apache.lenya.cms.publication.Document)
*/
public void delete(Document document) throws SiteException {
- SiteTree tree = getTree(document.getIdentityMap(), document.getPublication(), document
- .getArea());
+ SiteTree tree = getTree(document.getIdentityMap(),
+ document.getPublication(),
+ document.getArea());
SiteTreeNode node = tree.getNode(document.getId());
@@ -320,14 +328,18 @@
throws SiteException {
try {
List allNodes = getTree(map, publication, area).getNode("/").preOrder();
- Document[] documents = new Document[allNodes.size() - 1];
+ List documents = new ArrayList();
for (int i = 1; i < allNodes.size(); i++) {
SiteTreeNode node = (SiteTreeNode) allNodes.get(i);
- documents[i - 1] = map.get(publication, area, node.getAbsoluteId());
+ Document doc = map.get(publication, area, node.getAbsoluteId());
+ String[] languages = doc.getLanguages();
+ for (int l = 0; l < languages.length; l++) {
+ documents.add(map.getLanguageVersion(doc, languages[l]));
+ }
}
- return documents;
- } catch (DocumentBuildException e) {
+ return (Document[]) documents.toArray(new Document[documents.size()]);
+ } catch (Exception e) {
throw new SiteException(e);
}
}
@@ -388,7 +400,9 @@
Document availableDocument;
try {
availableDocument = document.getIdentityMap().get(document.getPublication(),
- document.getArea(), availableDocumentId, document.getLanguage());
+ document.getArea(),
+ availableDocumentId,
+ document.getLanguage());
} catch (DocumentBuildException e) {
throw new SiteException(e);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org