[Dotgnu-pnet-commits] CVS: pnetlib/I18N/Common Manager.cs,1.10,1.11

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnetlib/I18N/Common
In directory subversions:/tmp/cvs-serv29777/I18N/Common

Modified Files:
        Manager.cs 
Log Message:


Remove "_I18NCultureHandler" and inherit handlers from "CultureInfo" instead.


Index: Manager.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/I18N/Common/Manager.cs,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** Manager.cs  31 May 2003 02:24:43 -0000      1.10
--- Manager.cs  31 May 2003 05:47:41 -0000      1.11
***************
*** 110,114 ****
        // Get a specific culture by identifier.  Returns NULL
        // if the culture information is not available.
!       public _I18NCultureHandler GetCulture(int culture, bool useUserOverride)
                        {
                                // Create the hex version of the culture 
identifier.
--- 110,114 ----
        // Get a specific culture by identifier.  Returns NULL
        // if the culture information is not available.
!       public CultureInfo GetCulture(int culture, bool useUserOverride)
                        {
                                // Create the hex version of the culture 
identifier.
***************
*** 126,140 ****
                                        if(obj != null)
                                        {
!                                               return (obj as 
_I18NCultureHandler);
                                        }
                                }
  
                                // Look for the generic non-override culture.
!                               return (Instantiate("CID" + name) as 
_I18NCultureHandler);
                        }
  
        // Get a specific culture by name.  Returns NULL if the
        // culture informaion is not available.
!       public _I18NCultureHandler GetCulture(String name, bool useUserOverride)
                        {
                                // Validate the parameter.
--- 126,140 ----
                                        if(obj != null)
                                        {
!                                               return (obj as CultureInfo);
                                        }
                                }
  
                                // Look for the generic non-override culture.
!                               return (Instantiate("CID" + name) as 
CultureInfo);
                        }
  
        // Get a specific culture by name.  Returns NULL if the
        // culture informaion is not available.
!       public CultureInfo GetCulture(String name, bool useUserOverride)
                        {
                                // Validate the parameter.
***************
*** 153,163 ****
                                        if(obj != null)
                                        {
!                                               return (obj as 
_I18NCultureHandler);
                                        }
                                }
  
                                // Look for the generic non-override culture.
!                               return (Instantiate("CN" + name.ToString())
!                                                       as _I18NCultureHandler);
                        }
  
--- 153,162 ----
                                        if(obj != null)
                                        {
!                                               return (obj as CultureInfo);
                                        }
                                }
  
                                // Look for the generic non-override culture.
!                               return (Instantiate("CN" + name.ToString()) as 
CultureInfo);
                        }