--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/make/data/charsetmapping/IBM1166.c2b Thu Feb 26 09:36:30 2015 +0000
@@ -0,0 +1,1 @@
+0x15 U+0085
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/make/data/charsetmapping/IBM1166.map Thu Feb 26 09:36:30 2015 +0000
@@ -0,0 +1,256 @@
+0x00 U+0000
+0x01 U+0001
+0x02 U+0002
+0x03 U+0003
+0x04 U+009c
+0x05 U+0009
+0x06 U+0086
+0x07 U+007f
+0x08 U+0097
+0x09 U+008d
+0x0a U+008e
+0x0b U+000b
+0x0c U+000c
+0x0d U+000d
+0x0e U+000e
+0x0f U+000f
+0x10 U+0010
+0x11 U+0011
+0x12 U+0012
+0x13 U+0013
+0x14 U+009d
+0x15 U+000a
+0x16 U+0008
+0x17 U+0087
+0x18 U+0018
+0x19 U+0019
+0x1a U+0092
+0x1b U+008f
+0x1c U+001c
+0x1d U+001d
+0x1e U+001e
+0x1f U+001f
+0x20 U+0080
+0x21 U+0081
+0x22 U+0082
+0x23 U+0083
+0x24 U+0084
+0x25 U+000a
+0x26 U+0017
+0x27 U+001b
+0x28 U+0088
+0x29 U+0089
+0x2a U+008a
+0x2b U+008b
+0x2c U+008c
+0x2d U+0005
+0x2e U+0006
+0x2f U+0007
+0x30 U+0090
+0x31 U+0091
+0x32 U+0016
+0x33 U+0093
+0x34 U+0094
+0x35 U+0095
+0x36 U+0096
+0x37 U+0004
+0x38 U+0098
+0x39 U+0099
+0x3a U+009a
+0x3b U+009b
+0x3c U+0014
+0x3d U+0015
+0x3e U+009e
+0x3f U+001a
+0x40 U+0020
+0x41 U+00a0
+0x42 U+04d9
+0x43 U+0493
+0x44 U+0451
+0x45 U+0454
+0x46 U+0455
+0x47 U+0456
+0x48 U+049b
+0x49 U+0458
+0x4a U+005b
+0x4b U+002e
+0x4c U+003c
+0x4d U+0028
+0x4e U+002b
+0x4f U+0021
+0x50 U+0026
+0x51 U+04a3
+0x52 U+04e9
+0x53 U+04b1
+0x54 U+04af
+0x55 U+045e
+0x56 U+04bb
+0x57 U+042a
+0x58 U+2116
+0x59 U+04d8
+0x5a U+005d
+0x5b U+0024
+0x5c U+002a
+0x5d U+0029
+0x5e U+003b
+0x5f U+005e
+0x60 U+002d
+0x61 U+002f
+0x62 U+0492
+0x63 U+0401
+0x64 U+0404
+0x65 U+0405
+0x66 U+0406
+0x67 U+049a
+0x68 U+0408
+0x69 U+04a2
+0x6a U+007c
+0x6b U+002c
+0x6c U+0025
+0x6d U+005f
+0x6e U+003e
+0x6f U+003f
+0x70 U+04e8
+0x71 U+04b0
+0x72 U+04ae
+0x73 U+00ad
+0x74 U+040e
+0x75 U+04ba
+0x76 U+044e
+0x77 U+0430
+0x78 U+0431
+0x79 U+0060
+0x7a U+003a
+0x7b U+0023
+0x7c U+0040
+0x7d U+0027
+0x7e U+003d
+0x7f U+0022
+0x80 U+0446
+0x81 U+0061
+0x82 U+0062
+0x83 U+0063
+0x84 U+0064
+0x85 U+0065
+0x86 U+0066
+0x87 U+0067
+0x88 U+0068
+0x89 U+0069
+0x8a U+0434
+0x8b U+0435
+0x8c U+0444
+0x8d U+0433
+0x8e U+0445
+0x8f U+0438
+0x90 U+0439
+0x91 U+006a
+0x92 U+006b
+0x93 U+006c
+0x94 U+006d
+0x95 U+006e
+0x96 U+006f
+0x97 U+0070
+0x98 U+0071
+0x99 U+0072
+0x9a U+043a
+0x9b U+043b
+0x9c U+043c
+0x9d U+043d
+0x9e U+043e
+0x9f U+043f
+0xa0 U+044f
+0xa1 U+007e
+0xa2 U+0073
+0xa3 U+0074
+0xa4 U+0075
+0xa5 U+0076
+0xa6 U+0077
+0xa7 U+0078
+0xa8 U+0079
+0xa9 U+007a
+0xaa U+0440
+0xab U+0441
+0xac U+0442
+0xad U+0443
+0xae U+0436
+0xaf U+0432
+0xb0 U+044c
+0xb1 U+044b
+0xb2 U+0437
+0xb3 U+0448
+0xb4 U+044d
+0xb5 U+0449
+0xb6 U+0447
+0xb7 U+044a
+0xb8 U+042e
+0xb9 U+0410
+0xba U+0411
+0xbb U+0426
+0xbc U+0414
+0xbd U+0415
+0xbe U+0424
+0xbf U+0413
+0xc0 U+007b
+0xc1 U+0041
+0xc2 U+0042
+0xc3 U+0043
+0xc4 U+0044
+0xc5 U+0045
+0xc6 U+0046
+0xc7 U+0047
+0xc8 U+0048
+0xc9 U+0049
+0xca U+0425
+0xcb U+0418
+0xcc U+0419
+0xcd U+041a
+0xce U+041b
+0xcf U+041c
+0xd0 U+007d
+0xd1 U+004a
+0xd2 U+004b
+0xd3 U+004c
+0xd4 U+004d
+0xd5 U+004e
+0xd6 U+004f
+0xd7 U+0050
+0xd8 U+0051
+0xd9 U+0052
+0xda U+041d
+0xdb U+041e
+0xdc U+041f
+0xdd U+042f
+0xde U+0420
+0xdf U+0421
+0xe0 U+005c
+0xe1 U+20ac
+0xe2 U+0053
+0xe3 U+0054
+0xe4 U+0055
+0xe5 U+0056
+0xe6 U+0057
+0xe7 U+0058
+0xe8 U+0059
+0xe9 U+005a
+0xea U+0422
+0xeb U+0423
+0xec U+0416
+0xed U+0412
+0xee U+042c
+0xef U+042b
+0xf0 U+0030
+0xf1 U+0031
+0xf2 U+0032
+0xf3 U+0033
+0xf4 U+0034
+0xf5 U+0035
+0xf6 U+0036
+0xf7 U+0037
+0xf8 U+0038
+0xf9 U+0039
+0xfa U+0417
+0xfb U+0428
+0xfc U+042d
+0xfd U+0429
+0xfe U+0427
+0xff U+009f
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/make/data/charsetmapping/IBM1166.nr Thu Feb 26 09:36:30 2015 +0000
@@ -0,0 +1,1 @@
+0x25 U+000a
--- a/jdk/make/data/charsetmapping/charsets Thu Feb 26 08:08:52 2015 +0800
+++ b/jdk/make/data/charsetmapping/charsets Thu Feb 26 09:36:30 2015 +0000
@@ -1660,6 +1660,16 @@
alias EBCDIC-JP-kana
alias 290
+charset x-IBM1166 IBM1166
+ package sun.nio.cs.ext
+ type sbcs
+ hisname Cp1166
+ ascii false
+ alias cp1166
+ alias ibm1166
+ alias ibm-1166
+ alias 1166
+
charset x-IBM300 IBM300
package sun.nio.cs.ext
type dbcsonly
--- a/jdk/make/data/charsetmapping/list_old Thu Feb 26 08:08:52 2015 +0800
+++ b/jdk/make/data/charsetmapping/list_old Thu Feb 26 09:36:30 2015 +0000
@@ -57,6 +57,7 @@
IBM1147 IBM01147 Cp1147 false sun.nio.cs.ext
IBM1148 IBM01148 Cp1148 false sun.nio.cs.ext
IBM1149 IBM01149 Cp1149 false sun.nio.cs.ext
+IBM1166 x-IBM1166 Cp1166 false sun.nio.cs.ext
IBM273 IBM273 Cp273 false sun.nio.cs.ext
IBM277 IBM277 Cp277 false sun.nio.cs.ext
IBM278 IBM278 Cp278 false sun.nio.cs.ext
--- a/jdk/test/java/nio/charset/Charset/RegisteredCharsets.java Thu Feb 26 08:08:52 2015 +0800
+++ b/jdk/test/java/nio/charset/Charset/RegisteredCharsets.java Thu Feb 26 09:36:30 2015 +0000
@@ -22,7 +22,8 @@
*/
/* @test
- * @bug 4473201 4696726 4652234 4482298 4784385 4966197 4267354 5015668 6911753
+ * @bug 4473201 4696726 4652234 4482298 4784385 4966197 4267354 5015668
+ 6911753 8071447
* @summary Check that registered charsets are actually registered
*/
@@ -135,6 +136,7 @@
"x-IBM1122",
"x-IBM1123",
"x-IBM1124",
+ "x-IBM1166",
"x-IBM875",
"x-IBM921",
"x-IBM922",
@@ -863,6 +865,14 @@
"1124"
} );
+ aliasCheck("x-IBM1166" ,
+ new String[] {
+ "cp1166", // JDK historical
+ "ibm1166",
+ "ibm-1166",
+ "1166"
+ } );
+
aliasCheck("IBM273" ,
new String[] {
"cp273", // JDK historical
--- a/jdk/test/java/nio/charset/RemovingSunIO/SunioAlias.java Thu Feb 26 08:08:52 2015 +0800
+++ b/jdk/test/java/nio/charset/RemovingSunIO/SunioAlias.java Thu Feb 26 09:36:30 2015 +0000
@@ -675,6 +675,12 @@
aliasTable.put("1124", "Cp1124");
// MIBenum: ????
+ aliasTable.put("ibm1166", "Cp1166");
+ aliasTable.put("ibm-1166", "Cp1166");
+ aliasTable.put("cp1166", "Cp1166");
+ aliasTable.put("1166", "Cp1166");
+
+ // MIBenum: ????
aliasTable.put("ibm1381", "Cp1381"); /* MDA */
aliasTable.put("ibm-1381", "Cp1381"); /* MDA */
aliasTable.put("cp1381", "Cp1381"); /* MDA */
--- a/jdk/test/sun/nio/cs/CheckHistoricalNames.java Thu Feb 26 08:08:52 2015 +0800
+++ b/jdk/test/sun/nio/cs/CheckHistoricalNames.java Thu Feb 26 09:36:30 2015 +0000
@@ -196,6 +196,7 @@
checkMappedName("IBM1122", "Cp1122");
checkMappedName("IBM1123", "Cp1123");
checkMappedName("IBM1124", "Cp1124");
+ checkMappedName("IBM1166", "Cp1166");
checkMappedName("IBM01140", "Cp1140");
checkMappedName("IBM01141", "Cp1141");
checkMappedName("IBM01142", "Cp1142");