Index: ChangeLog =================================================================== RCS file: /cvsroot/classpath/classpath/ChangeLog,v retrieving revision 1.2311 diff -u -r1.2311 ChangeLog --- ChangeLog 15 Jul 2004 13:35:15 -0000 1.2311 +++ ChangeLog 15 Jul 2004 17:17:25 -0000 @@ -1,3 +1,10 @@ +2004-07-15 Roman Kennke + + * gnu/java/io/decode/DecoderUS_ASCII.java: + Added decoder for ASCI decoding of Unicode. + * java/lang/System.java: + Registered new US_ASCII decoder. + 2004-07-15 Michael Koch * java/util/zip/OutputWindow.java: Index: java/lang/System.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/lang/System.java,v retrieving revision 1.37 diff -u -r1.37 System.java --- java/lang/System.java 8 Jul 2004 14:40:32 -0000 1.37 +++ java/lang/System.java 15 Jul 2004 17:17:25 -0000 @@ -202,12 +202,14 @@ // XXX FIXME - Cheat a little for ASCII. // Remove when we get a real "ASCII En/Decoder" - defaultProperties.put("gnu.java.io.encoding_scheme_alias.ASCII", "8859_1"); - defaultProperties.put("gnu.java.io.encoding_scheme_alias.ascii", "8859_1"); + defaultProperties.put("gnu.java.io.encoding_scheme_alias.ASCII", + "US_ASCII"); + defaultProperties.put("gnu.java.io.encoding_scheme_alias.ascii", + "US_ASCII"); defaultProperties.put("gnu.java.io.encoding_scheme_alias.US-ASCII", - "8859_1"); + "US_ASCII"); defaultProperties.put("gnu.java.io.encoding_scheme_alias.us-ascii", - "8859_1"); + "US_ASCII"); // 8859_1 is a safe default encoding to use when not explicitly set if (defaultProperties.get("file.encoding") == null) Index: gnu/java/io/decode/DecoderUS_ASCII.java =================================================================== RCS file: gnu/java/io/decode/DecoderUS_ASCII.java diff -N gnu/java/io/decode/DecoderUS_ASCII.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ gnu/java/io/decode/DecoderUS_ASCII.java 15 Jul 2004 17:17:25 -0000 @@ -0,0 +1,324 @@ +/* DecoderUS-ASCII.java -- Decoder for US-ASCII Character set + Copyright (C) 2004 + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + +package gnu.java.io.decode; + +import java.io.InputStream; + +/** + * This class decodes bytes in US-ASCII format to Unicode. + * + * @version 1.0 + * + * @author Roman Kennke + * inspired by Decoder8859_1 by Aaron M. Renn (address@hidden) + * + */ +public class DecoderUS_ASCII extends DecoderEightBitLookup +{ + +/** + * This is the lookup table for this encoding + */ + +private static final char[] lookup_table_US_ASCII = { +0x0000, +0x0001, +0x0002, +0x0003, +0x0004, +0x0005, +0x0006, +0x0007, +0x0008, +0x0009, +0x000A, +0x000B, +0x000C, +0x000D, +0x000E, +0x000F, +0x0010, +0x0011, +0x0012, +0x0013, +0x0014, +0x0015, +0x0016, +0x0017, +0x0018, +0x0019, +0x001A, +0x001B, +0x001C, +0x001D, +0x001E, +0x001F, +0x0020, +0x0021, +0x0022, +0x0023, +0x0024, +0x0025, +0x0026, +0x0027, +0x0028, +0x0029, +0x002A, +0x002B, +0x002C, +0x002D, +0x002E, +0x002F, +0x0030, +0x0031, +0x0032, +0x0033, +0x0034, +0x0035, +0x0036, +0x0037, +0x0038, +0x0039, +0x003A, +0x003B, +0x003C, +0x003D, +0x003E, +0x003F, +0x0040, +0x0041, +0x0042, +0x0043, +0x0044, +0x0045, +0x0046, +0x0047, +0x0048, +0x0049, +0x004A, +0x004B, +0x004C, +0x004D, +0x004E, +0x004F, +0x0050, +0x0051, +0x0052, +0x0053, +0x0054, +0x0055, +0x0056, +0x0057, +0x0058, +0x0059, +0x005A, +0x005B, +0x005C, +0x005D, +0x005E, +0x005F, +0x0060, +0x0061, +0x0062, +0x0063, +0x0064, +0x0065, +0x0066, +0x0067, +0x0068, +0x0069, +0x006A, +0x006B, +0x006C, +0x006D, +0x006E, +0x006F, +0x0070, +0x0071, +0x0072, +0x0073, +0x0074, +0x0075, +0x0076, +0x0077, +0x0078, +0x0079, +0x007A, +0x007B, +0x007C, +0x007D, +0x007E, +0x007F, +0x0000, +0x0001, +0x0002, +0x0003, +0x0004, +0x0005, +0x0006, +0x0007, +0x0008, +0x0009, +0x000A, +0x000B, +0x000C, +0x000D, +0x000E, +0x000F, +0x0010, +0x0011, +0x0012, +0x0013, +0x0014, +0x0015, +0x0016, +0x0017, +0x0018, +0x0019, +0x001A, +0x001B, +0x001C, +0x001D, +0x001E, +0x001F, +0x0020, +0x0021, +0x0022, +0x0023, +0x0024, +0x0025, +0x0026, +0x0027, +0x0028, +0x0029, +0x002A, +0x002B, +0x002C, +0x002D, +0x002E, +0x002F, +0x0030, +0x0031, +0x0032, +0x0033, +0x0034, +0x0035, +0x0036, +0x0037, +0x0038, +0x0039, +0x003A, +0x003B, +0x003C, +0x003D, +0x003E, +0x003F, +0x0040, +0x0041, +0x0042, +0x0043, +0x0044, +0x0045, +0x0046, +0x0047, +0x0048, +0x0049, +0x004A, +0x004B, +0x004C, +0x004D, +0x004E, +0x004F, +0x0050, +0x0051, +0x0052, +0x0053, +0x0054, +0x0055, +0x0056, +0x0057, +0x0058, +0x0059, +0x005A, +0x005B, +0x005C, +0x005D, +0x005E, +0x005F, +0x0060, +0x0061, +0x0062, +0x0063, +0x0064, +0x0065, +0x0066, +0x0067, +0x0068, +0x0069, +0x006A, +0x006B, +0x006C, +0x006D, +0x006E, +0x006F, +0x0070, +0x0071, +0x0072, +0x0073, +0x0074, +0x0075, +0x0076, +0x0077, +0x0078, +0x0079, +0x007A, +0x007B, +0x007C, +0x007D, +0x007E, +0x007F, +}; + +public +DecoderUS_ASCII(InputStream in) +{ + super(in, "US_ASCII", lookup_table_US_ASCII); +} + +} // class DecoderUS_ASCII +