cvs commit: jakarta-commons/beanutils/optional/bean-collections/src/java/org/apache/commons/beanutils BeanMap.java

2004-06-22 Thread rdonkin
rdonkin 2004/06/22 14:07:02

  Modified:
beanutils/optional/bean-collections/src/java/org/apache/commons/beanutils
Tag: RELEASE_BEANUTILS_1_7_0_BRANCH BeanMap.java
  Log:
  Added toString javadocs
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.2.2.2   +4 -0  
jakarta-commons/beanutils/optional/bean-collections/src/java/org/apache/commons/beanutils/BeanMap.java
  
  Index: BeanMap.java
  ===
  RCS file: 
/home/cvs/jakarta-commons/beanutils/optional/bean-collections/src/java/org/apache/commons/beanutils/BeanMap.java,v
  retrieving revision 1.2.2.1
  retrieving revision 1.2.2.2
  diff -u -r1.2.2.1 -r1.2.2.2
  --- BeanMap.java  22 Jun 2004 20:56:34 -  1.2.2.1
  +++ BeanMap.java  22 Jun 2004 21:07:02 -  1.2.2.2
  @@ -158,6 +158,10 @@
   // Map interface
   //-
   
  +/**
  + * Renders a string representation of this object.
  + * @return a String representation of this object
  + */
   public String toString() {
   return "BeanMap<" + String.valueOf(bean) + ">";
   }
  
  
  

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



cvs commit: jakarta-commons/beanutils/optional/bean-collections/src/java/org/apache/commons/beanutils BeanMap.java

2004-06-22 Thread rdonkin
rdonkin 2004/06/22 13:56:34

  Modified:
beanutils/optional/bean-collections/src/java/org/apache/commons/beanutils
Tag: RELEASE_BEANUTILS_1_7_0_BRANCH BeanMap.java
  Log:
  Removed @since tag
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.2.2.1   +1 -2  
jakarta-commons/beanutils/optional/bean-collections/src/java/org/apache/commons/beanutils/BeanMap.java
  
  Index: BeanMap.java
  ===
  RCS file: 
/home/cvs/jakarta-commons/beanutils/optional/bean-collections/src/java/org/apache/commons/beanutils/BeanMap.java,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- BeanMap.java  24 May 2004 19:56:51 -  1.2
  +++ BeanMap.java  22 Jun 2004 20:56:34 -  1.2.2.1
  @@ -42,7 +42,6 @@
* If an exception occurs during attempts to get or set a property then the
* property is considered non existent in the Map
*
  - * @since Commons Collections 1.0
* @version $Revision$ $Date$
* 
* @author James Strachan
  
  
  

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



cvs commit: jakarta-commons/beanutils/optional/bean-collections/src/java/org/apache/commons/beanutils BeanMap.java

2004-05-24 Thread rdonkin
rdonkin 2004/05/24 12:56:51

  Modified:
beanutils/optional/bean-collections/src/java/org/apache/commons/beanutils
BeanMap.java
  Log:
  Renamed inner class (to something more sensible)
  
  Revision  ChangesPath
  1.2   +5 -5  
jakarta-commons/beanutils/optional/bean-collections/src/java/org/apache/commons/beanutils/BeanMap.java
  
  Index: BeanMap.java
  ===
  RCS file: 
