diff options
| author | Daniel Berlin <dberlin@dberlin.org> | 2005-02-28 03:48:13 +0000 |
|---|---|---|
| committer | Daniel Berlin <dberlin@dberlin.org> | 2005-02-28 03:48:13 +0000 |
| commit | ff5f58a960ef5ebef296b78380ac21ec73eb60d3 (patch) | |
| tree | 6b416e8523c502a82d386c98de1a39da6527b040 /libjava/gnu/java/nio/charset/UTF_16.java | |
| parent | f9f5c9e8498b005d223e54abc259d8edc19f22f3 (diff) | |
Merge from the pain trainstructure-aliasing-branch
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/structure-aliasing-branch@95649 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/gnu/java/nio/charset/UTF_16.java')
| -rw-r--r-- | libjava/gnu/java/nio/charset/UTF_16.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/libjava/gnu/java/nio/charset/UTF_16.java b/libjava/gnu/java/nio/charset/UTF_16.java index aebd14608bd..1737101d75d 100644 --- a/libjava/gnu/java/nio/charset/UTF_16.java +++ b/libjava/gnu/java/nio/charset/UTF_16.java @@ -1,5 +1,5 @@ /* UTF_16.java -- - Copyright (C) 2002, 2004 Free Software Foundation, Inc. + Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -51,7 +51,14 @@ final class UTF_16 extends Charset { UTF_16 () { - super ("UTF-16", null); + super ("UTF-16", new String[] { + // witnessed by the internet + "UTF16", + /* These names are provided by + * http://oss.software.ibm.com/cgi-bin/icu/convexp?s=ALL + */ + "ISO-10646-UCS-2", "unicode", "csUnicode", "ucs-2" + }); } public boolean contains (Charset cs) |