PatchSet 5522
Date: 2005/03/11 20:42:28
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: cleanup
2005-03-11 Dalibor Topic <[EMAIL PROTECTED]>
Resynced with GNU Classpath.
2005-03-10 Tom Tromey <[EMAIL PROTECTED]>
* java/io/InputStreamReader.java: Indentation fixlets. Added
'@since' markers.
Members:
ChangeLog:1.3696->1.3697
libraries/javalib/java/io/InputStreamReader.java:1.19->1.20
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3696 kaffe/ChangeLog:1.3697
--- kaffe/ChangeLog:1.3696 Fri Mar 11 20:12:31 2005
+++ kaffe/ChangeLog Fri Mar 11 20:42:28 2005
@@ -2,6 +2,15 @@
Resynced with GNU Classpath.
+ 2005-03-10 Tom Tromey <[EMAIL PROTECTED]>
+
+ * java/io/InputStreamReader.java: Indentation fixlets. Added
+ '@since' markers.
+
+2005-03-11 Dalibor Topic <[EMAIL PROTECTED]>
+
+ Resynced with GNU Classpath.
+
2005-03-10 Chris Burdess <[EMAIL PROTECTED]>
* gnu/xml/dom/ls/SAXEventSink.java: Ignore element declarations if
Index: kaffe/libraries/javalib/java/io/InputStreamReader.java
diff -u kaffe/libraries/javalib/java/io/InputStreamReader.java:1.19
kaffe/libraries/javalib/java/io/InputStreamReader.java:1.20
--- kaffe/libraries/javalib/java/io/InputStreamReader.java:1.19 Wed Feb 23
19:35:20 2005
+++ kaffe/libraries/javalib/java/io/InputStreamReader.java Fri Mar 11
20:42:31 2005
@@ -147,26 +147,29 @@
* Creates an InputStreamReader that uses a decoder of the given
* charset to decode the bytes in the InputStream into
* characters.
+ * @since 1.4
*/
- public InputStreamReader(InputStream in, Charset charset) {
+ public InputStreamReader(InputStream in, Charset charset)
+ {
/* FIXME: InputStream is wrapped in Channel which is read by a
* Reader-implementation for channels. However to fix this we
* need to completely move to NIO-style character
* encoding/decoding.
*/
- this.in = Channels.newReader(Channels.newChannel(in),
charset.newDecoder(), -1);
-
+ this.in = Channels.newReader(Channels.newChannel(in), charset.newDecoder(),
+ -1);
encoding = charset.name();
}
/**
* Creates an InputStreamReader that uses the given charset decoder
* to decode the bytes in the InputStream into characters.
+ * @since 1.4
*/
- public InputStreamReader(InputStream in, CharsetDecoder decoder) {
+ public InputStreamReader(InputStream in, CharsetDecoder decoder)
+ {
// FIXME: see [EMAIL PROTECTED] InputStreamReader(InputStream, Charset)
this.in = Channels.newReader(Channels.newChannel(in), decoder, -1);
-
encoding = decoder.charset().name();
}
_______________________________________________
kaffe mailing list
[email protected]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
