encodings.pl: New file.
* scripts/encodings.pl: New file. * Makefile.in: Rebuilt. * Makefile.am (convert_source_files): Added IOConverter.java. * gnu/gcj/convert/UnicodeToBytes.java (UnicodeToBytes): Extend IOConverter. (getDefaultDecodingClass): Canonicalize default encoding name. (getEncoder): Likewise. * gnu/gcj/convert/BytesToUnicode.java (BytesToUnicode): Extend IOConverter. (getDefaultDecodingClass): Canonicalize default encoding name. (getDecoder): Likewise. * gnu/gcj/convert/IOConverter.java: New file. From-SVN: r35432
This commit is contained in:
@@ -8,7 +8,7 @@ details. */
|
||||
|
||||
package gnu.gcj.convert;
|
||||
|
||||
public abstract class UnicodeToBytes
|
||||
public abstract class UnicodeToBytes extends IOConverter
|
||||
{
|
||||
/** Buffer to emit bytes to.
|
||||
* The locations buf[count] ... buf[buf.length-1] are available. */
|
||||
@@ -22,7 +22,7 @@ public abstract class UnicodeToBytes
|
||||
// Test (defaultEncodingClass == null) again in case of race condition.
|
||||
if (defaultEncodingClass == null)
|
||||
{
|
||||
String encoding = System.getProperty("file.encoding");
|
||||
String encoding = canonicalize (System.getProperty("file.encoding"));
|
||||
String className = "gnu.gcj.convert.Output_"+encoding;
|
||||
try
|
||||
{
|
||||
@@ -58,7 +58,7 @@ public abstract class UnicodeToBytes
|
||||
public static UnicodeToBytes getEncoder (String encoding)
|
||||
throws java.io.UnsupportedEncodingException
|
||||
{
|
||||
String className = "gnu.gcj.convert.Output_"+encoding;
|
||||
String className = "gnu.gcj.convert.Output_" + canonicalize (encoding);
|
||||
Class encodingClass;
|
||||
try
|
||||
{
|
||||
@@ -69,6 +69,8 @@ public abstract class UnicodeToBytes
|
||||
{
|
||||
try
|
||||
{
|
||||
// We pass the original name to iconv and let it handle
|
||||
// its own aliasing.
|
||||
return new Output_iconv (encoding);
|
||||
}
|
||||
catch (Throwable _)
|
||||
|
||||
Reference in New Issue
Block a user