Imported GNU Classpath 0.90

       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.

From-SVN: r111942

20 files changed, 187 insertions, 96 deletions

diff --git a/libjava/classpath/javax/print/attribute/AttributeSetUtilities.java b/libjava/classpath/javax/print/attribute/AttributeSetUtilities.java
index 5d97c66..f6a64eb 100644
--- a/libjava/classpath/javax/print/attribute/AttributeSetUtilities.java
+++ b/libjava/classpath/javax/print/attribute/AttributeSetUtilities.java
@@ -1,5 +1,5 @@
 /* AttributeSetUtilities.java -- 
-   Copyright (C) 2003, 2004  Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -78,14 +78,14 @@ public final class AttributeSetUtilities
   private static class UnmodifiableAttributeSet
     implements AttributeSet, Serializable
   {
-    private AttributeSet set;
+    private AttributeSet attrset;
 
     public UnmodifiableAttributeSet(AttributeSet attributeSet)
     {
       if (attributeSet == null)
         throw new NullPointerException("attributeSet may not be null");
 
-      this.set = attributeSet;
+      this.attrset = attributeSet;
     }
 
     public boolean add(Attribute attribute)
@@ -105,32 +105,32 @@ public final class AttributeSetUtilities
 
     public boolean containsKey(Class category)
     {
-      return set.containsKey(category);
+      return attrset.containsKey(category);
     }
 
     public boolean containsValue(Attribute attribute)
     {
-      return set.containsValue(attribute);
+      return attrset.containsValue(attribute);
     }
 
     public boolean equals(Object obj)
     {
-      return set.equals(obj);
+      return attrset.equals(obj);
     }
     
     public Attribute get(Class interfaceName)
     {
-      return set.get(interfaceName);
+      return attrset.get(interfaceName);
     }
 
     public int hashCode()
     {
-      return set.hashCode();
+      return attrset.hashCode();
     }
     
     public boolean isEmpty()
     {
-      return set.isEmpty();
+      return attrset.isEmpty();
     }
 
     public boolean remove(Class category)
@@ -145,12 +145,12 @@ public final class AttributeSetUtilities
 
     public int size()
     {
-      return set.size();
+      return attrset.size();
     }
 
     public Attribute[] toArray()
     {
-      return set.toArray();
+      return attrset.toArray();
     }
   }
 
@@ -197,79 +197,79 @@ public final class AttributeSetUtilities
   private static class SynchronizedAttributeSet
     implements AttributeSet, Serializable
   {
-    private AttributeSet set;
+    private AttributeSet attrset;
 
     public SynchronizedAttributeSet(AttributeSet attributeSet)
     {
       if (attributeSet == null)
         throw new NullPointerException("attributeSet may not be null");
 
-      this.set = attributeSet;
+      attrset = attributeSet;
     }
 
     public synchronized boolean add(Attribute attribute)
     {
-      return set.add(attribute);
+      return attrset.add(attribute);
     }
 
     public synchronized boolean addAll(AttributeSet attributes)
     {
-      return set.addAll(attributes);
+      return attrset.addAll(attributes);
     }
     
     public synchronized void clear()
     {
-      set.clear();
+      attrset.clear();
     }
 
     public synchronized boolean containsKey(Class category)
     {
-      return set.containsKey(category);
+      return attrset.containsKey(category);
     }
 
     public synchronized boolean containsValue(Attribute attribute)
     {
-      return set.containsValue(attribute);
+      return attrset.containsValue(attribute);
     }
 
     public synchronized boolean equals(Object obj)
     {
-      return set.equals(obj);
+      return attrset.equals(obj);
     }
     
     public synchronized Attribute get(Class interfaceName)
     {
-      return set.get(interfaceName);
+      return attrset.get(interfaceName);
     }
 
     public synchronized int hashCode()
     {
-      return set.hashCode();
+      return attrset.hashCode();
     }
     
     public synchronized boolean isEmpty()
     {
-      return set.isEmpty();
+      return attrset.isEmpty();
     }
 
     public synchronized boolean remove(Class category)
     {
-      return set.remove(category);
+      return attrset.remove(category);
     }
 
     public synchronized boolean remove(Attribute attribute)
     {
-      return set.remove(attribute);
+      return attrset.remove(attribute);
     }
 
     public synchronized int size()
     {
-      return set.size();
+      return attrset.size();
     }
 
     public synchronized Attribute[] toArray()
     {
-      return set.toArray();
+      return attrset.toArray();
     }
   }
 
diff --git a/libjava/classpath/javax/print/attribute/DateTimeSyntax.java b/libjava/classpath/javax/print/attribute/DateTimeSyntax.java
index d591932..8cff702 100644
--- a/libjava/classpath/javax/print/attribute/DateTimeSyntax.java
+++ b/libjava/classpath/javax/print/attribute/DateTimeSyntax.java
@@ -102,4 +102,14 @@ public abstract class DateTimeSyntax implements Cloneable, Serializable
   {
     return value.hashCode();
   }
+  
+  /**
+   * Returns the string representation for this object.
+   *
+   * @return The string representation.
+   */
+  public String toString() 
+  {
+    return value.toString();    
+  }
 }
