luetzkendorf    2005/01/21 08:11:48

  Modified:    src/webdav/server/org/apache/slide/webdav/util/resourcekind
                        ResourceKindManager.java
  Log:
  setPropertyName first before call of configure
  
  Revision  Changes    Path
  1.6       +10 -9     
jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/ResourceKindManager.java
  
  Index: ResourceKindManager.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/util/resourcekind/ResourceKindManager.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- ResourceKindManager.java  11 Jan 2005 17:05:23 -0000      1.5
  +++ ResourceKindManager.java  21 Jan 2005 16:11:48 -0000      1.6
  @@ -309,6 +309,10 @@
           try {
               Class cls = Class.forName(computerClass);
               PropertyComputer computer = (PropertyComputer)cls.newInstance();
  +
  +            if (computer instanceof ConfigurablePropertyComputer) {
  +                
((ConfigurablePropertyComputer)computer).setPropertyName(name);
  +            }
               
               if (computer instanceof Configurable) {
                   Configuration configuration = null;
  @@ -321,9 +325,6 @@
                       ((Configurable)computer).configure(configuration);
                   }
               }
  -            if (computer instanceof ConfigurablePropertyComputer) {
  -                
((ConfigurablePropertyComputer)computer).setPropertyName(name);
  -            }
               
               registerComputedProperty(kind, name, computer);
           } catch (ClassNotFoundException ex) {
  @@ -346,6 +347,9 @@
               PropertyValueValidator validator = 
(PropertyValueValidator)cls.newInstance();
               registerPropertyValidator(kind, name, validator);
               
  +            if (validator instanceof ConfigurablePropertyValueValidator) {
  +                
((ConfigurablePropertyValueValidator)validator).setPropertyName(name);
  +            }
               if (validator instanceof Configurable) {
                   Configuration configuration = null;
                   try {
  @@ -356,9 +360,6 @@
                   if (configuration != null) {
                       ((Configurable)validator).configure(configuration);
                   }
  -            }
  -            if (validator instanceof ConfigurablePropertyValueValidator) {
  -                
((ConfigurablePropertyValueValidator)validator).setPropertyName(name);
               }
           } catch (ClassNotFoundException ex) {
               error("Class " + validatorClass + " for validator not found!");
  
  
  

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

Reply via email to