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

1 files changed, 153 insertions, 192 deletions

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
-