stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8308046: Move Solaris related charsets from java.base to jdk.charsets module

Browse Source 
Reviewed-by: naoto
This commit is contained in:
Ichiroh Takiguchi 2023-05-23 00:41:59 +00:00
parent 878162b362
commit 5d8ba938be
4 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
make/data/charsetmapping/DoubleByte-X.java.template
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2009, 2021, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2009, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -56,10 +56,10 @@ public class $NAME_CLZ$ extends Charset
return new DoubleByte.Encoder$ENCTYPE$(this, $ENC_REPLACEMENT$ EncodeHolder.c2b, EncodeHolder.c2bIndex, $ASCIICOMPATIBLE$); return new DoubleByte.Encoder$ENCTYPE$(this, $ENC_REPLACEMENT$ EncodeHolder.c2b, EncodeHolder.c2bIndex, $ASCIICOMPATIBLE$);
} }
static class DecodeHolder { public static class DecodeHolder {
$B2C$ $B2C$
static final char[][] b2c = new char[b2cStr.length][]; public static final char[][] b2c = new char[b2cStr.length][];
static final char[] b2cSB; public static final char[] b2cSB;
static { static {
for (int i = 0; i < b2cStr.length; i++) { for (int i = 0; i < b2cStr.length; i++) {
@ -72,9 +72,9 @@ public class $NAME_CLZ$ extends Charset
} }
} }
static class EncodeHolder { public static class EncodeHolder {
static final char[] c2b = new char[$C2BLENGTH$]; public static final char[] c2b = new char[$C2BLENGTH$];
static final char[] c2bIndex = new char[0x100]; public static final char[] c2bIndex = new char[0x100];
static { static {
$NONROUNDTRIP_B2C$ $NONROUNDTRIP_B2C$

5
make/data/charsetmapping/stdcs-linux
View File

@ -2,13 +2,11 @@
# generate these charsets into sun.nio.cs # generate these charsets into sun.nio.cs
# #
Big5 Big5
Big5_Solaris
Big5_HKSCS Big5_HKSCS
EUC_CN EUC_CN
EUC_KR EUC_KR
EUC_JP EUC_JP
EUC_JP_LINUX EUC_JP_LINUX
EUC_JP_Open
EUC_TW EUC_TW
GBK GBK
ISO_8859_11 ISO_8859_11
@ -16,12 +14,9 @@ ISO_8859_3
ISO_8859_6 ISO_8859_6
ISO_8859_8 ISO_8859_8
Johab Johab
PCK
TIS_620 TIS_620
JIS_X_0201 JIS_X_0201
JIS_X_0208 JIS_X_0208
JIS_X_0212 JIS_X_0212
JIS_X_0208_Solaris
JIS_X_0212_Solaris
MS932 MS932
SJIS SJIS

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

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2004, 2021, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2004, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -28,8 +28,7 @@ package $PACKAGE$;
import java.nio.charset.Charset; import java.nio.charset.Charset;
import java.nio.charset.CharsetDecoder; import java.nio.charset.CharsetDecoder;
import java.nio.charset.CharsetEncoder; import java.nio.charset.CharsetEncoder;
import sun.nio.cs.DoubleByte; import sun.nio.cs.*;
import sun.nio.cs.HistoricallyNamedCharset;
import java.util.Arrays; import java.util.Arrays;
import static sun.nio.cs.CharsetMapping.*; import static sun.nio.cs.CharsetMapping.*;

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

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2002, 2021, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2002, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -72,16 +72,16 @@ public class EUC_JP
return new Encoder(this); return new Encoder(this);
} }
static class Decoder extends CharsetDecoder public static class Decoder extends CharsetDecoder
implements DelegatableDecoder { implements DelegatableDecoder {
static final SingleByte.Decoder DEC0201 = public static final SingleByte.Decoder DEC0201 =
(SingleByte.Decoder)new JIS_X_0201().newDecoder(); (SingleByte.Decoder)new JIS_X_0201().newDecoder();
static final DoubleByte.Decoder DEC0208 = public static final DoubleByte.Decoder DEC0208 =
(DoubleByte.Decoder)new JIS_X_0208().newDecoder(); (DoubleByte.Decoder)new JIS_X_0208().newDecoder();
static final DoubleByte.Decoder DEC0212 = public static final DoubleByte.Decoder DEC0212 =
(DoubleByte.Decoder)new JIS_X_0212().newDecoder(); (DoubleByte.Decoder)new JIS_X_0212().newDecoder();
private final SingleByte.Decoder dec0201; private final SingleByte.Decoder dec0201;
@ -228,7 +228,7 @@ public class EUC_JP
} }
static class Encoder extends CharsetEncoder { public static class Encoder extends CharsetEncoder {
static final SingleByte.Encoder ENC0201 = static final SingleByte.Encoder ENC0201 =
(SingleByte.Encoder)new JIS_X_0201().newEncoder(); (SingleByte.Encoder)new JIS_X_0201().newEncoder();