Merged gcj-eclipse branch to trunk.

[pf3gnuchains/gcc-fork.git] / libjava / classpath / javax / print / attribute / standard / PagesPerMinute.java

diff --git a/libjava/classpath/javax/print/attribute/standard/PagesPerMinute.java b/libjava/classpath/javax/print/attribute/standard/PagesPerMinute.java
index db2658a..6305842 100644 (file)
--- a/libjava/classpath/javax/print/attribute/standard/PagesPerMinute.java
+++ b/libjava/classpath/javax/print/attribute/standard/PagesPerMinute.java
@@ -1,5 +1,5 @@
 /* PagesPerMinute.java -- 
-   Copyright (C) 2003, 2004  Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,10 +38,18 @@ exception statement from your version. */
 
 package javax.print.attribute.standard;
 
+import javax.print.attribute.Attribute;
 import javax.print.attribute.IntegerSyntax;
 import javax.print.attribute.PrintServiceAttribute;
 
 /**
+ * The <code>PagesPerMinute</code> printing attribute specifies 
+ * the nominal number of pages per minute which may be printed
+ * by the printer. 
+ * <p>
+ * <b>IPP Compatibility:</b> PagesPerMinute is an IPP 1.1 attribute.
+ * </p>
+ * 
  * @author Michael Koch (konqueror@gmx.de)
  */
 public final class PagesPerMinute extends IntegerSyntax
@@ -54,7 +62,7 @@ public final class PagesPerMinute extends IntegerSyntax
    *
    * @param value the number of pages per minute
    *
-   * @exception IllegalArgumentException if value < 0
+   * @exception IllegalArgumentException if value &lt; 0
    */
   public PagesPerMinute(int value)
   {
@@ -65,11 +73,12 @@ public final class PagesPerMinute extends IntegerSyntax
   }
   
   /**
-   * Tests of obj is equal to this object.
+   * Tests if the given object is equal to this object.
    *
    * @param obj the object to test
    *
-   * @return true if both objects are equal, false otherwise.
+   * @return <code>true</code> if both objects are equal, 
+   * <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
   {
@@ -82,17 +91,17 @@ public final class PagesPerMinute extends IntegerSyntax
   /**
    * Returns category of this class.
    *
-   * @return the class <code>PagesPerMinute</code> itself
+   * @return The class <code>PagesPerMinute</code> itself.
    */
-  public Class getCategory()
+  public Class< ? extends Attribute> getCategory()
   {
     return PagesPerMinute.class;
   }
 
   /**
-   * Returns name of this class.
+   * Returns the name of this attribute.
    *
-   * @return the string "pages-per-minute"
+   * @return The name "pages-per-minute".
    */
   public String getName()
   {