diff --git a/libjava/classpath/javax/print/attribute/HashAttributeSet.java b/libjava/classpath/javax/print/attribute/HashAttributeSet.java
index 0db81ba..65371ea 100644
--- a/libjava/classpath/javax/print/attribute/HashAttributeSet.java
+++ b/libjava/classpath/javax/print/attribute/HashAttributeSet.java
@@ -1,5 +1,5 @@
 /* HashAttributeSet.java -- 
-   Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,6 +37,9 @@ exception statement from your version. */
 
 package javax.print.attribute;
 
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -49,8 +52,8 @@ public class HashAttributeSet implements AttributeSet, Serializable
 {
   private static final long serialVersionUID = 5311560590283707917L;
   
-  private Class interfaceName;
-  private HashMap attributeMap = new HashMap();
+  private Class myInterface;
+  private transient HashMap attributeMap = new HashMap();
 
   /**
    * Creates an empty <code>HashAttributeSet</code> object.
@@ -112,7 +115,7 @@ public class HashAttributeSet implements AttributeSet, Serializable
     if (interfaceName == null)
       throw new NullPointerException("interfaceName may not be null");
     
-    this.interfaceName = interfaceName;
+    myInterface = interfaceName;
   }
   
   /**
@@ -192,7 +195,7 @@ public class HashAttributeSet implements AttributeSet, Serializable
    */
   public boolean add(Attribute attribute)
   {
-    return addInternal(attribute, interfaceName);
+    return addInternal(attribute, myInterface);
   }
 
   private boolean addInternal(Attribute attribute, Class interfaceName)
@@ -201,7 +204,7 @@ public class HashAttributeSet implements AttributeSet, Serializable
       throw new NullPointerException("attribute may not be null");
 
     AttributeSetUtilities.verifyAttributeCategory(interfaceName,
-						  this.interfaceName);
+                                                  myInterface);
 
     Object old = attributeMap.put
       (attribute.getCategory(), AttributeSetUtilities.verifyAttributeValue
@@ -220,7 +223,7 @@ public class HashAttributeSet implements AttributeSet, Serializable
    */
   public boolean addAll(AttributeSet attributes)
   {
-    return addAllInternal(attributes, interfaceName);
+    return addAllInternal(attributes, myInterface);
   }
 
   private boolean addAllInternal(AttributeSet attributes, Class interfaceName)
@@ -393,4 +396,24 @@ public class HashAttributeSet implements AttributeSet, Serializable
     
     return array;
   }
+  
+  // Implemented as specified in serialized form
+  private void readObject(ObjectInputStream s)
+    throws ClassNotFoundException, IOException
+  {
+    myInterface = (Class) s.readObject();
+    int size = s.readInt();
+    attributeMap = new HashMap(size);
+    for (int i=0; i < size; i++)
+      add((Attribute) s.readObject());
+  }
+         
+  private void writeObject(ObjectOutputStream s) throws IOException
+  {
+    s.writeObject(myInterface);
+    s.writeInt(size());
+    Iterator it = attributeMap.values().iterator();
+    while (it.hasNext())
+      s.writeObject(it.next());    
+  }
 }
