diff options
Diffstat (limited to 'libjava/gnu')
| -rw-r--r-- | libjava/gnu/gcj/convert/IOConverter.java | 47 |
1 files changed, 24 insertions, 23 deletions
diff --git a/libjava/gnu/gcj/convert/IOConverter.java b/libjava/gnu/gcj/convert/IOConverter.java index 9b5fbad00f4..2c1d526b4cd 100644 --- a/libjava/gnu/gcj/convert/IOConverter.java +++ b/libjava/gnu/gcj/convert/IOConverter.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 Free Software Foundation +/* Copyright (C) 2000, 2001 Free Software Foundation This file is part of libgcj. @@ -29,33 +29,34 @@ public abstract class IOConverter hash.put ("ISO-Latin-1", "8859_1"); // All aliases after this point are automatically generated by the // `encodings.pl' script. Run it to make any corrections. - hash.put ("ANSI_X3.4-1968", "ASCII"); + hash.put ("ansi_x3.4-1968", "ASCII"); hash.put ("iso-ir-6", "ASCII"); - hash.put ("ANSI_X3.4-1986", "ASCII"); - hash.put ("ISO_646.irv:1991", "ASCII"); - hash.put ("ASCII", "ASCII"); - hash.put ("ISO646-US", "ASCII"); - hash.put ("US-ASCII", "ASCII"); + hash.put ("ansi_x3.4-1986", "ASCII"); + hash.put ("iso_646.irv:1991", "ASCII"); + hash.put ("ascii", "ASCII"); + hash.put ("iso646-us", "ASCII"); + hash.put ("us-ascii", "ASCII"); hash.put ("us", "ASCII"); - hash.put ("IBM367", "ASCII"); + hash.put ("ibm367", "ASCII"); hash.put ("cp367", "ASCII"); - hash.put ("csASCII", "ASCII"); - hash.put ("ISO_8859-1:1987", "8859_1"); + hash.put ("csascii", "ASCII"); + hash.put ("iso_8859-1:1987", "8859_1"); hash.put ("iso-ir-100", "8859_1"); - hash.put ("ISO_8859-1", "8859_1"); - hash.put ("ISO-8859-1", "8859_1"); + hash.put ("iso_8859-1", "8859_1"); + hash.put ("iso-8859-1", "8859_1"); hash.put ("latin1", "8859_1"); hash.put ("l1", "8859_1"); - hash.put ("IBM819", "8859_1"); - hash.put ("CP819", "8859_1"); - hash.put ("csISOLatin1", "8859_1"); - hash.put ("UTF-8", "UTF8"); - hash.put ("Shift_JIS", "SJIS"); - hash.put ("MS_Kanji", "SJIS"); - hash.put ("csShiftJIS", "SJIS"); - hash.put ("Extended_UNIX_Code_Packed_Format_for_Japanese", "EUCJIS"); - hash.put ("csEUCPkdFmtJapanese", "EUCJIS"); - hash.put ("EUC-JP", "EUCJIS"); + hash.put ("ibm819", "8859_1"); + hash.put ("cp819", "8859_1"); + hash.put ("csisolatin1", "8859_1"); + hash.put ("utf-8", "UTF8"); + hash.put ("none", "UTF8"); + hash.put ("shift_jis", "SJIS"); + hash.put ("ms_kanji", "SJIS"); + hash.put ("csshiftjis", "SJIS"); + hash.put ("extended_unix_code_packed_format_for_japanese", "EUCJIS"); + hash.put ("cseucpkdfmtjapanese", "EUCJIS"); + hash.put ("euc-jp", "EUCJIS"); iconv_byte_swap = iconv_init (); } @@ -65,7 +66,7 @@ public abstract class IOConverter // Turn an alias into the canonical form. protected static final String canonicalize (String name) { - String c = (String) hash.get (name); + String c = (String) hash.get (name.toLowerCase ()); return c == null ? name : c; } } |