diff -r b309b58eb190 -r a3211bb4daff jdk/src/java.desktop/share/classes/javax/print/attribute/standard/SheetCollate.java --- a/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/SheetCollate.java Thu Aug 31 13:00:23 2017 -0700 +++ b/jdk/src/java.desktop/share/classes/javax/print/attribute/standard/SheetCollate.java Thu Aug 31 15:47:34 2017 -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,146 +22,134 @@ * 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.DocAttribute; +import javax.print.attribute.PrintJobAttribute; import javax.print.attribute.PrintRequestAttribute; -import javax.print.attribute.PrintJobAttribute; /** - * Class SheetCollate is a printing attribute class, an enumeration, that - * specifies whether or not the media sheets of each copy of each printed + * Class {@code SheetCollate} is a printing attribute class, an enumeration, + * that specifies whether or not the media sheets of each copy of each printed * document in a job are to be in sequence, when multiple copies of the document - * are specified by the {@link Copies Copies} attribute. When SheetCollate is - * COLLATED, each copy of each document is printed with the print-stream sheets - * in sequence. When SheetCollate is UNCOLLATED, each print-stream sheet is - * printed a number of times equal to the value of the {@link Copies Copies} - * attribute in succession. For example, suppose a document produces two media - * sheets as output, {@link Copies Copies} is 6, and SheetCollate is UNCOLLATED; - * in this case six copies of the first media sheet are printed followed by - * six copies of the second media sheet. - *

+ * are specified by the {@link Copies Copies} attribute. When + * {@code SheetCollate} is {@code COLLATED}, each copy of each document is + * printed with the print-stream sheets in sequence. When {@code SheetCollate} + * is {@code UNCOLLATED}, each print-stream sheet is printed a number of times + * equal to the value of the {@link Copies Copies} attribute in succession. For + * example, suppose a document produces two media sheets as output, + * {@link Copies Copies} is 6, and {@code SheetCollate} is UNCOLLATED; in this + * case six copies of the first media sheet are printed followed by six copies + * of the second media sheet. + *

* Whether the effect of sheet collation is achieved by placing copies of a * document in multiple output bins or in the same output bin with - * implementation defined document separation is implementation dependent. - * Also whether it is achieved by making multiple passes over the job or by - * using an output sorter is implementation dependent. - *

- * If a printer does not support the SheetCollate attribute (meaning the client - * cannot specify any particular sheet collation), the printer must behave as - * though SheetCollate were always set to COLLATED. - *

- * The SheetCollate attribute interacts with the {@link MultipleDocumentHandling - * MultipleDocumentHandling} attribute. The {@link MultipleDocumentHandling - * MultipleDocumentHandling} attribute describes the collation of entire - * documents, and the SheetCollate attribute describes the semantics of - * collating individual pages within a document. - *

- * The effect of a SheetCollate attribute on a multidoc print job (a job with - * multiple documents) depends on whether all the docs have the same sheet - * collation specified or whether different docs have different sheet - * collations specified, and on the (perhaps defaulted) value of the {@link - * MultipleDocumentHandling MultipleDocumentHandling} attribute. - *

- *

- * IPP Compatibility: SheetCollate is not an IPP attribute at present. - * - * @see MultipleDocumentHandling - * - * @author Alan Kaminsky + * @author Alan Kaminsky + * @see MultipleDocumentHandling */ public final class SheetCollate extends EnumSyntax implements DocAttribute, PrintRequestAttribute, PrintJobAttribute { + /** + * Use serialVersionUID from JDK 1.4 for interoperability. + */ private static final long serialVersionUID = 7080587914259873003L; /** - * Sheets within a document appear in uncollated order when multiple - * copies are printed. + * Sheets within a document appear in uncollated order when multiple copies + * are printed. */ public static final SheetCollate UNCOLLATED = new SheetCollate(0); @@ -175,31 +163,37 @@ * Construct a new sheet collate enumeration value with the given integer * value. * - * @param value Integer value. + * @param value Integer value */ protected SheetCollate(int value) { super (value); } + /** + * The string table for class {@code SheetCollate}. + */ private static final String[] myStringTable = { "uncollated", "collated" }; + /** + * The enumeration value table for class {@code SheetCollate}. + */ private static final SheetCollate[] myEnumValueTable = { UNCOLLATED, COLLATED }; /** - * Returns the string table for class SheetCollate. + * Returns the string table for class {@code SheetCollate}. */ protected String[] getStringTable() { return myStringTable; } /** - * Returns the enumeration value table for class SheetCollate. + * Returns the enumeration value table for class {@code SheetCollate}. */ protected EnumSyntax[] getEnumValueTable() { return myEnumValueTable; @@ -208,11 +202,12 @@ /** * Get the printing attribute class which is to be used as the "category" * for this printing attribute value. - *

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

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

- * For class SheetCollate, the category name is {@code "sheet-collate"}. + *

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