diff --git a/libjava/classpath/javax/print/attribute/standard/Compression.java b/libjava/classpath/javax/print/attribute/standard/Compression.java
index d29ffa0..01891fe 100644
--- a/libjava/classpath/javax/print/attribute/standard/Compression.java
+++ b/libjava/classpath/javax/print/attribute/standard/Compression.java
@@ -1,5 +1,5 @@
 /* Compression.java --
-   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -91,7 +91,7 @@ public class Compression extends EnumSyntax
    *
    * @return The class <code>Compression</code> itself.
    */
-  public Class getCategory()
+  public final Class getCategory()
   {
     return Compression.class;
   }
@@ -101,7 +101,7 @@ public class Compression extends EnumSyntax
    *
    * @return The name "compression".
    */
-  public String getName()
+  public final String getName()
   {
     return "compression";
   }
diff --git a/libjava/classpath/javax/print/attribute/standard/Finishings.java b/libjava/classpath/javax/print/attribute/standard/Finishings.java
index 6d474a6..963485e 100644
--- a/libjava/classpath/javax/print/attribute/standard/Finishings.java
+++ b/libjava/classpath/javax/print/attribute/standard/Finishings.java
@@ -1,5 +1,5 @@
 /* Finishings.java --
-   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -238,7 +238,7 @@ public class Finishings extends EnumSyntax
    *
    * @return the class <code>Finishings</code> itself
    */
-  public Class getCategory()
+  public final Class getCategory()
   {
     return Finishings.class;
   }
@@ -248,7 +248,7 @@ public class Finishings extends EnumSyntax
    *
    * @return The name "finishings".
    */
-  public String getName()
+  public final String getName()
   {
     return "finishings";
   }
diff --git a/libjava/classpath/javax/print/attribute/standard/JobMediaSheets.java b/libjava/classpath/javax/print/attribute/standard/JobMediaSheets.java
index 75e072c..04b8306 100644
--- a/libjava/classpath/javax/print/attribute/standard/JobMediaSheets.java
+++ b/libjava/classpath/javax/print/attribute/standard/JobMediaSheets.java
@@ -1,5 +1,5 @@
 /* JobMediaSheets.java -- 
-   Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -107,7 +107,7 @@ public class JobMediaSheets extends IntegerSyntax
    *
    * @return The class <code>JobMediaSheets</code> itself.
    */
-  public Class getCategory()
+  public final Class getCategory()
   {
     return JobMediaSheets.class;
   }
@@ -117,7 +117,7 @@ public class JobMediaSheets extends IntegerSyntax
    *
    * @return The name "job-media-sheets".
    */
-  public String getName()
+  public final String getName()
   {
     return "job-media-sheets";
   }
diff --git a/libjava/classpath/javax/print/attribute/standard/JobSheets.java b/libjava/classpath/javax/print/attribute/standard/JobSheets.java
index d61acfe..f2cfacc 100644
--- a/libjava/classpath/javax/print/attribute/standard/JobSheets.java
+++ b/libjava/classpath/javax/print/attribute/standard/JobSheets.java
@@ -1,5 +1,5 @@
 /* JobSheets.java --
-   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -88,7 +88,7 @@ public class JobSheets extends EnumSyntax
    *
    * @return The class <code>JobSheets</code> itself.
    */
-  public Class getCategory()
+  public final Class getCategory()
   {
     return JobSheets.class;
   }
@@ -98,7 +98,7 @@ public class JobSheets extends EnumSyntax
    *
    * @return The name "job-sheets".
    */
-  public String getName()
+  public final String getName()
   {
     return "job-sheets";
   }
diff --git a/libjava/classpath/javax/print/attribute/standard/JobState.java b/libjava/classpath/javax/print/attribute/standard/JobState.java
index bd09e1f..8289569 100644
--- a/libjava/classpath/javax/print/attribute/standard/JobState.java
+++ b/libjava/classpath/javax/print/attribute/standard/JobState.java
@@ -1,5 +1,5 @@
 /* JobState.java --
-   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -137,7 +137,7 @@ public class JobState extends EnumSyntax
    *
    * @return The class <code>JobState</code> itself.
    */
-  public Class getCategory()
+  public final Class getCategory()
   {
     return JobState.class;
   }
