Imported GNU Classpath 0.90

       * scripts/makemake.tcl: Set gnu/java/awt/peer/swing to ignore.
       * gnu/classpath/jdwp/VMFrame.java (SIZE): New constant.
       * java/lang/VMCompiler.java: Use gnu.java.security.hash.MD5.
       * java/lang/Math.java: New override file.
       * java/lang/Character.java: Merged from Classpath.
       (start, end): Now 'int's.
       (canonicalName): New field.
       (CANONICAL_NAME, NO_SPACES_NAME, CONSTANT_NAME): New constants.
       (UnicodeBlock): Added argument.
       (of): New overload.
       (forName): New method.
       Updated unicode blocks.
       (sets): Updated.
       * sources.am: Regenerated.
       * Makefile.in: Likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@111942 138bc75d-0d04-0410-961f-82ee72b054a4

6 files changed, 532 insertions, 532 deletions

diff --git a/libjava/classpath/java/awt/print/NoPrinterJob.java b/libjava/classpath/java/awt/print/NoPrinterJob.java
new file mode 100644
index 00000000000..e9659a147e7
--- /dev/null
+++ b/libjava/classpath/java/awt/print/NoPrinterJob.java
@@ -0,0 +1,124 @@
+/* NoPrinterJob.java -- Fake PrinterJob that just signals no print service.
+   Copyright (C) 2006  Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package java.awt.print;
+
+/**
+ * Fake PrinterJob that just signals no print service.  This is only
+ * here so applications can call
+ * <code>PrintJob.getPrinterJob().getPrinterJob()</code> and check
+ * that it returns <code>null</code> which indicates no actual
+ * printing support is available.
+ */
+class NoPrinterJob extends PrinterJob
+{
+  public int getCopies()
+  {
+    return 0;
+  }
+
+  public void setCopies(int copies)
+  {
+    // Do nothing.
+  }
+
+  public String getJobName()
+  {
+    return "NoPrinterJob";
+  }
+
+  public void setJobName(String job_name)
+  {
+    // Do nothing.
+  }
+
+  public String getUserName()
+  {
+    return "NoUser";
+  }
+
+  public void cancel()
+  {
+    // Do nothing.
+  }
+
+  public boolean isCancelled()
+  {
+    return true;
+  }
+
+  public PageFormat defaultPage(PageFormat page_format)
+  {
+    return page_format;
+  }
+
+  public PageFormat pageDialog(PageFormat page_format)
+  {
+    return page_format;
+  }
+
+  public void print() throws PrinterException
+  {
+    throw new PrinterException("No printer");
+  }
+
+  public boolean printDialog()
+  {
+    return false;
+  }
+
+  public void setPageable(Pageable pageable)
+  {
+    // Do nothing.
+  }
+
+  public void setPrintable(Printable printable)
+  {
+    // Do nothing.
+  }
+
+  public void setPrintable(Printable printable, PageFormat page_format)
+  {
+    // Do nothing.
+  }
+
+  public PageFormat validatePage(PageFormat page_format)
+  {
+    return page_format;
+  }
+}
diff --git a/libjava/classpath/java/awt/print/PageFormat.java b/libjava/classpath/java/awt/print/PageFormat.java
index 6399552de44..0a8aa3ed0eb 100644
--- a/libjava/classpath/java/awt/print/PageFormat.java
+++ b/libjava/classpath/java/awt/print/PageFormat.java
@@ -1,5 +1,5 @@
 /* PageFormat.java -- Information about the page format
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,254 +39,195 @@ exception statement from your version. */
 package java.awt.print;
 
 /**
-  * This class contains information about the desired page format to
-  * use for printing a particular set of pages.
-  *
-  * @author Aaron M. Renn (arenn@urbanophile.com)
-  */
-public class PageFormat implements Cloneable
-{
-
-/*
- * Static Variables
- */
-
-/**
-  * A constant for a landscaped page orientation.  Used by
-  * <code>getOrientation</code> and <code>setOrientation</code>.
-  */
-public static final int LANDSCAPE = 0;
-
-/**
-  * A constant for a portrait page orientation.  Used by
-  * <code>getOrientation</code> and <code>setOrientation</code>.
-  */
-public static final int PORTRAIT = 1;
-
-/**
-  * A constant for a reversed landscaped page orientation.  This is
-  * the orientation used by Macintosh's for landscape.  The origin is
-  * in the upper right hand corner instead of the upper left.  The
-  * X and Y axes are reversed. Used by <code>getOrientation</code> and 
-  * <code>setOrientation</code>.
-  */
-public static final int REVERSE_LANDSCAPE = 2;
-
-/*************************************************************************/
-
-/*
- * Instance Variables
+ * This class contains information about the desired page format to use for
+ * printing a particular set of pages.
+ * 
+ * @author Aaron M. Renn (arenn@urbanophile.com)
  */
-
-// The page orientation
-private int orientation;
-
-// The paper type
-private Paper paper;
-
-/*************************************************************************/
-
-/*
- * Constructors
- */
-
-/**
-  * This method creates a default page layout, which will be in portrait
-  * format.
-  */
-public
-PageFormat()
-{
-  this.paper = new Paper();
-  this.orientation = PORTRAIT;
-}
-
-/*************************************************************************/
-
-/*
- * Instance Methods
- */
-
-/**
-  * This method returns the width of the page, in 1/72nd's of an inch.  The
-  * "width" measured depends on orientation.
-  *
-  * @return The width of the page.
-  */
-public double
-getWidth()
-{
-  return(paper.getWidth());
-}
-
-/*************************************************************************/
-
-/**
-  * This method returns the height of the page, in 1/72nd's of an inch.
-  * The "height" measured depends on the orientation.
-  *
-  * @return The height of the page.
-  */
-public double
-getHeight()
-{
-  return(paper.getHeight());
-}
-
-/*************************************************************************/
-
-/**
-  * This method returns the X coordinate value of the upper leftmost
-  * drawable area of the paper.
-  *
-  * @return The upper leftmost imageable X coordinate.
-  */
-public double
-getImageableX()
-{
-  return(paper.getImageableX());
-}
-
-/*************************************************************************/
-
-/**
-  * This method returns the Y coordinate value of the upper leftmost
-  * drawable area of the paper.
-  *
-  * @return The upper leftmost imageable Y coordinate.
-  */
-public double
-getImageableY()
-{
-  return(paper.getImageableY());
-}
-
-/*************************************************************************/
-
-/**
-  * This method returns the imageable width of the paper, in 1/72nd's of
-  * an inch.
-  *
-  * @return The imageable width of the paper.
-  */
-public double
-getImageableWidth()
+public class PageFormat
+  implements Cloneable
 {
-  return(paper.getImageableWidth());
-}
-
-/*************************************************************************/
+  /**
+   * A constant for a landscaped page orientation. Used by
+   * <code>getOrientation</code> and <code>setOrientation</code>.
+   */
+  public static final int LANDSCAPE = 0;
+
+  /**
+   * A constant for a portrait page orientation. Used by
+   * <code>getOrientation</code> and <code>setOrientation</code>.
+   */
+  public static final int PORTRAIT = 1;
+
+  /**
+   * A constant for a reversed landscaped page orientation. This is the
+   * orientation used by Macintosh's for landscape. The origin is in the 
+   * upper right hand corner instead of the upper left. The X and Y axes 
+   * are reversed. Used by <code>getOrientation</code> and 
+   * <code>setOrientation</code>.
+   */
+  public static final int REVERSE_LANDSCAPE = 2;
+
+  // The page orientation
+  private int orientation;
+
+  // The paper type
+  private Paper paper;
+
+  /**
+   * This method creates a default page layout, which will be in portrait
+   * format.
+   */
+  public PageFormat()
+  {
+    this.paper = new Paper();
+    this.orientation = PORTRAIT;
+  }
+
+  /**
+   * This method returns the width of the page, in 1/72nd's of an inch. The
+   * "width" measured depends on orientation.
+   * 
+   * @return The width of the page.
+   */
+  public double getWidth()
+  {
+    return paper.getWidth();
+  }
+
+  /**
+   * This method returns the height of the page, in 1/72nd's of an inch. The
+   * "height" measured depends on the orientation.
+   * 
+   * @return The height of the page.
+   */
+  public double getHeight()
+  {
+    return paper.getHeight();
+  }
+
+  /**
+   * This method returns the X coordinate value of the upper leftmost drawable
+   * area of the paper.
+   * 
+   * @return The upper leftmost imageable X coordinate.
+   */
+  public double getImageableX()
+  {
+    return paper.getImageableX();
+  }
+
+  /**
+   * This method returns the Y coordinate value of the upper leftmost drawable
+   * area of the paper.
+   * 
+   * @return The upper leftmost imageable Y coordinate.
+   */
+  public double getImageableY()
+  {
+    return paper.getImageableY();
+  }
+
+  /**
+   * This method returns the imageable width of the paper, in 1/72nd's of an
+   * inch.
+   * 
+   * @return The imageable width of the paper.
+   */
+  public double getImageableWidth()
+  {
+    return paper.getImageableWidth();
+  }
+
+  /**
+   * This method returns the imageable height of the paper, in 1/72nd's of an
+   * inch.
+   * 
+   * @return The imageable height of the paper.
+   */
+  public double getImageableHeight()
+  {
+    return paper.getImageableHeight();
+  }
+
+  /**
+   * Returns a copy of the <code>paper</code> object being used for this page
+   * format.
+   * 
+   * @return A copy of the <code>Paper</code> object for this format.
+   */
+  public Paper getPaper()
+  {
+    return (Paper) paper.clone();
+  }
+
+  /**
+   * Sets the <code>Paper</code> object to be used by this page format.
+   * 
+   * @param paper The new <code>Paper</code> object for this page format.
+   */
+  public void setPaper(Paper paper)
+  {
+    this.paper = paper;
+  }
+
+  /**
+   * This method returns the current page orientation. The value returned will
+   * be one of the page orientation constants from this class.
+   * 
+   * @return The current page orientation.
+   */
+  public int getOrientation()
+  {
+    return orientation;
+  }
+
+  /**
+   * This method sets the page orientation for this format to the specified
+   * value. It must be one of the page orientation constants from this class 
+   * or an exception will be thrown.
+   * 
+   * @param orientation The new page orientation.
+   * @exception IllegalArgumentException If the specified page orientation 
+   *            value is not one of the constants from this class.
+   */
+  public void setOrientation(int orientation) throws IllegalArgumentException
+  {
+    if ((orientation != PORTRAIT) && (orientation != LANDSCAPE)
+        && (orientation != REVERSE_LANDSCAPE))
+      throw new IllegalArgumentException("Bad page orientation value: "
+                                         + orientation);
+
+    this.orientation = orientation;
+  }
+
+  /**
+   * This method returns a matrix used for transforming user space coordinates
+   * to page coordinates. The value returned will be six doubles as described 
+   * in <code>java.awt.geom.AffineTransform</code>.
+   * 
+   * @return The transformation matrix for this page format.
+   */
+  public double[] getMatrix()
+  {
+    throw new RuntimeException("Not implemented since I don't know what to do");
+  }
+
+  /**
+   * This method returns a copy of this object.
+   *
+   * @return A copy of this object.
+   */
+  public Object clone()
+  {
+    try
+      {
+        return (super.clone());
+      }
+    catch (CloneNotSupportedException e)
+      {
+        return (null);
+      }
+  }
 
-/**
-  * This method returns the imageable height of the paper, in 1/72nd's of
-  * an inch.
-  *
-  * @return The imageable height of the paper.
-  */
-public double getImageableHeight()
-{
-  return(paper.getImageableHeight());
 }
-
-/*************************************************************************/
-
-/**
-  * Returns a copy of the <code>paper</code> object being used for this 
-  * page format.
-  *
-  * @return A copy of the <code>Paper</code> object for this format.
-  */
-public Paper
-getPaper()
-{
-  return((Paper)paper.clone());
-}
-
-/*************************************************************************/
-
-/**
-  * Sets the <code>Paper</code> object to be used by this page format.
-  *
-  * @param paper The new <code>Paper</code> object for this page format.
-  */
-public void
-setPaper(Paper paper)
-{
-  this.paper = paper;
-}
-
-/*************************************************************************/
-
-/**
-  * This method returns the current page orientation.  The value returned
-  * will be one of the page orientation constants from this class.
-  *
-  * @return The current page orientation.
-  */
-public int
-getOrientation()
-{
-  return(orientation);
-}
-
-/*************************************************************************/
-
-/**
-  * This method sets the page orientation for this format to the
-  * specified value.  It must be one of the page orientation constants
-  * from this class or an exception will be thrown.
-  *
-  * @param orientation The new page orientation.
-  *
-  * @exception IllegalArgumentException If the specified page orientation
-  * value is not one of the constants from this class.
-  */
-public void
-setOrientation(int orientation) throws IllegalArgumentException
-{
-  if ((orientation != PORTRAIT) &&
-      (orientation != LANDSCAPE) &&
-      (orientation != REVERSE_LANDSCAPE))
-    throw new IllegalArgumentException("Bad page orientation value: " +
-                                       orientation);
-
-  this.orientation = orientation;
-}
-
-/*************************************************************************/
-
-/**
-  * This method returns a matrix used for transforming user space
-  * coordinates to page coordinates.  The value returned will be six
-  * doubles as described in <code>java.awt.geom.AffineTransform</code>.
-  *
-  * @return The transformation matrix for this page format.
-  */
-public double[]
-getMatrix()
-{
-  throw new RuntimeException("Not implemented since I don't know what to do");
-}
-
-/*************************************************************************/
-
-/**
-  * This method returns a copy of this object.
-  *
-  * @return A copy of this object.
-  */
-public Object
-clone()
-{
-  try
-    {
-      return(super.clone());
-    } 
-  catch(CloneNotSupportedException e)
-    {
-      return(null);
-    }
-}
-
-} // class PageFormat
-
diff --git a/libjava/classpath/java/awt/print/Pageable.java b/libjava/classpath/java/awt/print/Pageable.java
index 12fa542a8c6..d61195a92f0 100644
--- a/libjava/classpath/java/awt/print/Pageable.java
+++ b/libjava/classpath/java/awt/print/Pageable.java
@@ -1,5 +1,5 @@
 /* Pageable.java -- Pages to be printed
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,75 +39,52 @@ exception statement from your version. */
 package java.awt.print;
 
 /**
-  * This interface represents pages that are to be printed.
-  *
-  * @author Aaron M. Renn (arenn@urbanophile.com)
-  */
+ * This interface represents pages that are to be printed.
+ * 
+ * @author Aaron M. Renn (arenn@urbanophile.com)
+ */
 public interface Pageable
 {
-
-/*
- * Static Variables
- */
-
-/**
-  * This constant is returned when <code>getNumberOfPages()</code>
-  * cannot determine the number of pages available for printing.
-  */
-int UNKNOWN_NUMBER_OF_PAGES = -1;
-
-/*************************************************************************/
-
-/*
- * Instance Methods
- */
-
-/**
-  * This method returns the number of pages this object contains, or
-  * <code>UNKNOWN_NUMBER_OF_PAGES</code> if it cannot determine the number
-  * of pages to be printed.
-  *
-  * @return The number of pages to be printed, or 
-  * <code>UNKNOWN_NUMBER_OF_PAGES</code> if this is unknown.
-  */
-int
-getNumberOfPages();
-
-/*************************************************************************/
-
-/**
-  * This method returns the <code>PageFormat</code> instance for the
-  * specified page.  Page numbers start at zero.  An exception is thrown if 
-  * the requested page does not exist.
-  *
-  * @param pageIndex The index of the page to return the 
-  * <code>PageFormat</code> for.
-  *
-  * @return The <code>PageFormat</code> for the requested page.
-  *
-  * @exception IndexOutOfBoundsException If the requested page number does
-  * not exist.
-  */
-PageFormat
-getPageFormat(int pageIndex) throws IndexOutOfBoundsException;
-
-/*************************************************************************/
-
-/**
-  * This method returns the <code>Printable</code> instance for the
-  * specified page.  Page numbers start at zero.  An exception is thrown if 
-  * the requested page does not exist.
-  *
-  * @param pageIndex The index of the page to return the 
-  * <code>Printable</code> for.
-  *
-  * @return The <code>Printable</code> for the requested page.
-  *
-  * @exception IndexOutOfBoundsException If the requested page number does
-  * not exist.
-  */
-Printable
-getPrintable(int pageIndex) throws IndexOutOfBoundsException;
-
-} // interface Pageable
-
+  /**
+   * This constant is returned when <code>getNumberOfPages()</code> cannot
+   * determine the number of pages available for printing.
+   */
+  int UNKNOWN_NUMBER_OF_PAGES = - 1;
+
+  /**
+   * This method returns the number of pages this object contains, or
+   * <code>UNKNOWN_NUMBER_OF_PAGES</code> if it cannot determine the number 
+   * of pages to be printed.
+   * 
+   * @return The number of pages to be printed, or
+   *         <code>UNKNOWN_NUMBER_OF_PAGES</code> if this is unknown.
+   */
+  int getNumberOfPages();
+
+  /**
+   * This method returns the <code>PageFormat</code> instance for the
+   * specified page. Page numbers start at zero. An exception is thrown if the
+   * requested page does not exist.
+   * 
+   * @param pageIndex The index of the page to return the
+   *          <code>PageFormat</code> for.
+   * @return The <code>PageFormat</code> for the requested page.
+   * @exception IndexOutOfBoundsException If the requested page number does 
+   *            not exist.
+   */
+  PageFormat getPageFormat(int pageIndex) throws IndexOutOfBoundsException;
+
+  /**
+   * This method returns the <code>Printable</code> instance for the specified
+   * page. Page numbers start at zero. An exception is thrown if the requested
+   * page does not exist.
+   * 
+   * @param pageIndex The index of the page to return the 
+   *        <code>Printable</code> for.
+   * @return The <code>Printable</code> for the requested page.
+   * @exception IndexOutOfBoundsException If the requested page number does 
+   *            not exist.
+   */
+  Printable getPrintable(int pageIndex) throws IndexOutOfBoundsException;
+
+}
diff --git a/libjava/classpath/java/awt/print/Paper.java b/libjava/classpath/java/awt/print/Paper.java
index 4579da3ea3c..fb7ba91158f 100644
--- a/libjava/classpath/java/awt/print/Paper.java
+++ b/libjava/classpath/java/awt/print/Paper.java
@@ -1,5 +1,5 @@
 /* Paper.java -- Information about a paper type.
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,198 +39,159 @@ exception statement from your version. */
 package java.awt.print;
 
 /**
-  * This class describes a particular type of paper.
-  *
-  * @author Aaron M. Renn (arenn@urbanophile.com)
-  */
-public class Paper implements Cloneable
-{
-
-/*
- * Instance Variables
+ * This class describes a particular type of paper.
+ * 
+ * @author Aaron M. Renn (arenn@urbanophile.com)
  */
-
-// Height of the paper
-private double height;
-
-// Width of the paper
-private double width;
-
-// Upper left imageable X coordinate
-private double imageableX;
-
-// Upper left imageable Y coordinate
-private double imageableY;
-
-// Imageable width of the page
-private double imageableWidth;
-
-// Imageable height of the page
-private double imageableHeight;
-
-/*************************************************************************/
-
-/*
- * Constructor
- */
-
-/**
-  * This method creates a letter sized paper with one inch margins
-  */
-public
-Paper()
-{
-  width = 8.5 * 72;
-  height = 11 * 72;
-  imageableX = 72;
-  imageableY = 72;
-  imageableWidth = width - (2 * 72);
-  imageableHeight = height - (2 * 72);
-}
-
-/*************************************************************************/
-
-/**
-  * This method returns the height of the paper in 1/72nds of an inch.
-  *
-  * @return The height of the paper in 1/72nds of an inch.
-  */
-public double
-getHeight()
+public class Paper
+  implements Cloneable
 {
-  return(height);
-}
+  // Height of the paper
+  private double height;
+
+  // Width of the paper
+  private double width;
+
+  // Upper left imageable X coordinate
+  private double imageableX;
+
+  // Upper left imageable Y coordinate
+  private double imageableY;
+
+  // Imageable width of the page
+  private double imageableWidth;
+
+  // Imageable height of the page
+  private double imageableHeight;
+
+  /**
+   * This method creates a letter sized paper with one inch margins
+   */
+  public Paper()
+  {
+    width = 8.5 * 72;
+    height = 11 * 72;
+    imageableX = 72;
+    imageableY = 72;
+    imageableWidth = width - (2 * 72);
+    imageableHeight = height - (2 * 72);
+  }
+
+  /**
+   * This method returns the height of the paper in 1/72nds of an inch.
+   * 
+   * @return The height of the paper in 1/72nds of an inch.
+   */
+  public double getHeight()
+  {
+    return height;
+  }
+
+  /**
+   * Returns the width of the paper in 1/72nds of an inch.
+   * 
+   * @return The width of the paper in 1/72nds of an inch.
+   */
+  public double getWidth()
+  {
+    return width;
+  }
+
+  /**
+   * This method returns the X coordinate of the upper left hand corner of the
+   * imageable area of the paper.
+   * 
+   * @return The X coordinate of the upper left hand corner of the imageable
+   *         area of the paper.
+   */
+  public double getImageableX()
+  {
+    return imageableX;
+  }
+
+  /**
+   * This method returns the Y coordinate of the upper left hand corner of the
+   * imageable area of the paper.
+   * 
+   * @return The Y coordinate of the upper left hand corner of the imageable
+   *         area of the paper.
+   */
+  public double getImageableY()
+  {
+    return imageableY;
+  }
+
+  /**
+   * Returns the width of the imageable area of the paper.
+   * 
+   * @return The width of the imageable area of the paper.
+   */
+  public double getImageableWidth()
+  {
+    return imageableWidth;
+  }
+
+  /**
+   * Returns the height of the imageable area of the paper.
+   * 
+   * @return The height of the imageable area of the paper.
+   */
+  public double getImageableHeight()
+  {
+    return imageableHeight;
+  }
+
+  /**
+   * This method sets the size of the paper to the specified width and height,
+   * which are specified in 1/72nds of an inch.
+   * 
+   * @param width The width of the paper in 1/72nds of an inch.
+   * @param height The height of the paper in 1/72nds of an inch.
+   */
+  public void setSize(double width, double height)
+  {
+    this.width = width;
+    this.height = height;
+  }
+
+  /**
+   * This method sets the imageable area of the paper by specifying the
+   * coordinates of the upper left hand corner of that area, and its length 
+   * and height. All values are in 1/72nds of an inch.
+   * 
+   * @param imageableX The X coordinate of the upper left hand corner of the
+   *          imageable area, in 1/72nds of an inch.
+   * @param imageableY The Y coordinate of the upper left hand corner of the
+   *          imageable area, in 1/72nds of an inch.
+   * @param imageableWidth The width of the imageable area of the paper, in
+   *          1/72nds of an inch.
+   * @param imageableHeight The heigth of the imageable area of the paper, in
+   *          1/72nds of an inch.
+   */
+  public void setImageableArea(double imageableX, double imageableY,
+      double imageableWidth, double imageableHeight)
+  {
+    this.imageableX = imageableX;
+    this.imageableY = imageableY;
+    this.imageableWidth = imageableWidth;
+    this.imageableHeight = imageableHeight;
+  }
+
+  /**
+   * This method creates a copy of this object.
+   * 
+   * @return A copy of this object.
+   */
+  public Object clone()
+  {
+    try
+      {
+        return (super.clone());
+      }
+    catch (CloneNotSupportedException e)
+      {
+        return (null);
+      }
+  }
 
-/*************************************************************************/
-
-/**
-  * Returns the width of the paper in 1/72nds of an inch.
-  *
-  * @return The width of the paper in 1/72nds of an inch.
-  */
-public double
-getWidth()
-{
-  return(width);
 }
-
-/*************************************************************************/
-
-/**
-  * This method returns the X coordinate of the upper left hand corner
-  * of the imageable area of the paper.
-  *
-  * @return The X coordinate of the upper left hand corner of the imageable
-  * area of the paper.
-  */
-public double
-getImageableX()
-{
-  return(imageableX);
-}
-
-/*************************************************************************/
-
-/**
-  * This method returns the Y coordinate of the upper left hand corner
-  * of the imageable area of the paper.
-  *
-  * @return The Y coordinate of the upper left hand corner of the imageable
-  * area of the paper.
-  */
-public double
-getImageableY()
-{
-  return(imageableY);
-}
-
-/*************************************************************************/
-
-/**
-  * Returns the width of the imageable area of the paper.
-  *
-  * @return The width of the imageable area of the paper.
-  */
-public double
-getImageableWidth()
-{
-  return(imageableWidth);
-}
-
-/*************************************************************************/
-
-/**
-  * Returns the height of the imageable area of the paper.
-  *
-  * @return The height of the imageable area of the paper.
-  */
-public double
-getImageableHeight()
-{
-  return(imageableHeight);
-}
-
-/*************************************************************************/
-
-/**
-  * This method sets the size of the paper to the specified width and
-  * height, which are specified in 1/72nds of an inch.
-  *
-  * @param width The width of the paper in 1/72nds of an inch.
-  * @param height The height of the paper in 1/72nds of an inch.
-  */
-public void
-setSize(double width, double height)
-{
-  this.width = width;
-  this.height = height;
-}
-
-/*************************************************************************/
-
-/**
-  * This method sets the imageable area of the paper by specifying the
-  * coordinates of the upper left hand corner of that area, and its
-  * length and height.  All values are in 1/72nds of an inch.
-  *
-  * @param imageableX The X coordinate of the upper left hand corner of
-  * the imageable area, in 1/72nds of an inch.
-  * @param imageableY The Y coordinate of the upper left hand corner of
-  * the imageable area, in 1/72nds of an inch.
-  * @param imageableWidth The width of the imageable area of the paper, 
-  * in 1/72nds of an inch.
-  * @param imageableHeight The heigth of the imageable area of the paper, 
-  * in 1/72nds of an inch.
-  */
-public void
-setImageableArea(double imageableX, double imageableY, 
-                 double imageableWidth, double imageableHeight)
-{
-  this.imageableX = imageableX;
-  this.imageableY = imageableY;
-  this.imageableWidth = imageableWidth;
-  this.imageableHeight = imageableHeight;
-}
-
-/*************************************************************************/
-
-/**
-  * This method creates a copy of this object.
-  *
-  * @return A copy of this object.
-  */
-public Object
-clone()
-{
-  try
-    {
-      return(super.clone());
-    }
-  catch(CloneNotSupportedException e)
-    {
-      return(null);
-    }
-}
-
-} // class Paper
-
diff --git a/libjava/classpath/java/awt/print/PrinterGraphics.java b/libjava/classpath/java/awt/print/PrinterGraphics.java
index 5ca64190424..62fde8406dd 100644
--- a/libjava/classpath/java/awt/print/PrinterGraphics.java
+++ b/libjava/classpath/java/awt/print/PrinterGraphics.java
@@ -1,5 +1,5 @@
 /* PrinterGraphics.java -- Hook to return print job controller.
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,23 +39,20 @@ exception statement from your version. */
 package java.awt.print;
 
 /**
-  * This interface is implemented by the <code>Graphics</code> instance
-  * that is used for rendering pages.  It provides a hook to return the
-  * object that is controlling the print job.
-  *
-  * @author Aaron M. Renn (arenn@urbanophile.com)
-  */
+ * This interface is implemented by the <code>Graphics</code> instance that is
+ * used for rendering pages. It provides a hook to return the object that is
+ * controlling the print job.
+ * 
+ * @author Aaron M. Renn (arenn@urbanophile.com)
+ */
 public interface PrinterGraphics
 {
-
-/**
-  * This method returns the instance of <code>PrinterJob</code> that is
-  * controlling this print job.
-  *
-  * @return The <code>PrinterJob</code> that is controlling this print job.
-  */
-PrinterJob
-getPrinterJob();
-
-} // interface PrinterGraphics
-
+  /**
+   * This method returns the instance of <code>PrinterJob</code> that is
+   * controlling this print job.
+   * 
+   * @return The <code>PrinterJob</code> that is controlling this print job.
+   */
+  PrinterJob getPrinterJob();
+
+}
diff --git a/libjava/classpath/java/awt/print/PrinterJob.java b/libjava/classpath/java/awt/print/PrinterJob.java
index e1aeabc3e62..7f67a6b048b 100644
--- a/libjava/classpath/java/awt/print/PrinterJob.java
+++ b/libjava/classpath/java/awt/print/PrinterJob.java
@@ -1,5 +1,5 @@
 /* PrinterJob.java -- This job is the printer control class
-   Copyright (C) 1999, 2004, 2005  Free Software Foundation, Inc.
+   Copyright (C) 1999, 2004, 2005, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -61,7 +61,7 @@ public abstract class PrinterJob
   public static PrinterJob getPrinterJob()
   {
     // FIXME: Need to fix this to load a default implementation instance.
-    return null;
+    return new NoPrinterJob();
   }
 
   /**