AWT/Swing merge from GNU Classpath.

From-SVN: r56147

1 files changed, 59 insertions, 85 deletions

diff --git a/libjava/java/awt/PrintJob.java b/libjava/java/awt/PrintJob.java
index 4e6ae29..9cf95f2 100644
--- a/libjava/java/awt/PrintJob.java
+++ b/libjava/java/awt/PrintJob.java
@@ -1,5 +1,5 @@
 /* PrintJob.java -- A print job class
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,90 +39,64 @@ exception statement from your version. */
 package java.awt;
 
 /**
-  * This abstract class represents a print job.
-  *
-  * @author Aaron M. Renn (arenn@urbanophile.com)
-  */
-public abstract class PrintJob
-{
-
-/*
- * Constructors
+ * This abstract class represents a print job.
+ *
+ * @author Aaron M. Renn <arenn@urbanophile.com>
+ * @see Toolkit#getPrintJob(Frame, String, Properties)
+ * @since 1.0
+ * @status updated to 1.4
  */
-
-/**
-  * This method initializes a new instance of <code>PrintJob</code>.
-  */
-public
-PrintJob()
-{
-}
-
-/*************************************************************************/
-
-/*
- * Instance Methods
- */
-
-/**
-  * Returns a graphics context suitable for rendering the next page.
-  *
-  * @return A graphics context for printing the next page.
-  */
-public abstract Graphics
-getGraphics();
-
-/*************************************************************************/
-
-/**
-  * Returns the dimension of the page in pixels.  The resolution will be
-  * chosen to be similar to the on screen image.
-  *
-  * @return The page dimensions.
-  */
-public abstract Dimension
-getPageDimension();
-
-/*************************************************************************/
-
-/**
-  * Returns the resolution of the page in pixels per inch.
-  *
-  * @return The resolution of the page in pixels per inch.
-  */
-public abstract int
-getPageResolution();
-
-/*************************************************************************/
-
-/**
-  * Tests whether or not the last page will be printed first.
-  *
-  * @return <code>true</code> if the last page prints first, <code>false</code>
-  * otherwise.
-  */
-public abstract boolean
-lastPageFirst();
-
-/*************************************************************************/
-
-/**
-  * Informs the print job that printing is complete.
-  */
-public abstract void
-end();
-
-/*************************************************************************/
-
-/**
-  * This method explicitly ends the print job in the event the job
-  * becomes un-referenced without the application having done so.
-  */
-public void
-finalize()
+public abstract class PrintJob
 {
-  end();
-}
-
+  /**
+   * Create a new PrintJob.
+   */
+  public PrintJob()
+  {
+  }
+
+  /**
+   * Returns a graphics context suitable for rendering the next page. The
+   * return must also implement {@link PrintGraphics}.
+   *
+   * @return a graphics context for printing the next page
+   */
+  public abstract Graphics getGraphics();
+
+  /**
+   * Returns the dimension of the page in pixels.  The resolution will be
+   * chosen to be similar to the on screen image.
+   *
+   * @return the page dimensions
+   */
+  public abstract Dimension getPageDimension();
+
+  /**
+   * Returns the resolution of the page in pixels per inch. Note that this is
+   * not necessarily the printer's resolution.
+   *
+   * @return the resolution of the page in pixels per inch
+   */
+  public abstract int getPageResolution();
+
+  /**
+   * Tests whether or not the last page will be printed first.
+   *
+   * @return true if the last page prints first
+   */
+  public abstract boolean lastPageFirst();
+
+  /**
+   * Informs the print job that printing is complete or should be aborted.
+   */
+  public abstract void end();
+
+  /**
+   * This method explicitly ends the print job in the event the job
+   * becomes un-referenced without the application having done so.
+   */
+  public void finalize()
+  {
+    end();
+  }
 } // class PrintJob
-