[Dotgnu-pnet-commits] CVS: pnetlib/System/ComponentModel EnumConverter.cs,1.3,1.4

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnetlib/System/ComponentModel
In directory subversions:/tmp/cvs-serv1038/System/ComponentModel

Modified Files:
        EnumConverter.cs 
Log Message:


EnumConverter.cs: clean-up of ConvertFrom


Index: EnumConverter.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System/ComponentModel/EnumConverter.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** EnumConverter.cs    1 Jan 2003 18:29:20 -0000       1.3
--- EnumConverter.cs    10 Jan 2003 22:16:26 -0000      1.4
***************
*** 61,79 ****
                                return base.ConvertFrom(context, culture, 
value);
                        string[] values = val.Split(new char[] {','});
!                       int j;
!                       IList vals = (IList) Enum.GetValues(this.type);
  
                        foreach (string s in values)
                        {
!                               for (j=0; j<vals.Count; j++)
!                               {
!                                       if (s == vals[j].ToString())
!                                               return Enum.ToObject(type, j);
!                               }
                        }
!                       return Enum.ToObject(type, -1);  // not a valid enum 
string, throw an exception? which one?
                }
!               
!               
                public override Object ConvertTo(ITypeDescriptorContext 
context, 
                                CultureInfo culture, Object value, Type 
destinationType)
--- 61,75 ----
                                return base.ConvertFrom(context, culture, 
value);
                        string[] values = val.Split(new char[] {','});
!                       object temp;
  
                        foreach (string s in values)
                        {
!                               temp = Enum.Parse(type, s, true);
!                               if (temp != null)
!                                       return temp;
                        }
!                       return null;
                }
! 
                public override Object ConvertTo(ITypeDescriptorContext 
context, 
                                CultureInfo culture, Object value, Type 
destinationType)