commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rdon...@apache.org
Subject cvs commit: jakarta-commons/beanutils/src/test/org/apache/commons/beanutils ExtendMapBean.java PropertyUtilsTestCase.java
Date Tue, 26 Nov 2002 21:28:46 GMT
rdonkin     2002/11/26 13:28:46

  Modified:    beanutils/src/java/org/apache/commons/beanutils
                        PropertyUtils.java
               beanutils/src/test/org/apache/commons/beanutils
                        PropertyUtilsTestCase.java
  Added:       beanutils/src/test/org/apache/commons/beanutils
                        ExtendMapBean.java
  Log:
  Fixed bug #14440. A class implementing map can now have it's properties set (in the normal
way) by PropertyUtils.setProperty.
  
  Revision  Changes    Path
  1.34      +14 -5     jakarta-commons/beanutils/src/java/org/apache/commons/beanutils/PropertyUtils.java
  
  Index: PropertyUtils.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/beanutils/src/java/org/apache/commons/beanutils/PropertyUtils.java,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- PropertyUtils.java	23 Nov 2002 23:47:07 -0000	1.33
  +++ PropertyUtils.java	26 Nov 2002 21:28:46 -0000	1.34
  @@ -1544,7 +1544,16 @@
           indexOfMAPPED_DELIM = name.indexOf(MAPPED_DELIM);
   
           if (bean instanceof Map) {
  -            ((Map) bean).put(name, value);
  +            // check to see if the class has a standard property 
  +            PropertyDescriptor descriptor = 
  +                getPropertyDescriptor(bean, name);
  +            if (descriptor == null) {
  +                // no - then put the value into the map
  +                ((Map) bean).put(name, value);
  +            } else {
  +                // yes - use that instead
  +                setSimpleProperty(bean, name, value);
  +            }
           } else if (indexOfMAPPED_DELIM >= 0) {
               setMappedProperty(bean, name, value);
           } else if (indexOfINDEXED_DELIM >= 0) {
  
  
  
  1.29      +21 -4     jakarta-commons/beanutils/src/test/org/apache/commons/beanutils/PropertyUtilsTestCase.java
  
  Index: PropertyUtilsTestCase.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/beanutils/src/test/org/apache/commons/beanutils/PropertyUtilsTestCase.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- PropertyUtilsTestCase.java	21 Nov 2002 22:21:01 -0000	1.28
  +++ PropertyUtilsTestCase.java	26 Nov 2002 21:28:46 -0000	1.29
  @@ -3646,4 +3646,21 @@
           PropertyUtils.setMappedProperty(bean, "noGetterMappedProperty",  "Epsilon", "Epsilon");
           assertEquals("Cannot set mapped no-getter property", "MAP:Epsilon", bean.getSecret());
       }
  +    
  +    /** 
  +     * This tests to see that classes that implement Map can have 
  +     * their standard properties set.
  +     */
  +    public void testSetMapExtension() throws Exception {
  +        ExtendMapBean bean = new ExtendMapBean();
  +        
  +        bean.setUnusuallyNamedProperty("bean value");
  +        assertEquals("Set property direct failed", "bean value", bean.getUnusuallyNamedProperty());
  +        
  +        PropertyUtils.setSimpleProperty(bean, "unusuallyNamedProperty", "new value");
  +        assertEquals("Set property on map failed (1)", "new value", bean.getUnusuallyNamedProperty());
  +        
  +        PropertyUtils.setProperty(bean, "unusuallyNamedProperty", "next value");
  +        assertEquals("Set property on map failed (2)", "next value", bean.getUnusuallyNamedProperty());
  +    }
   }
  
  
  
  1.1                  jakarta-commons/beanutils/src/test/org/apache/commons/beanutils/ExtendMapBean.java
  
  Index: ExtendMapBean.java
  ===================================================================
  /*
   * $Header: /home/cvs/jakarta-commons/beanutils/src/test/org/apache/commons/beanutils/ExtendMapBean.java,v
1.1 2002/11/26 21:28:46 rdonkin Exp $
   * $Revision: 1.1 $
   * $Date: 2002/11/26 21:28:46 $
   *
   * ====================================================================
   *
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 1999-2002 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution, if
   *    any, must include the following acknowlegement:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowlegement may appear in the software itself,
   *    if and wherever such third-party acknowlegements normally appear.
   *
   * 4. The names "The Jakarta Project", "Commons", and "Apache Software
   *    Foundation" must not be used to endorse or promote products derived
   *    from this software without prior written permission. For written
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache"
   *    nor may "Apache" appear in their names without prior written
   *    permission of the Apache Group.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   *
   */
  
  package org.apache.commons.beanutils;
  
  import java.util.Hashtable;
  
  
  /**
   * Used to test 
   *
   * @author Robert Burrell
   */
  
  public class ExtendMapBean extends Hashtable {
      
      private String dbName = "[UNSET]";
      
      public ExtendMapBean() {}
      
      public String getUnusuallyNamedProperty()
      {
          return dbName;
      }
  
      public void setUnusuallyNamedProperty(String dbName)
      {
          this.dbName = dbName;
      }
  
  }
  
  
  

--
To unsubscribe, e-mail:   <mailto:commons-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:commons-dev-help@jakarta.apache.org>


Mime
View raw message