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 je...@apache.org on 2001/04/06 13:57:31 UTC
cvs commit: jakarta-slide/src/webdav/client/src/org/apache/webdav/util WebdavResource.java HttpURL.java
jericho 01/04/06 04:57:31
Modified: src/webdav/client/src/org/apache/webdav/util
WebdavResource.java HttpURL.java
Log:
- Remove the useless checking methods to avoid repetition.
- Add the serial version UID for HttpURL class.
Revision Changes Path
1.29 +21 -115 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.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- WebdavResource.java 2001/04/05 05:37:09 1.28
+++ WebdavResource.java 2001/04/06 11:57:31 1.29
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/util/WebdavResource.java,v 1.28 2001/04/05 05:37:09 jericho Exp $
- * $Revision: 1.28 $
- * $Date: 2001/04/05 05:37:09 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/util/WebdavResource.java,v 1.29 2001/04/06 11:57:31 jericho Exp $
+ * $Revision: 1.29 $
+ * $Date: 2001/04/06 11:57:31 $
*
* ====================================================================
*
@@ -247,12 +247,6 @@
/**
- * A string flag used for checking WebDAV properties.
- */
- private String httpURLChecked;
-
-
- /**
* The WebDAV client for the HTTP communication with WebDAV servers.
*/
private WebdavClient client;
@@ -389,50 +383,6 @@
/**
- * Test if the current http URL is checked or not.
- *
- * @return true if it is aleady checked.
- * @see #setUsed()
- * @see #setUnused()
- */
- private boolean getUsed() {
-
- if (httpURL != null && httpURLChecked != null)
- return httpURLChecked.equals(httpURL.toString());
-
- return false;
- }
-
-
- /**
- * Set the http URL checked.
- *
- * @see #getUsed()
- * @see #setUnused()
- * @exception MalformedURLException
- */
- private void setUsed() throws MalformedURLException {
-
- httpURLChecked = httpURL.toString();
- // Save the current session.
- if (client != null)
- WebdavSession.setSession(httpURL, client);
- client = null;
- }
-
-
- /**
- * Set the http URL unchecked.
- *
- * @see #getUsed()
- * @see #setUsed()
- */
- private void setUnused() {
- httpURLChecked = null;
- }
-
-
- /**
* Set WebDAV properties following to the given http URL.
* This method is fundamental for getting information of a collection.
*
@@ -579,9 +529,6 @@
if (!itself)
children.addResource(displayName, workingResource);
}
-
- // The given http URL checked.
- setUsed();
}
@@ -604,13 +551,10 @@
throws WebdavException, IOException {
this.httpURL = httpURL;
- // Let me do just once, do not repeat.
- if (!getUsed()) {
- // make its existence false
- setExistence(false);
- if (action)
- setAllProp(httpURL);
- }
+ // make its existence false
+ setExistence(false);
+ if (action)
+ setAllProp(httpURL);
}
@@ -632,13 +576,10 @@
throws WebdavException, IOException {
this.httpURL = new HttpURL(httpURL, path);
- // Let me do just once, do not repeat.
- if (!getUsed()) {
- // make its existence false
- setExistence(false);
- if (action)
- setAllProp(this.httpURL);
- }
+ // make its existence false
+ setExistence(false);
+ if (action)
+ setAllProp(this.httpURL);
}
@@ -1163,10 +1104,6 @@
latestStatusCode = statusCode;
latestStatusMessage = WebdavStatus.getStatusText(statusCode) +
" (" + statusCode + ")" + ((message == null) ? "" : message);
-
- // Make sure the cases except for getting the success responses.
- if (statusCode < 200 || statusCode >= 300)
- setUnused();
}
@@ -1220,7 +1157,7 @@
public String[] list()
throws WebdavException, IOException {
- // Check if the http URL is used.
+ // Make sure the refresh DAV properties.
setHttpURL(httpURL);
Enumeration hrefs = children.getResourceNames();
@@ -1256,7 +1193,7 @@
public Vector listInDetail()
throws WebdavException, IOException {
- // Check if the http URL is used.
+ // Make sure the refresh DAV properties.
setHttpURL(httpURL);
Enumeration hrefs = children.getResourceNames();
@@ -1491,13 +1428,8 @@
int statusCode = method.getStatusCode();
setStatusCode(statusCode);
-
- if (statusCode >= 200 && statusCode < 300) {
- setUnused();
- return true;
- }
- return false;
+ return (statusCode >= 200 && statusCode < 300) ? true : false;
}
@@ -1537,12 +1469,7 @@
int statusCode = method.getStatusCode();
setStatusCode(statusCode);
- if (statusCode >= 200 && statusCode < 300) {
- setUnused();
- return true;
- }
-
- return false;
+ return (statusCode >= 200 && statusCode < 300) ? true : false;
}
@@ -1904,10 +1831,8 @@
int statusCode = method.getStatusCode();
setStatusCode(statusCode);
- if (statusCode >= 200 && statusCode < 300) {
- setUnused();
+ if (statusCode >= 200 && statusCode < 300)
return true;
- }
}
return false;
@@ -1984,12 +1909,7 @@
int statusCode = method.getStatusCode();
setStatusCode(statusCode);
- if (statusCode >= 200 && statusCode < 300) {
- setUnused();
- return true;
- }
-
- return false;
+ return (statusCode >= 200 && statusCode < 300) ? true : false;
}
@@ -2030,13 +1950,8 @@
// SC_LOCKED, SC_BAD_GATEWAY
int statusCode = method.getStatusCode();
setStatusCode(statusCode);
-
- if (statusCode >= 200 && statusCode < 300) {
- setUnused();
- return true;
- }
- return false;
+ return (statusCode >= 200 && statusCode < 300) ? true : false;
}
@@ -2077,13 +1992,8 @@
// SC_LOCKED, SC_BAD_GATEWAY, SC_INSUFFICIENT_STORAGE
int statusCode = method.getStatusCode();
setStatusCode(statusCode);
-
- if (statusCode >= 200 && statusCode < 300) {
- setUnused();
- return true;
- }
- return false;
+ return (statusCode >= 200 && statusCode < 300) ? true : false;
}
@@ -2124,12 +2034,7 @@
int statusCode = method.getStatusCode();
setStatusCode(statusCode);
- if (statusCode >= 200 && statusCode < 300) {
- setUnused();
- return true;
- }
-
- return false;
+ return (statusCode >= 200 && statusCode < 300) ? true : false;
}
@@ -2377,3 +2282,4 @@
return httpURL.toString();
}
}
+
1.8 +11 -5 jakarta-slide/src/webdav/client/src/org/apache/webdav/util/HttpURL.java
Index: HttpURL.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/util/HttpURL.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- HttpURL.java 2001/03/28 05:56:52 1.7
+++ HttpURL.java 2001/04/06 11:57:31 1.8
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/util/HttpURL.java,v 1.7 2001/03/28 05:56:52 jericho Exp $
- * $Revision: 1.7 $
- * $Date: 2001/03/28 05:56:52 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/util/HttpURL.java,v 1.8 2001/04/06 11:57:31 jericho Exp $
+ * $Revision: 1.8 $
+ * $Date: 2001/04/06 11:57:31 $
*
* ====================================================================
*
@@ -130,8 +130,8 @@
public HttpURL(HttpURL httpURL, String path) {
this(httpURL.toString().endsWith("/") ?
- httpURL.toString() + path : httpURL.toString() + "/" + path);
-
+ httpURL.toString() + path : httpURL.toString() + "/" + path);
+
}
@@ -148,6 +148,12 @@
* Default port for HTTP URL.
*/
public final static int port = 80;
+
+
+ /**
+ * The serialVersionUID.
+ */
+ static final long serialVersionUID = -7158031098595039458L;
// --------------------------------------------------- Protected methods