You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by mi...@apache.org on 2005/04/05 11:40:14 UTC
svn commit: r160148 - in
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms:
authoring/DocumentCreator.java cocoon/acting/DefaultCreatorAction.java
cocoon/acting/DocumentIdExistsAction.java
cocoon/components/modules/input/SitetreeModule.java
publication/AbstractPublication.java publication/Publication.java
Author: michi
Date: Tue Apr 5 02:40:13 2005
New Revision: 160148
URL: http://svn.apache.org/viewcvs?view=rev&rev=160148
Log:
getSiteTree deprecated and getTree introduced such it stays backwards compatible
Modified:
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/authoring/DocumentCreator.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/DefaultCreatorAction.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/DocumentIdExistsAction.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/components/modules/input/SitetreeModule.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/AbstractPublication.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/Publication.java
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/authoring/DocumentCreator.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/authoring/DocumentCreator.java?view=diff&r1=160147&r2=160148
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/authoring/DocumentCreator.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/authoring/DocumentCreator.java Tue Apr 5 02:40:13 2005
@@ -102,7 +102,7 @@
try {
log.debug("Get sitetree of area: " + area);
- siteTree = publication.getSiteTree(area);
+ siteTree = publication.getTree(area);
} catch (Exception e) {
throw new CreatorException(e);
}
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/DefaultCreatorAction.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/DefaultCreatorAction.java?view=diff&r1=160147&r2=160148
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/DefaultCreatorAction.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/DefaultCreatorAction.java Tue Apr 5 02:40:13 2005
@@ -202,7 +202,7 @@
creator.init(doctypeConf);
// add a node to the tree
- SiteTree siteTree = publication.getSiteTree(Publication.AUTHORING_AREA);
+ SiteTree siteTree = publication.getTree(Publication.AUTHORING_AREA);
Label[] labels = new Label[1];
labels[0] = new Label(childname, language);
siteTree.addNode(parentid, creator.generateTreeId(childid, childType), labels, visibleInNav);
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/DocumentIdExistsAction.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/DocumentIdExistsAction.java?view=diff&r1=160147&r2=160148
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/DocumentIdExistsAction.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/DocumentIdExistsAction.java Tue Apr 5 02:40:13 2005
@@ -84,7 +84,7 @@
PageEnvelopeFactory.getInstance().getPageEnvelope(objectModel);
SiteTree siteTree =
- pageEnvelope.getPublication().getSiteTree(area);
+ pageEnvelope.getPublication().getTree(area);
if (siteTree.getNode(documentId) != null) {
return Collections.EMPTY_MAP;
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/components/modules/input/SitetreeModule.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/components/modules/input/SitetreeModule.java?view=diff&r1=160147&r2=160148
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/components/modules/input/SitetreeModule.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/components/modules/input/SitetreeModule.java Tue Apr 5 02:40:13 2005
@@ -55,27 +55,27 @@
Publication publication = envelope.getPublication();
if (name.equals(AUTHORING_NODE)) {
- SiteTree authoringTree = publication.getSiteTree(Publication.AUTHORING_AREA);
+ SiteTree authoringTree = publication.getTree(Publication.AUTHORING_AREA);
value = authoringTree.getNode(envelope.getDocument().getId());
}
if (name.equals(LIVE_NODE)) {
- SiteTree liveTree = publication.getSiteTree(Publication.LIVE_AREA);
+ SiteTree liveTree = publication.getTree(Publication.LIVE_AREA);
value = liveTree.getNode(envelope.getDocument().getId());
}
if (name.equals(TRASH_NODE)) {
- SiteTree trashTree = publication.getSiteTree(Publication.TRASH_AREA);
+ SiteTree trashTree = publication.getTree(Publication.TRASH_AREA);
value = trashTree.getNode(envelope.getDocument().getId());
}
if (name.equals(ARCHIVE_NODE)) {
- SiteTree archiveTree = publication.getSiteTree(Publication.ARCHIVE_AREA);
+ SiteTree archiveTree = publication.getTree(Publication.ARCHIVE_AREA);
value = archiveTree.getNode(envelope.getDocument().getId());
}
if (name.equals(FIRST_CHILD_ID)) {
- SiteTree siteTree = publication.getSiteTree(envelope.getDocument().getArea());
+ SiteTree siteTree = publication.getTree(envelope.getDocument().getArea());
SiteTreeNode node = siteTree.getNode(envelope.getDocument().getId());
SiteTreeNode[] children = node.getChildren(envelope.getDocument().getLanguage());
if (children.length > 0){
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/AbstractPublication.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/AbstractPublication.java?view=diff&r1=160147&r2=160148
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/AbstractPublication.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/AbstractPublication.java Tue Apr 5 02:40:13 2005
@@ -319,13 +319,40 @@
*
* @throws SiteTreeException if an error occurs
*/
- public SiteTree getSiteTree(String area) throws SiteTreeException {
+ public SiteTree getTree(String area) throws SiteTreeException {
SiteTree sitetree = null;
if (hasSitetree) {
if (siteTrees.containsKey(area)) {
sitetree = (SiteTree) siteTrees.get(area);
+ } else {
+ sitetree = new DefaultSiteTree(getDirectory(), area);
+ siteTrees.put(area, sitetree);
+ }
+ }
+ return sitetree;
+ }
+
+ /**
+ * Get the sitetree for a specific area of this publication. Sitetrees are created on demand and
+ * are cached.
+ *
+ * @deprecated Please use getTree() because this method returns the interface and not a specific implementation
+ * @see getTree()
+ *
+ * @param area the area
+ * @return the sitetree for the specified area
+ *
+ * @throws SiteTreeException if an error occurs
+ */
+ public DefaultSiteTree getSiteTree(String area) throws SiteTreeException {
+
+ DefaultSiteTree sitetree = null;
+
+ if (hasSitetree) {
+ if (siteTrees.containsKey(area)) {
+ sitetree = (DefaultSiteTree) siteTrees.get(area);
} else {
sitetree = new DefaultSiteTree(getDirectory(), area);
siteTrees.put(area, sitetree);
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/Publication.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/Publication.java?view=diff&r1=160147&r2=160148
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/Publication.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/publication/Publication.java Tue Apr 5 02:40:13 2005
@@ -160,7 +160,21 @@
*
* @throws SiteTreeException if an error occurs
*/
- SiteTree getSiteTree(String area) throws SiteTreeException;
+ SiteTree getTree(String area) throws SiteTreeException;
+
+ /**
+ * Get the sitetree for a specific area of this publication.
+ * Sitetrees are created on demand and are cached.
+ *
+ * @deprecated Please use getTree() because this method returns the interface and not a specific implementation
+ * @see getTree()
+ *
+ * @param area the area
+ * @return the sitetree for the specified area
+ *
+ * @throws SiteTreeException if an error occurs
+ */
+ DefaultSiteTree getSiteTree(String area) throws SiteTreeException;
/**
* Returns the document builder of this instance.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org