Fix for PR40616: missing java.io.PrintStream constructors.

2009-07-27  Andrew John Hughes  <ahughes@redhat.com>

	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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 477d536..3d9868e 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,15 @@
+2009-07-27  Andrew John Hughes  <ahughes@redhat.com>
+
+       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  <kai.tietz@onevision.com>
 
        * 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 c5db701..78d5cd7 100644 (file)
Binary files a/libjava/classpath/lib/java/io/PrintStream.class and b/libjava/classpath/lib/java/io/PrintStream.class differ

diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ConstructorDocImpl.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ConstructorDocImpl.class
index 774e33c..e75c4e0 100644 (file)
Binary files a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ConstructorDocImpl.class and b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/ConstructorDocImpl.class differ

diff --git a/libjava/java/io/PrintStream.h b/libjava/java/io/PrintStream.h
index b76912e..6247ba8 100644 (file)
--- 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 d3f386d..be28619 100644 (file)
--- 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 <code>PrintStream</code> object to write
+   * to the specified output File. Doesn't autoflush.
+   *
+   * @param file The <code>File</code> 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 <code>PrintStream</code> object to write
+   * to the specified output File. Doesn't autoflush.
+   *
+   * @param file The <code>File</code> 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
+   * <code>encoding</code> 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 <code>PrintStream</code> object to write
+   * to the specified output File. Doesn't autoflush.
+   *
+   * @param fileName The name of the <code>File</code> 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 <code>PrintStream</code> object to write
+   * to the specified output File. Doesn't autoflush.
+   *
+   * @param fileName The name of the <code>File</code> 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
+   * <code>encoding</code> 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 <code>PrintStream</code> 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