@@ -70,9 +70,8 @@ class ResourceBundleGenerator implements BundleGenerator {
7070 private static final String META_VALUE_PREFIX = "metaValue_" ;
7171
7272 @ Override
73- public void generateBundle (String packageName , String baseName , String localeID , boolean useJava ,
73+ public void generateBundle (String packageName , String baseName , String localeID ,
7474 Map <String , ?> map , BundleType type ) throws IOException {
75- String suffix = useJava ? ".java" : ".properties" ;
7675 String dirName = CLDRConverter .DESTINATION_DIR + File .separator + "sun" + File .separator
7776 + packageName + File .separator + "resources" + File .separator + "cldr" ;
7877 packageName = packageName + ".resources.cldr" ;
@@ -91,23 +90,12 @@ public void generateBundle(String packageName, String baseName, String localeID,
9190 if (!dir .exists ()) {
9291 dir .mkdirs ();
9392 }
94- File file = new File (dir , baseName + ("root" .equals (localeID ) ? "" : "_" + localeID ) + suffix );
93+ File file = new File (dir , baseName + ("root" .equals (localeID ) ? "" : "_" + localeID ) + ".java" );
9594 if (!file .exists ()) {
9695 file .createNewFile ();
9796 }
9897 CLDRConverter .info ("\t Writing file " + file );
9998
100- String encoding ;
101- if (useJava ) {
102- if (CLDRConverter .USE_UTF8 ) {
103- encoding = "utf-8" ;
104- } else {
105- encoding = "us-ascii" ;
106- }
107- } else {
108- encoding = "iso-8859-1" ;
109- }
110-
11199 Formatter fmt = null ;
112100 if (type == BundleType .TIMEZONE ) {
113101 fmt = new Formatter ();
@@ -119,7 +107,7 @@ public void generateBundle(String packageName, String baseName, String localeID,
119107 value = (String []) map .get (key );
120108 fmt .format (" final String[] %s = new String[] {\n " , meta );
121109 for (String s : value ) {
122- fmt .format (" \" %s\" ,\n " , CLDRConverter .saveConvert ( s , useJava ));
110+ fmt .format (" \" %s\" ,\n " , CLDRConverter .escape ( s ));
123111 }
124112 fmt .format (" };\n " );
125113 metaKeys .add (key );
@@ -159,11 +147,11 @@ public void generateBundle(String packageName, String baseName, String localeID,
159147 if (val instanceof String [] values ) {
160148 fmt .format (" final String[] %s = new String[] {\n " , metaVal );
161149 for (String s : values ) {
162- fmt .format (" \" %s\" ,\n " , CLDRConverter .saveConvert ( s , useJava ));
150+ fmt .format (" \" %s\" ,\n " , CLDRConverter .escape ( s ));
163151 }
164152 fmt .format (" };\n " );
165153 } else {
166- fmt .format (" final String %s = \" %s\" ;\n " , metaVal , CLDRConverter .saveConvert ((String )val , useJava ));
154+ fmt .format (" final String %s = \" %s\" ;\n " , metaVal , CLDRConverter .escape ((String )val ));
167155 }
168156 newMap .put (oldEntry .key , oldEntry .metaKey ());
169157 }
@@ -173,55 +161,47 @@ public void generateBundle(String packageName, String baseName, String localeID,
173161 map = newMap ;
174162 }
175163
176- try (PrintWriter out = new PrintWriter (file , encoding )) {
164+ try (PrintWriter out = new PrintWriter (file , "utf-8" )) {
177165 // Output copyright headers
178166 out .println (getOpenJDKCopyright ());
179167 out .println (CopyrightHeaders .getUnicodeCopyright ());
180168
181- if (useJava ) {
182- out .println ("package sun." + packageName + ";\n " );
183- out .printf ("import %s;\n \n " , type .getPathName ());
184- out .printf ("public class %s%s extends %s {\n " , baseName , "root" .equals (localeID ) ? "" : "_" + localeID , type .getClassName ());
169+ out .println ("package sun." + packageName + ";\n " );
170+ out .printf ("import %s;\n \n " , type .getPathName ());
171+ out .printf ("public class %s%s extends %s {\n " , baseName , "root" .equals (localeID ) ? "" : "_" + localeID , type .getClassName ());
185172
186- out .println (" @Override\n " +
187- " protected final Object[][] getContents() {" );
188- if (fmt != null ) {
189- out .print (fmt .toString ());
190- }
191- out .println (" final Object[][] data = new Object[][] {" );
173+ out .println (" @Override\n " +
174+ " protected final Object[][] getContents() {" );
175+ if (fmt != null ) {
176+ out .print (fmt .toString ());
192177 }
178+ out .println (" final Object[][] data = new Object[][] {" );
193179 for (String key : map .keySet ()) {
194- if (useJava ) {
195- Object value = map .get (key );
196- if (value == null ) {
197- CLDRConverter .warning ("null value for " + key );
198- } else if (value instanceof String ) {
199- String valStr = (String )value ;
200- if (type == BundleType .TIMEZONE &&
201- !(key .startsWith (CLDRConverter .EXEMPLAR_CITY_PREFIX ) ||
202- key .startsWith (CLDRConverter .METAZONE_DSTOFFSET_PREFIX )) ||
203- valStr .startsWith (META_VALUE_PREFIX )) {
204- out .printf (" { \" %s\" , %s },\n " , key , CLDRConverter .saveConvert (valStr , useJava ));
205- } else {
206- out .printf (" { \" %s\" , \" %s\" },\n " , key , CLDRConverter .saveConvert (valStr , useJava ));
207- }
208- } else if (value instanceof String []) {
209- String [] values = (String []) value ;
210- out .println (" { \" " + key + "\" ,\n new String[] {" );
211- for (String s : values ) {
212- out .println (" \" " + CLDRConverter .saveConvert (s , useJava ) + "\" ," );
213- }
214- out .println (" }\n }," );
180+ Object value = map .get (key );
181+ if (value == null ) {
182+ CLDRConverter .warning ("null value for " + key );
183+ } else if (value instanceof String ) {
184+ String valStr = (String )value ;
185+ if (type == BundleType .TIMEZONE &&
186+ !(key .startsWith (CLDRConverter .EXEMPLAR_CITY_PREFIX ) ||
187+ key .startsWith (CLDRConverter .METAZONE_DSTOFFSET_PREFIX )) ||
188+ valStr .startsWith (META_VALUE_PREFIX )) {
189+ out .printf (" { \" %s\" , %s },\n " , key , CLDRConverter .escape (valStr ));
215190 } else {
216- throw new RuntimeException ( "unknown value type: " + value . getClass (). getName ( ));
191+ out . printf ( " { \" %s \" , \" %s \" }, \n " , key , CLDRConverter . escape ( valStr ));
217192 }
193+ } else if (value instanceof String []) {
194+ String [] values = (String []) value ;
195+ out .println (" { \" " + key + "\" ,\n new String[] {" );
196+ for (String s : values ) {
197+ out .println (" \" " + CLDRConverter .escape (s ) + "\" ," );
198+ }
199+ out .println (" }\n }," );
218200 } else {
219- out . println ( key + "=" + CLDRConverter . saveConvert (( String ) map . get ( key ), useJava ));
201+ throw new RuntimeException ( "unknown value type: " + value . getClass (). getName ( ));
220202 }
221203 }
222- if (useJava ) {
223- out .println (" };\n return data;\n }\n }" );
224- }
204+ out .println (" };\n return data;\n }\n }" );
225205 }
226206 }
227207
0 commit comments