--- old/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterName.java 2017-08-11 15:13:06.000000000 -0700 +++ new/src/java.desktop/share/classes/javax/print/attribute/standard/PrinterName.java 2017-08-11 15:13:06.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,43 +22,45 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ + package javax.print.attribute.standard; import java.util.Locale; import javax.print.attribute.Attribute; -import javax.print.attribute.TextSyntax; import javax.print.attribute.PrintServiceAttribute; +import javax.print.attribute.TextSyntax; /** - * Class PrinterName is a printing attribute class, a text attribute, that - * specifies the name of a printer. It is a name that is more end-user friendly - * than a URI. An administrator determines a printer's name and sets this - * attribute to that name. This name may be the last part of the printer's URI - * or it may be unrelated. In non-US-English locales, a name may contain - * characters that are not allowed in a URI. - *

- * IPP Compatibility: The string value gives the IPP name value. The + * Class {@code PrinterName} is a printing attribute class, a text attribute, + * that specifies the name of a printer. It is a name that is more end-user + * friendly than a {@code URI}. An administrator determines a printer's name and + * sets this attribute to that name. This name may be the last part of the + * printer's {@code URI} or it may be unrelated. In non-US-English locales, a + * name may contain characters that are not allowed in a {@code URI}. + *

+ * IPP Compatibility: The string value gives the IPP name value. The * locale gives the IPP natural language. The category name returned by * {@code getName()} gives the IPP attribute name. * - * @author Alan Kaminsky + * @author Alan Kaminsky */ public final class PrinterName extends TextSyntax implements PrintServiceAttribute { + /** + * Use serialVersionUID from JDK 1.4 for interoperability. + */ private static final long serialVersionUID = 299740639137803127L; /** * Constructs a new printer name attribute with the given name and locale. * - * @param printerName Printer name. - * @param locale Natural language of the text string. null - * is interpreted to mean the default locale as returned - * by {@code Locale.getDefault()} - * - * @exception NullPointerException - * (unchecked exception) Thrown if {@code printerName} is null. + * @param printerName printer name + * @param locale natural language of the text string. {@code null} is + * interpreted to mean the default locale as returned by + * {@code Locale.getDefault()} + * @throws NullPointerException if {@code printerName} is {@code null} */ public PrinterName(String printerName, Locale locale) { super (printerName, locale); @@ -68,23 +70,18 @@ * Returns whether this printer name 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 PrinterName. - *
  3. - * This printer name attribute's underlying string and - * {@code object}'s underlying string are equal. - *
  4. - * This printer name attribute's locale and {@code object}'s locale - * are equal. - *
- * - * @param object Object to compare to. - * - * @return True if {@code object} is equivalent to this printer - * name attribute, false otherwise. + *
    + *
  1. {@code object} is not {@code null}. + *
  2. {@code object} is an instance of class {@code PrinterName}. + *
  3. This printer name attribute's underlying string and + * {@code object}'s underlying string are equal. + *
  4. This printer name attribute's locale and {@code object}'s locale + * are equal. + *
+ * + * @param object {@code Object} to compare to + * @return {@code true} if {@code object} is equivalent to this printer name + * attribute, {@code false} otherwise */ public boolean equals(Object object) { return (super.equals(object) && object instanceof PrinterName); @@ -93,12 +90,12 @@ /** * Get the printing attribute class which is to be used as the "category" * for this printing attribute value. - *

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

+ * For class {@code PrinterName}, the category is class + * {@code PrinterName} 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 PrinterName.class; @@ -107,14 +104,13 @@ /** * Get the name of the category of which this attribute value is an * instance. - *

- * For class PrinterName, the category - * name is {@code "printer-name"}. + *

+ * For class {@code PrinterName}, the category name is + * {@code "printer-name"}. * - * @return Attribute category name. + * @return attribute category name */ public final String getName() { return "printer-name"; } - }