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 ms...@apache.org on 2002/02/05 00:49:14 UTC
cvs commit: jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/util SPUtils.java
msmith 02/02/04 15:49:14
Modified: src/contrib/webdavgui/src/java/org/apache/webdav/ui/filechooser
SPFileChooser.java SPFileView.java
src/contrib/webdavgui/src/java/org/apache/webdav/ui/filechooser/dir
SPFile.java SPWebFolder.java
src/contrib/webdavgui/src/java/org/apache/webdav/ui/lib/methods
SPPropFindMethod.java
src/contrib/webdavgui/src/java/org/apache/webdav/ui/lib/properties
LockdiscoveryProperty.java
src/contrib/webdavgui/src/java/org/apache/webdav/ui/util
SPUtils.java
Log:
Updates to webdav gui code to a) fix some bugs revealed by current server,
and b) work with jdk 1.4
Revision Changes Path
1.3 +18 -3 jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/filechooser/SPFileChooser.java
Index: SPFileChooser.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/filechooser/SPFileChooser.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SPFileChooser.java 17 Jul 2001 04:00:46 -0000 1.2
+++ SPFileChooser.java 4 Feb 2002 23:49:13 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/filechooser/SPFileChooser.java,v 1.2 2001/07/17 04:00:46 msmith Exp $
- * $Revision: 1.2 $
- * $Date: 2001/07/17 04:00:46 $
+ * $Header: /home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/filechooser/SPFileChooser.java,v 1.3 2002/02/04 23:49:13 msmith Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/02/04 23:49:13 $
*
* ====================================================================
*
@@ -102,6 +102,21 @@
SPFileSystemView fileSystemView =
new SPFileSystemView(directoryService);
SPFileChooser fileChooser = new SPFileChooser(fileSystemView);
+ return fileChooser;
+
+ } catch (Exception e) {
+ throw e;
+ }
+ }
+
+ public static SPFileChooser createWebFileChooser(HttpClient client,
+ String rootUrlPath, SPDirectoryService service) throws Exception {
+
+ try {
+ directoryService = service;
+ SPFileSystemView fileSystemView =
+ new SPFileSystemView(directoryService);
+ SPFileChooser fileChooser = new SPFileChooser(fileSystemView);
return fileChooser;
} catch (Exception e) {
1.3 +6 -3 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SPFileView.java 17 Jul 2001 04:00:46 -0000 1.2
+++ SPFileView.java 4 Feb 2002 23:49:13 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/filechooser/SPFileView.java,v 1.2 2001/07/17 04:00:46 msmith Exp $
- * $Revision: 1.2 $
- * $Date: 2001/07/17 04:00:46 $
+ * $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 $
*
* ====================================================================
*
@@ -182,6 +182,9 @@
*/
public Icon getIcon(File aFile) {
ImageIcon icon = this.unknownIcon;
+
+ if (!(aFile instanceof SPFile))
+ return icon;
SPFile f = (SPFile) aFile;
int type = f.getType();
1.4 +33 -13 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SPFile.java 1 Aug 2001 01:25:54 -0000 1.3
+++ SPFile.java 4 Feb 2002 23:49:13 -0000 1.4
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/filechooser/dir/SPFile.java,v 1.3 2001/08/01 01:25:54 msmith Exp $
- * $Revision: 1.3 $
- * $Date: 2001/08/01 01:25:54 $
+ * $Header: /home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/filechooser/dir/SPFile.java,v 1.4 2002/02/04 23:49:13 msmith Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/02/04 23:49:13 $
*
* ====================================================================
*
@@ -84,7 +84,8 @@
public class SPFile extends File {
private SPDirectoryService directoryService;
-
+ private SPResourceNode _resourceNode;
+
public SPFile(String pathname, SPDirectoryService directoryService) {
super(pathname);
this.directoryService = directoryService;
@@ -102,6 +103,12 @@
this.directoryService = directoryService;
}
+ // Constructor that is Directory service independent
+ public SPFile(String pathname, SPResourceNode resource) {
+ super(pathname);
+ _resourceNode = resource;
+ }
+
/*
* Determines if the file should be displayed
* based on the current filter.
@@ -185,27 +192,37 @@
}
public boolean equals(Object obj) {
- if (obj == null) {
- return false;
- }
-
- SPFile objFile = (SPFile) obj;
- return ( (directoryService == objFile.getDirectoryService())
- && (super.equals(obj)) );
+ if (obj == null) {
+ return false;
+ }
+
+ if (!(obj instanceof SPFile))
+ return false;
+
+ SPFile objFile = (SPFile) obj;
+ if (directoryService!=null)
+ return ( (directoryService == objFile.getDirectoryService())
+ && (super.equals(obj)) );
+ else
+ return super.equals(obj);
}
public String getResourceUrlPath() {
return (getResourceNode().getResourceUrlPath());
}
public File getParentFile() {
- if (this.equals(directoryService.getRoot())) {
+ if (directoryService!=null && this.equals(directoryService.getRoot())) {
return this;
}
String absPath = getAbsolutePath();
absPath = absPath.substring(0, absPath.lastIndexOf(File.separator));
- return new SPFile(absPath, directoryService);
+ if (directoryService!=null)
+ return new SPFile(absPath, directoryService);
+ else
+ return new SPFile(absPath,
+ SPUtils.getSPResourceNode(_resourceNode.getClient(), absPath));
}
/*
@@ -226,6 +243,9 @@
* Returns null if the resource node is not found in server
*/
public SPResourceNode getResourceNode() {
+ if (_resourceNode!=null)
+ return _resourceNode;
+
SPResourceNode theNode=null;
try {
1.5 +12 -5 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SPWebFolder.java 16 Oct 2001 23:44:45 -0000 1.4
+++ SPWebFolder.java 4 Feb 2002 23:49:13 -0000 1.5
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/filechooser/dir/SPWebFolder.java,v 1.4 2001/10/16 23:44:45 msmith Exp $
- * $Revision: 1.4 $
- * $Date: 2001/10/16 23:44:45 $
+ * $Header: /home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/filechooser/dir/SPWebFolder.java,v 1.5 2002/02/04 23:49:13 msmith Exp $
+ * $Revision: 1.5 $
+ * $Date: 2002/02/04 23:49:13 $
*
* ====================================================================
*
@@ -153,6 +153,13 @@
children = new ArrayList();
Enumeration enum = propFindMethod.getAllResponseURLs();
+ // Ensure that we're not going to get caught out by an extra /
+ String urlPathSlashIndep;
+ if (resourceUrlPath.endsWith("/"))
+ urlPathSlashIndep = resourceUrlPath.substring(0, resourceUrlPath.length()-1);
+ else
+ urlPathSlashIndep = resourceUrlPath + "/";
+
while (enum.hasMoreElements()){
String url = (String) enum.nextElement();
@@ -183,8 +190,8 @@
// Pending: Waiting for the proper setting of "displayname" property
// in the server
-
- if( ! url.endsWith(resourceUrlPath) ) {
+ if( ! url.endsWith(resourceUrlPath)
+ && ! url.endsWith(urlPathSlashIndep)) {
//if not this SPWebFolder's url
//create a SPWebFolder or SPWebFile child according to its type
1.4 +7 -5 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SPPropFindMethod.java 1 Aug 2001 03:42:59 -0000 1.3
+++ SPPropFindMethod.java 4 Feb 2002 23:49:14 -0000 1.4
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/lib/methods/SPPropFindMethod.java,v 1.3 2001/08/01 03:42:59 msmith Exp $
- * $Revision: 1.3 $
- * $Date: 2001/08/01 03:42:59 $
+ * $Header: /home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/lib/methods/SPPropFindMethod.java,v 1.4 2002/02/04 23:49:14 msmith Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/02/04 23:49:14 $
*
* ====================================================================
*
@@ -144,6 +144,10 @@
if(propertyName.lastIndexOf(':') >= 0)
propertyName = propertyName.substring(propertyName.lastIndexOf(':')+1);
+ // Seems to return null in this case
+ if (urlPath.endsWith("/"))
+ urlPath=urlPath.substring(0,urlPath.length()-1);
+
Enumeration propEnum = getResponseProperties(urlPath);
boolean isFound = false;
@@ -155,7 +159,6 @@
isFound = true;
}
}// while (enum...)
-
return theProperty;
}
@@ -201,7 +204,6 @@
public String toString() {
return (new String("PropFindMethod()"));
}
-
}//End of SPPropFindMethod class
1.2 +5 -6 jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/lib/properties/LockdiscoveryProperty.java
Index: LockdiscoveryProperty.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/lib/properties/LockdiscoveryProperty.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LockdiscoveryProperty.java 17 Jul 2001 04:00:53 -0000 1.1
+++ LockdiscoveryProperty.java 4 Feb 2002 23:49:14 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/lib/properties/LockdiscoveryProperty.java,v 1.1 2001/07/17 04:00:53 msmith Exp $
- * $Revision: 1.1 $
- * $Date: 2001/07/17 04:00:53 $
+ * $Header: /home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/lib/properties/LockdiscoveryProperty.java,v 1.2 2002/02/04 23:49:14 msmith Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/02/04 23:49:14 $
*
* ====================================================================
*
@@ -114,13 +114,12 @@
for (int i = 0; notFound && i < activeLockList.getLength(); i++ ) {
Element activeLockElement = (Element) activeLockList.item(i);
NodeList ownerList = activeLockElement.getElementsByTagName("owner");
-
if (ownerList.getLength() == 1) { //if exists
Element ownerElement = (Element) ownerList.item(0);
String activeLockOwner = DOMUtils.getTextValue(ownerElement);
-
- notFound = (owner.indexOf(activeLockOwner)>=0) ? false : true;
+ //notFound = (owner.indexOf(activeLockOwner)>=0) ? false : true;
+ notFound = (activeLockOwner.indexOf(owner)>=0) ? false : true;
theActiveLock = (notFound) ? null : activeLockElement;
} //if (ownerList.getLength() == 1);
1.9 +5 -7 jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/util/SPUtils.java
Index: SPUtils.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/util/SPUtils.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SPUtils.java 16 Oct 2001 23:44:45 -0000 1.8
+++ SPUtils.java 4 Feb 2002 23:49:14 -0000 1.9
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/util/SPUtils.java,v 1.8 2001/10/16 23:44:45 msmith Exp $
- * $Revision: 1.8 $
- * $Date: 2001/10/16 23:44:45 $
+ * $Header: /home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/util/SPUtils.java,v 1.9 2002/02/04 23:49:14 msmith Exp $
+ * $Revision: 1.9 $
+ * $Date: 2002/02/04 23:49:14 $
*
* ====================================================================
*
@@ -178,18 +178,15 @@
*/
public static boolean isReadOnly(SPResourceNode resource) {
boolean lockedByOthers = false;
-
LockdiscoveryProperty lockdiscoveryProp =
(LockdiscoveryProperty) getProperty(resource, "lockdiscovery");
-
if (lockdiscoveryProp != null) { // is being locked
- String userName = resource.getClient().getCredentials().getUserName();
+ String userName = resource.getClient().getCredentials().getUserName();
if (lockdiscoveryProp.getLockToken(userName) == null) {
// is being locked by other users
lockedByOthers = true;
}
}
-
return lockedByOthers;
} // isReadOnly()
@@ -199,6 +196,7 @@
public static boolean isLocked(SPResourceNode resource) {
SPProperty lockdiscoveryProp = getProperty(resource, "lockdiscovery");
boolean locked = (lockdiscoveryProp == null) ? false : true;
+System.out.println("LOCKED Checking to see if resource is locked: "+locked+" "+lockdiscoveryProp);
return locked;
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>