luetzkendorf    2004/11/29 10:57:23

  Modified:    src/webdav/server/org/apache/slide/webdav/util
                        ComputedPropertyProvider.java
                        PropertyRetrieverImpl.java
                        ResourceWithProvidedProperties.java
  Log:
  adaption to new PropertyName instance pooling
  
  Revision  Changes    Path
  1.11      +6 -6      
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/ComputedPropertyProvider.java
  
  Index: ComputedPropertyProvider.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/ComputedPropertyProvider.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ComputedPropertyProvider.java     19 Oct 2004 13:26:59 -0000      1.10
  +++ ComputedPropertyProvider.java     29 Nov 2004 18:57:23 -0000      1.11
  @@ -207,8 +207,8 @@
           List propertiesNamesList = new 
ArrayList(computedLivePropertyNames.size());
           Iterator iterator = computedLivePropertyNames.iterator();
           while (iterator.hasNext()) {
  -            propertiesNamesList.add(new PropertyName((String)iterator.next(),
  -                                                     
NamespaceCache.DEFAULT_URI));
  +            propertiesNamesList.add(PropertyName.getPropertyName(
  +                    (String)iterator.next(), NamespaceCache.DEFAULT_URI));
           }
           
           return propertiesNamesList.iterator();
  
  
  
  1.42      +1 -1      
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyRetrieverImpl.java
  
  Index: PropertyRetrieverImpl.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/PropertyRetrieverImpl.java,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- PropertyRetrieverImpl.java        24 Nov 2004 16:22:45 -0000      1.41
  +++ PropertyRetrieverImpl.java        29 Nov 2004 18:57:23 -0000      1.42
  @@ -359,7 +359,7 @@
                       erroneousPropertiesList = new ArrayList();
                       erroneousPropertiesMap.put(errorCode, 
erroneousPropertiesList);
                   }
  -                erroneousPropertiesList.add(new 
PropertyName(property.getName(), property.getNamespace()));
  +                
erroneousPropertiesList.add(PropertyName.getPropertyName(property.getName(), 
property.getNamespace()));
               }
               else {
                   propertyElement = getPropertyElement(currentProperty, 
servletContextPath);
  
  
  
  1.7       +9 -10     
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/ResourceWithProvidedProperties.java
  
  Index: ResourceWithProvidedProperties.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/ResourceWithProvidedProperties.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ResourceWithProvidedProperties.java       26 Nov 2004 23:37:44 -0000      
1.6
  +++ ResourceWithProvidedProperties.java       29 Nov 2004 18:57:23 -0000      
1.7
  @@ -141,16 +141,15 @@
           if (props != null) {
               while (props.hasMoreElements()) {
                   property = (NodeProperty)props.nextElement();
  -                propertyNamesList.add(new PropertyName(property.getName(),
  -                                                       
property.getNamespace()));
  +                propertyNamesList.add(property.getPropertyName());
               }
           }
           
           if  (propertyProvider != null) {
  -        Iterator iterator = 
propertyProvider.getSupportedPropertiesNames(getUri());
  -        while (iterator.hasNext()) {
  -            propertyNamesList.add(iterator.next());
  -        }
  +            Iterator iterator = 
propertyProvider.getSupportedPropertiesNames(getUri());
  +            while (iterator.hasNext()) {
  +                propertyNamesList.add(iterator.next());
  +            }
           }
           
           return propertyNamesList.iterator();
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to