You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by re...@locus.apache.org on 2000/12/11 03:06:03 UTC
cvs commit: jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods CopyMethod.java DeleteMethod.java GetMethod.java HeadMethod.java LockMethod.java MkcolMethod.java MoveMethod.java OptionsMethod.java PostMethod.java PropFindMethod.java PropPatchMethod.java PutMethod.java UnlockMethod.java WebdavMethod.java WebdavMethodBase.java XMLResponseMethodBase.java
remm 00/12/10 18:06:03
Modified: src/webdav/client/src/org/apache/webdav/lib/methods
CopyMethod.java DeleteMethod.java GetMethod.java
HeadMethod.java LockMethod.java MkcolMethod.java
MoveMethod.java OptionsMethod.java PostMethod.java
PropFindMethod.java PropPatchMethod.java
PutMethod.java UnlockMethod.java WebdavMethod.java
WebdavMethodBase.java XMLResponseMethodBase.java
Log:
- Add convinience constructors, as suggested by Sung-Gu Park.
- Remove an overzealous checkUsed() call.
Revision Changes Path
1.4 +28 -3 jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/CopyMethod.java
Index: CopyMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/CopyMethod.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CopyMethod.java 2000/12/04 06:32:40 1.3
+++ CopyMethod.java 2000/12/11 02:06:00 1.4
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/CopyMethod.java,v 1.3 2000/12/04 06:32:40 bcholmes Exp $
- * $Revision: 1.3 $
- * $Date: 2000/12/04 06:32:40 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/CopyMethod.java,v 1.4 2000/12/11 02:06:00 remm Exp $
+ * $Revision: 1.4 $
+ * $Date: 2000/12/11 02:06:00 $
*
* ====================================================================
*
@@ -83,9 +83,34 @@
* Method constructor.
*/
public CopyMethod() {
+ name = "COPY";
+ }
+
+ /**
+ * Method constructor.
+ */
+ public CopyMethod(String source) {
+ super(source);
name = "COPY";
+ }
+
+
+ /**
+ * Method constructor.
+ */
+ public CopyMethod(String source, String destination) {
+ this(source);
+ setDestination(destination);
+ }
+
+ /**
+ * Method constructor.
+ */
+ public CopyMethod(String source, String destination, boolean overwrite) {
+ this(source, destination);
+ setOverwrite(overwrite);
}
1.3 +12 -3 jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/DeleteMethod.java
Index: DeleteMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/DeleteMethod.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DeleteMethod.java 2000/12/04 06:32:41 1.2
+++ DeleteMethod.java 2000/12/11 02:06:00 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/DeleteMethod.java,v 1.2 2000/12/04 06:32:41 bcholmes Exp $
- * $Revision: 1.2 $
- * $Date: 2000/12/04 06:32:41 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/DeleteMethod.java,v 1.3 2000/12/11 02:06:00 remm Exp $
+ * $Revision: 1.3 $
+ * $Date: 2000/12/11 02:06:00 $
*
* ====================================================================
*
@@ -115,6 +115,15 @@
* Method constructor.
*/
public DeleteMethod() {
+ name = "DELETE";
+ }
+
+
+ /**
+ * Method constructor.
+ */
+ public DeleteMethod(String path) {
+ super(path);
name = "DELETE";
}
1.4 +64 -11 jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/GetMethod.java
Index: GetMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/GetMethod.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- GetMethod.java 2000/11/30 02:23:03 1.3
+++ GetMethod.java 2000/12/11 02:06:00 1.4
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/GetMethod.java,v 1.3 2000/11/30 02:23:03 remm Exp $
- * $Revision: 1.3 $
- * $Date: 2000/11/30 02:23:03 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/GetMethod.java,v 1.4 2000/12/11 02:06:00 remm Exp $
+ * $Revision: 1.4 $
+ * $Date: 2000/12/11 02:06:00 $
*
* ====================================================================
*
@@ -95,33 +95,67 @@
* Method constructor.
*/
public GetMethod() {
-
name = "GET";
-
}
+ /**
+ * Method constructor.
+ */
+ public GetMethod(String path) {
+ super(path);
+ name = "GET";
+ }
+
+
+ /**
+ * Method constructor.
+ */
+ public GetMethod(String path, String tempDir) {
+ this(path);
+ useDisk = true;
+ setTempDir(tempDir);
+ }
+
+
+ /**
+ * Method constructor.
+ */
+ public GetMethod(String path, boolean useDisk, String tempDir) {
+ this(path);
+ setUseDisk(useDisk);
+ if (useDisk)
+ setTempDir(tempDir);
+ }
+
+
// ----------------------------------------------------- Instance Variables
/**
* By default, the get method will buffer read data to the disk.
*/
- private boolean useDisk = true;
+ protected boolean useDisk = true;
/**
* If we're not using the HD, we're using a memory byte buffer.
*/
- private byte[] memoryData;
+ protected byte[] memoryData;
/**
* File which contains the buffered data.
*/
- private File fileData;
+ protected File fileData;
+
+ /**
+ * Temporary directory to use.
+ */
+ protected String tempDir = TEMP_DIR;
+
// ------------------------------------------------------------- Properties
@@ -156,6 +190,25 @@
}
+ /**
+ * Temporary directory setter.
+ *
+ * @param tempDir New value of tempDir
+ */
+ public void setTempDir(String tempDir) {
+ checkNotUsed();
+ this.tempDir = tempDir;
+ }
+
+
+ /**
+ * Temporary directory getter.
+ */
+ public String getTempDir() {
+ return tempDir;
+ }
+
+
// --------------------------------------------------------- Public Methods
@@ -235,10 +288,10 @@
if (useDisk) {
// Create a temporary file on the HD
- File tempDir = new File(TEMP_DIR);
- tempDir.mkdirs();
+ File dir = new File(tempDir);
+ dir.mkdirs();
- String tempFileName = TEMP_DIR + getPath().hashCode() + ".tmp";
+ String tempFileName = tempDir + getPath().hashCode() + ".tmp";
fileData = new File(tempFileName);
out = new FileOutputStream(fileData);
1.3 +12 -5 jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/HeadMethod.java
Index: HeadMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/HeadMethod.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HeadMethod.java 2000/11/27 22:55:58 1.2
+++ HeadMethod.java 2000/12/11 02:06:01 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/HeadMethod.java,v 1.2 2000/11/27 22:55:58 remm Exp $
- * $Revision: 1.2 $
- * $Date: 2000/11/27 22:55:58 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/HeadMethod.java,v 1.3 2000/12/11 02:06:01 remm Exp $
+ * $Revision: 1.3 $
+ * $Date: 2000/12/11 02:06:01 $
*
* ====================================================================
*
@@ -86,9 +86,16 @@
* Method constructor.
*/
public HeadMethod() {
-
name = "HEAD";
-
+ }
+
+
+ /**
+ * Method constructor.
+ */
+ public HeadMethod(String path) {
+ super(path);
+ name = "HEAD";
}
1.8 +21 -3 jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/LockMethod.java
Index: LockMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/LockMethod.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- LockMethod.java 2000/12/07 06:56:59 1.7
+++ LockMethod.java 2000/12/11 02:06:01 1.8
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/LockMethod.java,v 1.7 2000/12/07 06:56:59 bcholmes Exp $
- * $Revision: 1.7 $
- * $Date: 2000/12/07 06:56:59 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/LockMethod.java,v 1.8 2000/12/11 02:06:01 remm Exp $
+ * $Revision: 1.8 $
+ * $Date: 2000/12/11 02:06:01 $
*
* ====================================================================
*
@@ -205,9 +205,27 @@
* Method constructor.
*/
public LockMethod() {
+ name = "LOCK";
+ }
+
+ /**
+ * Method constructor.
+ */
+ public LockMethod(String path) {
+ super(path);
name = "LOCK";
+ }
+
+ /**
+ * Method constructor.
+ */
+ public LockMethod(String path, String owner, short scope, long timeout) {
+ this(path);
+ setOwner(owner);
+ setScope(scope);
+ setTimeout(timeout);
}
1.3 +12 -5 jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/MkcolMethod.java
Index: MkcolMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/MkcolMethod.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MkcolMethod.java 2000/11/30 02:23:04 1.2
+++ MkcolMethod.java 2000/12/11 02:06:01 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/MkcolMethod.java,v 1.2 2000/11/30 02:23:04 remm Exp $
- * $Revision: 1.2 $
- * $Date: 2000/11/30 02:23:04 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/MkcolMethod.java,v 1.3 2000/12/11 02:06:01 remm Exp $
+ * $Revision: 1.3 $
+ * $Date: 2000/12/11 02:06:01 $
*
* ====================================================================
*
@@ -113,9 +113,16 @@
* Method constructor.
*/
public MkcolMethod() {
-
name = "MKCOL";
-
+ }
+
+
+ /**
+ * Method constructor.
+ */
+ public MkcolMethod(String path) {
+ super(path);
+ name = "MKCOL";
}
1.4 +28 -3 jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/MoveMethod.java
Index: MoveMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/MoveMethod.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MoveMethod.java 2000/12/04 06:32:41 1.3
+++ MoveMethod.java 2000/12/11 02:06:01 1.4
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/MoveMethod.java,v 1.3 2000/12/04 06:32:41 bcholmes Exp $
- * $Revision: 1.3 $
- * $Date: 2000/12/04 06:32:41 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/MoveMethod.java,v 1.4 2000/12/11 02:06:01 remm Exp $
+ * $Revision: 1.4 $
+ * $Date: 2000/12/11 02:06:01 $
*
* ====================================================================
*
@@ -86,9 +86,34 @@
* Method constructor.
*/
public MoveMethod() {
+ name = "MOVE";
+ }
+
+ /**
+ * Method constructor.
+ */
+ public MoveMethod(String source) {
+ super(source);
name = "MOVE";
+ }
+
+
+ /**
+ * Method constructor.
+ */
+ public MoveMethod(String source, String destination) {
+ this(source);
+ setDestination(destination);
+ }
+
+ /**
+ * Method constructor.
+ */
+ public MoveMethod(String source, String destination, boolean overwrite) {
+ this(source, destination);
+ setOverwrite(overwrite);
}
1.3 +12 -5 jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/OptionsMethod.java
Index: OptionsMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/OptionsMethod.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- OptionsMethod.java 2000/11/30 02:23:04 1.2
+++ OptionsMethod.java 2000/12/11 02:06:01 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/OptionsMethod.java,v 1.2 2000/11/30 02:23:04 remm Exp $
- * $Revision: 1.2 $
- * $Date: 2000/11/30 02:23:04 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/OptionsMethod.java,v 1.3 2000/12/11 02:06:01 remm Exp $
+ * $Revision: 1.3 $
+ * $Date: 2000/12/11 02:06:01 $
*
* ====================================================================
*
@@ -125,9 +125,16 @@
* Method constructor.
*/
public OptionsMethod() {
-
name = "OPTIONS";
-
+ }
+
+
+ /**
+ * Method constructor.
+ */
+ public OptionsMethod(String path) {
+ super(path);
+ name = "OPTIONS";
}
1.2 +12 -5 jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/PostMethod.java
Index: PostMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/PostMethod.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PostMethod.java 2000/11/22 06:19:09 1.1
+++ PostMethod.java 2000/12/11 02:06:01 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/PostMethod.java,v 1.1 2000/11/22 06:19:09 remm Exp $
- * $Revision: 1.1 $
- * $Date: 2000/11/22 06:19:09 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/PostMethod.java,v 1.2 2000/12/11 02:06:01 remm Exp $
+ * $Revision: 1.2 $
+ * $Date: 2000/12/11 02:06:01 $
*
* ====================================================================
*
@@ -86,9 +86,16 @@
* Method constructor.
*/
public PostMethod() {
-
name = "POST";
-
+ }
+
+
+ /**
+ * Method constructor.
+ */
+ public PostMethod(String path) {
+ super(path);
+ name = "POST";
}
1.10 +40 -3 jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/PropFindMethod.java
Index: PropFindMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/PropFindMethod.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- PropFindMethod.java 2000/12/10 05:07:53 1.9
+++ PropFindMethod.java 2000/12/11 02:06:01 1.10
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/PropFindMethod.java,v 1.9 2000/12/10 05:07:53 bcholmes Exp $
- * $Revision: 1.9 $
- * $Date: 2000/12/10 05:07:53 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/PropFindMethod.java,v 1.10 2000/12/11 02:06:01 remm Exp $
+ * $Revision: 1.10 $
+ * $Date: 2000/12/11 02:06:01 $
*
* ====================================================================
*
@@ -145,9 +145,46 @@
* Method constructor.
*/
public PropFindMethod() {
+ name = "PROPFIND";
+ }
+
+ /**
+ * Method constructor.
+ */
+ public PropFindMethod(String path) {
+ super(path);
name = "PROPFIND";
+ }
+
+
+ /**
+ * Method constructor.
+ */
+ public PropFindMethod(String path, int depth) {
+ this(path);
+ setDepth(depth);
+ }
+
+ /**
+ * Method constructor.
+ */
+ public PropFindMethod(String path, int depth, int type) {
+ this(path);
+ setDepth(depth);
+ setType(type);
+ }
+
+
+ /**
+ * Method constructor.
+ */
+ public PropFindMethod(String path, Enumeration propertyNames) {
+ this(path);
+ setDepth(1);
+ setPropertyNames(propertyNames);
+ setType(BY_NAME);
}
1.6 +11 -4 jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/PropPatchMethod.java
Index: PropPatchMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/PropPatchMethod.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PropPatchMethod.java 2000/12/10 05:07:53 1.5
+++ PropPatchMethod.java 2000/12/11 02:06:01 1.6
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/PropPatchMethod.java,v 1.5 2000/12/10 05:07:53 bcholmes Exp $
- * $Revision: 1.5 $
- * $Date: 2000/12/10 05:07:53 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/PropPatchMethod.java,v 1.6 2000/12/11 02:06:01 remm Exp $
+ * $Revision: 1.6 $
+ * $Date: 2000/12/11 02:06:01 $
*
* ====================================================================
*
@@ -91,9 +91,16 @@
* Method constructor.
*/
public PropPatchMethod() {
-
name = "PROPPATCH";
+ }
+
+ /**
+ * Method constructor.
+ */
+ public PropPatchMethod(String path) {
+ super(path);
+ name = "PROPPATCH";
}
1.4 +12 -5 jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/PutMethod.java
Index: PutMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/PutMethod.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PutMethod.java 2000/12/07 07:11:13 1.3
+++ PutMethod.java 2000/12/11 02:06:01 1.4
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/PutMethod.java,v 1.3 2000/12/07 07:11:13 remm Exp $
- * $Revision: 1.3 $
- * $Date: 2000/12/07 07:11:13 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/PutMethod.java,v 1.4 2000/12/11 02:06:01 remm Exp $
+ * $Revision: 1.4 $
+ * $Date: 2000/12/11 02:06:01 $
*
* ====================================================================
*
@@ -86,9 +86,16 @@
* Method constructor.
*/
public PutMethod() {
-
name = "PUT";
-
+ }
+
+
+ /**
+ * Method constructor.
+ */
+ public PutMethod(String path) {
+ super(path);
+ name = "PUT";
}
1.5 +28 -5 jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/UnlockMethod.java
Index: UnlockMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/UnlockMethod.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- UnlockMethod.java 2000/12/05 23:53:25 1.4
+++ UnlockMethod.java 2000/12/11 02:06:01 1.5
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/UnlockMethod.java,v 1.4 2000/12/05 23:53:25 remm Exp $
- * $Revision: 1.4 $
- * $Date: 2000/12/05 23:53:25 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/UnlockMethod.java,v 1.5 2000/12/11 02:06:01 remm Exp $
+ * $Revision: 1.5 $
+ * $Date: 2000/12/11 02:06:01 $
*
* ====================================================================
*
@@ -80,12 +80,15 @@
public class UnlockMethod
extends WebdavMethodBase {
+
// ----------------------------------------------------- Instance Variables
+
private String lockToken = null;
private State state = null;
+
// ----------------------------------------------------------- Constructors
@@ -93,19 +96,39 @@
* Method constructor.
*/
public UnlockMethod() {
-
+ name = "UNLOCK";
+ }
+
+
+ /**
+ * Method constructor.
+ */
+ public UnlockMethod(String path) {
+ super(path);
name = "UNLOCK";
-
}
+
+ /**
+ * Method constructor.
+ */
+ public UnlockMethod(String path, String lockToken) {
+ this(path);
+ setLockToken(lockToken);
+ }
+
+
// ------------------------------------------------------------- Properties
+
public void setLockToken(String lockToken) {
checkNotUsed();
this.lockToken = lockToken;
}
+
// --------------------------------------------------- WebdavMethod Methods
+
/**
* Generate additional headers needed by the request.
1.4 +11 -3 jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/WebdavMethod.java
Index: WebdavMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/WebdavMethod.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WebdavMethod.java 2000/12/04 06:32:42 1.3
+++ WebdavMethod.java 2000/12/11 02:06:01 1.4
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/WebdavMethod.java,v 1.3 2000/12/04 06:32:42 bcholmes Exp $
- * $Revision: 1.3 $
- * $Date: 2000/12/04 06:32:42 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/WebdavMethod.java,v 1.4 2000/12/11 02:06:01 remm Exp $
+ * $Revision: 1.4 $
+ * $Date: 2000/12/11 02:06:01 $
*
* ====================================================================
*
@@ -149,6 +149,14 @@
* @return String path
*/
public String getPath();
+
+
+ /**
+ * Name property getter.
+ *
+ * @return String name
+ */
+ public String getName();
/**
1.6 +23 -4 jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/WebdavMethodBase.java
Index: WebdavMethodBase.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/WebdavMethodBase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- WebdavMethodBase.java 2000/12/06 04:56:32 1.5
+++ WebdavMethodBase.java 2000/12/11 02:06:01 1.6
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/WebdavMethodBase.java,v 1.5 2000/12/06 04:56:32 remm Exp $
- * $Revision: 1.5 $
- * $Date: 2000/12/06 04:56:32 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/WebdavMethodBase.java,v 1.6 2000/12/11 02:06:01 remm Exp $
+ * $Revision: 1.6 $
+ * $Date: 2000/12/11 02:06:01 $
*
* ====================================================================
*
@@ -140,7 +140,14 @@
* Method constructor.
*/
public WebdavMethodBase() {
+ }
+
+ /**
+ * Method constructor.
+ */
+ public WebdavMethodBase(String path) {
+ this.path = path;
}
@@ -193,6 +200,7 @@
* @return String status text
*/
public String getStatusText() {
+ checkUsed();
return statusText;
}
@@ -203,6 +211,7 @@
* @param path Absolute path
*/
public void setPath(String path) {
+ checkNotUsed();
this.path = path;
}
@@ -218,6 +227,16 @@
/**
+ * Name property getter.
+ *
+ * @return String name
+ */
+ public String getName() {
+ return name;
+ }
+
+
+ /**
* Set header.
*
* @param headerName Header name
@@ -436,7 +455,7 @@
*/
public final String generateRequestLine() {
- return (name + " " + path + " " + PROTOCOL + "\r\n");
+ return (getName() + " " + path + " " + PROTOCOL + "\r\n");
}
1.5 +27 -0 jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/XMLResponseMethodBase.java
Index: XMLResponseMethodBase.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/XMLResponseMethodBase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XMLResponseMethodBase.java 2000/12/10 05:07:53 1.4
+++ XMLResponseMethodBase.java 2000/12/11 02:06:02 1.5
@@ -106,6 +106,25 @@
extends WebdavMethodBase {
+ // ----------------------------------------------------------- Constructors
+
+
+ /**
+ * Method constructor.
+ */
+ public XMLResponseMethodBase() {
+ super();
+ }
+
+
+ /**
+ * Method constructor.
+ */
+ public XMLResponseMethodBase(String path) {
+ super(path);
+ }
+
+
// ----------------------------------------------------- Instance Variables
@@ -129,6 +148,7 @@
// ------------------------------------------------------------- Properties
+
/**
* Response document getter.
*
@@ -138,10 +158,12 @@
return this.responseDocument;
}
+
public Enumeration getResponses() {
return getResponseHashtable().elements();
}
+
// --------------------------------------------------- WebdavMethod Methods
@@ -167,6 +189,7 @@
}
}
+
protected void parseXMLResponse(InputStream input)
throws IOException, WebdavException {
@@ -203,6 +226,7 @@
return responseHashtable;
}
+
private synchronized void initResponseHashtable() {
if (responseHashtable == null) {
@@ -240,6 +264,7 @@
}
}
+
/**
* This method creates a property implementation from an element.
* It treats known properties (i.e., the DAV properties) specially.
@@ -274,6 +299,7 @@
// ---------------------------------------------------------- Inner Classes
+
/**
* An abstract class that models a DAV:response.
*/
@@ -316,6 +342,7 @@
return tmp.getBuffer().toString();
}
}
+
/**
* A class that models the DAV:response element within a multistatus.