ozeigermann 2004/04/13 02:00:53
Modified: webdavclient/clientlib/src/java/org/apache/webdav/lib
WebdavResource.java
webdavclient/commandline/src/java/org/apache/webdav/cmd
Client.java
Log:
Applied patch by Thomas Bernert to address issue #28275
Revision Changes Path
1.12 +11 -4
jakarta-slide/webdavclient/clientlib/src/java/org/apache/webdav/lib/WebdavResource.java
Index: WebdavResource.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/webdavclient/clientlib/src/java/org/apache/webdav/lib/WebdavResource.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- WebdavResource.java 22 Mar 2004 08:26:25 -0000 1.11
+++ WebdavResource.java 13 Apr 2004 09:00:53 -0000 1.12
@@ -1979,6 +1979,7 @@
* array 1: getcontentlength
* array 2: iscollection or getcontentype
* array 3: getlastmodifieddate
+ * array 4: name
*
* @return An array of pathnames and more denoting the resources.
* @exception HttpException
@@ -1997,9 +1998,10 @@
WebdavResource currentResource =
childResources.getResource(resourceName);
- String[] longFormat = new String[4];
+ String[] longFormat = new String[5];
// displayname.
longFormat[0] = currentResource.getDisplayName();
+
long length = currentResource.getGetContentLength();
// getcontentlength
@@ -2019,6 +2021,11 @@
// Print the local fancy date format.
DateFormat.getDateTimeInstance().format(date);
hrefList.addElement(longFormat);
+
+ // real name of componente
+ longFormat[4] = currentResource.getName();
+
+
} catch (Exception e) {
// FIXME: After if's gotten an exception, any solution?
if (debug > 0)
1.8 +43 -34
jakarta-slide/webdavclient/commandline/src/java/org/apache/webdav/cmd/Client.java
Index: Client.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/webdavclient/commandline/src/java/org/apache/webdav/cmd/Client.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Client.java 6 Apr 2004 10:16:02 -0000 1.7
+++ Client.java 13 Apr 2004 09:00:53 -0000 1.8
@@ -611,45 +611,54 @@
webdavResource.setPath(path);
}
switch (option) {
+
case 'l':
+
Vector basiclist = webdavResource.listBasic();
for (int i = 0; i < basiclist.size(); i++) {
String[] longFormat =
(String []) basiclist.elementAt(i);
- for (int j = 0;
- j < longFormat.length; j++) {
- String s = longFormat[j];
+
+ // name -> position 4
+ String s = longFormat[4];
int len = s.length();
- switch (j) {
- case 0:
- out.print(s);
- for (int k = len; k < 20; k++)
- out.print(" ");
- break;
- case 1:
- for (int k = 10 - len;
- k > 0 ; k--)
- out.print(" ");
- // don't cut the size.
- out.print(s + " ");
- break;
- case 2:
- // cut the description.
- out.print(" " +
- ((len > 20) ?
- s.substring(0, 20) : s));
- for (int k = len; k < 20; k++)
- out.print(" ");
- break;
- case 3:
- default:
- out.print(" " + s);
- }
+ out.print(s);
+ for (int k = len; k < 20; k++)
+ out.print(" ");
+
+
+ // size -> position 1
+ s = longFormat[1];
+ len = s.length();
+ for (int k = 10 - len;
+ k > 0 ; k--)
+ out.print(" ");
+ // don't cut the size.
+ out.print(s + " ");
+
+
+ // description -> position 2
+ // cut the description.
+ s = longFormat[2];
+ len = s.length();
+
+ out.print(" " +
+ ((len > 20) ?
+ s.substring(0, 20) : s));
+ for (int k = len; k < 20; k++)
+ out.print(" ");
+
+ // date -> position 3
+ s = longFormat[3];
+ len = s.length();
+ out.println(" " + s);
}
- // Start with a new line.
- out.println();
- }
+
+
+
break;
+
+
case 'F':
String[] list = webdavResource.list();
int i = 0;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
