svn commit: r567737 - in /lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree2: DelegatingNode.java TreeSiteManager.java

Author: andreas
Date: Mon Aug 20 09:09:55 2007
New Revision: 567737

URL: http://svn.apache.org/viewvc?rev=567737&view=rev
Log:
Fixed class cast problems with delegating sitetree

Modified:
    lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree2/DelegatingNode.java
    lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree2/TreeSiteManager.java

Modified: lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree2/DelegatingNode.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree2/DelegatingNode.java?rev=567737&r1=567736&r2=567737&view=diff
==============================================================================
--- lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree2/DelegatingNode.java (original)
+++ lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree2/DelegatingNode.java Mon Aug 20 09:09:55 2007
@@ -29,7 +29,7 @@
 /**
  * Site tree node which delegates all operations to a shared tree node.
  */
-public class DelegatingNode implements SiteNode, TreeNode {
+public class DelegatingNode implements TreeNode {
     
     private SiteNode node;
     private DelegatingSiteTree tree;

Modified: lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree2/TreeSiteManager.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree2/TreeSiteManager.java?rev=567737&r1=567736&r2=567737&view=diff
==============================================================================
--- lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree2/TreeSiteManager.java (original)
+++ lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree2/TreeSiteManager.java Mon Aug 20 09:09:55 2007
@@ -229,15 +229,15 @@
     public SiteNode[] getRequiringResources(DocumentFactory map, SiteNode resource)
             throws SiteException {
         NodeSet nodes = new NodeSet(this.manager);
-        SiteTreeImpl tree = ((TreeNodeImpl) resource).getTree();
+        SiteTree tree = (SiteTree) resource.getStructure();
 
-        TreeNodeImpl node = (TreeNodeImpl) tree.getNode(resource.getPath());
+        TreeNode node = (TreeNode) tree.getNode(resource.getPath());
         if (node != null) {
             SiteNode[] preOrder = node.preOrder();
 
             // exclude original resource (does not require itself)
             for (int i = 1; i < preOrder.length; i++) {
-                TreeNodeImpl descendant = (TreeNodeImpl) preOrder[i];
+                TreeNode descendant = (TreeNode) preOrder[i];
                 nodes.add(descendant);
             }
         }