msmith 02/02/11 22:34:32
Modified: src/contrib/webdavgui/src/java/org/apache/webdav/ui/filechooser/dir
SPResourceNode.java
src/contrib/webdavgui/src/java/org/apache/webdav/ui/lab
HostFrame.java
src/contrib/webdavgui/src/java/org/apache/webdav/ui/lib/methods
SPPutMethod.java
src/contrib/webdavgui/src/java/org/apache/webdav/ui/lib/properties
SPProperty.java
Log:
Final round of bugfixes (property handling mistakes).
Revision Changes Path
1.6 +4 -7
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SPResourceNode.java 12 Feb 2002 05:41:59 -0000 1.5
+++ SPResourceNode.java 12 Feb 2002 06:34:31 -0000 1.6
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/filechooser/dir/SPResourceNode.java,v
1.5 2002/02/12 05:41:59 msmith Exp $
- * $Revision: 1.5 $
- * $Date: 2002/02/12 05:41:59 $
+ * $Header:
/home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/filechooser/dir/SPResourceNode.java,v
1.6 2002/02/12 06:34:31 msmith Exp $
+ * $Revision: 1.6 $
+ * $Date: 2002/02/12 06:34:31 $
*
* ====================================================================
*
@@ -410,18 +410,15 @@
public void setProperties(Enumeration properties) {
SPPropPatchMethod method = new SPPropPatchMethod(this);
- System.err.println("Processing list of properties to set...");
while(properties.hasMoreElements()) {
SPProperty prop = (SPProperty)properties.nextElement();
- System.err.println("Adding property to set: "+prop.getLocalName()+" as
value \""+encodeXML(prop.getPropertyAsString())+" with
namespace="+prop.getNamespaceURI());
method.addPropertyToSet(prop.getLocalName(),
encodeXML(prop.getPropertyAsString()),
- prop.getNamespaceURI(), prop.getNamespaceURI());
+ prop.getNamespace(), prop.getNamespaceURI());
cachedProperties.put(prop.getName(),
new PropertiesCacheEntry(prop));
}
- System.err.println("Done processing list of properties to set...");
try {
method.execute();
1.3 +4 -4
jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/lab/HostFrame.java
Index: HostFrame.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/lab/HostFrame.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HostFrame.java 17 Jul 2001 04:00:48 -0000 1.2
+++ HostFrame.java 12 Feb 2002 06:34:31 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/lab/HostFrame.java,v
1.2 2001/07/17 04:00:48 msmith Exp $
- * $Revision: 1.2 $
- * $Date: 2001/07/17 04:00:48 $
+ * $Header:
/home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/lab/HostFrame.java,v
1.3 2002/02/12 06:34:31 msmith Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/02/12 06:34:31 $
*
* ====================================================================
*
@@ -227,7 +227,7 @@
this.currFile = aFile;
// ...and mark the edit session as being clean
this.dirty = false;
- String mode = (aFile.isReadOnly()) ? "READ Only" : "READ/WRITE";
+ String mode = (aFile.isLockedByOthers()) ? "READ Only" : "READ/WRITE";
statusTextLabel.setText("Opened "+aFile.getPath()+" Mode: "+mode);
statusCodeLabel.setText(""); //clear it
1.7 +4 -4
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SPPutMethod.java 12 Feb 2002 05:41:59 -0000 1.6
+++ SPPutMethod.java 12 Feb 2002 06:34:31 -0000 1.7
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/lib/methods/SPPutMethod.java,v
1.6 2002/02/12 05:41:59 msmith Exp $
- * $Revision: 1.6 $
- * $Date: 2002/02/12 05:41:59 $
+ * $Header:
/home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/lib/methods/SPPutMethod.java,v
1.7 2002/02/12 06:34:31 msmith Exp $
+ * $Revision: 1.7 $
+ * $Date: 2002/02/12 06:34:31 $
*
* ====================================================================
*
@@ -109,7 +109,7 @@
public SPWebdavMethod execute() throws Exception {
try {
client.executeMethod(this.getWebdavMethodHandle());
- if(resource != null)
+ if(resource != null && resource.getCurrentLockToken() != null)
resource.lock();
else
System.err.println("ERROR: No resource available, cannot set locktoken");
1.4 +14 -5
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SPProperty.java 11 Feb 2002 00:20:28 -0000 1.3
+++ SPProperty.java 12 Feb 2002 06:34:32 -0000 1.4
@@ -1,7 +1,7 @@
/*
- * $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 $
+ * $Header:
/home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/lib/properties/SPProperty.java,v
1.4 2002/02/12 06:34:32 msmith Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/02/12 06:34:32 $
*
* ====================================================================
*
@@ -90,6 +90,7 @@
String value;
String localName;
String namespaceURI;
+ String namespace;
Element element;
@@ -150,15 +151,16 @@
public SPProperty(String namespace, String namespaceInfo,
String name, String value)
{
+ this.namespace = namespace;
this.namespaceURI = namespaceInfo;
- this.name = name;
+ this.localName = this.name = name;
this.value = value;
}
public SPProperty(String name, String value)
{
this.namespaceURI = null;
- this.name = name;
+ this.localName = this.name = name;
this.value = value;
}
@@ -174,6 +176,13 @@
return property.getLocalName();
else
return localName;
+ }
+
+ public String getNamespace() {
+ if(property != null)
+ return property.getNamespaceURI();
+ else
+ return namespace;
}
public String getNamespaceURI() {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