@@ -147,7 +147,7 @@ public class JobState extends EnumSyntax
    *
    * @return The name "job-state".
    */
-  public String getName()
+  public final String getName()
   {
     return "job-state";
   }
diff --git a/libjava/classpath/javax/print/attribute/standard/JobStateReason.java b/libjava/classpath/javax/print/attribute/standard/JobStateReason.java
index bd831cd..967a6bf 100644
--- a/libjava/classpath/javax/print/attribute/standard/JobStateReason.java
+++ b/libjava/classpath/javax/print/attribute/standard/JobStateReason.java
@@ -1,5 +1,5 @@
 /* JobStateReason.java --
-   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -262,7 +262,7 @@ public class JobStateReason extends EnumSyntax
    *
    * @return The class <code>JobStateReason</code> itself.
    */
-  public Class getCategory()
+  public final Class getCategory()
   {
     return JobStateReason.class;
   }
@@ -272,7 +272,7 @@ public class JobStateReason extends EnumSyntax
    *
    * @return The name "job-state-reason".
    */
-  public String getName()
+  public final String getName()
   {
     return "job-state-reason";
   }
diff --git a/libjava/classpath/javax/print/attribute/standard/JobStateReasons.java b/libjava/classpath/javax/print/attribute/standard/JobStateReasons.java
index 9dbca0c..32f942b 100644
--- a/libjava/classpath/javax/print/attribute/standard/JobStateReasons.java
+++ b/libjava/classpath/javax/print/attribute/standard/JobStateReasons.java
@@ -131,7 +131,7 @@ public final class JobStateReasons extends HashSet
     if (o == null)
       throw new NullPointerException("reason is null");  
     
-    return add((JobStateReason) o);
+    return super.add((JobStateReason) o);   
   }
   
   /**
diff --git a/libjava/classpath/javax/print/attribute/standard/Media.java b/libjava/classpath/javax/print/attribute/standard/Media.java
index 202a3f3..37132e7 100644
--- a/libjava/classpath/javax/print/attribute/standard/Media.java
+++ b/libjava/classpath/javax/print/attribute/standard/Media.java
@@ -1,5 +1,5 @@
 /* Media.java --
-   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -105,7 +105,7 @@ public abstract class Media extends EnumSyntax
    *
    * @return The class <code>Media</code> itself.
    */
-  public Class getCategory()
+  public final Class getCategory()
   {
     return Media.class;
   }
@@ -115,7 +115,7 @@ public abstract class Media extends EnumSyntax
    *
    * @return The name "media".
    */
-  public String getName()
+  public final String getName()
   {
     return "media";
   }
