craigmcc 02/04/06 15:34:29 Modified: beanutils/src/java/org/apache/commons/beanutils BeanUtils.java Log: Remove the old populate() method that was commented out. Revision Changes Path 1.18 +4 -241 jakarta-commons/beanutils/src/java/org/apache/commons/beanutils/BeanUtils.java Index: BeanUtils.java =================================================================== RCS file: /home/cvs/jakarta-commons/beanutils/src/java/org/apache/commons/beanutils/BeanUtils.java,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- BeanUtils.java 6 Apr 2002 23:28:34 -0000 1.17 +++ BeanUtils.java 6 Apr 2002 23:34:29 -0000 1.18 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-commons/beanutils/src/java/org/apache/commons/beanutils/BeanUtils.java,v 1.17 2002/04/06 23:28:34 craigmcc Exp $ - * $Revision: 1.17 $ - * $Date: 2002/04/06 23:28:34 $ + * $Header: /home/cvs/jakarta-commons/beanutils/src/java/org/apache/commons/beanutils/BeanUtils.java,v 1.18 2002/04/06 23:34:29 craigmcc Exp $ + * $Revision: 1.18 $ + * $Date: 2002/04/06 23:34:29 $ * * ==================================================================== * @@ -87,7 +87,7 @@ * @author Chris Audley * @author Rey François * @author Gregor Raıman - * @version $Revision: 1.17 $ $Date: 2002/04/06 23:28:34 $ + * @version $Revision: 1.18 $ $Date: 2002/04/06 23:34:29 $ */ public class BeanUtils { @@ -676,243 +676,6 @@ } } - - -/* - public static void populate(Object bean, Map properties) - throws IllegalAccessException, InvocationTargetException { - - if ((bean == null) || (properties == null)) - return; - - if (log.isDebugEnabled()) { - log.debug("BeanUtils.populate(" + bean + ", " + - properties + ")"); - } - - // Loop through the property name/value pairs to be set - Iterator names = properties.keySet().iterator(); - while (names.hasNext()) { - - // Identify the property name and value(s) to be assigned - String name = (String) names.next(); - if (name == null) - continue; - Object value = properties.get(name); // String or String[] - - if (log.isTraceEnabled()) { - log.trace(" name='" + name + "', value.class='" + - (value == null ? "NONE" : - value.getClass().getName()) + "', value='" + - (value == null ? "NONE" : value) + "'"); - } - - // Get the property descriptor of the requested property (if any) - PropertyDescriptor descriptor = null; - DynaProperty dynaProperty = null; - try { - if (bean instanceof DynaBean) { - String dynaName = name; - int i = dynaName.indexOf(PropertyUtils.INDEXED_DELIM); - if (i >= 0) { - dynaName = dynaName.substring(0, i); - } - int j = dynaName.indexOf(PropertyUtils.MAPPED_DELIM); - if (j >= 0) { - dynaName = dynaName.substring(0, j); - } - DynaClass dynaClass = ((DynaBean) bean).getDynaClass(); - dynaProperty = dynaClass.getDynaProperty(dynaName); - } else { - descriptor = - PropertyUtils.getPropertyDescriptor(bean, name); - } - } catch (Throwable t) { - - if (log.isTraceEnabled()) { - log.trace(" getPropertyDescriptor", t); - } - - descriptor = null; - dynaProperty = null; - } - if ((descriptor == null) && (dynaProperty == null)) { - - if (log.isTraceEnabled()) { - log.trace(" No such property, skipping"); - } - - continue; - } - - if (log.isTraceEnabled()) { - if (descriptor != null) { - log.trace(" Property descriptor is '" + - descriptor + "'"); - } else { - log.trace(" DynaProperty descriptor is '" + - descriptor + "'"); - } - } - - // Process differently for JavaBeans and DynaBeans - if (descriptor != null) { - - // Identify the relevant setter method (if there is one) - Method setter = null; - if ((descriptor instanceof IndexedPropertyDescriptor) && - (name.indexOf(PropertyUtils.INDEXED_DELIM) > 0)) { - setter = ((IndexedPropertyDescriptor) descriptor). - getIndexedWriteMethod(); - } else if (descriptor instanceof MappedPropertyDescriptor) { - setter = ((MappedPropertyDescriptor) descriptor).getMappedWriteMethod(); - } - - if (setter == null) - setter = descriptor.getWriteMethod(); - if (setter == null) { - - if (log.isTraceEnabled()) { - log.trace(" No setter method, skipping"); - } - - continue; - } - Class parameterTypes[] = setter.getParameterTypes(); - - if (log.isTraceEnabled()) { - log.trace(" Setter method is '" + - setter.getName() + "(" + - parameterTypes[0].getName() + - (parameterTypes.length > 1 ? - ", " + parameterTypes[1].getName() : "") - + ")'"); - } - - Class parameterType = parameterTypes[0]; - if (parameterTypes.length > 1) - parameterType = parameterTypes[1]; // Indexed or mapped setter - - // Convert the parameter value as required for this setter method - Object parameters[] = new Object[1]; - // if (parameterTypes[0].isArray()) { - if (parameterType.isArray()) { - if (value instanceof String) { - String values[] = new String[1]; - values[0] = (String) value; - parameters[0] = ConvertUtils.convert((String[]) values, - parameterType); - } else if (value instanceof String[]) { - parameters[0] = ConvertUtils.convert((String[]) value, - parameterType); - } else { - parameters[0] = value; - } - } else { - if (value instanceof String) { - parameters[0] = ConvertUtils.convert((String) value, - parameterType); - } else if (value instanceof String[]) { - parameters[0] = ConvertUtils.convert(((String[]) value)[0], - parameterType); - } else { - parameters[0] = value; - } - } - - // Invoke the setter method - try { - PropertyUtils.setProperty(bean, name, parameters[0]); - } catch (NoSuchMethodException e) { - log.error(" CANNOT HAPPEN (setProperty()): ", e); - } - - } else { - - // Handle scalar and indexed properties differently - Object newValue = null; - Class type = dynaProperty.getType(); - String dynaName = name; - int index = -1; - String key = null; - int delim1 = name.indexOf(PropertyUtils.INDEXED_DELIM); - int delim2 = name.indexOf(PropertyUtils.INDEXED_DELIM2); - if (delim1 >= 0) { - dynaName = name.substring(0, delim1); - try { - index = - Integer.parseInt(name.substring(delim1+1, delim2)); - } catch (NumberFormatException e) { - ; - } - } - delim1 = name.indexOf(PropertyUtils.MAPPED_DELIM); - delim2 = name.indexOf(PropertyUtils.MAPPED_DELIM2); - if (delim1 >= 0) { - dynaName = name.substring(0, delim1); - try { - key = name.substring(delim1 + 1, delim2); - } catch (IndexOutOfBoundsException e) { - ; - } - } - if (type.isArray() && (index < 0)) { - if (value instanceof String) { - String values[] = new String[1]; - values[0] = (String) value; - newValue = ConvertUtils.convert((String[]) values, - type); - } else if (value instanceof String[]) { - newValue = ConvertUtils.convert((String[]) value, - type); - } else { - newValue = value; - } - } else if (type.isArray()) { - if (value instanceof String) { - newValue = - ConvertUtils.convert((String) value, - type.getComponentType()); - } else if (value instanceof String[]) { - newValue = - ConvertUtils.convert(((String[]) value)[0], - type.getComponentType()); - } else { - newValue = value; - } - } else { - if (value instanceof String) { - newValue = ConvertUtils.convert((String) value, type); - } else if (value instanceof String[]) { - newValue = ConvertUtils.convert(((String[]) value)[0], - type); - } else { - newValue = value; - } - } - - // Invoke the setter method - try { - if (index >= 0) { - PropertyUtils.setIndexedProperty(bean, dynaName, - index, newValue); - } else if (key != null) { - PropertyUtils.setMappedProperty(bean, dynaName, - key, newValue); - } else { - PropertyUtils.setProperty(bean, name, newValue); - } - } catch (NoSuchMethodException e) { - log.error(" CANNOT HAPPEN (setProperty())", e); - } - - - } - - } - - } -*/ }
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>