Skip to content

Commit 5d8ba93

Browse files
author
Ichiroh Takiguchi
committed
8308046: Move Solaris related charsets from java.base to jdk.charsets module
Reviewed-by: naoto
1 parent 878162b commit 5d8ba93

File tree

4 files changed

+15
-21
lines changed

4 files changed

+15
-21
lines changed

make/data/charsetmapping/DoubleByte-X.java.template

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2009, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2009, 2023, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -56,10 +56,10 @@ public class $NAME_CLZ$ extends Charset
5656
return new DoubleByte.Encoder$ENCTYPE$(this, $ENC_REPLACEMENT$ EncodeHolder.c2b, EncodeHolder.c2bIndex, $ASCIICOMPATIBLE$);
5757
}
5858

59-
static class DecodeHolder {
59+
public static class DecodeHolder {
6060
$B2C$
61-
static final char[][] b2c = new char[b2cStr.length][];
62-
static final char[] b2cSB;
61+
public static final char[][] b2c = new char[b2cStr.length][];
62+
public static final char[] b2cSB;
6363

6464
static {
6565
for (int i = 0; i < b2cStr.length; i++) {
@@ -72,9 +72,9 @@ public class $NAME_CLZ$ extends Charset
7272
}
7373
}
7474

75-
static class EncodeHolder {
76-
static final char[] c2b = new char[$C2BLENGTH$];
77-
static final char[] c2bIndex = new char[0x100];
75+
public static class EncodeHolder {
76+
public static final char[] c2b = new char[$C2BLENGTH$];
77+
public static final char[] c2bIndex = new char[0x100];
7878

7979
static {
8080
$NONROUNDTRIP_B2C$

make/data/charsetmapping/stdcs-linux

-5
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,21 @@
22
# generate these charsets into sun.nio.cs
33
#
44
Big5
5-
Big5_Solaris
65
Big5_HKSCS
76
EUC_CN
87
EUC_KR
98
EUC_JP
109
EUC_JP_LINUX
11-
EUC_JP_Open
1210
EUC_TW
1311
GBK
1412
ISO_8859_11
1513
ISO_8859_3
1614
ISO_8859_6
1715
ISO_8859_8
1816
Johab
19-
PCK
2017
TIS_620
2118
JIS_X_0201
2219
JIS_X_0208
2320
JIS_X_0212
24-
JIS_X_0208_Solaris
25-
JIS_X_0212_Solaris
2621
MS932
2722
SJIS

src/jdk.charsets/share/classes/sun/nio/cs/ext/Big5_Solaris.java.template

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2004, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2004, 2023, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -28,8 +28,7 @@ package $PACKAGE$;
2828
import java.nio.charset.Charset;
2929
import java.nio.charset.CharsetDecoder;
3030
import java.nio.charset.CharsetEncoder;
31-
import sun.nio.cs.DoubleByte;
32-
import sun.nio.cs.HistoricallyNamedCharset;
31+
import sun.nio.cs.*;
3332
import java.util.Arrays;
3433
import static sun.nio.cs.CharsetMapping.*;
3534

src/jdk.charsets/share/classes/sun/nio/cs/ext/EUC_JP.java.template

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -72,16 +72,16 @@ public class EUC_JP
7272
return new Encoder(this);
7373
}
7474

75-
static class Decoder extends CharsetDecoder
75+
public static class Decoder extends CharsetDecoder
7676
implements DelegatableDecoder {
7777

78-
static final SingleByte.Decoder DEC0201 =
78+
public static final SingleByte.Decoder DEC0201 =
7979
(SingleByte.Decoder)new JIS_X_0201().newDecoder();
8080

81-
static final DoubleByte.Decoder DEC0208 =
81+
public static final DoubleByte.Decoder DEC0208 =
8282
(DoubleByte.Decoder)new JIS_X_0208().newDecoder();
8383

84-
static final DoubleByte.Decoder DEC0212 =
84+
public static final DoubleByte.Decoder DEC0212 =
8585
(DoubleByte.Decoder)new JIS_X_0212().newDecoder();
8686

8787
private final SingleByte.Decoder dec0201;
@@ -228,7 +228,7 @@ public class EUC_JP
228228
}
229229

230230

231-
static class Encoder extends CharsetEncoder {
231+
public static class Encoder extends CharsetEncoder {
232232

233233
static final SingleByte.Encoder ENC0201 =
234234
(SingleByte.Encoder)new JIS_X_0201().newEncoder();

0 commit comments

Comments
 (0)