Skip to content
/ icu Public

Commit 148f5ca

Browse files
mihnitamihnita
committed
ICU-23247 Format source code damaged in the CLDR integration
1 parent e4a6e22 commit 148f5ca

File tree

2 files changed

+125
-144
lines changed

2 files changed

+125
-144
lines changed

‎icu4j/main/core/src/main/java/com/ibm/icu/impl/LocaleFallbackData.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
//
44
// Internal static data tables used by ICUResourceBundle.java
55
// WARNING: This file is mechanically generated by the CLDR-to-ICU tool
6-
// (see tools/cldr/cldr-to-icu/src/main/java/org/unicode/tool/cldrtoicu/generator/ResourcFallbackCodeGenerator.java).
6+
// (see
7+
// tools/cldr/cldr-to-icu/src/main/java/org/unicode/tool/cldrtoicu/generator/ResourcFallbackCodeGenerator.java).
78
// DO NOT HAND EDIT!!!
89

910
package com.ibm.icu.impl;
@@ -13,7 +14,7 @@
1314
import java.util.Map;
1415

1516
class LocaleFallbackData {
16-
//======================================================================
17+
// ======================================================================
1718
// Default script table
1819
public static final Map<String, String> DEFAULT_SCRIPT_TABLE = buildDefaultScriptTable();
1920

@@ -1088,7 +1089,7 @@ private static Map<String, String> buildDefaultScriptTable() {
10881089
return Collections.unmodifiableMap(t);
10891090
}
10901091

1091-
//======================================================================
1092+
// ======================================================================
10921093
// Parent locale table
10931094
public static final Map<String, String> PARENT_LOCALE_TABLE = buildParentLocaleTable();
10941095

‎icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/DebugUtilitiesData.java‎

Lines changed: 121 additions & 141 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,26 @@
11
// Copyright (C) 2016 and later: Unicode, Inc. and others.
22
// License & terms of use: http://www.unicode.org/copyright.html
33

4-
/** Copyright (C) 2007-2016, International Business Machines Corporation and Others. All Rights Reserved. **/
4+
/**
5+
* Copyright (C) 2007-2016, International Business Machines Corporation and Others. All Rights
6+
* Reserved. *
7+
*/
58

69
/* NOTE: this file is AUTOMATICALLY GENERATED by gentest.
7-
* See: {ICU4C}/source/data/icu4j-readme.txt for more information.
10+
* See: {ICU4C}/source/data/icu4j-readme.txt for more information.
811
**/
912

1013
package com.ibm.icu.dev.test.util;
1114

1215
public class DebugUtilitiesData extends Object {
13-
public static final String ICU4C_VERSION="79.0.1";
16+
public static final String ICU4C_VERSION = "79.0.1";
1417
public static final int UDebugEnumType = 0;
1518
public static final int UCalendarDateFields = 1;
1619
public static final int UCalendarMonths = 2;
1720
public static final int UDateFormatStyle = 3;
1821
public static final int UAcceptResult = 4;
1922
public static final int UColAttributeValue = 5;
20-
public static final String [] TYPES = {
23+
public static final String[] TYPES = {
2124
"UDebugEnumType", /* 0 */
2225
"UCalendarDateFields", /* 1 */
2326
"UCalendarMonths", /* 2 */
@@ -26,168 +29,145 @@ public class DebugUtilitiesData extends Object {
2629
"UColAttributeValue", /* 5 */
2730
};
2831

29-
public static final String [][] NAMES = {
32+
public static final String[][] NAMES = {
3033
/* UDebugEnumType, 0 */
31-
{
32-
"UDebugEnumType", /* 0 */
33-
"UCalendarDateFields", /* 1 */
34-
"UCalendarMonths", /* 2 */
35-
"UDateFormatStyle", /* 3 */
36-
"UAcceptResult", /* 4 */
37-
"UColAttributeValue", /* 5 */
34+
{
35+
"UDebugEnumType", /* 0 */
36+
"UCalendarDateFields", /* 1 */
37+
"UCalendarMonths", /* 2 */
38+
"UDateFormatStyle", /* 3 */
39+
"UAcceptResult", /* 4 */
40+
"UColAttributeValue", /* 5 */
3841
},
3942
/* UCalendarDateFields, 1 */
40-
{
41-
"ERA", /* 0 */
42-
"YEAR", /* 1 */
43-
"MONTH", /* 2 */
44-
"WEEK_OF_YEAR", /* 3 */
45-
"WEEK_OF_MONTH", /* 4 */
46-
"DATE", /* 5 */
47-
"DAY_OF_YEAR", /* 6 */
48-
"DAY_OF_WEEK", /* 7 */
49-
"DAY_OF_WEEK_IN_MONTH", /* 8 */
50-
"AM_PM", /* 9 */
51-
"HOUR", /* 10 */
52-
"HOUR_OF_DAY", /* 11 */
53-
"MINUTE", /* 12 */
54-
"SECOND", /* 13 */
55-
"MILLISECOND", /* 14 */
56-
"ZONE_OFFSET", /* 15 */
57-
"DST_OFFSET", /* 16 */
58-
"YEAR_WOY", /* 17 */
59-
"DOW_LOCAL", /* 18 */
60-
"EXTENDED_YEAR", /* 19 */
61-
"JULIAN_DAY", /* 20 */
62-
"MILLISECONDS_IN_DAY", /* 21 */
63-
"IS_LEAP_MONTH", /* 22 */
64-
//"ORDINAL_MONTH", /* 23 */
43+
{
44+
"ERA", /* 0 */
45+
"YEAR", /* 1 */
46+
"MONTH", /* 2 */
47+
"WEEK_OF_YEAR", /* 3 */
48+
"WEEK_OF_MONTH", /* 4 */
49+
"DATE", /* 5 */
50+
"DAY_OF_YEAR", /* 6 */
51+
"DAY_OF_WEEK", /* 7 */
52+
"DAY_OF_WEEK_IN_MONTH", /* 8 */
53+
"AM_PM", /* 9 */
54+
"HOUR", /* 10 */
55+
"HOUR_OF_DAY", /* 11 */
56+
"MINUTE", /* 12 */
57+
"SECOND", /* 13 */
58+
"MILLISECOND", /* 14 */
59+
"ZONE_OFFSET", /* 15 */
60+
"DST_OFFSET", /* 16 */
61+
"YEAR_WOY", /* 17 */
62+
"DOW_LOCAL", /* 18 */
63+
"EXTENDED_YEAR", /* 19 */
64+
"JULIAN_DAY", /* 20 */
65+
"MILLISECONDS_IN_DAY", /* 21 */
66+
"IS_LEAP_MONTH", /* 22 */
67+
// "ORDINAL_MONTH", /* 23 */
6568
},
6669
/* UCalendarMonths, 2 */
67-
{
68-
"JANUARY", /* 0 */
69-
"FEBRUARY", /* 1 */
70-
"MARCH", /* 2 */
71-
"APRIL", /* 3 */
72-
"MAY", /* 4 */
73-
"JUNE", /* 5 */
74-
"JULY", /* 6 */
75-
"AUGUST", /* 7 */
76-
"SEPTEMBER", /* 8 */
77-
"OCTOBER", /* 9 */
78-
"NOVEMBER", /* 10 */
79-
"DECEMBER", /* 11 */
80-
"UNDECIMBER", /* 12 */
70+
{
71+
"JANUARY", /* 0 */
72+
"FEBRUARY", /* 1 */
73+
"MARCH", /* 2 */
74+
"APRIL", /* 3 */
75+
"MAY", /* 4 */
76+
"JUNE", /* 5 */
77+
"JULY", /* 6 */
78+
"AUGUST", /* 7 */
79+
"SEPTEMBER", /* 8 */
80+
"OCTOBER", /* 9 */
81+
"NOVEMBER", /* 10 */
82+
"DECEMBER", /* 11 */
83+
"UNDECIMBER", /* 12 */
8184
},
8285
/* UDateFormatStyle, 3 */
83-
{
84-
"FULL", /* 0 */
85-
"LONG", /* 1 */
86-
"MEDIUM", /* 2 */
87-
"SHORT", /* 3 */
86+
{
87+
"FULL", /* 0 */ "LONG", /* 1 */ "MEDIUM", /* 2 */ "SHORT", /* 3 */
8888
},
8989
/* UAcceptResult, 4 */
90-
{
91-
"FAILED", /* 0 */
92-
"VALID", /* 1 */
93-
"FALLBACK", /* 2 */
90+
{
91+
"FAILED", /* 0 */ "VALID", /* 1 */ "FALLBACK", /* 2 */
9492
},
9593
/* UColAttributeValue, 5 */
96-
{
97-
"PRIMARY", /* 0 */
98-
"SECONDARY", /* 1 */
99-
"TERTIARY", /* 2 */
100-
"QUATERNARY", /* 3 */
101-
"IDENTICAL", /* 4 */
102-
"OFF", /* 5 */
103-
"ON", /* 6 */
104-
"SHIFTED", /* 7 */
105-
"NON_IGNORABLE", /* 8 */
106-
"LOWER_FIRST", /* 9 */
107-
"UPPER_FIRST", /* 10 */
94+
{
95+
"PRIMARY", /* 0 */
96+
"SECONDARY", /* 1 */
97+
"TERTIARY", /* 2 */
98+
"QUATERNARY", /* 3 */
99+
"IDENTICAL", /* 4 */
100+
"OFF", /* 5 */
101+
"ON", /* 6 */
102+
"SHIFTED", /* 7 */
103+
"NON_IGNORABLE", /* 8 */
104+
"LOWER_FIRST", /* 9 */
105+
"UPPER_FIRST", /* 10 */
108106
},
109107
};
110108

111-
public static final int [][] VALUES = {
109+
public static final int[][] VALUES = {
112110
/* UDebugEnumType, 0 */
113-
{
114-
0, /* UDebugEnumType */
115-
1, /* UCalendarDateFields */
116-
2, /* UCalendarMonths */
117-
3, /* UDateFormatStyle */
118-
4, /* UAcceptResult */
119-
5, /* UColAttributeValue */
111+
{
112+
0, /* UDebugEnumType */ 1, /* UCalendarDateFields */ 2, /* UCalendarMonths */
113+
3, /* UDateFormatStyle */ 4, /* UAcceptResult */ 5, /* UColAttributeValue */
120114
},
121115
/* UCalendarDateFields, 1 */
122-
{
123-
com.ibm.icu.util.Calendar.ERA, /* 0 */
124-
com.ibm.icu.util.Calendar.YEAR, /* 1 */
125-
com.ibm.icu.util.Calendar.MONTH, /* 2 */
126-
com.ibm.icu.util.Calendar.WEEK_OF_YEAR, /* 3 */
127-
com.ibm.icu.util.Calendar.WEEK_OF_MONTH, /* 4 */
128-
com.ibm.icu.util.Calendar.DATE, /* 5 */
129-
com.ibm.icu.util.Calendar.DAY_OF_YEAR, /* 6 */
130-
com.ibm.icu.util.Calendar.DAY_OF_WEEK, /* 7 */
131-
com.ibm.icu.util.Calendar.DAY_OF_WEEK_IN_MONTH, /* 8 */
132-
com.ibm.icu.util.Calendar.AM_PM, /* 9 */
133-
com.ibm.icu.util.Calendar.HOUR, /* 10 */
134-
com.ibm.icu.util.Calendar.HOUR_OF_DAY, /* 11 */
135-
com.ibm.icu.util.Calendar.MINUTE, /* 12 */
136-
com.ibm.icu.util.Calendar.SECOND, /* 13 */
137-
com.ibm.icu.util.Calendar.MILLISECOND, /* 14 */
138-
com.ibm.icu.util.Calendar.ZONE_OFFSET, /* 15 */
139-
com.ibm.icu.util.Calendar.DST_OFFSET, /* 16 */
140-
com.ibm.icu.util.Calendar.YEAR_WOY, /* 17 */
141-
com.ibm.icu.util.Calendar.DOW_LOCAL, /* 18 */
142-
com.ibm.icu.util.Calendar.EXTENDED_YEAR, /* 19 */
143-
com.ibm.icu.util.Calendar.JULIAN_DAY, /* 20 */
144-
com.ibm.icu.util.Calendar.MILLISECONDS_IN_DAY, /* 21 */
145-
com.ibm.icu.util.ChineseCalendar.IS_LEAP_MONTH, /* 22 */
146-
//com.ibm.icu.util.Calendar.ORDINAL_MONTH, /* 23 */
116+
{
117+
com.ibm.icu.util.Calendar.ERA, /* 0 */
118+
com.ibm.icu.util.Calendar.YEAR, /* 1 */
119+
com.ibm.icu.util.Calendar.MONTH, /* 2 */
120+
com.ibm.icu.util.Calendar.WEEK_OF_YEAR, /* 3 */
121+
com.ibm.icu.util.Calendar.WEEK_OF_MONTH, /* 4 */
122+
com.ibm.icu.util.Calendar.DATE, /* 5 */
123+
com.ibm.icu.util.Calendar.DAY_OF_YEAR, /* 6 */
124+
com.ibm.icu.util.Calendar.DAY_OF_WEEK, /* 7 */
125+
com.ibm.icu.util.Calendar.DAY_OF_WEEK_IN_MONTH, /* 8 */
126+
com.ibm.icu.util.Calendar.AM_PM, /* 9 */
127+
com.ibm.icu.util.Calendar.HOUR, /* 10 */
128+
com.ibm.icu.util.Calendar.HOUR_OF_DAY, /* 11 */
129+
com.ibm.icu.util.Calendar.MINUTE, /* 12 */
130+
com.ibm.icu.util.Calendar.SECOND, /* 13 */
131+
com.ibm.icu.util.Calendar.MILLISECOND, /* 14 */
132+
com.ibm.icu.util.Calendar.ZONE_OFFSET, /* 15 */
133+
com.ibm.icu.util.Calendar.DST_OFFSET, /* 16 */
134+
com.ibm.icu.util.Calendar.YEAR_WOY, /* 17 */
135+
com.ibm.icu.util.Calendar.DOW_LOCAL, /* 18 */
136+
com.ibm.icu.util.Calendar.EXTENDED_YEAR, /* 19 */
137+
com.ibm.icu.util.Calendar.JULIAN_DAY, /* 20 */
138+
com.ibm.icu.util.Calendar.MILLISECONDS_IN_DAY, /* 21 */
139+
com.ibm.icu.util.ChineseCalendar.IS_LEAP_MONTH, /* 22 */
140+
// com.ibm.icu.util.Calendar.ORDINAL_MONTH, /* 23 */
147141
},
148142
/* UCalendarMonths, 2 */
149-
{
150-
com.ibm.icu.util.Calendar.JANUARY, /* 0 */
151-
com.ibm.icu.util.Calendar.FEBRUARY, /* 1 */
152-
com.ibm.icu.util.Calendar.MARCH, /* 2 */
153-
com.ibm.icu.util.Calendar.APRIL, /* 3 */
154-
com.ibm.icu.util.Calendar.MAY, /* 4 */
155-
com.ibm.icu.util.Calendar.JUNE, /* 5 */
156-
com.ibm.icu.util.Calendar.JULY, /* 6 */
157-
com.ibm.icu.util.Calendar.AUGUST, /* 7 */
158-
com.ibm.icu.util.Calendar.SEPTEMBER, /* 8 */
159-
com.ibm.icu.util.Calendar.OCTOBER, /* 9 */
160-
com.ibm.icu.util.Calendar.NOVEMBER, /* 10 */
161-
com.ibm.icu.util.Calendar.DECEMBER, /* 11 */
162-
com.ibm.icu.util.Calendar.UNDECIMBER, /* 12 */
143+
{
144+
com.ibm.icu.util.Calendar.JANUARY, /* 0 */
145+
com.ibm.icu.util.Calendar.FEBRUARY, /* 1 */
146+
com.ibm.icu.util.Calendar.MARCH, /* 2 */
147+
com.ibm.icu.util.Calendar.APRIL, /* 3 */
148+
com.ibm.icu.util.Calendar.MAY, /* 4 */
149+
com.ibm.icu.util.Calendar.JUNE, /* 5 */
150+
com.ibm.icu.util.Calendar.JULY, /* 6 */
151+
com.ibm.icu.util.Calendar.AUGUST, /* 7 */
152+
com.ibm.icu.util.Calendar.SEPTEMBER, /* 8 */
153+
com.ibm.icu.util.Calendar.OCTOBER, /* 9 */
154+
com.ibm.icu.util.Calendar.NOVEMBER, /* 10 */
155+
com.ibm.icu.util.Calendar.DECEMBER, /* 11 */
156+
com.ibm.icu.util.Calendar.UNDECIMBER, /* 12 */
163157
},
164158
/* UDateFormatStyle, 3 */
165-
{
166-
0, /* FULL */
167-
1, /* LONG */
168-
2, /* MEDIUM */
169-
3, /* SHORT */
159+
{
160+
0, /* FULL */ 1, /* LONG */ 2, /* MEDIUM */ 3, /* SHORT */
170161
},
171162
/* UAcceptResult, 4 */
172-
{
173-
0, /* FAILED */
174-
1, /* VALID */
175-
2, /* FALLBACK */
163+
{
164+
0, /* FAILED */ 1, /* VALID */ 2, /* FALLBACK */
176165
},
177166
/* UColAttributeValue, 5 */
178-
{
179-
0, /* PRIMARY */
180-
1, /* SECONDARY */
181-
2, /* TERTIARY */
182-
3, /* QUATERNARY */
183-
4, /* IDENTICAL */
184-
5, /* OFF */
185-
6, /* ON */
186-
7, /* SHIFTED */
187-
8, /* NON_IGNORABLE */
188-
9, /* LOWER_FIRST */
189-
10, /* UPPER_FIRST */
167+
{
168+
0, /* PRIMARY */ 1, /* SECONDARY */ 2, /* TERTIARY */ 3, /* QUATERNARY */
169+
4, /* IDENTICAL */ 5, /* OFF */ 6, /* ON */ 7, /* SHIFTED */ 8, /* NON_IGNORABLE */
170+
9, /* LOWER_FIRST */ 10, /* UPPER_FIRST */
190171
},
191172
};
192-
193173
}

0 commit comments

Comments
 (0)