juergen 01/01/29 07:26:42
Modified: src/webdav/client/src/org/apache/webdav/lib/methods
LockMethod.java PropFindMethod.java
PropPatchMethod.java WebdavMethod.java
WebdavMethodBase.java
Log:
added a new method named setQuery. If the query XML document is already present,
the user can set this XML document directly without having to use the high level
functionality.
Revision Changes Path
1.10 +9 -6
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- LockMethod.java 2000/12/11 03:56:40 1.9
+++ LockMethod.java 2001/01/29 15:26:36 1.10
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/LockMethod.java,v
1.9 2000/12/11 03:56:40 remm Exp $
- * $Revision: 1.9 $
- * $Date: 2000/12/11 03:56:40 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/LockMethod.java,v
1.10 2001/01/29 15:26:36 juergen Exp $
+ * $Revision: 1.10 $
+ * $Date: 2001/01/29 15:26:36 $
*
* ====================================================================
*
@@ -374,8 +374,11 @@
*/
public String generateQuery() {
- String query = null;
+
+ if (query != null) return query;
+ String result = null;
+
if (!isRefresh()) {
if (this.owner == null || this.owner.equals("")) {
throw new IllegalStateException
@@ -420,13 +423,13 @@
DOMWriter domWriter = new DOMWriter(stringWriter, true);
domWriter.print(document);
- query = stringWriter.getBuffer().toString();
+ result = stringWriter.getBuffer().toString();
} catch (DOMException e) {
} catch (ParserConfigurationException e) {
}
}
- return query;
+ return result;
}
1.13 +7 -5
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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- PropFindMethod.java 2001/01/11 00:04:56 1.12
+++ PropFindMethod.java 2001/01/29 15:26:38 1.13
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/PropFindMethod.java,v
1.12 2001/01/11 00:04:56 remm Exp $
- * $Revision: 1.12 $
- * $Date: 2001/01/11 00:04:56 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/PropFindMethod.java,v
1.13 2001/01/29 15:26:38 juergen Exp $
+ * $Revision: 1.13 $
+ * $Date: 2001/01/29 15:26:38 $
*
* ====================================================================
*
@@ -312,10 +312,12 @@
* @return String query
*/
public String generateQuery() {
+
+ if (query != null) return query;
WebdavXMLPrinter printer = new WebdavXMLPrinter();
printer.writeXMLHeader();
- printer.writeElement("D", "DAV:", "propfind",
+ printer.writeElement("D", "DAV:", "propfind",
WebdavXMLPrinter.OPENING);
switch (type) {
@@ -337,7 +339,7 @@
break;
}
- printer.writeElement("D", "DAV:", "propfind",
+ printer.writeElement("D", "DAV:", "propfind",
WebdavXMLPrinter.CLOSING);
if (debug > 1) {
System.out.println("Request body:");
1.10 +5 -3
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- PropPatchMethod.java 2000/12/23 21:45:34 1.9
+++ PropPatchMethod.java 2001/01/29 15:26:38 1.10
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/PropPatchMethod.java,v
1.9 2000/12/23 21:45:34 remm Exp $
- * $Revision: 1.9 $
- * $Date: 2000/12/23 21:45:34 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/PropPatchMethod.java,v
1.10 2001/01/29 15:26:38 juergen Exp $
+ * $Revision: 1.10 $
+ * $Date: 2001/01/29 15:26:38 $
*
* ====================================================================
*
@@ -226,6 +226,8 @@
* @return String query
*/
public String generateQuery() {
+
+ if (query != null) return query;
WebdavXMLPrinter printer = new WebdavXMLPrinter();
printer.writeXMLHeader();
1.5 +13 -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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WebdavMethod.java 2000/12/11 02:06:01 1.4
+++ WebdavMethod.java 2001/01/29 15:26:39 1.5
@@ -1,7 +1,7 @@
/*
- * $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 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/WebdavMethod.java,v
1.5 2001/01/29 15:26:39 juergen Exp $
+ * $Revision: 1.5 $
+ * $Date: 2001/01/29 15:26:39 $
*
* ====================================================================
*
@@ -252,6 +252,16 @@
* @return String query
*/
public String generateQuery();
+
+
+ /**
+ * Set the query String as a XML document.
+ * If the query string is already given as an XML document
+ * this low level function will set the query string directly.
+ * This method make only sense in the context of lock, propFind,
+ * and propPatch. In all other cases this method call is ignored.
+ */
+ public void setQuery(String query);
/**
1.9 +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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- WebdavMethodBase.java 2001/01/15 18:19:42 1.8
+++ WebdavMethodBase.java 2001/01/29 15:26:39 1.9
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/WebdavMethodBase.java,v
1.8 2001/01/15 18:19:42 remm Exp $
- * $Revision: 1.8 $
- * $Date: 2001/01/15 18:19:42 $
+ * $Header:
/home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/WebdavMethodBase.java,v
1.9 2001/01/29 15:26:39 juergen Exp $
+ * $Revision: 1.9 $
+ * $Date: 2001/01/29 15:26:39 $
*
* ====================================================================
*
@@ -400,6 +400,25 @@
return false;
}
+ /**
+ * Holds the query body if set by setQuery.
+ */
+
+ String query = null;
+
+ /**
+ * Set the query String as a XML document.
+ * If the query string is already given as an XML document
+ * this low level function will set the query string directly.
+ * This method make only sense in the context of lock, propFind,
+ * and propPatch. In all other cases this method call is ignored.
+ */
+ public void setQuery(String query) {
+ this.query = query;
+ }
+
+
+
/**
* Generate the query body.
@@ -407,7 +426,7 @@
* @return String query
*/
public String generateQuery() {
- return "";
+ return query!=null?query:"";
}
