2004-06-08 Atsushi Enomoto <atsushi@ximian.com>

	* Driver.cs : To make "extra pattern only" xxxFormatLength possible,
	  fill values only when the exact element was available.

svn path=/trunk/mono/; revision=29048

2 files changed, 27 insertions, 16 deletions

diff --git a/tools/locale-builder/ChangeLog b/tools/locale-builder/ChangeLog
index 5a0a7ec1580..b32b036a4d1 100644
--- a/tools/locale-builder/ChangeLog
+++ b/tools/locale-builder/ChangeLog
@@ -1,5 +1,10 @@
 2004-06-08  Atsushi Enomoto  <atsushi@ximian.com>
 
+	* Driver.cs : To make "extra pattern only" xxxFormatLength possible,
+	  fill values only when the exact element was available.
+
+2004-06-08  Atsushi Enomoto  <atsushi@ximian.com>
+
 	* DateTimeFormatEntry.cs : Use "{0}" for empty array.
 
 2004-06-08  Atsushi Enomoto  <atsushi@ximian.com>
diff --git a/tools/locale-builder/Driver.cs b/tools/locale-builder/Driver.cs
index c1d73fca75f..f9e9b0bc3e6 100644
--- a/tools/locale-builder/Driver.cs
+++ b/tools/locale-builder/Driver.cs
@@ -417,16 +417,18 @@ namespace Mono.Tools.LocaleBuilder {
 				while (ni2.MoveNext ()) {
 					XPathNavigator df_nav = ni2.Current;
 					XPathNodeIterator p = df_nav.Select ("dateFormat/pattern");
-					string value = "";
+					string value = null;
 					if (p.MoveNext ())
 						value = p.Current.Value;
 					XPathNodeIterator ext = null;
 					switch (df_nav.GetAttribute ("type", String.Empty)) {
-                                        case "full":
-                                                ParseFullDateFormat (df, value);
-                                                break;
+					case "full":
+						if (value != null)
+							ParseFullDateFormat (df, value);
+						break;
 					case "long":
-						df.LongDatePattern = value;
+						if (value != null)
+							df.LongDatePattern = value;
 						ext = df_nav.Select ("extraPatterns/pattern");
 						if (ext.MoveNext ()) {
 							df.LongDatePatterns.Clear ();
@@ -436,7 +438,8 @@ namespace Mono.Tools.LocaleBuilder {
 						}
 						break;
 					case "short":
-						df.ShortDatePattern = value;
+						if (value != null)
+							df.ShortDatePattern = value;
 						ext = df_nav.Select ("extraPatterns/pattern");
 						if (ext.MoveNext ()) {
 							df.ShortDatePatterns.Clear ();
@@ -444,14 +447,15 @@ namespace Mono.Tools.LocaleBuilder {
 								df.ShortDatePatterns.Add (ext.Current.Value);
 							} while (ext.MoveNext ());
 						}
-
 						break;
-                                        case "year_month":
-                                                df.YearMonthPattern = value;
-                                                break;
-                                        case "month_day":
-                                                df.MonthDayPattern = value;
-                                                break;
+					case "year_month":
+						if (value != null)
+							df.YearMonthPattern = value;
+						break;
+					case "month_day":
+						if (value != null)
+							df.MonthDayPattern = value;
+						break;
 					}
 				}
 
@@ -459,13 +463,14 @@ namespace Mono.Tools.LocaleBuilder {
 				while (ni2.MoveNext ()) {
 					XPathNavigator df_nav = ni2.Current;
 					XPathNodeIterator p = df_nav.Select ("timeFormat/pattern");
-					string value = "";
+					string value = null;
 					if (p.MoveNext ())
 						value = p.Current.Value;
 					XPathNodeIterator ext = null;
 					switch (df_nav.GetAttribute ("type", String.Empty)) {
 					case "long":
-						df.LongTimePattern = value.Replace ('a', 't');
+						if (value != null)
+							df.LongTimePattern = value.Replace ('a', 't');
 						ext = df_nav.Select ("extraPatterns/pattern");
 						if (ext.MoveNext ()) {
 							df.LongTimePatterns.Clear ();
@@ -475,7 +480,8 @@ namespace Mono.Tools.LocaleBuilder {
 						}
 						break;
 					case "short":
-						df.ShortTimePattern = value.Replace ('a', 't');
+						if (value != null)
+							df.ShortTimePattern = value.Replace ('a', 't');
 						ext = df_nav.Select ("extraPatterns/pattern");
 						if (ext.MoveNext ()) {
 							df.ShortTimePatterns.Clear ();