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

8201540: [AIX] Extend the set of supported charsets in java.base

Browse Source 
Reviewed-by: alanb, sherman, simonis
This commit is contained in:
Bhaktavatsal R Maram 2018-04-16 14:29:27 +05:30 committed by Volker Simonis
parent 67f6ee6cc7
commit e81b41a371
5 changed files with 41 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
make/data/charsetmapping/charsets
View File

@ -1,5 +1,5 @@
#
# Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
# Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@ -326,6 +326,8 @@ charset windows-1252 MS1252
ascii true
alias cp1252 # JDK historical
alias cp5348 # Euro IBM CCSID
alias ibm-1252
alias ibm1252
charset windows-1253 MS1253
package sun.nio.cs
@ -933,11 +935,16 @@ charset x-IBM942 IBM942 # IBM & PC/MSDOS encodings
charset x-IBM942C IBM942C
package sun.nio.cs.ext
type source
type template
alias cp942C # JDK historical
alias ibm942C
alias ibm-942C
alias 942C
alias cp932
alias ibm932
alias ibm-932
alias 932
alias x-ibm932
charset x-IBM943 IBM943
package sun.nio.cs.ext
@ -952,7 +959,7 @@ charset x-IBM943 IBM943
charset x-IBM943C IBM943C
package sun.nio.cs.ext
type source
type template
alias cp943C # JDK historical
alias ibm943C
alias ibm-943C
@ -1519,6 +1526,9 @@ charset x-IBM1383 IBM1383
alias ibm1383
alias ibm-1383
alias 1383
alias ibmeuccn
alias ibm-euccn
alias cpeuccn
charset x-IBM970 IBM970
package sun.nio.cs.ext

20
make/data/charsetmapping/stdcs-aix
View File

@ -1,6 +1,26 @@
#
# generate these charsets into sun.nio.cs
#
Big5
Big5_Solaris
Big5_HKSCS
EUC_CN
EUC_KR
GBK
GB18030
IBM856
IBM921
IBM922
IBM942
IBM942C
IBM943
IBM943C
IBM950
IBM970
IBM1046
IBM1124
IBM1383
ISO_8859_6
ISO_8859_8
MS1252
TIS_620

4
make/jdk/src/classes/build/tools/charsetmapping/SPI.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -129,7 +129,7 @@ public class SPI {
} else if (line.indexOf("_INCLUDE_ALIASES_MAP_") != -1) {
Hasher.genClass(out, aliasKeys, aliasValues,
null, "Aliases", "String",
11, 3, true, false, false);
12, 3, true, false, false);
} else if (line.indexOf("_INCLUDE_CLASSES_MAP_") != -1) {
Hasher.genClass(out, clzKeys, clzValues,
null, "Classes", "String",

6
src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM942C.java → src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM942C.java.template
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -23,7 +23,7 @@
* questions.
*/
package sun.nio.cs.ext;
package $PACKAGE$;
import java.nio.charset.Charset;
import java.nio.charset.CharsetDecoder;
@ -36,7 +36,7 @@ import static sun.nio.cs.CharsetMapping.*;
public class IBM942C extends Charset implements HistoricallyNamedCharset
{
public IBM942C() {
super("x-IBM942C", ExtendedCharsets.aliasesFor("x-IBM942C"));
super("x-IBM942C", $ALIASES$);
}
public String historicalName() {

6
src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM943C.java → src/jdk.charsets/share/classes/sun/nio/cs/ext/IBM943C.java.template
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -23,7 +23,7 @@
* questions.
*/
package sun.nio.cs.ext;
package $PACKAGE$;
import java.nio.charset.Charset;
import java.nio.charset.CharsetDecoder;
@ -36,7 +36,7 @@ public class IBM943C extends Charset implements HistoricallyNamedCharset
{
public IBM943C() {
super("x-IBM943C", ExtendedCharsets.aliasesFor("x-IBM943C"));
super("x-IBM943C", $ALIASES$);
}
public String historicalName() {