1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
|
--- ../../j2se/src/share/classes/sun/nio/cs/standard-charsets Tue Oct 19 14:57:57 2004
+++ ../../j2se/src/share/classes/sun/nio/cs/standard-charsets Wed Jul 20 00:02:11 2005
@@ -172,6 +172,11 @@
charset KOI8-R KOI8_R
alias koi8_r # JDK historical
- alias koi8
alias cskoi8r
+
+charset KOI8-U KOI8_U # Superset of KOI8-R covering other
+ alias koi8_u # Cyrillics-using alphabets
+ alias koi8
+ alias cskoi8u
+ alias koi8u
charset windows-1250 MS1250
--- ../../j2se/src/share/classes/sun/io/CharacterEncoding.java Tue Oct 19 14:57:28 2004
+++ ../../j2se/src/share/classes/sun/io/CharacterEncoding.java Wed Jul 20 01:10:16 2005
@@ -75,4 +75,5 @@
aliasTable.put("gbk", "GBK");
aliasTable.put("koi8-r", "KOI8_R");
+ aliasTable.put("koi8-u", "KOI8_U");
aliasTable.put("tis620.2533", "TIS620");
@@ -763,6 +764,11 @@
// Russian KOI8-R
aliasTable.put("koi8-r", "KOI8_R");
- aliasTable.put("koi8", "KOI8_R");
aliasTable.put("cskoi8r", "KOI8_R");
+
+ // Ukrainian and Bielorussian KOI8-U (includes KOI8-R)
+ aliasTable.put("koi8-u", "KOI8_U");
+ aliasTable.put("koi8", "KOI8_U");
+ aliasTable.put("koi8u", "KOI8_U");
+ aliasTable.put("cskoi8u", "KOI8_U");
// Simplified Chinese
--- ../../j2se/make/java/sun_io/FILES_java.gmk Tue Oct 19 14:44:54 2004
+++ ../../j2se/make/java/sun_io/FILES_java.gmk Wed Jul 20 01:20:35 2005
@@ -65,4 +65,6 @@
$(TARGDIR)sun/io/ByteToCharKOI8_R.java \
$(TARGDIR)sun/io/CharToByteKOI8_R.java \
+ $(TARGDIR)sun/io/ByteToCharKOI8_U.java \
+ $(TARGDIR)sun/io/CharToByteKOI8_U.java \
$(TARGDIR)sun/io/ByteToCharSingleByte.java \
$(TARGDIR)sun/io/CharToByteSingleByte.java \
--- ../../j2se/src/solaris/classes/sun/awt/motif/MFontConfiguration.java Tue Oct 19 15:01:53 2004
+++ ../../j2se/src/solaris/classes/sun/awt/motif/MFontConfiguration.java Tue Aug 2 12:20:17 2005
@@ -101,4 +101,5 @@
reorderMap.put("windows-1251", "cyrillic-cp1251");
reorderMap.put("KOI8-R", "cyrillic-koi8-r");
+ reorderMap.put("KOI8-U", "cyrillic-koi8-u");
reorderMap.put("ISO-8859-6", "arabic");
reorderMap.put("ISO-8859-7", "greek");
--- ../../j2se/src/solaris/classes/sun/font/XMap.java Tue Oct 19 15:01:55 2004
+++ ../../j2se/src/solaris/classes/sun/font/XMap.java Tue Aug 2 12:21:16 2005
@@ -84,4 +84,6 @@
} else if (encoding.equals("koi8-r")) {
jclass = "io.CharToByteKOI8_R";
+ } else if (encoding.equals("koi8-u")) {
+ jclass = "io.CharToByteKOI8_U";
} else if (encoding.equals("ansi-1251")) {
jclass = "io.CharToByteCp1251";
|
