Mailing-List: contact jackrabbit-commits-help@incubator.apache.org;
 run by ezmlm
Precedence: bulk
Reply-To: jackrabbit-dev@incubator.apache.org
Message-ID: <20060314183626.58598.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r385846 [3/3] - in
 /incubator/jackrabbit/branches/1.0/jcr-server:
 server/src/java/org/apache/jackrabbit/server/jcr/
 server/src/java/org/apache/jackrabbit/webdav/jcr/
 server/src/java/org/apache/jackrabbit/webdav/jcr/observation/ server/src/j...
Date: Tue, 14 Mar 2006 18:35:03 -0000
To: jackrabbit-commits@incubator.apache.org
From: jukka@apache.org

Modified: incubator/jackrabbit/branches/1.0/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/version/report/VersionTreeReport.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/branches/1.0/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/version/report/VersionTreeReport.java?rev=385846&r1=385845&r2=385846&view=diff
==============================================================================
--- incubator/jackrabbit/branches/1.0/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/version/report/VersionTreeReport.java (original)
+++ incubator/jackrabbit/branches/1.0/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/version/report/VersionTreeReport.java Tue Mar 14 10:34:59 2006
@@ -18,7 +18,6 @@
 import org.apache.log4j.Logger;
 import org.apache.jackrabbit.webdav.property.DavPropertyNameSet;
 import org.apache.jackrabbit.webdav.version.DeltaVConstants;
-import org.apache.jackrabbit.webdav.version.DeltaVResource;
 import org.apache.jackrabbit.webdav.version.VersionControlledResource;
 import org.apache.jackrabbit.webdav.version.VersionResource;
 import org.apache.jackrabbit.webdav.DavException;
@@ -40,7 +39,7 @@
     private static Logger log = Logger.getLogger(VersionTreeReport.class);
 
     private ReportInfo info;
-    private DeltaVResource resource;
+    private DavResource resource;
 
     /**
      * Returns {@link ReportType#VERSION_TREE}
@@ -68,9 +67,9 @@
      * @param resource
      * @param info
      * @throws org.apache.jackrabbit.webdav.DavException
-     * @see Report#init(org.apache.jackrabbit.webdav.version.DeltaVResource, ReportInfo)
+     * @see Report#init(DavResource, ReportInfo)
      */
-    public void init(DeltaVResource resource, ReportInfo info) throws DavException {
+    public void init(DavResource resource, ReportInfo info) throws DavException {
         setResource(resource);
         setInfo(info);
     }
@@ -80,9 +79,9 @@
      *
      * @param resource
      * @throws DavException if the given resource is neither
-     * {@link org.apache.jackrabbit.webdav.version.VersionControlledResource} nor {@link org.apache.jackrabbit.webdav.version.VersionResource}.
+     * {@link VersionControlledResource} nor {@link VersionResource}.
      */
-    private void setResource(DeltaVResource resource) throws DavException {
+    private void setResource(DavResource resource) throws DavException {
         if (resource != null && (resource instanceof VersionControlledResource || resource instanceof VersionResource)) {
             this.resource = resource;
         } else {
@@ -144,13 +143,13 @@
     private void buildResponse(DavResource res, DavPropertyNameSet propNameSet,
                                int depth, MultiStatus ms) {
         try {
-        VersionResource[] versions = getVersions(res);
-        for (int i = 0; i < versions.length; i++) {
-            if (propNameSet.isEmpty()) {
-                ms.addResourceStatus(versions[i], DavServletResponse.SC_OK, 0);
-            } else {
-                ms.addResourceProperties(versions[i], propNameSet, 0);
-            }
+            VersionResource[] versions = getVersions(res);
+            for (int i = 0; i < versions.length; i++) {
+                if (propNameSet.isEmpty()) {
+                    ms.addResourceStatus(versions[i], DavServletResponse.SC_OK, 0);
+                } else {
+                    ms.addResourceProperties(versions[i], propNameSet, 0);
+                }
             }
         } catch (DavException e) {
             log.error(e);