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:05:50 UTC

svn commit: r160155 - in lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content: authoring/removelabel.xsp info/overview.xsp info/restore.xsp publishing/screen.xsp

Author: michi
Date: Tue Apr  5 03:05:46 2005
New Revision: 160155

URL: http://svn.apache.org/viewcvs?view=rev&rev=160155
Log:
deprecated getSiteTree replaced by getTree

Modified:
    lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/authoring/removelabel.xsp
    lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/info/overview.xsp
    lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/info/restore.xsp
    lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/publishing/screen.xsp

Modified: lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/authoring/removelabel.xsp
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/authoring/removelabel.xsp?view=diff&r1=160154&r2=160155
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/authoring/removelabel.xsp (original)
+++ lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/authoring/removelabel.xsp Tue Apr  5 03:05:46 2005
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 
-<!-- $Id: removelabel.xsp,v 1.4 2004/03/13 12:31:31 gregor Exp $ -->
+<!-- $Id$ -->
 
 <xsp:page
        language="java"
@@ -37,7 +37,7 @@
       Publication pub = (Publication) <input:get-attribute module="page-envelope" as="object" name="publication"/>;
       String label = "";
       try {
-        label = pub.getSiteTree(Publication.AUTHORING_AREA).getNode(documentId).getLabel(language).getLabel();
+        label = pub.getTree(Publication.AUTHORING_AREA).getNode(documentId).getLabel(language).getLabel();
       } catch (SiteTreeException e) {}
     </xsp:logic>
   

Modified: lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/info/overview.xsp
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/info/overview.xsp?view=diff&r1=160154&r2=160155
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/info/overview.xsp (original)
+++ lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/info/overview.xsp Tue Apr  5 03:05:46 2005
@@ -48,7 +48,7 @@
       String visibility = "visible";
       
       try {
-          SiteTreeNode node = doc.getPublication().getSiteTree(doc.getArea()).getNode(doc.getId());
+          SiteTreeNode node = doc.getPublication().getTree(doc.getArea()).getNode(doc.getId());
           if (!node.visibleInNav()) visibility = "hidden";
       } catch(SiteTreeException e) {
           throw new ProcessingException(e);

Modified: lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/info/restore.xsp
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/info/restore.xsp?view=diff&r1=160154&r2=160155
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/info/restore.xsp (original)
+++ lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/info/restore.xsp Tue Apr  5 03:05:46 2005
@@ -15,7 +15,7 @@
   limitations under the License.
 -->
 
-<!-- $Id: restore.xsp,v 1.5 2004/03/13 12:31:30 gregor Exp $ -->
+<!-- $Id$ -->
 
 <xsp:page 
   language="java" 
@@ -56,7 +56,7 @@
         parentId = "/";
     } 
     try {
-        SiteTree sectree = publication.getSiteTree(Publication.AUTHORING_AREA);
+        SiteTree sectree = publication.getTree(Publication.AUTHORING_AREA);
         parentNode = sectree.getNode(parentId);
     } catch (Exception e) {
         <exception><xsp:expr>e.toString()</xsp:expr></exception>

Modified: lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/publishing/screen.xsp
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/publishing/screen.xsp?view=diff&r1=160154&r2=160155
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/publishing/screen.xsp (original)
+++ lenya/branches/BRANCH_1_2_X/src/webapp/lenya/content/publishing/screen.xsp Tue Apr  5 03:05:46 2005
@@ -71,7 +71,7 @@
               SiteTreeNode authoringNode = (SiteTreeNode) authoringNodeObject;
               String authoringParentId = authoringNode.getAbsoluteParentId();
           
-              SiteTree liveTree = document.getPublication().getSiteTree(Publication.LIVE_AREA);
+              SiteTree liveTree = document.getPublication().getTree(Publication.LIVE_AREA);
               SiteTreeNode liveParent = liveTree.getNode(authoringParentId);
           
               Publication publication = (Publication)



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org