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, 11 insertions, 11 deletions

diff --git a/libjava/classpath/javax/print/attribute/standard/MediaPrintableArea.java b/libjava/classpath/javax/print/attribute/standard/MediaPrintableArea.java
index 9a1342cb43f..e0366f589ad 100644
--- a/libjava/classpath/javax/print/attribute/standard/MediaPrintableArea.java
+++ b/libjava/classpath/javax/print/attribute/standard/MediaPrintableArea.java
@@ -1,5 +1,5 @@
 /* MediaPrintableArea.java -- 
-   Copyright (C) 2005  Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -95,9 +95,9 @@ public final class MediaPrintableArea
   /** y in micrometers. */
   private int y;
   /** width in micrometers. */
-  private int width;
+  private int w;
   /** height in micrometers. */
-  private int height;
+  private int h;
   
   /**
    * Creates a new <code>MediaPrintableArea</code> object with the given
@@ -119,8 +119,8 @@ public final class MediaPrintableArea
 
     this.x = (int) (x * units + 0.5f);
     this.y = (int) (y * units + 0.5f);
-    this.width = (int) (w * units + 0.5f);
-    this.height = (int) (h * units + 0.5f);
+    this.w = (int) (w * units + 0.5f);
+    this.h = (int) (h * units + 0.5f);
   }
 
   /**
@@ -143,8 +143,8 @@ public final class MediaPrintableArea
 
     this.x = x * units;
     this.y = y * units;
-    this.width = w * units;
-    this.height = h * units;
+    this.w = w * units;
+    this.h = h * units;
   }
 
   /**
@@ -180,7 +180,7 @@ public final class MediaPrintableArea
     if (units < 1)
       throw new IllegalArgumentException("units may not be less than 1");
 
-    return height / ((float)units);
+    return h / ((float)units);
   }
 
   /**
@@ -196,7 +196,7 @@ public final class MediaPrintableArea
     if (units < 1)
       throw new IllegalArgumentException("units may not be less than 1");
 
-    return width / ((float)units);
+    return w / ((float)units);
   }
 
   /**
@@ -248,7 +248,7 @@ public final class MediaPrintableArea
     MediaPrintableArea tmp = (MediaPrintableArea) obj;
 
     return (x == tmp.getX(1) && y == tmp.getY(1)
-            && width == tmp.getWidth(1) && height == tmp.getHeight(1));
+            && w == tmp.getWidth(1) && h == tmp.getHeight(1));
   }
 
   /**
@@ -270,7 +270,7 @@ public final class MediaPrintableArea
    */
   public int hashCode()
   {
-    return x ^ y + width ^ height;
+    return x ^ y + w ^ h;
   }
   
   /**