--- old/src/share/classes/sun/text/resources/FormatData.java	Fri Aug 17 21:16:49 2012
+++ new/src/share/classes/sun/text/resources/FormatData.java	Fri Aug 17 21:16:47 2012
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -119,19 +119,19 @@
                     "AD"
                 }
             },
-            { "sun.util.BuddhistCalendar.Eras",
+            { "buddhist.Eras",
                 new String[] { // Thai Buddhist calendar era strings
                     "BC",     // BC
                     "B.E."    // Buddhist Era
                 }
             },
-            { "sun.util.BuddhistCalendar.short.Eras",
+            { "buddhist.short.Eras",
                 new String[] { // Thai Buddhist calendar era strings
                     "BC",     // BC
                     "B.E."    // Buddhist Era
                 }
             },
-            { "java.util.JapaneseImperialCalendar.Eras",
+            { "japanese.Eras",
                 new String[] { // Japanese imperial calendar era strings
                     "",
                     "Meiji",
@@ -140,7 +140,7 @@
                     "Heisei",
                 }
             },
-            { "java.util.JapaneseImperialCalendar.short.Eras",
+            { "japanese.short.Eras",
                 new String[] { // Japanese imperial calendar era abbreviations
                     "",
                     "M",
@@ -149,7 +149,7 @@
                     "H",
                 }
             },
-            { "java.util.JapaneseImperialCalendar.FirstYear",
+            { "japanese.FirstYear",
                 new String[] { // Japanese imperial calendar year name
                     // empty in English
                 }
@@ -161,6 +161,7 @@
                     "#,##0%" // percent pattern
                 }
             },
+            { "DefaultNumberingSystem", "" },
             { "NumberElements",
                 new String[] {
                     ".", // decimal separator
@@ -176,42 +177,591 @@
                     "\ufffd" // NaN
                 }
             },
-            { "DateTimePatterns",
+            { "arab.NumberElements",
                 new String[] {
+                    "\u066b",
+                    "\u066c",
+                    "\u061b",
+                    "\u066a",
+                    "\u0660",
+                    "#",
+                    "-",
+                    "\u0627\u0633",
+                    "\u0609",
+                    "\u221e",
+                    "NaN",
+                }
+            },
+            { "arabext.NumberElements",
+                new String[] {
+                    "\u066b",
+                    "\u066c",
+                    "\u061b",
+                    "\u066a",
+                    "\u06f0",
+                    "#",
+                    "-",
+                    "\u00d7\u06f1\u06f0^",
+                    "\u0609",
+                    "\u221e",
+                    "NaN",
+                }
+            },
+            { "bali.NumberElements",
+                new String[] {
+                    ".",
+                    ",",
+                    ";",
+                    "%",
+                    "\u1b50",
+                    "#",
+                    "-",
+                    "E",
+                    "\u2030",
+                    "\u221e",
+                    "NaN",
+                }
+            },
+            { "beng.NumberElements",
+                new String[] {
+                    ".",
+                    ",",
+                    ";",
+                    "%",
+                    "\u09e6",
+                    "#",
+                    "-",
+                    "E",
+                    "\u2030",
+                    "\u221e",
+                    "NaN",
+                }
+            },
+            { "cham.NumberElements",
+                new String[] {
+                    ".",
+                    ",",
+                    ";",
+                    "%",
+                    "\uaa50",
+                    "#",
+                    "-",
+                    "E",
+                    "\u2030",
+                    "\u221e",
+                    "NaN",
+                }
+            },
+            { "deva.NumberElements",
+                new String[] {
+                    ".",
+                    ",",
+                    ";",
+                    "%",
+                    "\u0966",
+                    "#",
+                    "-",
+                    "E",
+                    "\u2030",
+                    "\u221e",
+                    "NaN",
+                }
+            },
+            { "fullwide.NumberElements",
+                new String[] {
+                    ".",
+                    ",",
+                    ";",
+                    "%",
+                    "\uff10",
+                    "#",
+                    "-",
+                    "E",
+                    "\u2030",
+                    "\u221e",
+                    "NaN",
+                }
+            },
+            { "gujr.NumberElements",
+                new String[] {
+                    ".",
+                    ",",
+                    ";",
+                    "%",
+                    "\u0ae6",
+                    "#",
+                    "-",
+                    "E",
+                    "\u2030",
+                    "\u221e",
+                    "NaN",
+                }
+            },
+            { "guru.NumberElements",
+                new String[] {
+                    ".",
+                    ",",
+                    ";",
+                    "%",
+                    "\u0a66",
+                    "#",
+                    "-",
+                    "E",
+                    "\u2030",
+                    "\u221e",
+                    "NaN",
+                }
+            },
+            { "java.NumberElements",
+                new String[] {
+                    ".",
+                    ",",
+                    ";",
+                    "%",
+                    "\ua9d0",
+                    "#",
+                    "-",
+                    "E",
+                    "\u2030",
+                    "\u221e",
+                    "NaN",
+                }
+            },
+            { "kali.NumberElements",
+                new String[] {
+                    ".",
+                    ",",
+                    ";",
+                    "%",
+                    "\ua900",
+                    "#",
+                    "-",
+                    "E",
+                    "\u2030",
+                    "\u221e",
+                    "NaN",
+                }
+            },
+            { "khmr.NumberElements",
+                new String[] {
+                    ".",
+                    ",",
+                    ";",
+                    "%",
+                    "\u17e0",
+                    "#",
+                    "-",
+                    "E",
+                    "\u2030",
+                    "\u221e",
+                    "NaN",
+                }
+            },
+            { "knda.NumberElements",
+                new String[] {
+                    ".",
+                    ",",
+                    ";",
+                    "%",
+                    "\u0ce6",
+                    "#",
+                    "-",
+                    "E",
+                    "\u2030",
+                    "\u221e",
+                    "NaN",
+                }
+            },
+            { "laoo.NumberElements",
+                new String[] {
+                    ".",
+                    ",",
+                    ";",
+                    "%",
+                    "\u0ed0",
+                    "#",
+                    "-",
+                    "E",
+                    "\u2030",
+                    "\u221e",
+                    "NaN",
+                }
+            },
+            { "lana.NumberElements",
+                new String[] {
+                    ".",
+                    ",",
+                    ";",
+                    "%",
+                    "\u1a80",
+                    "#",
+                    "-",
+                    "E",
+                    "\u2030",
+                    "\u221e",
+                    "NaN",
+                }
+            },
+            { "lanatham.NumberElements",
+                new String[] {
+                    ".",
+                    ",",
+                    ";",
+                    "%",
+                    "\u1a90",
+                    "#",
+                    "-",
+                    "E",
+                    "\u2030",
+                    "\u221e",
+                    "NaN",
+                }
+            },
+            { "latn.NumberElements",
+                new String[] {
+                    ".", // decimal separator
+                    ",", // group (thousands) separator
+                    ";", // list separator
+                    "%", // percent sign
+                    "0", // native 0 digit
+                    "#", // pattern digit
+                    "-", // minus sign
+                    "E", // exponential
+                    "\u2030", // per mille
+                    "\u221e", // infinity
+                    "\ufffd" // NaN
+                }
+            },
+            { "lepc.NumberElements",
+                new String[] {
+                    ".",
+                    ",",
+                    ";",
+                    "%",
+                    "\u1c40",
+                    "#",
+                    "-",
+                    "E",
+                    "\u2030",
+                    "\u221e",
+                    "NaN",
+                }
+            },
+            { "limb.NumberElements",
+                new String[] {
+                    ".",
+                    ",",
+                    ";",
+                    "%",
+                    "\u1946",
+                    "#",
+                    "-",
+                    "E",
+                    "\u2030",
+                    "\u221e",
+                    "NaN",
+                }
+            },
+            { "mlym.NumberElements",
+                new String[] {
+                    ".",
+                    ",",
+                    ";",
+                    "%",
+                    "\u0d66",
+                    "#",
+                    "-",
+                    "E",
+                    "\u2030",
+                    "\u221e",
+                    "NaN",
+                }
+            },
+            { "mong.NumberElements",
+                new String[] {
+                    ".",
+                    ",",
+                    ";",
+                    "%",
+                    "\u1810",
+                    "#",
+                    "-",
+                    "E",
+                    "\u2030",
+                    "\u221e",
+                    "NaN",
+                }
+            },
+            { "mtei.NumberElements",
+                new String[] {
+                    ".",
+                    ",",
+                    ";",
+                    "%",
+                    "\uabf0",
+                    "#",
+                    "-",
+                    "E",
+                    "\u2030",
+                    "\u221e",
+                    "NaN",
+                }
+            },
+            { "mymr.NumberElements",
+                new String[] {
+                    ".",
+                    ",",
+                    ";",
+                    "%",
+                    "\u1040",
+                    "#",
+                    "-",
+                    "E",
+                    "\u2030",
+                    "\u221e",
+                    "NaN",
+                }
+            },
+            { "mymrshan.NumberElements",
+                new String[] {
+                    ".",
+                    ",",
+                    ";",
+                    "%",
+                    "\u1090",
+                    "#",
+                    "-",
+                    "E",
+                    "\u2030",
+                    "\u221e",
+                    "NaN",
+                }
+            },
+            { "nkoo.NumberElements",
+                new String[] {
+                    ".",
+                    ",",
+                    ";",
+                    "%",
+                    "\u07c0",
+                    "#",
+                    "-",
+                    "E",
+                    "\u2030",
+                    "\u221e",
+                    "NaN",
+                }
+            },
+            { "olck.NumberElements",
+                new String[] {
+                    ".",
+                    ",",
+                    ";",
+                    "%",
+                    "\u1c50",
+                    "#",
+                    "-",
+                    "E",
+                    "\u2030",
+                    "\u221e",
+                    "NaN",
+                }
+            },
+            { "orya.NumberElements",
+                new String[] {
+                    ".",
+                    ",",
+                    ";",
+                    "%",
+                    "\u0b66",
+                    "#",
+                    "-",
+                    "E",
+                    "\u2030",
+                    "\u221e",
+                    "NaN",
+                }
+            },
+            { "saur.NumberElements",
+                new String[] {
+                    ".",
+                    ",",
+                    ";",
+                    "%",
+                    "\ua8d0",
+                    "#",
+                    "-",
+                    "E",
+                    "\u2030",
+                    "\u221e",
+                    "NaN",
+                }
+            },
+            { "sund.NumberElements",
+                new String[] {
+                    ".",
+                    ",",
+                    ";",
+                    "%",
+                    "\u1bb0",
+                    "#",
+                    "-",
+                    "E",
+                    "\u2030",
+                    "\u221e",
+                    "NaN",
+                }
+            },
+            { "talu.NumberElements",
+                new String[] {
+                    ".",
+                    ",",
+                    ";",
+                    "%",
+                    "\u19d0",
+                    "#",
+                    "-",
+                    "E",
+                    "\u2030",
+                    "\u221e",
+                    "NaN",
+                }
+            },
+            { "tamldec.NumberElements",
+                new String[] {
+                    ".",
+                    ",",
+                    ";",
+                    "%",
+                    "\u0be6",
+                    "#",
+                    "-",
+                    "E",
+                    "\u2030",
+                    "\u221e",
+                    "NaN",
+                }
+            },
+            { "telu.NumberElements",
+                new String[] {
+                    ".",
+                    ",",
+                    ";",
+                    "%",
+                    "\u0c66",
+                    "#",
+                    "-",
+                    "E",
+                    "\u2030",
+                    "\u221e",
+                    "NaN",
+                }
+            },
+            { "thai.NumberElements",
+                new String[] {
+                    ".", // decimal separator
+                    ",", // group (thousands) separator
+                    ";", // list separator
+                    "%", // percent sign
+                    "\u0E50", // native 0 digit
+                    "#", // pattern digit
+                    "-", // minus sign
+                    "E", // exponential
+                    "\u2030", // per mille
+                    "\u221e", // infinity
+                    "\ufffd" // NaN
+                }
+            },
+            { "tibt.NumberElements",
+                new String[] {
+                    ".",
+                    ",",
+                    ";",
+                    "%",
+                    "\u0f20",
+                    "#",
+                    "-",
+                    "E",
+                    "\u2030",
+                    "\u221e",
+                    "NaN",
+                }
+            },
+            { "vaii.NumberElements",
+                new String[] {
+                    ".",
+                    ",",
+                    ";",
+                    "%",
+                    "\ua620",
+                    "#",
+                    "-",
+                    "E",
+                    "\u2030",
+                    "\u221e",
+                    "NaN",
+                }
+            },
+            { "TimePatterns",
+                new String[] {
                     "h:mm:ss a z",        // full time pattern
                     "h:mm:ss a z",        // long time pattern
                     "h:mm:ss a",          // medium time pattern
                     "h:mm a",             // short time pattern
+                }
+            },
+            { "DatePatterns",
+                new String[] {
                     "EEEE, MMMM d, yyyy", // full date pattern
                     "MMMM d, yyyy",       // long date pattern
                     "MMM d, yyyy",        // medium date pattern
                     "M/d/yy",             // short date pattern
+                }
+            },
+            { "DateTimePatterns",
+                new String[] {
                     "{1} {0}"             // date-time pattern
                 }
             },
-            { "sun.util.BuddhistCalendar.DateTimePatterns",
+            { "buddhist.TimePatterns",
                 new String[] {
                     "H:mm:ss z",          // full time pattern
                     "H:mm:ss z",          // long time pattern
                     "H:mm:ss",            // medium time pattern
                     "H:mm",               // short time pattern
+                }
+            },
+            { "buddhist.DatePatterns",
+                new String[] {
                     "EEEE d MMMM G yyyy", // full date pattern
                     "d MMMM yyyy",        // long date pattern
                     "d MMM yyyy",         // medium date pattern
                     "d/M/yyyy",           // short date pattern
+                }
+            },
+            { "buddhist.DateTimePatterns",
+                new String[] {
                     "{1}, {0}"            // date-time pattern
                 }
             },
-            { "java.util.JapaneseImperialCalendar.DateTimePatterns",
+            { "japanese.TimePatterns",
                 new String[] {
                     "h:mm:ss a z",             // full time pattern
                     "h:mm:ss a z",             // long time pattern
                     "h:mm:ss a",               // medium time pattern
                     "h:mm a",                  // short time pattern
+                }
+            },
+            { "japanese.DatePatterns",
+                new String[] {
                     "GGGG yyyy MMMM d (EEEE)", // full date pattern
                     "GGGG yyyy MMMM d",        // long date pattern
                     "GGGG yyyy MMM d",         // medium date pattern
                     "Gy.MM.dd",                // short date pattern
+                }
+            },
+            { "japanese.DateTimePatterns",
+                new String[] {
                     "{1} {0}"                  // date-time pattern
                 }
             },