juergen 2002/07/29 04:09:38
Modified: src/webdav/client/src/org/apache/webdav/lib/methods
CheckoutMethod.java VersionControlMethod.java
Log:
if a query string is present, this query string is delievered to the server.
Revision Changes Path
1.6 +6 -6
jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/CheckoutMethod.java
Index: CheckoutMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/CheckoutMethod.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CheckoutMethod.java 25 Apr 2002 21:12:29 -0000 1.5
+++ CheckoutMethod.java 29 Jul 2002 11:09:38 -0000 1.6
@@ -135,9 +135,9 @@
*/
public String generateQuery() {
- return "";
-
-
+ if (query != null) {
+ return query;
+ } else return "";
}
1.5 +14 -25
jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/VersionControlMethod.java
Index: VersionControlMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/VersionControlMethod.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- VersionControlMethod.java 25 Apr 2002 21:15:15 -0000 1.4
+++ VersionControlMethod.java 29 Jul 2002 11:09:38 -0000 1.5
@@ -152,34 +152,23 @@
*/
public String generateQuery() {
- if (sTarget != null){
+ if (query != null) {
+ return query;
+ } else if (sTarget != null){
XMLPrinter printer = new XMLPrinter();
printer.writeXMLHeader();
- printer.writeElement("D", "DAV:", "version-control",
- XMLPrinter.OPENING);
- printer.writeElement("D", "version",
- XMLPrinter.OPENING);
+ printer.writeElement("D", "DAV:", "version-control",
XMLPrinter.OPENING);
+ printer.writeElement("D", "version", XMLPrinter.OPENING);
- printer.writeElement("D", "href",
- XMLPrinter.OPENING);
+ printer.writeElement("D", "href", XMLPrinter.OPENING);
printer.writeText(sTarget);
- printer.writeElement("D", "href",
- XMLPrinter.CLOSING);
- printer.writeElement("D", "version",
- XMLPrinter.CLOSING);
- printer.writeElement("D", "version-control",
- XMLPrinter.CLOSING);
-
-
- String query;
- query = printer.toString();
- System.out.println(query.toString());
-
- return query;
-
+ printer.writeElement("D", "href", XMLPrinter.CLOSING);
+ printer.writeElement("D", "version", XMLPrinter.CLOSING);
+ printer.writeElement("D", "version-control", XMLPrinter.CLOSING);
- }else return "";
+ return printer.toString();
+ } else return "";
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
