You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by gr...@apache.org on 2005/01/10 05:11:21 UTC
svn commit: r124763 - in lenya/trunk/src: java/org/apache/lenya/cms/ant java/org/apache/lenya/cms/site/tree test/org/apache/lenya/cms/task
Author: gregor
Date: Sun Jan 9 20:11:20 2005
New Revision: 124763
URL: http://svn.apache.org/viewcvs?view=rev&rev=124763
Log:
Removed deprecated getAbsoluteParentId() from SiteTreeNode interface
Modified:
lenya/trunk/src/java/org/apache/lenya/cms/ant/TreePublisher.java
lenya/trunk/src/java/org/apache/lenya/cms/site/tree/DefaultSiteTree.java
lenya/trunk/src/java/org/apache/lenya/cms/site/tree/SiteTreeNode.java
lenya/trunk/src/java/org/apache/lenya/cms/site/tree/SiteTreeNodeImpl.java
lenya/trunk/src/java/org/apache/lenya/cms/site/tree/TreeSiteManager.java
lenya/trunk/src/test/org/apache/lenya/cms/task/DocumentCopyTaskTest.java
lenya/trunk/src/test/org/apache/lenya/cms/task/DocumentMoveTaskTest.java
lenya/trunk/src/test/org/apache/lenya/cms/task/DocumentRenameTaskTest.java
Modified: lenya/trunk/src/java/org/apache/lenya/cms/ant/TreePublisher.java
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/ant/TreePublisher.java?view=diff&rev=124763&p1=lenya/trunk/src/java/org/apache/lenya/cms/ant/TreePublisher.java&r1=124762&p2=lenya/trunk/src/java/org/apache/lenya/cms/ant/TreePublisher.java&r2=124763
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/ant/TreePublisher.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/ant/TreePublisher.java Sun Jan 9 20:11:20 2005
@@ -96,7 +96,7 @@
SiteTreeNode authoringNode = authoringTree.getNode(documentId);
SiteTreeNode[] siblings = authoringNode.getNextSiblings();
- String parentId = authoringNode.getAbsoluteParentId();
+ String parentId = authoringNode.getParent().getAbsoluteId();
SiteTreeNode sibling = null;
String siblingDocId = null;
for (int i = 0; i < siblings.length; i++) {
Modified: lenya/trunk/src/java/org/apache/lenya/cms/site/tree/DefaultSiteTree.java
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/site/tree/DefaultSiteTree.java?view=diff&rev=124763&p1=lenya/trunk/src/java/org/apache/lenya/cms/site/tree/DefaultSiteTree.java&r1=124762&p2=lenya/trunk/src/java/org/apache/lenya/cms/site/tree/DefaultSiteTree.java&r2=124763
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/site/tree/DefaultSiteTree.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/site/tree/DefaultSiteTree.java Sun Jan 9 20:11:20 2005
@@ -203,7 +203,7 @@
* java.lang.String)
*/
public void addNode(SiteTreeNode node, String refDocumentId) throws SiteException {
- this.addNode(node.getAbsoluteParentId(), node.getId(), node.getLabels(), node.getHref(),
+ this.addNode(node.getParent().getAbsoluteId(), node.getId(), node.getLabels(), node.getHref(),
node.getSuffix(), node.hasLink(), refDocumentId);
}
Modified: lenya/trunk/src/java/org/apache/lenya/cms/site/tree/SiteTreeNode.java
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/site/tree/SiteTreeNode.java?view=diff&rev=124763&p1=lenya/trunk/src/java/org/apache/lenya/cms/site/tree/SiteTreeNode.java&r1=124762&p2=lenya/trunk/src/java/org/apache/lenya/cms/site/tree/SiteTreeNode.java&r2=124763
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/site/tree/SiteTreeNode.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/site/tree/SiteTreeNode.java Sun Jan 9 20:11:20 2005
@@ -52,13 +52,6 @@
String getAbsoluteId();
/**
- * Get the absolute parent-id of this node.
- *
- * @return the absolute parent-id.
- */
- String getAbsoluteParentId();
-
- /**
* Get the id of this node.
*
* @return the node id.
Modified: lenya/trunk/src/java/org/apache/lenya/cms/site/tree/SiteTreeNodeImpl.java
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/site/tree/SiteTreeNodeImpl.java?view=diff&rev=124763&p1=lenya/trunk/src/java/org/apache/lenya/cms/site/tree/SiteTreeNodeImpl.java&r1=124762&p2=lenya/trunk/src/java/org/apache/lenya/cms/site/tree/SiteTreeNodeImpl.java&r2=124763
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/site/tree/SiteTreeNodeImpl.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/site/tree/SiteTreeNodeImpl.java Sun Jan 9 20:11:20 2005
@@ -69,15 +69,6 @@
}
/**
- * @see org.apache.lenya.cms.site.tree.SiteTreeNode#getAbsoluteParentId()
- * @deprecated use getParent().getAbsoluteId() instead
- */
- public String getAbsoluteParentId() {
- SiteTreeNode parent = this.getParent();
- return (parent == null) ? "" : parent.getAbsoluteId();
- }
-
- /**
* @see org.apache.lenya.cms.site.tree.SiteTreeNode#getAbsoluteId()
*/
public String getAbsoluteId() {
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?view=diff&rev=124763&p1=lenya/trunk/src/java/org/apache/lenya/cms/site/tree/TreeSiteManager.java&r1=124762&p2=lenya/trunk/src/java/org/apache/lenya/cms/site/tree/TreeSiteManager.java&r2=124763
==============================================================================
--- 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 Sun Jan 9 20:11:20 2005
@@ -173,7 +173,7 @@
} else {
SiteTreeNode[] siblings = sourceNode.getNextSiblings();
- String parentId = sourceNode.getAbsoluteParentId();
+ String parentId = sourceNode.getParent().getAbsoluteId();
SiteTreeNode sibling = null;
String siblingDocId = null;
Modified: lenya/trunk/src/test/org/apache/lenya/cms/task/DocumentCopyTaskTest.java
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/test/org/apache/lenya/cms/task/DocumentCopyTaskTest.java?view=diff&rev=124763&p1=lenya/trunk/src/test/org/apache/lenya/cms/task/DocumentCopyTaskTest.java&r1=124762&p2=lenya/trunk/src/test/org/apache/lenya/cms/task/DocumentCopyTaskTest.java&r2=124763
==============================================================================
--- lenya/trunk/src/test/org/apache/lenya/cms/task/DocumentCopyTaskTest.java (original)
+++ lenya/trunk/src/test/org/apache/lenya/cms/task/DocumentCopyTaskTest.java Sun Jan 9 20:11:20 2005
@@ -136,6 +136,6 @@
SiteTreeNode node = sitetree.getNode(secdocumentid);
assertNotNull(node);
System.out.println("Sitetree node with id " + node.getId()
- + " was created as child of node with id: " + node.getAbsoluteParentId());
+ + " was created as child of node with id: " + node.getParent().getAbsoluteId());
}
}
Modified: lenya/trunk/src/test/org/apache/lenya/cms/task/DocumentMoveTaskTest.java
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/test/org/apache/lenya/cms/task/DocumentMoveTaskTest.java?view=diff&rev=124763&p1=lenya/trunk/src/test/org/apache/lenya/cms/task/DocumentMoveTaskTest.java&r1=124762&p2=lenya/trunk/src/test/org/apache/lenya/cms/task/DocumentMoveTaskTest.java&r2=124763
==============================================================================
--- lenya/trunk/src/test/org/apache/lenya/cms/task/DocumentMoveTaskTest.java (original)
+++ lenya/trunk/src/test/org/apache/lenya/cms/task/DocumentMoveTaskTest.java Sun Jan 9 20:11:20 2005
@@ -174,7 +174,7 @@
SiteTreeNode node = sitetree.getNode(secdocumentid);
assertNotNull(node);
System.out.println("Sitetree node with id " + node.getId()
- + " was created as child of node with id: " + node.getAbsoluteParentId());
+ + " was created as child of node with id: " + node.getParent().getAbsoluteId());
SiteTreeNode firstnode = sitetree.getNode(FIRST_DOCUMENT_ID);
assertNull(firstnode);
System.out.println("Sitetree node for document id " + FIRST_DOCUMENT_ID + " was deleted");
Modified: lenya/trunk/src/test/org/apache/lenya/cms/task/DocumentRenameTaskTest.java
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/test/org/apache/lenya/cms/task/DocumentRenameTaskTest.java?view=diff&rev=124763&p1=lenya/trunk/src/test/org/apache/lenya/cms/task/DocumentRenameTaskTest.java&r1=124762&p2=lenya/trunk/src/test/org/apache/lenya/cms/task/DocumentRenameTaskTest.java&r2=124763
==============================================================================
--- lenya/trunk/src/test/org/apache/lenya/cms/task/DocumentRenameTaskTest.java (original)
+++ lenya/trunk/src/test/org/apache/lenya/cms/task/DocumentRenameTaskTest.java Sun Jan 9 20:11:20 2005
@@ -192,7 +192,7 @@
"Sitetree node with id "
+ node.getId()
+ " was created as child of node with id: "
- + node.getAbsoluteParentId());
+ + node.getParent().getAbsoluteId());
SiteTreeNode firstnode = sitetree.getNode(FIRST_DOCUMENT_ID);
assertNull(firstnode);
System.out.println("Sitetree node for document id "+FIRST_DOCUMENT_ID+" was deleted");
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org