[kaffe] CVS kaffe (robilad): resynced with gnu classpath:
Kaffe CVS
cvs-commits at kaffe.org
Sun May 15 05:49:55 PDT 2005
PatchSet 6495
Date: 2005/05/15 12:31:49
Author: robilad
Branch: HEAD
Tag: (none)
Log:
resynced with gnu classpath:
2005-05-15 Dalibor Topic <robilad at kaffe.org>
Resynced with GNU Classpath.
2005-04-29 Michael Koch <konqueror at gmx.de>
* java/nio/charset/Charset.java
(defaultCharset): Reformatted.
Members:
libraries/javalib/java/nio/charset/Charset.java:1.12->1.13
ChangeLog:1.4020->1.4021
Index: kaffe/libraries/javalib/java/nio/charset/Charset.java
diff -u kaffe/libraries/javalib/java/nio/charset/Charset.java:1.12 kaffe/libraries/javalib/java/nio/charset/Charset.java:1.13
--- kaffe/libraries/javalib/java/nio/charset/Charset.java:1.12 Sun May 15 11:48:52 2005
+++ kaffe/libraries/javalib/java/nio/charset/Charset.java Sun May 15 12:31:49 2005
@@ -1,5 +1,5 @@
/* Charset.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.
@@ -126,22 +126,39 @@
public static Charset defaultCharset()
{
String encoding;
+
try
{
encoding = System.getProperty("file.encoding");
- } catch(SecurityException e) {
+ }
+ catch(SecurityException e)
+ {
+ // Use fallback.
encoding = "ISO-8859-1";
- } catch(IllegalArgumentException e) {
+ }
+ catch(IllegalArgumentException e)
+ {
+ // Use fallback.
encoding = "ISO-8859-1";
}
try
{
return forName(encoding);
- } catch(UnsupportedCharsetException e) {
- } catch(IllegalCharsetNameException e) {
- } catch(IllegalArgumentException e) {
}
+ catch(UnsupportedCharsetException e)
+ {
+ // Ignore.
+ }
+ catch(IllegalCharsetNameException e)
+ {
+ // Ignore.
+ }
+ catch(IllegalArgumentException e)
+ {
+ // Ignore.
+ }
+
throw new IllegalStateException("Can't get default charset!");
}
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4020 kaffe/ChangeLog:1.4021
--- kaffe/ChangeLog:1.4020 Sun May 15 12:27:23 2005
+++ kaffe/ChangeLog Sun May 15 12:31:35 2005
@@ -4,6 +4,15 @@
2005-04-29 Michael Koch <konqueror at gmx.de>
+ * java/nio/charset/Charset.java
+ (defaultCharset): Reformatted.
+
+2005-05-15 Dalibor Topic <robilad at kaffe.org>
+
+ Resynced with GNU Classpath.
+
+ 2005-04-29 Michael Koch <konqueror at gmx.de>
+
* gnu/java/net/protocol/http/HTTPConnection.java:
(userAgent): Initialize from system properties.
(initUserAgent): Removed.
More information about the kaffe
mailing list