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 12:19:38 UTC
svn commit: r160157 - in
lenya/sandbox/jcrsitetree/src/java/org/apache/lenya/cms/publication:
AbstractPublication.java JCRDocument.java
Author: michi
Date: Tue Apr 5 03:19:36 2005
New Revision: 160157
URL: http://svn.apache.org/viewcvs?view=rev&rev=160157
Log:
deprecated getSiteTree replaced by getTree
Modified:
lenya/sandbox/jcrsitetree/src/java/org/apache/lenya/cms/publication/AbstractPublication.java
lenya/sandbox/jcrsitetree/src/java/org/apache/lenya/cms/publication/JCRDocument.java
Modified: lenya/sandbox/jcrsitetree/src/java/org/apache/lenya/cms/publication/AbstractPublication.java
URL: http://svn.apache.org/viewcvs/lenya/sandbox/jcrsitetree/src/java/org/apache/lenya/cms/publication/AbstractPublication.java?view=diff&r1=160156&r2=160157
==============================================================================
--- lenya/sandbox/jcrsitetree/src/java/org/apache/lenya/cms/publication/AbstractPublication.java (original)
+++ lenya/sandbox/jcrsitetree/src/java/org/apache/lenya/cms/publication/AbstractPublication.java Tue Apr 5 03:19:36 2005
@@ -319,7 +319,7 @@
*
* @throws SiteTreeException if an error occurs
*/
- public SiteTree getSiteTree(String area) throws SiteTreeException {
+ public SiteTree getTree(String area) throws SiteTreeException {
assert config != null;
SiteTree sitetree = null;
@@ -419,8 +419,8 @@
throws PublicationException {
if (hasSitetree) {
try {
- SiteTree sourceTree = getSiteTree(sourceDocument.getArea());
- SiteTree destinationTree = getSiteTree(destinationDocument.getArea());
+ SiteTree sourceTree = getTree(sourceDocument.getArea());
+ SiteTree destinationTree = getTree(destinationDocument.getArea());
SiteTreeNode sourceNode = sourceTree.getNode(sourceDocument.getId());
if (sourceNode == null) {
@@ -520,7 +520,7 @@
if (hasSitetree) {
SiteTree tree;
try {
- tree = getSiteTree(document.getArea());
+ tree = getTree(document.getArea());
} catch (SiteTreeException e) {
throw new PublicationException(e);
}
Modified: lenya/sandbox/jcrsitetree/src/java/org/apache/lenya/cms/publication/JCRDocument.java
URL: http://svn.apache.org/viewcvs/lenya/sandbox/jcrsitetree/src/java/org/apache/lenya/cms/publication/JCRDocument.java?view=diff&r1=160156&r2=160157
==============================================================================
--- lenya/sandbox/jcrsitetree/src/java/org/apache/lenya/cms/publication/JCRDocument.java (original)
+++ lenya/sandbox/jcrsitetree/src/java/org/apache/lenya/cms/publication/JCRDocument.java Tue Apr 5 03:19:36 2005
@@ -183,7 +183,7 @@
ArrayList languages = new ArrayList();
SiteTree sitetree;
try {
- sitetree = getPublication().getSiteTree(getArea());
+ sitetree = getPublication().getTree(getArea());
if (sitetree != null) {
SiteTreeNode node = sitetree.getNode(getId());
if (node != null) {
@@ -217,7 +217,7 @@
public String getLabel() throws DocumentException {
String label = "";
try {
- SiteTree siteTree = getPublication().getSiteTree(getArea());
+ SiteTree siteTree = getPublication().getTree(getArea());
if (siteTree != null) {
label = siteTree.getNode(getId()).getLabel(getLanguage()).getLabel();
}
@@ -313,7 +313,7 @@
public boolean exists() throws DocumentException {
boolean exists;
try {
- SiteTree sitetree = getPublication().getSiteTree(getArea());
+ SiteTree sitetree = getPublication().getTree(getArea());
if (sitetree != null) {
SiteTreeNode node = sitetree.getNode(getId());
exists = (node != null) && (node.getLabel(getLanguage()) != null);
@@ -332,7 +332,7 @@
public boolean existsInAnyLanguage() throws DocumentException {
boolean exists = false;
try {
- SiteTree sitetree = getPublication().getSiteTree(getArea());
+ SiteTree sitetree = getPublication().getTree(getArea());
if (sitetree != null) {
SiteTreeNode node = sitetree.getNode(getId());
exists = node != null;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org