This is the mail archive of the java-patches@gcc.gnu.org mailing list for the Java project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[patch] merge character encoding aliases into System from Classpath


This is a partial merge from classpath.  (I'm working on synchronizing
the classes which now have 'VM' counterparts, bit by bit.)  OK?

2001-01-08  Mark Wielaard  <mark@klomp.org>

	* java/lang/System.java (insertGNUProperties): Add standard character
	encoding aliases.
	(Merged from Classpath 2003-09-21)

Index: System.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/lang/System.java,v
retrieving revision 1.13
diff -u -r1.13 System.java
--- System.java	27 May 2003 06:03:14 -0000	1.13
+++ System.java	21 Sep 2003 18:12:35 -0000
@@ -99,6 +99,109 @@
 
     defaultProperties.put("gnu.cpu.endian",
 			  isWordsBigEndian() ? "big" : "little");
+
+    // Common encoding aliases. See gnu.java.io.EncodingManager.
+    defaultProperties.put("gnu.java.io.encoding_scheme_alias.ISO8859_1",
+                          "8859_1");
+
+    defaultProperties.put("gnu.java.io.encoding_scheme_alias.ISO-8859-1",
+                          "8859_1");
+    defaultProperties.put("gnu.java.io.encoding_scheme_alias.ISO-8859-2",
+                          "8859_2");
+    defaultProperties.put("gnu.java.io.encoding_scheme_alias.ISO-8859-3",
+                          "8859_3");
+    defaultProperties.put("gnu.java.io.encoding_scheme_alias.ISO-8859-4",
+                          "8859_4");
+    defaultProperties.put("gnu.java.io.encoding_scheme_alias.ISO-8859-5",
+                          "8859_5");
+    defaultProperties.put("gnu.java.io.encoding_scheme_alias.ISO-8859-6",
+                          "8859_6");
+    defaultProperties.put("gnu.java.io.encoding_scheme_alias.ISO-8859-7",
+                          "8859_7");
+    defaultProperties.put("gnu.java.io.encoding_scheme_alias.ISO-8859-8",
+                          "8859_8");
+    defaultProperties.put("gnu.java.io.encoding_scheme_alias.ISO-8859-9",
+                          "8859_9");
+
+    defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso-8859-1",
+                          "8859_1");
+    defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso-8859-2",
+                          "8859_2");
+    defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso-8859-3",
+                          "8859_3");
+    defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso-8859-4",
+                          "8859_4");
+    defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso-8859-5",
+                          "8859_5");
+    defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso-8859-6",
+                          "8859_6");
+    defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso-8859-7",
+                          "8859_7");
+    defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso-8859-8",
+                          "8859_8");
+    defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso-8859-9",
+                          "8859_9");
+
+    defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso8859_1",
+                          "8859_1");
+    defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso8859_2",
+                          "8859_2");
+    defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso8859_3",
+                          "8859_3");
+    defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso8859_4",
+                          "8859_4");
+    defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso8859_5",
+                          "8859_5");
+    defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso8859_6",
+                          "8859_6");
+    defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso8859_7",
+                          "8859_7");
+    defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso8859_8",
+                          "8859_8");
+    defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso8859_9",
+                          "8859_9");
+
+    defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso-latin-1",
+                          "8859_1");
+    defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso-latin-2",
+                          "8859_2");
+    defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso-latin-3",
+                          "8859_3");
+    defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso-latin-4",
+                          "8859_4");
+    defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso-latin-5",
+                          "8859_5");
+    defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso-latin-6",
+                          "8859_6");
+    defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso-latin-7",
+                          "8859_7");
+    defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso-latin-8",
+                          "8859_8");
+    defaultProperties.put("gnu.java.io.encoding_scheme_alias.iso-latin-9",
+                          "8859_9");
+
+    defaultProperties.put("gnu.java.io.encoding_scheme_alias.latin1",
+                          "8859_1");
+    defaultProperties.put("gnu.java.io.encoding_scheme_alias.latin2",
+                          "8859_2");
+    defaultProperties.put("gnu.java.io.encoding_scheme_alias.latin3",
+                          "8859_3");
+    defaultProperties.put("gnu.java.io.encoding_scheme_alias.latin4",
+                          "8859_4");
+    defaultProperties.put("gnu.java.io.encoding_scheme_alias.latin5",
+                          "8859_5");
+    defaultProperties.put("gnu.java.io.encoding_scheme_alias.latin6",
+                          "8859_6");
+    defaultProperties.put("gnu.java.io.encoding_scheme_alias.latin7",
+                          "8859_7");
+    defaultProperties.put("gnu.java.io.encoding_scheme_alias.latin8",
+                          "8859_8");
+    defaultProperties.put("gnu.java.io.encoding_scheme_alias.latin9",
+                          "8859_9");
+
+    defaultProperties.put("gnu.java.io.encoding_scheme_alias.UTF-8", "UTF8");
+    defaultProperties.put("gnu.java.io.encoding_scheme_alias.utf-8", "UTF8");
+
     // XXX FIXME - Temp hack for old systems that set the wrong property
     if (defaultProperties.get("java.io.tmpdir") == null)
       defaultProperties.put("java.io.tmpdir",

-- 
Nathanael Nerode  <neroden at gcc.gnu.org>
http://home.twcny.rr.com/nerode/neroden/fdl.html


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]