cvs commit: jakarta-slide/src/webdav/client/src/org/apache/webdav/util WebdavResource.java

[jericho]

jericho     01/04/10 04:24:23

  Modified:    src/webdav/client/src/org/apache/webdav/util
                        WebdavResource.java
  Log:
  - Add the fuction to find property to be possbile to check authomatically,
    whether it's a collection or not.
  
  Bug reported by Miguel Carvalho <[EMAIL PROTECTED]>
  
  Revision  Changes    Path
  1.34      +26 -6     
jakarta-slide/src/webdav/client/src/org/apache/webdav/util/WebdavResource.java
  
  Index: WebdavResource.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/util/WebdavResource.java,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- WebdavResource.java       2001/04/10 10:54:32     1.33
  +++ WebdavResource.java       2001/04/10 11:24:22     1.34
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/util/WebdavResource.java,v
 1.33 2001/04/10 10:54:32 jericho Exp $
  - * $Revision: 1.33 $
  - * $Date: 2001/04/10 10:54:32 $
  + * $Header: 
/home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/util/WebdavResource.java,v
 1.34 2001/04/10 11:24:22 jericho Exp $
  + * $Revision: 1.34 $
  + * $Date: 2001/04/10 11:24:22 $
    *
    * ====================================================================
    *
  @@ -1741,12 +1741,32 @@
               // Do loop as many as requested.
               for (int i = 0; i < properties.size(); i++) {
                   // Do not need to be more strict.
  -                results.addElement(DOMUtils.getTextValue(
  -                    property.getElement()));
  +                results.addElement
  +                    (DOMUtils.getTextValue(property.getElement()));
               }
           }
  +        if (href.length() > 1) {
  +            if (href.endsWith("/")) {
  +                href = href.substring(0, href.length()-1);
  +            } else {
  +                href += "/";
  +            }
  +            enum = method.getResponseProperties(href);
  +            while (enum.hasMoreElements()) {
  +                Property property = (Property) enum.nextElement();
  +                if (property.getStatusCode() > 0) {
  +                    // Set the right status code by multi-status.
  +                    setStatusCode(property.getStatusCode());
  +                }
  +                // Do loop as many as requested.
  +                for (int i = 0; i < properties.size(); i++) {
  +                    // Do not need to be more strict.
  +                    results.addElement
  +                        (DOMUtils.getTextValue(property.getElement()));
  +                }
  +            }
  +        }
   
  -        // FIXME: some work is still needed. if null? server problem?
           return results.elements();
       }