[Dotgnu-pnet-commits] CVS: pnetlib/I18N/Common CID0009.cs,1.1,1.2 CID0409.cs,1.1,1.2 CID0809.cs,1.1,1.2 CID0c09.cs,1.1,1.2 CID1009.cs,1.1,1.2 CID1409.cs,1.1,1.2 CID1809.cs,1.1,1.2 CID1c09.cs,1.1,1.2 CID3009.cs,1.1,1.2 CID3409.cs,1.1,1.2 HandlerCollection.cs,1.2,1.3 Manager.cs,1.13,1.14 RootCulture.cs,1.2,1.3 CultureName.cs,1.1,NONE CultureNameTable.cs,1.2,NONE

[Rhys Weatherley <address@hidden>]

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

Modified Files:
        CID0009.cs CID0409.cs CID0809.cs CID0c09.cs CID1009.cs 
        CID1409.cs CID1809.cs CID1c09.cs CID3009.cs CID3409.cs 
        HandlerCollection.cs Manager.cs RootCulture.cs 
Removed Files:
        CultureName.cs CultureNameTable.cs 
Log Message:


Remove the final dependencies on CultureNameTable by moving the name
information into the culture handlers.


Index: CID0009.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/I18N/Common/CID0009.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** CID0009.cs  2 Jun 2003 00:58:59 -0000       1.1
--- CID0009.cs  2 Jun 2003 02:25:41 -0000       1.2
***************
*** 29,40 ****
  public class CID0009 : RootCulture
  {
!       private CultureName cultureName;
  
!       public CID0009()
!               : base(0x0009, CultureNameTable.GetNameInfoByID(0x0009)) {}
!       public CID0009(int culture, CultureName cultureName)
!               : base(culture, cultureName) {}
! 
!       public override String Language
        {
                get
--- 29,57 ----
  public class CID0009 : RootCulture
  {
!       public CID0009() : base(0x0009) {}
!       public CID0009(int culture) : base(culture) {}
  
!       public override String Name
!       {
!               get
!               {
!                       return "en";
!               }
!       }
!       public override String ThreeLetterISOLanguageName
!       {
!               get
!               {
!                       return "eng";
!               }
!       }
!       public override String ThreeLetterWindowsLanguageName
!       {
!               get
!               {
!                       return "ENU";
!               }
!       }
!       public override String TwoLetterISOLanguageName
        {
                get

Index: CID0409.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/I18N/Common/CID0409.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** CID0409.cs  2 Jun 2003 00:58:59 -0000       1.1
--- CID0409.cs  2 Jun 2003 02:25:41 -0000       1.2
***************
*** 29,40 ****
  public class CID0409 : CID0009
  {
!       public CID0409()
!               : base(0x0409, CultureNameTable.GetNameInfoByID(0x0409)) {}
  
!       public override String Language
        {
                get
                {
!                       return "en";
                }
        }
--- 29,39 ----
  public class CID0409 : CID0009
  {
!       public CID0409() : base(0x0409) {}
  
!       public override String Name
        {
                get
                {
!                       return "en-US";
                }
        }

Index: CID0809.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/I18N/Common/CID0809.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** CID0809.cs  2 Jun 2003 00:58:59 -0000       1.1
--- CID0809.cs  2 Jun 2003 02:25:41 -0000       1.2
***************
*** 29,40 ****
  public class CID0809 : CID0009
  {
!       public CID0809()
!               : base(0x0809, CultureNameTable.GetNameInfoByID(0x0809)) {}
  
!       public override String Language
        {
                get
                {
!                       return "en";
                }
        }
--- 29,46 ----
  public class CID0809 : CID0009
  {
!       public CID0809() : base(0x0809) {}
  
!       public override String Name
        {
                get
                {
!                       return "en-GB";
!               }
!       }
!       public override String ThreeLetterWindowsLanguageName
!       {
!               get
!               {
!                       return "ENG";
                }
        }

Index: CID0c09.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/I18N/Common/CID0c09.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** CID0c09.cs  2 Jun 2003 00:58:59 -0000       1.1
--- CID0c09.cs  2 Jun 2003 02:25:41 -0000       1.2
***************
*** 29,40 ****
  public class CID0c09 : CID0009
  {
!       public CID0c09()
!               : base(0x0C09, CultureNameTable.GetNameInfoByID(0x0C09)) {}
  
!       public override String Language
        {
                get
                {
!                       return "en";
                }
        }
--- 29,46 ----
  public class CID0c09 : CID0009
  {
!       public CID0c09() : base(0x0C09) {}
  
!       public override String Name
        {
                get
                {
!                       return "en-AU";
!               }
!       }
!       public override String ThreeLetterWindowsLanguageName
!       {
!               get
!               {
!                       return "ENA";
                }
        }

Index: CID1009.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/I18N/Common/CID1009.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** CID1009.cs  2 Jun 2003 00:58:59 -0000       1.1
--- CID1009.cs  2 Jun 2003 02:25:41 -0000       1.2
***************
*** 29,40 ****
  public class CID1009 : CID0009
  {
!       public CID1009()
!               : base(0x1009, CultureNameTable.GetNameInfoByID(0x1009)) {}
  
!       public override String Language
        {
                get
                {
!                       return "en";
                }
        }
--- 29,46 ----
  public class CID1009 : CID0009
  {
!       public CID1009() : base(0x1009) {}
  
!       public override String Name
        {
                get
                {
!                       return "en-CA";
!               }
!       }
!       public override String ThreeLetterWindowsLanguageName
!       {
!               get
!               {
!                       return "ENC";
                }
        }

Index: CID1409.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/I18N/Common/CID1409.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** CID1409.cs  2 Jun 2003 00:58:59 -0000       1.1
--- CID1409.cs  2 Jun 2003 02:25:41 -0000       1.2
***************
*** 29,40 ****
  public class CID1409 : CID0009
  {
!       public CID1409()
!               : base(0x1409, CultureNameTable.GetNameInfoByID(0x1409)) {}
  
!       public override String Language
        {
                get
                {
!                       return "en";
                }
        }
--- 29,46 ----
  public class CID1409 : CID0009
  {
!       public CID1409() : base(0x1409) {}
  
!       public override String Name
        {
                get
                {
!                       return "en-NZ";
!               }
!       }
!       public override String ThreeLetterWindowsLanguageName
!       {
!               get
!               {
!                       return "ENZ";
                }
        }

Index: CID1809.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/I18N/Common/CID1809.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** CID1809.cs  2 Jun 2003 00:58:59 -0000       1.1
--- CID1809.cs  2 Jun 2003 02:25:41 -0000       1.2
***************
*** 29,40 ****
  public class CID1809 : CID0009
  {
!       public CID1809()
!               : base(0x1809, CultureNameTable.GetNameInfoByID(0x1809)) {}
  
!       public override String Language
        {
                get
                {
!                       return "en";
                }
        }
--- 29,46 ----
  public class CID1809 : CID0009
  {
!       public CID1809() : base(0x1809) {}
  
!       public override String Name
        {
                get
                {
!                       return "en-IE";
!               }
!       }
!       public override String ThreeLetterWindowsLanguageName
!       {
!               get
!               {
!                       return "ENI";
                }
        }

Index: CID1c09.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/I18N/Common/CID1c09.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** CID1c09.cs  2 Jun 2003 00:58:59 -0000       1.1
--- CID1c09.cs  2 Jun 2003 02:25:41 -0000       1.2
***************
*** 29,40 ****
  public class CID1c09 : CID0009
  {
!       public CID1c09()
!               : base(0x1C09, CultureNameTable.GetNameInfoByID(0x1C09)) {}
  
!       public override String Language
        {
                get
                {
!                       return "en";
                }
        }
--- 29,46 ----
  public class CID1c09 : CID0009
  {
!       public CID1c09() : base(0x1C09) {}
  
!       public override String Name
        {
                get
                {
!                       return "en-ZA";
!               }
!       }
!       public override String ThreeLetterWindowsLanguageName
!       {
!               get
!               {
!                       return "ENS";
                }
        }

Index: CID3009.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/I18N/Common/CID3009.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** CID3009.cs  2 Jun 2003 00:58:59 -0000       1.1
--- CID3009.cs  2 Jun 2003 02:25:41 -0000       1.2
***************
*** 29,40 ****
  public class CID3009 : CID0009
  {
!       public CID3009()
!               : base(0x3009, CultureNameTable.GetNameInfoByID(0x3009)) {}
  
!       public override String Language
        {
                get
                {
!                       return "en";
                }
        }
--- 29,46 ----
  public class CID3009 : CID0009
  {
!       public CID3009() : base(0x3009) {}
  
!       public override String Name
        {
                get
                {
!                       return "en-ZW";
!               }
!       }
!       public override String ThreeLetterWindowsLanguageName
!       {
!               get
!               {
!                       return "ENW";
                }
        }

Index: CID3409.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/I18N/Common/CID3409.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** CID3409.cs  2 Jun 2003 00:58:59 -0000       1.1
--- CID3409.cs  2 Jun 2003 02:25:41 -0000       1.2
***************
*** 29,40 ****
  public class CID3409 : CID0009
  {
!       public CID3409()
!               : base(0x3409, CultureNameTable.GetNameInfoByID(0x3409)) {}
  
!       public override String Language
        {
                get
                {
!                       return "en";
                }
        }
--- 29,46 ----
  public class CID3409 : CID0009
  {
!       public CID3409() : base(0x3409) {}
  
!       public override String Name
        {
                get
                {
!                       return "en-PH";
!               }
!       }
!       public override String ThreeLetterWindowsLanguageName
!       {
!               get
!               {
!                       return "ENP";
                }
        }

Index: HandlerCollection.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/I18N/Common/HandlerCollection.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** HandlerCollection.cs        16 Apr 2003 07:12:11 -0000      1.2
--- HandlerCollection.cs        2 Jun 2003 02:25:41 -0000       1.3
***************
*** 51,55 ****
  
        // Find the index of a specific name.
!       private int IndexOf(String name)
                        {
                                int posn;
--- 51,55 ----
  
        // Find the index of a specific name.
!       public int IndexOf(String name)
                        {
                                int posn;

Index: Manager.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/I18N/Common/Manager.cs,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** Manager.cs  2 Jun 2003 00:58:59 -0000       1.13
--- Manager.cs  2 Jun 2003 02:25:41 -0000       1.14
***************
*** 164,172 ****
        public bool HasCulture(int culture)
                        {
!                               return 
(CultureNameTable.GetNameInfoByID(culture) != null);
                        }
        public bool HasCulture(String name)
                        {
!                               return 
(CultureNameTable.GetNameInfoByName(name) != null);
                        }
  
--- 164,192 ----
        public bool HasCulture(int culture)
                        {
!                               // Create the hex version of the culture 
identifier.
!                               StringBuilder builder = new StringBuilder();
!                               builder.Append("CID");
!                               builder.Append(hex[(culture >> 12) & 0x0F]);
!                               builder.Append(hex[(culture >> 8) & 0x0F]);
!                               builder.Append(hex[(culture >> 4) & 0x0F]);
!                               builder.Append(hex[culture & 0x0F]);
!                               String name = builder.ToString();
! 
!                               // Determine if a handler exists for this 
culture.
!                               return (handlers.IndexOf(name) != -1);
                        }
        public bool HasCulture(String name)
                        {
!                               // Validate the parameter.
!                               if(name == null)
!                               {
!                                       return false;
!                               }
! 
!                               // Normalize the culture name.
!                               name = Normalize(name);
! 
!                               // Determine if a handler exists for this 
culture.
!                               return (handlers.IndexOf(name) != -1);
                        }
  
***************
*** 174,178 ****
        private static String GetCultureName(RootCulture info, RootCulture str)
                        {
!                               String name = 
str.ResolveLanguage(info.Language);
                                String country = info.Country;
                                if(country != null)
--- 194,199 ----
        private static String GetCultureName(RootCulture info, RootCulture str)
                        {
!                               String name = str.ResolveLanguage
!                                       (info.TwoLetterISOLanguageName);
                                String country = info.Country;
                                if(country != null)

Index: RootCulture.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/I18N/Common/RootCulture.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** RootCulture.cs      2 Jun 2003 00:58:59 -0000       1.2
--- RootCulture.cs      2 Jun 2003 02:25:41 -0000       1.3
***************
*** 29,39 ****
  public abstract class RootCulture : CultureInfo
  {
!       private CultureName cultureName;
! 
!       public RootCulture(int culture, CultureName cultureName)
!               : base(0x40000000 + culture)
!       {
!               this.cultureName = cultureName;
!       }
  
        public override String DisplayName
--- 29,33 ----
  public abstract class RootCulture : CultureInfo
  {
!       public RootCulture(int culture) : base(0x40000000 + culture) {}
  
        public override String DisplayName
***************
*** 51,61 ****
                }
        }
-       public override String Name
-       {
-               get
-               {
-                       return cultureName.name;
-               }
-       }
        public override String NativeName
        {
--- 45,48 ----
***************
*** 65,91 ****
                }
        }
-       public override String ThreeLetterISOLanguageName
-       {
-               get
-               {
-                       return cultureName.threeLetterISOName;
-               }
-       }
-       public override String ThreeLetterWindowsLanguageName
-       {
-               get
-               {
-                       return cultureName.threeLetterWindowsName;
-               }
-       }
-       public override String TwoLetterISOLanguageName
-       {
-               get
-               {
-                       return cultureName.twoLetterISOName;
-               }
-       }
- 
-       public abstract String Language { get; }
        public virtual String Country
        {
--- 52,55 ----

--- CultureName.cs DELETED ---

--- CultureNameTable.cs DELETED ---