--- old/src/java.desktop/share/classes/javax/print/attribute/standard/PagesPerMinuteColor.java 2017-08-11 15:12:58.000000000 -0700 +++ new/src/java.desktop/share/classes/javax/print/attribute/standard/PagesPerMinuteColor.java 2017-08-11 15:12:58.000000000 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ + package javax.print.attribute.standard; import javax.print.attribute.Attribute; @@ -29,43 +30,44 @@ import javax.print.attribute.PrintServiceAttribute; /** - * Class PagesPerMinuteColor is an integer valued printing attribute that - * indicates the nominal number of pages per minute to the nearest whole number - * which may be generated by this printer when printing color (e.g., simplex, - * color). For purposes of this attribute, "color" means the same as for the - * {@link ColorSupported ColorSupported} attribute, namely, the device is - * capable of any type of color printing at all, including highlight color as + * Class {@code PagesPerMinuteColor} is an integer valued printing attribute + * that indicates the nominal number of pages per minute to the nearest whole + * number which may be generated by this printer when printing color (e.g., + * simplex, color). For purposes of this attribute, "color" means the same as + * for the {@link ColorSupported ColorSupported} attribute, namely, the device + * is capable of any type of color printing at all, including highlight color as * well as full process color. This attribute is informative, not a service * guarantee. Generally, it is the value used in the marketing literature to * describe the color capabilities of this device. A value of 0 indicates a * device that takes more than two minutes to process a page. If a color device * has several color modes, it may use the pages-per- minute value for this * attribute that corresponds to the mode that produces the highest number. - *

- * A black and white only printer must not include the PagesPerMinuteColor - * attribute in its attribute set or service registration. If this attribute is - * present, then the {@link ColorSupported ColorSupported} printer description - * attribute must also be present and have a value of SUPPORTED. - *

- * IPP Compatibility: The integer value gives the IPP integer value. The - * category name returned by {@code getName()} gives the IPP attribute - * name. + *

+ * A black and white only printer must not include the + * {@code PagesPerMinuteColor} attribute in its attribute set or service + * registration. If this attribute is present, then the + * {@link ColorSupported ColorSupported} printer description attribute must also + * be present and have a value of {@code SUPPORTED}. + *

+ * IPP Compatibility: The integer value gives the IPP integer value. The + * category name returned by {@code getName()} gives the IPP attribute name. * - * @author Alan Kaminsky + * @author Alan Kaminsky */ public final class PagesPerMinuteColor extends IntegerSyntax implements PrintServiceAttribute { + /** + * Use serialVersionUID from JDK 1.4 for interoperability. + */ static final long serialVersionUID = 1684993151687470944L; /** * Construct a new pages per minute color attribute with the given integer * value. * - * @param value Integer value. - * - * @exception IllegalArgumentException - * (Unchecked exception) Thrown if {@code value} is less than 0. + * @param value Integer value + * @throws IllegalArgumentException if {@code value} is negative */ public PagesPerMinuteColor(int value) { super(value, 0, Integer.MAX_VALUE); @@ -75,20 +77,16 @@ * Returns whether this pages per minute color attribute is equivalent to * the passed in object. To be equivalent, all of the following conditions * must be true: - *

    - *
  1. - * {@code object} is not null. - *
  2. - * {@code object} is an instance of class PagesPerMinuteColor. - *
  3. - * This pages per minute attribute's value and {@code object}'s - * value are equal. - *
- * - * @param object Object to compare to. - * - * @return True if {@code object} is equivalent to this pages per - * minute color attribute, false otherwise. + *
    + *
  1. {@code object} is not {@code null}. + *
  2. {@code object} is an instance of class {@code PagesPerMinuteColor}. + *
  3. This pages per minute attribute's value and {@code object}'s value + * are equal. + *
+ * + * @param object {@code Object} to compare to + * @return {@code true} if {@code object} is equivalent to this pages per + * minute color attribute, {@code false} otherwise */ public boolean equals(Object object) { return (super.equals(object) && @@ -98,12 +96,12 @@ /** * Get the printing attribute class which is to be used as the "category" * for this printing attribute value. - *

- * For class PagesPerMinuteColor, the - * category is class PagesPerMinuteColor itself. + *

+ * For class {@code PagesPerMinuteColor}, the category is class + * {@code PagesPerMinuteColor} itself. * - * @return Printing attribute class (category), an instance of class - * {@link java.lang.Class java.lang.Class}. + * @return printing attribute class (category), an instance of class + * {@link Class java.lang.Class} */ public final Class getCategory() { return PagesPerMinuteColor.class; @@ -112,14 +110,13 @@ /** * Get the name of the category of which this attribute value is an * instance. - *

- * For class PagesPerMinuteColor, the - * category name is {@code "pages-per-minute-color"}. + *

+ * For class {@code PagesPerMinuteColor}, the category name is + * {@code "pages-per-minute-color"}. * - * @return Attribute category name. + * @return attribute category name */ public final String getName() { return "pages-per-minute-color"; } - }