diff --git a/libjava/classpath/javax/print/attribute/standard/MediaPrintableArea.java b/libjava/classpath/javax/print/attribute/standard/MediaPrintableArea.java
index 9a1342c..e0366f5 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;
   }
   
   /**
diff --git a/libjava/classpath/javax/print/attribute/standard/MediaSize.java b/libjava/classpath/javax/print/attribute/standard/MediaSize.java
index 00bcb34..982b5c5 100644
--- a/libjava/classpath/javax/print/attribute/standard/MediaSize.java
+++ b/libjava/classpath/javax/print/attribute/standard/MediaSize.java
@@ -1,5 +1,5 @@
 /* MediaSize.java -- 
-   Copyright (C) 2005  Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -72,7 +72,14 @@ public class MediaSize extends Size2DSyntax
   static
     {
       mediaCache = new ArrayList();
-
+      
+      // We call one instance of every container class to make sure it gets
+      // loaded during class initialization and therefore all other static
+      // fields of this container class also.
+      
+      // This is needed to put all MediaSize instance into the mediaCache
+      // for use by the static methods in this class.
+      
       MediaSize tmp = MediaSize.ISO.A0;
       tmp = MediaSize.JIS.B0;
       tmp = MediaSize.Engineering.A;
@@ -80,16 +87,21 @@ public class MediaSize extends Size2DSyntax
       tmp = MediaSize.Other.EXECUTIVE;
     }
   
-  private MediaSizeName media;
+  private MediaSizeName mediaName;
   
   /**
-   * Creates a <code>MediaSize</code> object.
+   * Creates a <code>MediaSize</code> object. The created object will be added 
+   * to an internal cache used in the static methods of this class for lookup 
+   * of available <code>MediaSize</code> instances.
    *
    * @param x the size in x direction
    * @param y the size in y direction
    * @param units the units to use for the sizes
    *
    * @exception IllegalArgumentException if x or y &lt; 0 or units &lt; 1
+   * 
+   * @see #findMedia(float, float, int)
+   * @see #getMediaSizeForName(MediaSizeName)
    */
   public MediaSize(float x, float y, int units)
   {
@@ -99,7 +111,9 @@ public class MediaSize extends Size2DSyntax
   
   /**
    * Creates a <code>MediaSize</code> object associated with the given
-   * media name.
+   * media name. The created object will be added to an internal cache used 
+   * in the static methods of this class for lookup of available 
+   * <code>MediaSize</code> instances.
    *
    * @param x the size in x direction
    * @param y the size in y direction
@@ -107,22 +121,30 @@ public class MediaSize extends Size2DSyntax
    * @param media the media name to associate
    *
    * @exception IllegalArgumentException if x or y &lt; 0 or units &lt; 1
+   * 
+   * @see #findMedia(float, float, int)
+   * @see #getMediaSizeForName(MediaSizeName)
    */
   public MediaSize(float x, float y, int units, MediaSizeName media)
   {
     super(x, y, units);
-    this.media = media;
+    mediaName = media;
     mediaCache.add(this);
   }
   
   /**
-   * Creates a <code>MediaSize</code> object.
+   * Creates a <code>MediaSize</code> object. The created object will be added 
+   * to an internal cache used in the static methods of this class for lookup 
+   * of available <code>MediaSize</code> instances.
    *
    * @param x the size in x direction
    * @param y the size in y direction
    * @param units the units to use for the sizes
    *
    * @exception IllegalArgumentException if x or y &lt; 0 or units &lt; 1
+   * 
+   * @see #findMedia(float, float, int)
+   * @see #getMediaSizeForName(MediaSizeName)
    */
   public MediaSize(int x, int y, int units)
   {
@@ -132,7 +154,9 @@ public class MediaSize extends Size2DSyntax
   
   /**
    * Creates a <code>MediaSize</code> object associated with the given
-   * media name.
+   * media name. The created object will be added to an internal cache used 
+   * in the static methods of this class for lookup of available 
+   * <code>MediaSize</code> instances.
    *
    * @param x the size in x direction
    * @param y the size in y direction
@@ -140,11 +164,14 @@ public class MediaSize extends Size2DSyntax
    * @param media the media name to associate
    *
    * @exception IllegalArgumentException if x or y &lt; 0 or units &lt; 1
+   * 
+   * @see #findMedia(float, float, int)
+   * @see #getMediaSizeForName(MediaSizeName)
    */
   public MediaSize(int x, int y, int units, MediaSizeName media)
   {
     super(x, y, units);
-    this.media = media;
+    mediaName = media;
     mediaCache.add(this);
   }
   
@@ -153,7 +180,7 @@ public class MediaSize extends Size2DSyntax
    *
    * @return The class <code>MediaSize</code> itself.
    */
-  public Class getCategory()
+  public final Class getCategory()
   {
     return MediaSize.class;
   }
@@ -246,7 +273,7 @@ public class MediaSize extends Size2DSyntax
    */
   public MediaSizeName getMediaSizeName()
   {
-    return media;
+    return mediaName;
   }
 
   /**
@@ -254,7 +281,7 @@ public class MediaSize extends Size2DSyntax
    *
    * @return The name "media-size".
    */
-  public String getName()
+  public final String getName()
   {
     return "media-size";
   }
@@ -266,7 +293,11 @@ public class MediaSize extends Size2DSyntax
    */
   public static final class ISO 
   {
-
+    private ISO()
+    {
+      // prevent instantiation
+    }
+    
     /**
      * ISO A0 paper, 841 mm x 1189 mm.
      */
@@ -415,6 +446,11 @@ public class MediaSize extends Size2DSyntax
    */
   public static final class NA
   {
+    private NA()
+    {
+      // prevent instantiation
+    }
+    
     /**
      * US Legal paper size, 8.5 inch x 14 inch
      */
@@ -530,6 +566,11 @@ public class MediaSize extends Size2DSyntax
    */
   public static final class Engineering 
   {
+    private Engineering()
+    {
+      // prevent instantiation
+    }
+    
     /**
      * ANSI A paper size. 8.5 inch x 11 inch
      */
@@ -568,6 +609,11 @@ public class MediaSize extends Size2DSyntax
    */
   public static final class JIS 
   {
+    private JIS()
+    {
+      // prevent instantiation
+    }
+    
     /**
      * JIS B0 paper. 1030 mm x 1456 mm
      * Note: The JIS B-series is not identical to the ISO B-series.
@@ -762,6 +808,11 @@ public class MediaSize extends Size2DSyntax
    */
   public static final class Other
   {
+    private Other()
+    {
+      // prevent instantiation
+    }
+    
     /**
      * US Executive paper size, 7.25 inch x 10.5 inch
      */
@@ -820,6 +871,13 @@ public class MediaSize extends Size2DSyntax
      * Japanese double postcard, 148 mm x 200 mm
      */
     public static final MediaSize JAPANESE_DOUBLE_POSTCARD = new MediaSize(148, 200, MediaSize.MM, MediaSizeName.JAPANESE_DOUBLE_POSTCARD);
+    
+    /**
+     * Tabloid size, 11 inch x 17 inch.
+     * @since 1.5
+     */
+    public static final MediaSize TABLOID = 
+      new MediaSize(11, 17, Size2DSyntax.INCH, MediaSizeName.TABLOID);
   }
 }
 
diff --git a/libjava/classpath/javax/print/attribute/standard/MultipleDocumentHandling.java b/libjava/classpath/javax/print/attribute/standard/MultipleDocumentHandling.java
index 1ed0c91..1a89fd0 100644
--- a/libjava/classpath/javax/print/attribute/standard/MultipleDocumentHandling.java
+++ b/libjava/classpath/javax/print/attribute/standard/MultipleDocumentHandling.java
@@ -1,5 +1,5 @@
 /* MultipleDocumentHandling.java --
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -108,7 +108,7 @@ public class MultipleDocumentHandling extends EnumSyntax
    *
    * @return The class <code>MultipleDocumentHandling</code> itself.
    */
-  public Class getCategory()
+  public final Class getCategory()
   {
     return MultipleDocumentHandling.class;
   }
@@ -118,7 +118,7 @@ public class MultipleDocumentHandling extends EnumSyntax
    *
    * @return The name "multiple-document-handling".
    */
-  public String getName()
+  public final String getName()
   {
     return "multiple-document-handling";
   }
diff --git a/libjava/classpath/javax/print/attribute/standard/PDLOverrideSupported.java b/libjava/classpath/javax/print/attribute/standard/PDLOverrideSupported.java
index d3be3e5..ee07edb 100644
--- a/libjava/classpath/javax/print/attribute/standard/PDLOverrideSupported.java
+++ b/libjava/classpath/javax/print/attribute/standard/PDLOverrideSupported.java
@@ -1,5 +1,5 @@
 /* PDLOverrideSupported.java --
-   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -91,7 +91,7 @@ public class PDLOverrideSupported extends EnumSyntax
    *
    * @return The class  <code>PDLOverrideSupported</code> itself.
    */
-  public Class getCategory()
+  public final Class getCategory()
   {
     return PDLOverrideSupported.class;
   }
@@ -101,7 +101,7 @@ public class PDLOverrideSupported extends EnumSyntax
    *
    * @return The name "pdl-override-supported".
    */
-  public String getName()
+  public final String getName()
   {
     return "pdl-override-supported";
   }
diff --git a/libjava/classpath/javax/print/attribute/standard/PrintQuality.java b/libjava/classpath/javax/print/attribute/standard/PrintQuality.java
index 2f1a105..c581d5f 100644
--- a/libjava/classpath/javax/print/attribute/standard/PrintQuality.java
+++ b/libjava/classpath/javax/print/attribute/standard/PrintQuality.java
@@ -1,5 +1,5 @@
 /* PrintQuality.java --
-   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -92,7 +92,7 @@ public class PrintQuality extends EnumSyntax
    *
    * @return The class <code>PrintQuality</code> itself.
    */
-  public Class getCategory()
+  public final Class getCategory()
   {
     return PrintQuality.class;
   }
@@ -102,7 +102,7 @@ public class PrintQuality extends EnumSyntax
    *
    * @return The name "print-quality".
    */
-  public String getName()
+  public final String getName()
   {
     return "print-quality";
   }
diff --git a/libjava/classpath/javax/print/attribute/standard/PrinterIsAcceptingJobs.java b/libjava/classpath/javax/print/attribute/standard/PrinterIsAcceptingJobs.java
index 51f96c1..96dbc57c 100644
--- a/libjava/classpath/javax/print/attribute/standard/PrinterIsAcceptingJobs.java
+++ b/libjava/classpath/javax/print/attribute/standard/PrinterIsAcceptingJobs.java
@@ -55,7 +55,7 @@ import javax.print.attribute.PrintServiceAttribute;
  * @author Michael Koch (konqueror@gmx.de)
  * @author Wolfgang Baer (WBaer@gmx.de)
  */
-public class PrinterIsAcceptingJobs extends EnumSyntax
+public final class PrinterIsAcceptingJobs extends EnumSyntax
   implements PrintServiceAttribute
 {
   private static final long serialVersionUID = -5052010680537678061L;
diff --git a/libjava/classpath/javax/print/attribute/standard/PrinterStateReason.java b/libjava/classpath/javax/print/attribute/standard/PrinterStateReason.java
index 3a13585..340bfba 100644
--- a/libjava/classpath/javax/print/attribute/standard/PrinterStateReason.java
+++ b/libjava/classpath/javax/print/attribute/standard/PrinterStateReason.java
@@ -1,5 +1,5 @@
 /* PrinterStateReason.java --
-   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -293,7 +293,7 @@ public class PrinterStateReason extends EnumSyntax
    *
    * @return The class <code>PrintStateReason</code> itself.
    */
-  public Class getCategory()
+  public final Class getCategory()
   {
     return PrinterStateReason.class;
   }
@@ -303,7 +303,7 @@ public class PrinterStateReason extends EnumSyntax
    *
    * @return The name "printer-state-reason".
    */
-  public String getName()
+  public final String getName()
   {
     return "printer-state-reason";
   }
diff --git a/libjava/classpath/javax/print/attribute/standard/PrinterStateReasons.java b/libjava/classpath/javax/print/attribute/standard/PrinterStateReasons.java
index 67f160d..40c6f1b 100644
--- a/libjava/classpath/javax/print/attribute/standard/PrinterStateReasons.java
+++ b/libjava/classpath/javax/print/attribute/standard/PrinterStateReasons.java
@@ -178,7 +178,7 @@ public final class PrinterStateReasons extends HashMap
     if (severity == null)
       throw new NullPointerException("severity is null");
     
-    return put((PrinterStateReason) reason, (Severity) severity);
+    return super.put((PrinterStateReason) reason, (Severity) severity);
   }   
   
   /**
diff --git a/libjava/classpath/javax/print/attribute/standard/ReferenceUriSchemesSupported.java b/libjava/classpath/javax/print/attribute/standard/ReferenceUriSchemesSupported.java
index 8a00218..aeccaac 100644
--- a/libjava/classpath/javax/print/attribute/standard/ReferenceUriSchemesSupported.java
+++ b/libjava/classpath/javax/print/attribute/standard/ReferenceUriSchemesSupported.java
@@ -1,5 +1,5 @@
 /* ReferenceUriSchemesSupported.java --
-   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -128,7 +128,7 @@ public class ReferenceUriSchemesSupported extends EnumSyntax
    *
    * @return The class <code>ReferenceUriSchemesSupported</code> itself.
    */
-  public Class getCategory()
+  public final Class getCategory()
   {
     return ReferenceUriSchemesSupported.class;
   }
@@ -138,7 +138,7 @@ public class ReferenceUriSchemesSupported extends EnumSyntax
    *
    * @return The name "reference-uri-schemes-supported".
    */
-  public String getName()
+  public final String getName()
   {
     return "reference-uri-schemes-supported";
   }