2005-04-19 Michael Koch <konqueror@gmx.de>

	* java/awt/print/PrinterJob.java
	(pageDialog): New method.
	(printDialog): Implemented.

From-SVN: r98371

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 0911a4a18671636b8c8723bd4784816489c5dd19..94a889455676dde79c52c29813f343c8d5b3fad6 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2005-04-19  Michael Koch  <konqueror@gmx.de>
+
+       * java/awt/print/PrinterJob.java
+       (pageDialog): New method.
+       (printDialog): Implemented.
+
 2005-04-19  Michael Koch  <konqueror@gmx.de>
 
        * java/awt/image/ConvolveOp.java:

diff --git a/libjava/java/awt/print/PrinterJob.java b/libjava/java/awt/print/PrinterJob.java
index bc5cfcd5a1ba9f600f3b9193b215687aac1ba90a..c7dba00e4023a2dc4b54a9b1e483dc404fa5cce9 100644 (file)
--- a/libjava/java/awt/print/PrinterJob.java
+++ b/libjava/java/awt/print/PrinterJob.java
@@ -151,6 +151,16 @@ public abstract class PrinterJob
   public abstract PageFormat pageDialog(PageFormat page_format)
     throws HeadlessException;
 
+  /**
+   * @since 1.4
+   */
+  public PageFormat pageDialog(PrintRequestAttributeSet attributes)
+    throws HeadlessException
+  {
+    // FIXME: Implement this for real.
+    return pageDialog((PageFormat) null);
+  }
+  
   /**
    * Prints the pages.
    */
@@ -179,8 +189,12 @@ public abstract class PrinterJob
    * @return <code>false</code> if the user cancels the dialog box,
    * <code>true</code> otherwise.
    */
-  public abstract boolean printDialog(PrintRequestAttributeSet attributes)
-    throws HeadlessException;
+  public boolean printDialog(PrintRequestAttributeSet attributes)
+    throws HeadlessException
+  {
+    // FIXME: Implement this for real.
+    return printDialog();
+  }
 
   /**
    * This sets the pages that are to be printed.