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 2001/08/01 03:25:54 UTC

cvs commit: jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/util SPUtils.java

msmith      01/07/31 18:25:54

  Modified:    src/contrib/webdavgui/src/java/org/apache/webdav/ui/filechooser/dir
                        SPFile.java SPWebFile.java
               src/contrib/webdavgui/src/java/org/apache/webdav/ui/util
                        SPUtils.java
  Log:
  Updates for namespace-awareness in the UI code, doing proppatches. Requires
  current slide webdav client libraries (as of 5 minutes ago) to work right.
  
  Revision  Changes    Path
  1.3       +4 -4      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SPFile.java	2001/07/17 04:00:47	1.2
  +++ SPFile.java	2001/08/01 01:25:54	1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/filechooser/dir/SPFile.java,v 1.2 2001/07/17 04:00:47 msmith Exp $
  - * $Revision: 1.2 $
  - * $Date: 2001/07/17 04:00:47 $
  + * $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 $
    *
    * ====================================================================
    *
  @@ -375,7 +375,7 @@
   
     }
   
  -  public void setProperties(Map properties) {
  +  public void setProperties(Enumeration properties) {
       if (isFile())  {
   	((SPWebFile)getResourceNode()).setProperties(properties);
       }
  
  
  
  1.3       +4 -4      jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/filechooser/dir/SPWebFile.java
  
  Index: SPWebFile.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/filechooser/dir/SPWebFile.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SPWebFile.java	2001/07/17 04:00:47	1.2
  +++ SPWebFile.java	2001/08/01 01:25:54	1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/filechooser/dir/SPWebFile.java,v 1.2 2001/07/17 04:00:47 msmith Exp $
  - * $Revision: 1.2 $
  - * $Date: 2001/07/17 04:00:47 $
  + * $Header: /home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/filechooser/dir/SPWebFile.java,v 1.3 2001/08/01 01:25:54 msmith Exp $
  + * $Revision: 1.3 $
  + * $Date: 2001/08/01 01:25:54 $
    *
    * ====================================================================
    *
  @@ -264,7 +264,7 @@
       return statusCode;
     }//putFileContent(File)
   
  -  public void setProperties(Map properties) {
  +  public void setProperties(Enumeration properties) {
   	SPUtils.setProperty(this, properties);
     }
   
  
  
  
  1.4       +12 -9     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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SPUtils.java	2001/07/17 04:00:53	1.3
  +++ SPUtils.java	2001/08/01 01:25:54	1.4
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/util/SPUtils.java,v 1.3 2001/07/17 04:00:53 msmith Exp $
  - * $Revision: 1.3 $
  - * $Date: 2001/07/17 04:00:53 $
  + * $Header: /home/cvs/jakarta-slide/src/contrib/webdavgui/src/java/org/apache/webdav/ui/util/SPUtils.java,v 1.4 2001/08/01 01:25:54 msmith Exp $
  + * $Revision: 1.4 $
  + * $Date: 2001/08/01 01:25:54 $
    *
    * ====================================================================
    *
  @@ -71,6 +71,7 @@
   import org.apache.webdav.ui.lib.properties.*;
   import org.apache.webdav.lib.properties.ResourceTypeProperty;
   import org.apache.webdav.lib.methods.DepthSupport;
  +import org.apache.webdav.lib.Property;
   
   import org.apache.commons.httpclient.*;
   
  @@ -373,14 +374,16 @@
     /*
      * Property mutator
      */
  -  public static void setProperty(SPResourceNode resource, Map properties) {
  +  public static void setProperty(SPResourceNode resource, 
  +			Enumeration properties) {
         SPPropPatchMethod pp = new SPPropPatchMethod(resource);
  -      Iterator i = properties.entrySet().iterator();
  -      while(i.hasNext())
  +      while(properties.hasMoreElements())
         {
  -	  Map.Entry entry = (Map.Entry)i.next();
  -	  pp.addPropertyToSet((String)entry.getKey(),
  -	        encodeXML((String)entry.getValue()), null, null);
  +		  WebdavProperty prop = (WebdavProperty)properties.nextElement();
  +			System.err.println("Adding property: name="+prop.getName()+", namespace="+prop.getNamespace()+", namespaceInfo="+prop.getNamespaceInfo()+", value="+prop.getValue());
  +	  	  pp.addPropertyToSet(prop.getName(),
  +	          encodeXML(prop.getValue()), prop.getNamespace(), 
  +			  prop.getNamespaceInfo());
         }
   
         try {