From fbbb3bbd9f65f8d9aa81c08167d49d81f3644eb1 Mon Sep 17 00:00:00 2001 From: gandalf Date: Tue, 28 Jul 2009 15:08:12 +0000 Subject: [PATCH] Fix for PR40616: missing java.io.PrintStream constructors. 2009-07-27 Andrew John Hughes PR libgcj/40616 * java/io/PrintStream.class: Regenerated. * java/io/PrintStream.h: Updated. * java/io/PrintStream.java: (PrintStream(File)): Ported from GNU Classpath version. (PrintStream(File, String)): Likewise. (PrintStream(String)): Likewise. (PrintStream(String, String)): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@150161 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 12 ++++ libjava/classpath/lib/java/io/PrintStream.class | Bin 7581 -> 8245 bytes .../classpath/tools/gjdoc/ConstructorDocImpl.class | Bin 757 -> 753 bytes libjava/java/io/PrintStream.h | 4 ++ libjava/java/io/PrintStream.java | 68 +++++++++++++++++++++ 5 files changed, 84 insertions(+) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 477d5365009..3d9868ef8e6 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,15 @@ +2009-07-27 Andrew John Hughes + + PR libgcj/40616 + * java/io/PrintStream.class: Regenerated. + * java/io/PrintStream.h: Updated. + * java/io/PrintStream.java: + (PrintStream(File)): Ported from GNU Classpath + version. + (PrintStream(File, String)): Likewise. + (PrintStream(String)): Likewise. + (PrintStream(String, String)): Likewise. + 2009-07-24 Kai Tietz * gnu/java/security/jce/prng/natVMSecureRandomWin32.cc: New Win32 diff --git a/libjava/classpath/lib/java/io/PrintStream.class b/libjava/classpath/lib/java/io/PrintStream.class index c5db701b9df1dad7891cb8b36aa479392309311e..78d5cd79aa893231813feb355d62205fd9010d5a 100644 GIT binary patch literal 8245 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 literal 7581 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 Az5oCK diff --git a/libjava/java/io/PrintStream.h b/libjava/java/io/PrintStream.h index b76912e34ef..6247ba8292c 100644 --- a/libjava/java/io/PrintStream.h +++ b/libjava/java/io/PrintStream.h @@ -29,6 +29,10 @@ class java::io::PrintStream : public ::java::io::FilterOutputStream public: PrintStream(::java::io::OutputStream *); PrintStream(::java::io::OutputStream *, jboolean); + PrintStream(::java::io::File *); + PrintStream(::java::io::File *, ::java::lang::String *); + PrintStream(::java::lang::String *); + PrintStream(::java::lang::String *, ::java::lang::String *); PrintStream(::java::io::OutputStream *, jboolean, ::java::lang::String *); virtual jboolean checkError(); public: // actually protected diff --git a/libjava/java/io/PrintStream.java b/libjava/java/io/PrintStream.java index d3f386dc083..be28619059a 100644 --- a/libjava/java/io/PrintStream.java +++ b/libjava/java/io/PrintStream.java @@ -123,6 +123,74 @@ public class PrintStream extends FilterOutputStream implements Appendable } /** + * This method initializes a new PrintStream object to write + * to the specified output File. Doesn't autoflush. + * + * @param file The File to write to. + * @throws FileNotFoundException if an error occurs while opening the file. + * + * @since 1.5 + */ + public PrintStream (File file) + throws FileNotFoundException + { + this (new FileOutputStream(file), false); + } + + /** + * This method initializes a new PrintStream object to write + * to the specified output File. Doesn't autoflush. + * + * @param file The File to write to. + * @param encoding The name of the character encoding to use for this + * object. + * @throws FileNotFoundException If an error occurs while opening the file. + * @throws UnsupportedEncodingException If the charset specified by + * encoding is invalid. + * + * @since 1.5 + */ + public PrintStream (File file, String encoding) + throws FileNotFoundException,UnsupportedEncodingException + { + this (new FileOutputStream(file), false, encoding); + } + + /** + * This method initializes a new PrintStream object to write + * to the specified output File. Doesn't autoflush. + * + * @param fileName The name of the File to write to. + * @throws FileNotFoundException if an error occurs while opening the file, + * + * @since 1.5 + */ + public PrintStream (String fileName) + throws FileNotFoundException + { + this (new FileOutputStream(new File(fileName)), false); + } + + /** + * This method initializes a new PrintStream object to write + * to the specified output File. Doesn't autoflush. + * + * @param fileName The name of the File to write to. + * @param encoding The name of the character encoding to use for this + * object. + * @throws FileNotFoundException if an error occurs while opening the file. + * @throws UnsupportedEncodingException If the charset specified by + * encoding is invalid. + * + * @since 1.5 + */ + public PrintStream (String fileName, String encoding) + throws FileNotFoundException,UnsupportedEncodingException + { + this (new FileOutputStream(new File(fileName)), false, encoding); + } + + /** * This method intializes a new PrintStream object to write * to the specified output sink. This constructor also allows "auto-flush" * functionality to be specified where the stream will be flushed after -- 2.11.0