myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mat...@apache.org
Subject cvs commit: incubator-myfaces/src/jsfapi/javax/faces/component _ComponentAttributesMap.java
Date Sat, 08 Jan 2005 19:59:33 GMT
matzew      2005/01/08 11:59:33

  Modified:    src/jsfapi/javax/faces/component
                        _ComponentAttributesMap.java
  Log:
  closed MYFACES-74. Thanks to Heath Borders-Wing
  
  Revision  Changes    Path
  1.8       +23 -7     incubator-myfaces/src/jsfapi/javax/faces/component/_ComponentAttributesMap.java
  
  Index: _ComponentAttributesMap.java
  ===================================================================
  RCS file: /home/cvs/incubator-myfaces/src/jsfapi/javax/faces/component/_ComponentAttributesMap.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- _ComponentAttributesMap.java	1 Jul 2004 22:00:50 -0000	1.7
  +++ _ComponentAttributesMap.java	8 Jan 2005 19:59:33 -0000	1.8
  @@ -15,20 +15,29 @@
    */
   package javax.faces.component;
   
  -import javax.faces.FacesException;
  -import javax.faces.context.FacesContext;
   import java.beans.BeanInfo;
   import java.beans.IntrospectionException;
   import java.beans.Introspector;
   import java.beans.PropertyDescriptor;
   import java.io.Serializable;
   import java.lang.reflect.Method;
  -import java.util.*;
  +import java.util.Collection;
  +import java.util.HashMap;
  +import java.util.Iterator;
  +import java.util.Map;
  +import java.util.Set;
  +
  +import javax.faces.FacesException;
  +import javax.faces.context.FacesContext;
  +import javax.faces.el.ValueBinding;
   
   /**
    * @author Manfred Geiler (latest modification by $Author$)
    * @version $Revision$ $Date$
    * $Log$
  + * Revision 1.8  2005/01/08 19:59:33  matzew
  + * closed MYFACES-74. Thanks to Heath Borders-Wing
  + *
    * Revision 1.7  2004/07/01 22:00:50  mwessendorf
    * ASF switch
    *
  @@ -123,7 +132,14 @@
           PropertyDescriptor propertyDescriptor = getPropertyDescriptor((String)key);
           if (propertyDescriptor != null)
           {
  -            return getComponentProperty(propertyDescriptor);
  +            Object value = getComponentProperty(propertyDescriptor);
  +            if (value != null)
  +            {
  +            	return value;
  +            }
  +            
  +            ValueBinding vb = _component.getValueBinding((String) key);
  +            return vb != null ? vb.getValue(FacesContext.getCurrentInstance()) : null;
           }
           else
           {
  @@ -248,4 +264,4 @@
       {
           return _attributes;
       }
  -}
  +}
  \ No newline at end of file
  
  
  

Mime
View raw message