msmith 02/02/10 16:20:28
Modified: src/contrib/webdavgui/src/java/org/apache/webdav/ui/filechooser
SPFileView.java
src/contrib/webdavgui/src/java/org/apache/webdav/ui/filechooser/dir
SPFile.java SPResourceNode.java SPWebFolder.java
src/contrib/webdavgui/src/java/org/apache/webdav/ui/lib/methods
SPLockMethod.java SPPropFindMethod.java
SPPutMethod.java
src/contrib/webdavgui/src/java/org/apache/webdav/ui/lib/properties
SPProperty.java
Log:
Further optimisations, general cleanup, and removal of extra debugging
statements from filechooser.
Revision Changes Path
1.4 +5 -5
jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/filechooser/SPFileView.java
Index: SPFileView.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/filechooser/SPFileView.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SPFileView.java 4 Feb 2002 23:49:13 -0000 1.3
+++ SPFileView.java 11 Feb 2002 00:20:27 -0000 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/filechooser/SPFileView.java,v
1.3 2002/02/04 23:49:13 msmith Exp $
- * $Revision: 1.3 $
- * $Date: 2002/02/04 23:49:13 $
+ * $Header:
/home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/filechooser/SPFileView.java,v
1.4 2002/02/11 00:20:27 msmith Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/02/11 00:20:27 $
*
* ====================================================================
*
@@ -167,7 +167,7 @@
SPFile f = (SPFile) aFile;
- boolean isReadOnly = f.getReadOnlyCached();
+ boolean isReadOnly = f.isLockedByOthers();
boolean noWriteAccess = ! f.hasWriteAccess();
if (noWriteAccess || isReadOnly) {
@@ -188,7 +188,7 @@
SPFile f = (SPFile) aFile;
int type = f.getType();
- boolean isReadOnly = f.getReadOnlyCached();
+ boolean isReadOnly = f.isLockedByOthers();
boolean noWriteAccess = ! f.hasWriteAccess();
if (noWriteAccess || isReadOnly) {
1.6 +4 -8
jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/filechooser/dir/SPFile.java
Index: SPFile.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/filechooser/dir/SPFile.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SPFile.java 8 Feb 2002 04:24:05 -0000 1.5
+++ SPFile.java 11 Feb 2002 00:20:27 -0000 1.6
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/filechooser/dir/SPFile.java,v
1.5 2002/02/08 04:24:05 msmith Exp $
- * $Revision: 1.5 $
- * $Date: 2002/02/08 04:24:05 $
+ * $Header:
/home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/filechooser/dir/SPFile.java,v
1.6 2002/02/11 00:20:27 msmith Exp $
+ * $Revision: 1.6 $
+ * $Date: 2002/02/11 00:20:27 $
*
* ====================================================================
*
@@ -174,10 +174,6 @@
return getResourceNode().isLockedByOthersNotCached();
}
- public boolean getReadOnlyCached() {
- return !getResourceNode().hasWriteAccess();
- }
-
public boolean hasReadAccess() {
return getResourceNode().hasReadAccess();
}
@@ -224,7 +220,7 @@
if (directoryService!=null)
return new SPFile(absPath, directoryService);
else {
- System.err.println("ERRPR: Getting parent _without_ directoryService, can't
do this at the moment!");
+ System.err.println("ERROR: Getting parent _without_ directoryService, can't
do this at the moment!");
return null;
}
}
1.4 +5 -27
jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/filechooser/dir/SPResourceNode.java
Index: SPResourceNode.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/filechooser/dir/SPResourceNode.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SPResourceNode.java 8 Feb 2002 04:24:05 -0000 1.3
+++ SPResourceNode.java 11 Feb 2002 00:20:27 -0000 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/filechooser/dir/SPResourceNode.java,v
1.3 2002/02/08 04:24:05 msmith Exp $
- * $Revision: 1.3 $
- * $Date: 2002/02/08 04:24:05 $
+ * $Header:
/home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/filechooser/dir/SPResourceNode.java,v
1.4 2002/02/11 00:20:27 msmith Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/02/11 00:20:27 $
*
* ====================================================================
*
@@ -114,7 +114,6 @@
SPProperty spProp = SPProperty.factory(prop);
- System.err.println("Caching property "+spProp.getName());
cachedProperties.put(spProp.getName(),
new PropertiesCacheEntry(spProp));
propnames.remove(spProp.getName());
@@ -131,7 +130,6 @@
while(nullProps.hasMoreElements()) {
String propname = (String)nullProps.nextElement();
cachedProperties.put(propname, new PropertiesCacheEntry(null));
- System.err.println("Caching absence of property "+propname);
}
}
@@ -221,7 +219,6 @@
}
public String lock(long timeout) {
- System.err.println("Locking file...");
try {
SPLockMethod method;
@@ -236,11 +233,9 @@
}
if(lockToken != null) /* Refresh the lock */ {
- System.err.println("Refreshing lock using lockToken "+lockToken);
method = new SPLockMethod(this, lockToken, timeout);
}
else /* New lock */ {
- System.err.println("Getting new lock");
method = new SPLockMethod(this, timeout);
}
@@ -249,7 +244,6 @@
if(status == HttpStatus.SC_OK) {
lockToken = method.getLockToken();
- System.err.println("Got locktoken back from server: "+lockToken);
}
else if(status == HttpStatus.SC_LOCKED)
showErrorMessage("Locking Failure",
@@ -272,10 +266,8 @@
}
public boolean unlock() {
- System.err.println("Unlocking file...");
SPUnlockMethod method;
if(lockToken != null) {
- System.err.println("Unlocking using stored lockToken: "+lockToken);
method = new SPUnlockMethod(this, lockToken);
}
else {
@@ -285,6 +277,8 @@
* known.
*/
}
+ lockToken = null;
+ cachedProperties.remove("lockdiscovery");
try {
method.execute();
@@ -330,13 +324,11 @@
/* if uncached is set, this never comes out of the cache */
public SPProperty getProperty(String propertyName, boolean uncached) {
- System.err.println("Asking for property \""+propertyName+"\"");
PropertiesCacheEntry prop = (PropertiesCacheEntry)cachedProperties.get(
propertyName);
if(prop != null) {
if(!uncached) {
- System.err.println("Returning property from cache");
return prop.prop;
}
@@ -345,20 +337,10 @@
*/
long now = System.currentTimeMillis();
if(now - prop.time < 1000*60*5) {
- System.err.println("Request for UNCACHED property ignored: have current
value");
return prop.prop;
}
- else
- System.err.println("Had cached version, but was "+((now -
prop.time)/(1000*60))+" seconds old");
}
- else
- System.err.println("Not found in cache.");
-
- if(uncached)
- System.err.println("Explicit request for non-cached copy");
-
- System.err.println("Requesting property from server: "+propertyName);
SPPropFindMethod method = new SPPropFindMethod(getClient());
@@ -388,7 +370,6 @@
result = spProp;
if(spProp == null) {
- System.err.println("Caching absent property");
cachedProperties.put(propName,
new PropertiesCacheEntry(null));
}
@@ -448,7 +429,6 @@
}
public String getLockToken() {
- System.err.println("getLockToken() called - doing full lockdiscovery!");
String lockToken = null;
LockdiscoveryProperty lockdiscoveryProp =
@@ -459,8 +439,6 @@
lockToken = lockdiscoveryProp.getLockToken(userName);
this.lockToken = lockToken;
}
-
- System.err.println("Got lockToken: "+lockToken);
return lockToken;
}
1.7 +3 -7
jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/filechooser/dir/SPWebFolder.java
Index: SPWebFolder.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/filechooser/dir/SPWebFolder.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SPWebFolder.java 8 Feb 2002 04:24:05 -0000 1.6
+++ SPWebFolder.java 11 Feb 2002 00:20:27 -0000 1.7
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/filechooser/dir/SPWebFolder.java,v
1.6 2002/02/08 04:24:05 msmith Exp $
- * $Revision: 1.6 $
- * $Date: 2002/02/08 04:24:05 $
+ * $Header:
/home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/filechooser/dir/SPWebFolder.java,v
1.7 2002/02/11 00:20:27 msmith Exp $
+ * $Revision: 1.7 $
+ * $Date: 2002/02/11 00:20:27 $
*
* ====================================================================
*
@@ -151,17 +151,14 @@
while (enum.hasMoreElements()){
String url = (String) enum.nextElement();
- System.err.println("Next URL: "+url);
if(!url.endsWith(resourceUrlPath) && !url.endsWith(urlPathSlashIndep)) {
SPResourceNode newChild;
if(propFindMethod.isCollection(url)) {
- System.err.println("Inserting new child folder: "+url);
newChild = new SPWebFolder(client, url);
}
else {
- System.err.println("Inserting new child file: "+url);
newChild = new SPWebFile(client, url);
}
newChild.addCachedProperties(propFindMethod.getResponseProperties(
@@ -169,7 +166,6 @@
children.add(newChild);
}
else {
- System.err.println("Caching properties on directory.");
this.addCachedProperties(propFindMethod.getResponseProperties(
url), propList);
}
1.4 +4 -4
jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/lib/methods/SPLockMethod.java
Index: SPLockMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/lib/methods/SPLockMethod.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SPLockMethod.java 8 Feb 2002 04:24:06 -0000 1.3
+++ SPLockMethod.java 11 Feb 2002 00:20:27 -0000 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/lib/methods/SPLockMethod.java,v
1.3 2002/02/08 04:24:06 msmith Exp $
- * $Revision: 1.3 $
- * $Date: 2002/02/08 04:24:06 $
+ * $Header:
/home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/lib/methods/SPLockMethod.java,v
1.4 2002/02/11 00:20:27 msmith Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/02/11 00:20:27 $
*
* ====================================================================
*
@@ -111,7 +111,7 @@
public SPLockMethod(SPResourceNode resource,
String refreshOpaqueToken, long timeout) {
super(resource.getResourceUrlPath(), refreshOpaqueToken, timeout);
- this.client = client;
+ this.client = resource.getClient();
setOwner(client.getCredentials().getUserName());
}
1.6 +3 -6
jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/lib/methods/SPPropFindMethod.java
Index: SPPropFindMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/lib/methods/SPPropFindMethod.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SPPropFindMethod.java 8 Feb 2002 04:24:06 -0000 1.5
+++ SPPropFindMethod.java 11 Feb 2002 00:20:27 -0000 1.6
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/lib/methods/SPPropFindMethod.java,v
1.5 2002/02/08 04:24:06 msmith Exp $
- * $Revision: 1.5 $
- * $Date: 2002/02/08 04:24:06 $
+ * $Header:
/home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/lib/methods/SPPropFindMethod.java,v
1.6 2002/02/11 00:20:27 msmith Exp $
+ * $Revision: 1.6 $
+ * $Date: 2002/02/11 00:20:27 $
*
* ====================================================================
*
@@ -136,7 +136,6 @@
}
public SPProperty getProperty(String propertyName) {
- System.err.println("SPPropFindMethod.getProperty():
propertyName="+propertyName+", path = "+this.path);
return getProperty(propertyName, this.path);
}
@@ -154,10 +153,8 @@
while ( !isFound && propEnum.hasMoreElements()){
Property prop = (Property) propEnum.nextElement();
- System.err.println("Seeing if property "+prop.getLocalName()+" is
appopriate");
if ( (prop.getLocalName()).lastIndexOf(propertyName) != -1) {
- System.err.println("Found property. Creating property object");
theProperty = SPProperty.factory(prop);
isFound = true;
}
1.5 +3 -5
jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/lib/methods/SPPutMethod.java
Index: SPPutMethod.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/lib/methods/SPPutMethod.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SPPutMethod.java 8 Feb 2002 04:24:06 -0000 1.4
+++ SPPutMethod.java 11 Feb 2002 00:20:27 -0000 1.5
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/lib/methods/SPPutMethod.java,v
1.4 2002/02/08 04:24:06 msmith Exp $
- * $Revision: 1.4 $
- * $Date: 2002/02/08 04:24:06 $
+ * $Header:
/home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/lib/methods/SPPutMethod.java,v
1.5 2002/02/11 00:20:27 msmith Exp $
+ * $Revision: 1.5 $
+ * $Date: 2002/02/11 00:20:27 $
*
* ====================================================================
*
@@ -137,8 +137,6 @@
super.generateHeaders(host, state);
if(lockToken != null)
setHeader("If", "(<" + lockToken + ">)");
- else
- System.err.println("ERROR: lockToken is null!");
setHeader("Content-Type", "text/xml");
}
1.3 +3 -4
jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/lib/properties/SPProperty.java
Index: SPProperty.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/lib/properties/SPProperty.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SPProperty.java 8 Feb 2002 04:24:06 -0000 1.2
+++ SPProperty.java 11 Feb 2002 00:20:28 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/lib/properties/SPProperty.java,v
1.2 2002/02/08 04:24:06 msmith Exp $
- * $Revision: 1.2 $
- * $Date: 2002/02/08 04:24:06 $
+ * $Header:
/home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/lib/properties/SPProperty.java,v
1.3 2002/02/11 00:20:28 msmith Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/02/11 00:20:28 $
*
* ====================================================================
*
@@ -110,7 +110,6 @@
theSPProperty = (SPProperty) constructor.newInstance(
new Object[] {property});
} catch (Exception e) {
- System.err.println("DEBUG: Creating new generic SPProperty object for
property "+property.getLocalName());
theSPProperty = new SPProperty(property);
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
