--- old/src/java.desktop/share/classes/javax/print/attribute/standard/Media.java 2017-08-11 15:12:45.000000000 -0700 +++ new/src/java.desktop/share/classes/javax/print/attribute/standard/Media.java 2017-08-11 15:12:45.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,48 +22,51 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ + package javax.print.attribute.standard; import javax.print.attribute.Attribute; import javax.print.attribute.DocAttribute; import javax.print.attribute.EnumSyntax; -import javax.print.attribute.PrintRequestAttribute; import javax.print.attribute.PrintJobAttribute; +import javax.print.attribute.PrintRequestAttribute; /** - * Class Media is a printing attribute class that specifies the - * medium on which to print. + * Class {@code Media} is a printing attribute class that specifies the medium + * on which to print. *

* Media may be specified in different ways. *

- * Each of these corresponds to the IPP "media" attribute. - * The current API does not support describing media by characteristics - * (eg colour, opacity). - * This may be supported in a later revision of the specification. + * Each of these corresponds to the IPP "media" attribute. The current API does + * not support describing media by characteristics (eg colour, opacity). This + * may be supported in a later revision of the specification. *

- * A Media object is constructed with a value which represents - * one of the ways in which the Media attribute can be specified. + * A {@code Media} object is constructed with a value which represents one of + * the ways in which the Media attribute can be specified. *

- * IPP Compatibility: The category name returned by - * {@code getName()} is the IPP attribute name. The enumeration's - * integer value is the IPP enum value. The {@code toString()} method - * returns the IPP string representation of the attribute value. + * IPP Compatibility: The category name returned by {@code getName()} is + * the IPP attribute name. The enumeration's integer value is the IPP enum + * value. The {@code toString()} method returns the IPP string representation of + * the attribute value. * * @author Phil Race */ public abstract class Media extends EnumSyntax implements DocAttribute, PrintRequestAttribute, PrintJobAttribute { + /** + * Use serialVersionUID from JDK 1.4 for interoperability. + */ private static final long serialVersionUID = -2823970704630722439L; /** * Constructs a new media attribute specified by name. * - * @param value a value + * @param value a value */ protected Media(int value) { super (value); @@ -72,19 +75,16 @@ /** * Returns whether this media 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 of the same subclass of Media as this object. - *
  3. - * The values are equal. - *
- * - * @param object Object to compare to. + *
    + *
  1. {@code object} is not {@code null}. + *
  2. {@code object} is of the same subclass of {@code Media} as this + * object. + *
  3. The values are equal. + *
* - * @return True if {@code object} is equivalent to this media - * attribute, false otherwise. + * @param object {@code Object} to compare to + * @return {@code true} if {@code object} is equivalent to this media + * attribute, {@code false} otherwise */ public boolean equals(Object object) { return(object != null && object instanceof Media && @@ -95,12 +95,12 @@ /** * Get the printing attribute class which is to be used as the "category" * for this printing attribute value. - *

- * For class Media and any vendor-defined subclasses, the category is - * class Media itself. + *

+ * For class {@code Media} and any vendor-defined subclasses, the category + * is class {@code Media} 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 Media.class; @@ -109,14 +109,13 @@ /** * Get the name of the category of which this attribute value is an * instance. - *

- * For class Media and any vendor-defined subclasses, the category name is - * {@code "media"}. + *

+ * For class {@code Media} and any vendor-defined subclasses, the category + * name is {@code "media"}. * - * @return Attribute category name. + * @return attribute category name */ public final String getName() { return "media"; } - }