--- old/src/java.desktop/share/classes/javax/print/attribute/standard/Finishings.java 2017-08-11 15:12:30.000000000 -0700 +++ new/src/java.desktop/share/classes/javax/print/attribute/standard/Finishings.java 2017-08-11 15:12:30.000000000 -0700 @@ -22,209 +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.EnumSyntax; import javax.print.attribute.DocAttribute; -import javax.print.attribute.PrintRequestAttribute; +import javax.print.attribute.EnumSyntax; import javax.print.attribute.PrintJobAttribute; +import javax.print.attribute.PrintRequestAttribute; /** - * Class Finishings is a printing attribute class, an enumeration, that - * identifies whether the printer applies a finishing operation of some kind - * of binding to each copy of each printed document in the job. For multidoc - * print jobs (jobs with multiple documents), the - * {@link MultipleDocumentHandling - * MultipleDocumentHandling} attribute determines what constitutes a "copy" - * for purposes of finishing. - *

+ * Class {@code Finishings} is a printing attribute class, an enumeration, that + * identifies whether the printer applies a finishing operation of some kind of + * binding to each copy of each printed document in the job. For multidoc print + * jobs (jobs with multiple documents), the + * {@link MultipleDocumentHandling MultipleDocumentHandling} attribute + * determines what constitutes a "copy" for purposes of finishing. + *

* Standard Finishings values are: * * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
Standard Finishings values
- *   - * - * {@link #NONE NONE} - * - * {@link #STAPLE STAPLE} - * - * {@link #EDGE_STITCH EDGE_STITCH} - *
- *   - * - * {@link #BIND BIND} - * - * {@link #SADDLE_STITCH SADDLE_STITCH} - * - * {@link #COVER COVER} - * - *   - *
- *

- * The following Finishings values are more specific; they indicate a + * + *   + * {@link #NONE NONE} + * {@link #STAPLE STAPLE} + * {@link #EDGE_STITCH EDGE_STITCH} + * + *   + * {@link #BIND BIND} + * {@link #SADDLE_STITCH SADDLE_STITCH} + * {@link #COVER COVER} + *   + * + *

+ * The following {@code Finishings} values are more specific; they indicate a * corner or an edge as if the document were a portrait document: * * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - * - *
Specific Finishings values
- *   - * - * {@link #STAPLE_TOP_LEFT STAPLE_TOP_LEFT} - * - * {@link #EDGE_STITCH_LEFT EDGE_STITCH_LEFT} - * - * {@link #STAPLE_DUAL_LEFT STAPLE_DUAL_LEFT} - * - *   - *
- *   - * - * {@link #STAPLE_BOTTOM_LEFT STAPLE_BOTTOM_LEFT} - * - * {@link #EDGE_STITCH_TOP EDGE_STITCH_TOP} - * - * {@link #STAPLE_DUAL_TOP STAPLE_DUAL_TOP} - * - *   - *
- *   - * - * {@link #STAPLE_TOP_RIGHT STAPLE_TOP_RIGHT} - * - * {@link #EDGE_STITCH_RIGHT EDGE_STITCH_RIGHT} - * - * {@link #STAPLE_DUAL_RIGHT STAPLE_DUAL_RIGHT} - * - *   - *
- *   - * - * {@link #STAPLE_BOTTOM_RIGHT STAPLE_BOTTOM_RIGHT} - * - * {@link #EDGE_STITCH_BOTTOM EDGE_STITCH_BOTTOM} - * - * {@link #STAPLE_DUAL_BOTTOM STAPLE_DUAL_BOTTOM} - * - *   - *
- *

- * The STAPLE_XXX values are specified with respect to the - * document as if the document were a portrait document. If the document is - * actually a landscape or a reverse-landscape document, the client supplies the + * + *   + * {@link #STAPLE_TOP_LEFT STAPLE_TOP_LEFT} + * {@link #EDGE_STITCH_LEFT EDGE_STITCH_LEFT} + * {@link #STAPLE_DUAL_LEFT STAPLE_DUAL_LEFT} + *   + * + *   + * {@link #STAPLE_BOTTOM_LEFT STAPLE_BOTTOM_LEFT} + * {@link #EDGE_STITCH_TOP EDGE_STITCH_TOP} + * {@link #STAPLE_DUAL_TOP STAPLE_DUAL_TOP} + *   + * + *   + * {@link #STAPLE_TOP_RIGHT STAPLE_TOP_RIGHT} + * {@link #EDGE_STITCH_RIGHT EDGE_STITCH_RIGHT} + * {@link #STAPLE_DUAL_RIGHT STAPLE_DUAL_RIGHT} + *   + * + *   + * {@link #STAPLE_BOTTOM_RIGHT STAPLE_BOTTOM_RIGHT} + * {@link #EDGE_STITCH_BOTTOM EDGE_STITCH_BOTTOM} + * {@link #STAPLE_DUAL_BOTTOM STAPLE_DUAL_BOTTOM} + *   + * + *

+ * The STAPLE_XXX values are specified with respect to the document as if + * the document were a portrait document. If the document is actually a + * landscape or a reverse-landscape document, the client supplies the * appropriate transformed value. For example, to position a staple in the upper * left hand corner of a landscape document when held for reading, the client - * supplies the STAPLE_BOTTOM_LEFT value (since landscape is - * defined as a +90 degree rotation from portrait, i.e., anti-clockwise). On the - * other hand, to position a staple in the upper left hand corner of a + * supplies the {@code STAPLE_BOTTOM_LEFT} value (since landscape is defined as + * a +90 degree rotation from portrait, i.e., anti-clockwise). On the other + * hand, to position a staple in the upper left hand corner of a * reverse-landscape document when held for reading, the client supplies the - * STAPLE_TOP_RIGHT value (since reverse-landscape is defined as a - * -90 degree rotation from portrait, i.e., clockwise). - *

+ * {@code STAPLE_TOP_RIGHT} value (since reverse-landscape is defined as a -90 + * degree rotation from portrait, i.e., clockwise). + *

* The angle (vertical, horizontal, angled) of each staple with respect to the * document depends on the implementation which may in turn depend on the value * of the attribute. - *

- * The effect of a Finishings attribute on a multidoc print job (a job + *

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

- *

- * IPP Compatibility: Class Finishings encapsulates some of the - * IPP enum values that can be included in an IPP "finishings" attribute, which - * is a set of enums. 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. - * In IPP Finishings is a multi-value attribute, this API currently allows - * only one binding to be specified. + * specified, and on the (perhaps defaulted) value of the + * {@link MultipleDocumentHandling MultipleDocumentHandling} attribute. + *

+ *

+ * IPP Compatibility: Class Finishings encapsulates some of the IPP enum + * values that can be included in an IPP "finishings" attribute, which is a set + * of enums. 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. In IPP Finishings is a multi-value attribute, this API + * currently allows only one binding to be specified. * - * @author Alan Kaminsky + * @author Alan Kaminsky */ public class Finishings extends EnumSyntax implements DocAttribute, PrintRequestAttribute, PrintJobAttribute { + /** + * Use serialVersionUID from JDK 1.4 for interoperability. + */ private static final long serialVersionUID = -627840419548391754L; /** @@ -241,21 +166,21 @@ /** * This value is specified when it is desired to select a non-printed (or * pre-printed) cover for the document. This does not supplant the - * specification of a printed cover (on cover stock medium) by the - * document itself. + * specification of a printed cover (on cover stock medium) by the document + * itself. */ public static final Finishings COVER = new Finishings(6); /** - * This value indicates that a binding is to be applied to the document; - * the type and placement of the binding is site-defined. + * This value indicates that a binding is to be applied to the document; the + * type and placement of the binding is site-defined. */ public static final Finishings BIND = new Finishings(7); /** * Bind the document(s) with one or more staples (wire stitches) along the - * middle fold. The exact number and placement of the staples and the - * middle fold is implementation- and/or site-defined. + * middle fold. The exact number and placement of the staples and the middle + * fold is implementation- and/or site-defined. */ public static final Finishings SADDLE_STITCH = new Finishings(8); @@ -275,8 +200,7 @@ new Finishings(20); /** - * Bind the document(s) with one or more staples in the bottom left - * corner. + * Bind the document(s) with one or more staples in the bottom left corner. */ public static final Finishings STAPLE_BOTTOM_LEFT = new Finishings(21); @@ -288,8 +212,7 @@ new Finishings(22); /** - * Bind the document(s) with one or more staples in the bottom right - * corner. + * Bind the document(s) with one or more staples in the bottom right corner. */ public static final Finishings STAPLE_BOTTOM_RIGHT = new Finishings(23); @@ -327,15 +250,15 @@ new Finishings(27); /** - * Bind the document(s) with two staples (wire stitches) along the left - * edge assuming a portrait document (see above). + * Bind the document(s) with two staples (wire stitches) along the left edge + * assuming a portrait document (see above). */ public static final Finishings STAPLE_DUAL_LEFT = new Finishings(28); /** - * Bind the document(s) with two staples (wire stitches) along the top - * edge assuming a portrait document (see above). + * Bind the document(s) with two staples (wire stitches) along the top edge + * assuming a portrait document (see above). */ public static final Finishings STAPLE_DUAL_TOP = new Finishings(29); @@ -358,12 +281,15 @@ * Construct a new finishings binding enumeration value with the given * integer value. * - * @param value Integer value. + * @param value Integer value */ protected Finishings(int value) { super(value); } + /** + * The string table for class {@code Finishings}. + */ private static final String[] myStringTable = {"none", "staple", @@ -396,6 +322,9 @@ "staple-dual-bottom" }; + /** + * The enumeration value table for class {@code Finishings}. + */ private static final Finishings[] myEnumValueTable = {NONE, STAPLE, @@ -429,21 +358,21 @@ }; /** - * Returns the string table for class Finishings. + * Returns the string table for class {@code Finishings}. */ protected String[] getStringTable() { return myStringTable.clone(); } /** - * Returns the enumeration value table for class Finishings. + * Returns the enumeration value table for class {@code Finishings}. */ protected EnumSyntax[] getEnumValueTable() { return (EnumSyntax[])myEnumValueTable.clone(); } /** - * Returns the lowest integer value used by class Finishings. + * Returns the lowest integer value used by class {@code Finishings}. */ protected int getOffset() { return 3; @@ -452,12 +381,12 @@ /** * Get the printing attribute class which is to be used as the "category" * for this printing attribute value. - *

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

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

- * For class Finishings and any vendor-defined subclasses, the + *

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