/home/cvs/jakarta-commons/beanutils/optional/bean-collections/src/java/org/apache/commons/beanutils/BeanMap.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- BeanMap.java  11 May 2004 22:46:13 -  1.1
  +++ BeanMap.java  24 May 2004 19:56:51 -  1.2
  @@ -500,7 +500,7 @@
   public Object next() {
   Object key = iter.next();
   Object value = get(key);
  -return new MyMapEntry( BeanMap.this, key, value );
  +return new Entry( BeanMap.this, key, value );
   }
   public void remove() {
   throw new UnsupportedOperationException( "remove() not supported 
for BeanMap" );
  @@ -643,17 +643,17 @@
   /**
* Map entry used by [EMAIL PROTECTED] BeanMap}.
*/
  -protected static class MyMapEntry extends AbstractMapEntry {
  +protected static class Entry extends AbstractMapEntry {
   private BeanMap owner;
   
   /**
  - * Constructs a new MyMapEntry.
  + * Constructs a new Entry.
*
* @param owner  the BeanMap this entry belongs to
* @param key  the key for this entry
* @param value  the value for this entry
*/
  -protected MyMapEntry( BeanMap owner, Object key, Object value ) {
  +protected Entry( BeanMap owner, Object key, Object value ) {
   super( key, value );
   this.owner = owner;
   }
  
  
  

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



cvs commit: jakarta-commons/beanutils/optional/bean-collections/src/java/org/apache/commons/beanutils BeanMap.java

2004-05-11 Thread rdonkin
rdonkin 2004/05/11 15:46:13

  Added:   
beanutils/optional/bean-collections/src/java/org/apache/commons/beanutils
BeanMap.java
  Log:
  Added BeanMap from collections. (Thanks Stephen)
  
  Revision  ChangesPath
  1.1  
jakarta-commons/beanutils/optional/bean-collections/src/java/org/apache/commons/beanutils/BeanMap.java
  
  Index: BeanMap.java
  ===
  /*
   *  Copyright 2001-2004 The Apache Software Foundation
   *
   *  Licensed under the Apache License, Version 2.0 (the "License");
   *  you may not use this file except in compliance with the License.
   *  You may obtain a copy of the License at
   *
   *  http://www.apache.org/licenses/LICENSE-2.0
   *
   *  Unless required by applicable law or agreed to in writing, software
   *  distributed under the License is distributed on an "AS IS" BASIS,
   *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   *  See the License for the specific language governing permissions and
   *  limitations under the License.
   */
  package org.apache.commons.beanutils;
  
  import java.beans.BeanInfo;
  import java.beans.IntrospectionException;
  import java.beans.Introspector;
  import java.beans.PropertyDescriptor;
  import java.lang.reflect.Constructor;
  import java.lang.reflect.InvocationTargetException;
  import java.lang.reflect.Method;
  import java.util.AbstractMap;
  import java.util.AbstractSet;
  import java.util.ArrayList;
  import java.util.Collection;
  import java.util.HashMap;
  import java.util.Iterator;
  import java.util.Set;
  
  import org.apache.commons.collections.list.UnmodifiableList;
  import org.apache.commons.collections.keyvalue.AbstractMapEntry;
  import org.apache.commons.collections.set.UnmodifiableSet;
  import org.apache.commons.collections.Transformer;
  
  /** 
   * An implementation of Map for JavaBeans which uses introspection to
   * get and put properties in the bean.
   * 
   * If an exception occurs during attempts to get or set a property then the
   * property is considered non existent in the Map
   *
   * @since Commons Collections 1.0
   * @version $Revision: 1.1 $ $Date: 2004/05/11 22:46:13 $
   * 
   * @author James Strachan
   * @author Stephen Colebourne
   */
  public class BeanMap extends AbstractMap implements Cloneable {
  
  private transient Object bean;
  
  private transient HashMap readMethods = new HashMap();
  private transient HashMap writeMethods = new HashMap();
  private transient HashMap types = new HashMap();
  
  /**
   * An empty array.  Used to invoke accessors via reflection.
   */
  public static final Object[] NULL_ARGUMENTS = {};
  
  /**
   * Maps primitive Class types to transformers.  The transformer
   * transform strings into the appropriate primitive wrapper.
   */
  public static HashMap defaultTransformers = new HashMap();
  
  static {
  defaultTransformers.put( 
  Boolean.TYPE, 
  new Transformer() {
  public Object transform( Object input ) {
  return Boolean.valueOf( input.toString() );
  }
  }
  );
  defaultTransformers.put( 
  Character.TYPE, 
  new Transformer() {
  public Object transform( Object input ) {
  return new Character( input.toString().charAt( 0 ) );
  }
  }
  );
  defaultTransformers.put( 
  Byte.TYPE, 
  new Transformer() {
  public Object transform( Object input ) {
  return Byte.valueOf( input.toString() );
  }
  }
  );
  defaultTransformers.put( 
  Short.TYPE, 
  new Transformer() {
  public Object transform( Object input ) {
  return Short.valueOf( input.toString() );
  }
  }
  );
  defaultTransformers.put( 
  Integer.TYPE, 
  new Transformer() {
  public Object transform( Object input ) {
  return Integer.valueOf( input.toString() );
  }
  }
  );
  defaultTransformers.put( 
  Long.TYPE, 
  new Transformer() {
  public Object transform( Object input ) {
  return Long.valueOf( input.toString() );
  }
  }
  );
  defaultTransformers.put( 
  Float.TYPE, 
  new Transformer() {
  public Object transform( Object input ) {
  return Float.valueOf( input.toString() );
  }
  }
  );
  defaultTransformers.put( 
  Double.TYPE,