--- a/jdk/src/share/classes/javax/print/DocFlavor.java Wed Jul 31 13:11:31 2013 +0400
+++ b/jdk/src/share/classes/javax/print/DocFlavor.java Tue Aug 06 13:38:27 2013 -0700
@@ -286,7 +286,7 @@
* "autosensing" works is implementation dependent. In general, preformatted
* autosense print data is provided in a byte oriented representation class
* (byte array, InputStream, URL).
- *
+ * </UL>
* <P>
* <HR>
* <H3>Service Formatted Print Data</H3>
@@ -545,7 +545,7 @@
* the match.
* @return String representing a mime parameter, or
* null if that parameter is not in the mime type string.
- * @exception throws NullPointerException if paramName is null.
+ * @exception NullPointerException if paramName is null.
*/
public String getParameter(String paramName) {
return
--- a/jdk/src/share/classes/javax/print/MultiDocPrintJob.java Wed Jul 31 13:11:31 2013 +0400
+++ b/jdk/src/share/classes/javax/print/MultiDocPrintJob.java Tue Aug 06 13:38:27 2013 -0700
@@ -47,7 +47,7 @@
* PrintJobListener.
*
* @param multiDoc The documents to be printed. ALL must be a flavor
- * supported by the PrintJob & PrintService.
+ * supported by the PrintJob {@literal &} PrintService.
*
* @param attributes The job attributes to be applied to this print job.
* If this parameter is null then the default attributes are used.
--- a/jdk/src/share/classes/javax/print/PrintService.java Wed Jul 31 13:11:31 2013 +0400
+++ b/jdk/src/share/classes/javax/print/PrintService.java Tue Aug 06 13:38:27 2013 -0700
@@ -40,7 +40,7 @@
* a printer's supported attributes.
* <P>
* Example:
- * <PRE>
+ * <PRE>{@code
* DocFlavor flavor = DocFlavor.INPUT_STREAM.POSTSCRIPT;
* PrintRequestAttributeSet aset = new HashPrintRequestAttributeSet();
* aset.add(MediaSizeName.ISO_A4);
@@ -56,7 +56,7 @@
* } catch (PrintException e) {
* }
* }
- * </PRE>
+ * }</PRE>
*/
public interface PrintService {
--- a/jdk/src/share/classes/javax/print/ServiceUI.java Wed Jul 31 13:11:31 2013 +0400
+++ b/jdk/src/share/classes/javax/print/ServiceUI.java Tue Aug 06 13:38:27 2013 -0700
@@ -118,7 +118,7 @@
* any changes made by the user.
*
* A typical basic usage of this method may be :
- * <pre>
+ * <pre>{@code
* PrintService[] services = PrintServiceLookup.lookupPrintServices(
* DocFlavor.INPUT_STREAM.JPEG, null);
* PrintRequestAttributeSet attributes = new HashPrintRequestAttributeSet();
@@ -131,7 +131,7 @@
* ... print ...
* }
* }
- * </pre>
+ * }</pre>
* <p>
* @param gc used to select screen. null means primary or default screen.
--- a/jdk/src/share/classes/javax/print/ServiceUIFactory.java Wed Jul 31 13:11:31 2013 +0400
+++ b/jdk/src/share/classes/javax/print/ServiceUIFactory.java Tue Aug 06 13:38:27 2013 -0700
@@ -39,8 +39,8 @@
* initialize services only when needed without any API dependencies
* except in an environment in which they are used.
* <p>
- * Swing UIs are preferred as they provide a more consistent L&F and
- * can support accessibility APIs.
+ * Swing UIs are preferred as they provide a more consistent {@literal L&F}
+ * and can support accessibility APIs.
* <p>
* Example usage:
* <pre>
--- a/jdk/src/share/classes/javax/print/attribute/AttributeSet.java Wed Jul 31 13:11:31 2013 +0400
+++ b/jdk/src/share/classes/javax/print/attribute/AttributeSet.java Tue Aug 06 13:38:27 2013 -0700
@@ -42,7 +42,7 @@
* class rather than the attribute object's class itself. An attribute
* object's
* category is determined by calling the {@link Attribute#getCategory()
- * <CODE>getCategory()</CODE>} method defined in interface {@link Attribute
+ * getCategory()} method defined in interface {@link Attribute
* Attribute}.
* <P>
* The interfaces of an AttributeSet resemble those of the Java Collections
@@ -217,7 +217,7 @@
/**
* Adds all of the elements in the specified set to this attribute.
* The outcome is the same as if the =
- * {@link #add(Attribute) <CODE>add(Attribute)</CODE>}
+ * {@link #add(Attribute) add(Attribute)}
* operation had been applied to this attribute set successively with each
* element from the specified set.
* The behavior of the <CODE>addAll(AttributeSet)</CODE>
@@ -301,7 +301,7 @@
* This ensures that <tt>t1.equals(t2)</tt> implies that
* <tt>t1.hashCode()==t2.hashCode()</tt> for any two attribute sets
* <tt>t1</tt> and <tt>t2</tt>, as required by the general contract of
- * {@link java.lang.Object#hashCode() <CODE>Object.hashCode()</CODE>}.
+ * {@link java.lang.Object#hashCode() Object.hashCode()}.
*
* @return The hash code value for this attribute set.
*/
--- a/jdk/src/share/classes/javax/print/attribute/DateTimeSyntax.java Wed Jul 31 13:11:31 2013 +0400
+++ b/jdk/src/share/classes/javax/print/attribute/DateTimeSyntax.java Tue Aug 06 13:38:27 2013 -0700
@@ -36,9 +36,9 @@
* <P>
* Under the hood, a date-time attribute is stored as a value of class <code>
* java.util.Date</code>. You can get a date-time attribute's Date value by
- * calling {@link #getValue() <CODE>getValue()</CODE>}. A date-time attribute's
+ * calling {@link #getValue() getValue()}. A date-time attribute's
* Date value is established when it is constructed (see {@link
- * #DateTimeSyntax(Date) <CODE>DateTimeSyntax(Date)</CODE>}). Once
+ * #DateTimeSyntax(Date) DateTimeSyntax(Date)}). Once
* constructed, a date-time attribute's value is immutable.
* <P>
* To construct a date-time attribute from separate values of the year, month,
--- a/jdk/src/share/classes/javax/print/attribute/DocAttributeSet.java Wed Jul 31 13:11:31 2013 +0400
+++ b/jdk/src/share/classes/javax/print/attribute/DocAttributeSet.java Tue Aug 06 13:38:27 2013 -0700
@@ -37,8 +37,8 @@
* constructors and mutating operations guarantee an additional invariant,
* namely that all attribute values in the DocAttributeSet must be instances
* of interface {@link DocAttribute DocAttribute}.
- * The {@link #add(Attribute) <CODE>add(Attribute)</CODE>}, and
- * {@link #addAll(AttributeSet) <CODE>addAll(AttributeSet)</CODE>} operations
+ * The {@link #add(Attribute) add(Attribute)}, and
+ * {@link #addAll(AttributeSet) addAll(AttributeSet)} operations
* are respecified below to guarantee this additional invariant.
* <P>
*
@@ -74,7 +74,7 @@
/**
* Adds all of the elements in the specified set to this attribute.
* The outcome is the same as if the
- * {@link #add(Attribute) <CODE>add(Attribute)</CODE>}
+ * {@link #add(Attribute) add(Attribute)}
* operation had been applied to this attribute set successively with
* each element from the specified set. If none of the categories in the
* specified set are the same as any categories in this attribute set,
--- a/jdk/src/share/classes/javax/print/attribute/EnumSyntax.java Wed Jul 31 13:11:31 2013 +0400
+++ b/jdk/src/share/classes/javax/print/attribute/EnumSyntax.java Tue Aug 06 13:38:27 2013 -0700
@@ -81,15 +81,15 @@
* for identical objects (<CODE>==</CODE>).
* <P>
* You can convert an enumeration value to a string by calling {@link
- * #toString() <CODE>toString()</CODE>}. The string is obtained from a table
+ * #toString() toString()}. The string is obtained from a table
* supplied by the enumeration class.
* <P>
* Under the hood, an enumeration value is just an integer, a different integer
* for each enumeration value within an enumeration class. You can get an
* enumeration value's integer value by calling {@link #getValue()
- * <CODE>getValue()</CODE>}. An enumeration value's integer value is established
+ * getValue()}. An enumeration value's integer value is established
* when it is constructed (see {@link #EnumSyntax(int)
- * <CODE>EnumSyntax(int)</CODE>}). Since the constructor is protected, the only
+ * EnumSyntax(int)}). Since the constructor is protected, the only
* possible enumeration values are the singleton objects declared in the
* enumeration class; additional enumeration values cannot be created at run
* time.
@@ -170,10 +170,10 @@
*
* @return The enumeration singleton value stored at index
* <I>i</I>-<I>L</I> in the enumeration value table returned by
- * {@link #getEnumValueTable() <CODE>getEnumValueTable()</CODE>},
+ * {@link #getEnumValueTable() getEnumValueTable()},
* where <I>i</I> is this enumeration value's integer value and
* <I>L</I> is the value returned by {@link #getOffset()
- * <CODE>getOffset()</CODE>}.
+ * getOffset()}.
*
* @throws ObjectStreamException if the stream can't be deserialised
* @throws InvalidObjectException
@@ -220,18 +220,18 @@
* Returns the string table for this enumeration value's enumeration class.
* The enumeration class's integer values are assumed to lie in the range
* <I>L</I>..<I>L</I>+<I>N</I>-1, where <I>L</I> is the value returned by
- * {@link #getOffset() <CODE>getOffset()</CODE>} and <I>N</I> is the length
+ * {@link #getOffset() getOffset()} and <I>N</I> is the length
* of the string table. The element in the string table at index
* <I>i</I>-<I>L</I> is the value returned by {@link #toString()
- * <CODE>toString()</CODE>} for the enumeration value whose integer value
+ * toString()} for the enumeration value whose integer value
* is <I>i</I>. If an integer within the above range is not used by any
* enumeration value, leave the corresponding table element null.
* <P>
* The default implementation returns null. If the enumeration class (a
* subclass of class EnumSyntax) does not override this method to return a
* non-null string table, and the subclass does not override the {@link
- * #toString() <CODE>toString()</CODE>} method, the base class {@link
- * #toString() <CODE>toString()</CODE>} method will return just a string
+ * #toString() toString()} method, the base class {@link
+ * #toString() toString()} method will return just a string
* representation of this enumeration value's integer value.
* @return the string table
*/
@@ -243,11 +243,11 @@
* Returns the enumeration value table for this enumeration value's
* enumeration class. The enumeration class's integer values are assumed to
* lie in the range <I>L</I>..<I>L</I>+<I>N</I>-1, where <I>L</I> is the
- * value returned by {@link #getOffset() <CODE>getOffset()</CODE>} and
+ * value returned by {@link #getOffset() getOffset()} and
* <I>N</I> is the length of the enumeration value table. The element in the
* enumeration value table at index <I>i</I>-<I>L</I> is the enumeration
* value object whose integer value is <I>i</I>; the {@link #readResolve()
- * <CODE>readResolve()</CODE>} method needs this to preserve singleton
+ * readResolve()} method needs this to preserve singleton
* semantics during deserialization of an enumeration instance. If an
* integer within the above range is not used by any enumeration value,
* leave the corresponding table element null.
@@ -255,8 +255,8 @@
* The default implementation returns null. If the enumeration class (a
* subclass of class EnumSyntax) does not override this method to return
* a non-null enumeration value table, and the subclass does not override
- * the {@link #readResolve() <CODE>readResolve()</CODE>} method, the base
- * class {@link #readResolve() <CODE>readResolve()</CODE>} method will throw
+ * the {@link #readResolve() readResolve()} method, the base
+ * class {@link #readResolve() readResolve()} method will throw
* an exception whenever an enumeration instance is deserialized from an
* object input stream.
* @return the value table
--- a/jdk/src/share/classes/javax/print/attribute/HashAttributeSet.java Wed Jul 31 13:11:31 2013 +0400
+++ b/jdk/src/share/classes/javax/print/attribute/HashAttributeSet.java Tue Aug 06 13:38:27 2013 -0700
@@ -388,7 +388,7 @@
/**
* Adds all of the elements in the specified set to this attribute.
* The outcome is the same as if the
- * {@link #add(Attribute) <CODE>add(Attribute)</CODE>}
+ * {@link #add(Attribute) add(Attribute)}
* operation had been applied to this attribute set successively with
* each element from the specified set.
* The behavior of the <CODE>addAll(AttributeSet)</CODE>
@@ -512,7 +512,7 @@
* This ensures that <tt>t1.equals(t2)</tt> implies that
* <tt>t1.hashCode()==t2.hashCode()</tt> for any two attribute sets
* <tt>t1</tt> and <tt>t2</tt>, as required by the general contract of
- * {@link java.lang.Object#hashCode() <CODE>Object.hashCode()</CODE>}.
+ * {@link java.lang.Object#hashCode() Object.hashCode()}.
*
* @return The hash code value for this attribute set.
*/
--- a/jdk/src/share/classes/javax/print/attribute/IntegerSyntax.java Wed Jul 31 13:11:31 2013 +0400
+++ b/jdk/src/share/classes/javax/print/attribute/IntegerSyntax.java Tue Aug 06 13:38:27 2013 -0700
@@ -33,9 +33,9 @@
* <P>
* Under the hood, an integer attribute is just an integer. You can get an
* integer attribute's integer value by calling {@link #getValue()
- * <CODE>getValue()</CODE>}. An integer attribute's integer value is
+ * getValue()}. An integer attribute's integer value is
* established when it is constructed (see {@link #IntegerSyntax(int)
- * <CODE>IntegerSyntax(int)</CODE>}). Once constructed, an integer attribute's
+ * IntegerSyntax(int)}). Once constructed, an integer attribute's
* value is immutable.
* <P>
*
--- a/jdk/src/share/classes/javax/print/attribute/PrintJobAttributeSet.java Wed Jul 31 13:11:31 2013 +0400
+++ b/jdk/src/share/classes/javax/print/attribute/PrintJobAttributeSet.java Tue Aug 06 13:38:27 2013 -0700
@@ -36,8 +36,8 @@
* constructors and mutating operations guarantee an additional invariant,
* namely that all attribute values in the PrintJobAttributeSet must be
* instances of interface {@link PrintJobAttribute PrintJobAttribute}.
- * The {@link #add(Attribute) <CODE>add(Attribute)</CODE>}, and
- * {@link #addAll(AttributeSet) <CODE>addAll(AttributeSet)</CODE>} operations
+ * The {@link #add(Attribute) add(Attribute)}, and
+ * {@link #addAll(AttributeSet) >addAll(AttributeSet)} operations
* are respecified below to guarantee this additional invariant.
* <P>
*
@@ -72,7 +72,7 @@
/**
* Adds all of the elements in the specified set to this attribute.
* The outcome is the same as if the
- * {@link #add(Attribute) <CODE>add(Attribute)</CODE>}
+ * {@link #add(Attribute) add(Attribute)}
* operation had been applied to this attribute set successively with
* each element from the specified set. If none of the categories in the
* specified set are the same as any categories in this attribute set,
--- a/jdk/src/share/classes/javax/print/attribute/PrintRequestAttributeSet.java Wed Jul 31 13:11:31 2013 +0400
+++ b/jdk/src/share/classes/javax/print/attribute/PrintRequestAttributeSet.java Tue Aug 06 13:38:27 2013 -0700
@@ -37,8 +37,8 @@
* constructors and mutating operations guarantee an additional invariant,
* namely that all attribute values in the PrintRequestAttributeSet must be
* instances of interface {@link PrintRequestAttribute PrintRequestAttribute}.
- * The {@link #add(Attribute) <CODE>add(Attribute)</CODE>}, and
- * {@link #addAll(AttributeSet) <CODE>addAll(AttributeSet)</CODE>} operations
+ * The {@link #add(Attribute) add(Attribute)}, and
+ * {@link #addAll(AttributeSet) addAll(AttributeSet)} operations
* are respecified below to guarantee this additional invariant.
* <P>
*
@@ -73,7 +73,7 @@
/**
* Adds all of the elements in the specified set to this attribute.
* The outcome is the same as if the
- * {@link #add(Attribute) <CODE>add(Attribute)</CODE>}
+ * {@link #add(Attribute) add(Attribute)}
* operation had been applied to this attribute set successively with
* each element from the specified set. If none of the categories in the
* specified set are the same as any categories in this attribute set,
--- a/jdk/src/share/classes/javax/print/attribute/PrintServiceAttributeSet.java Wed Jul 31 13:11:31 2013 +0400
+++ b/jdk/src/share/classes/javax/print/attribute/PrintServiceAttributeSet.java Tue Aug 06 13:38:27 2013 -0700
@@ -39,8 +39,8 @@
* invariant,
* namely that all attribute values in the PrintServiceAttributeSet must be
* instances of interface {@link PrintServiceAttribute PrintServiceAttribute}.
- * The {@link #add(Attribute) <CODE>add(Attribute)</CODE>}, and
- * {@link #addAll(AttributeSet) <CODE>addAll(AttributeSet)</CODE>} operations
+ * The {@link #add(Attribute) add(Attribute)}, and
+ * {@link #addAll(AttributeSet) addAll(AttributeSet)} operations
* are respecified below to guarantee this additional invariant.
* <P>
*
@@ -77,7 +77,7 @@
/**
* Adds all of the elements in the specified set to this attribute.
* The outcome is the same as if the
- * {@link #add(Attribute) <CODE>add(Attribute)</CODE>}
+ * {@link #add(Attribute) add(Attribute)}
* operation had been applied to this attribute set successively with
* each element from the specified set. If none of the categories in the
* specified set are the same as any categories in this attribute set,
--- a/jdk/src/share/classes/javax/print/attribute/ResolutionSyntax.java Wed Jul 31 13:11:31 2013 +0400
+++ b/jdk/src/share/classes/javax/print/attribute/ResolutionSyntax.java Tue Aug 06 13:38:27 2013 -0700
@@ -39,7 +39,7 @@
* resolution attribute's values, indicating the units in which the values are
* to be returned. The two most common resolution units are dots per inch (dpi)
* and dots per centimeter (dpcm), and exported constants {@link #DPI
- * <CODE>DPI</CODE>} and {@link #DPCM <CODE>DPCM</CODE>} are provided for
+ * DPI} and {@link #DPCM DPCM} are provided for
* indicating those units.
* <P>
* Once constructed, a resolution attribute's value is immutable.
@@ -68,9 +68,9 @@
* done, which would not be guaranteed if a floating point representation were
* used.
* <P>
- * The exported constant {@link #DPI <CODE>DPI</CODE>} is actually the
+ * The exported constant {@link #DPI DPI} is actually the
* conversion factor by which to multiply a value in dpi to get the value in
- * dphi. Likewise, the exported constant {@link #DPCM <CODE>DPCM</CODE>} is the
+ * dphi. Likewise, the exported constant {@link #DPCM DPCM} is the
* conversion factor by which to multiply a value in dpcm to get the value in
* dphi. A client can specify a resolution value in units other than dpi or dpcm
* by supplying its own conversion factor. However, since the internal units of
@@ -120,12 +120,12 @@
* @param feedResolution
* Feed direction resolution.
* @param units
- * Unit conversion factor, e.g. {@link #DPI <CODE>DPI</CODE>} or
- * {@link #DPCM <CODE>DPCM</CODE>}.
+ * Unit conversion factor, e.g. {@link #DPI DPI} or
+ * {@link #DPCM DPCM}.
*
* @exception IllegalArgumentException
- * (unchecked exception) Thrown if <CODE>crossFeedResolution</CODE> <
- * 1 or <CODE>feedResolution</CODE> < 1 or <CODE>units</CODE> < 1.
+ * (unchecked exception) Thrown if {@code crossFeedResolution < 1}
+ * or {@code feedResolution < 1} or {@code units < 1}.
*/
public ResolutionSyntax(int crossFeedResolution, int feedResolution,
int units) {
@@ -172,14 +172,14 @@
* The values are rounded to the nearest integer.
*
* @param units
- * Unit conversion factor, e.g. {@link #DPI <CODE>DPI</CODE>} or
- * {@link #DPCM <CODE>DPCM</CODE>}.
+ * Unit conversion factor, e.g. {@link #DPI DPI} or
+ * {@link #DPCM DPCM}.
*
* @return A two-element array with the cross feed direction resolution
* at index 0 and the feed direction resolution at index 1.
*
* @exception IllegalArgumentException
- * (unchecked exception) Thrown if <CODE>units</CODE> < 1.
+ * (unchecked exception) Thrown if {@code units < 1}.
*/
public int[] getResolution(int units) {
return new int[] { getCrossFeedResolution(units),
@@ -192,13 +192,13 @@
* the given units. The value is rounded to the nearest integer.
*
* @param units
- * Unit conversion factor, e.g. {@link #DPI <CODE>DPI</CODE>} or
- * {@link #DPCM <CODE>DPCM</CODE>}.
+ * Unit conversion factor, e.g. {@link #DPI DPI} or
+ * {@link #DPCM DPCM}.
*
* @return Cross feed direction resolution.
*
* @exception IllegalArgumentException
- * (unchecked exception) Thrown if <CODE>units</CODE> < 1.
+ * (unchecked exception) Thrown if {@code units < 1}.
*/
public int getCrossFeedResolution(int units) {
return convertFromDphi (crossFeedResolution, units);
@@ -209,13 +209,13 @@
* given units. The value is rounded to the nearest integer.
*
* @param units
- * Unit conversion factor, e.g. {@link #DPI <CODE>DPI</CODE>} or {@link
- * #DPCM <CODE>DPCM</CODE>}.
+ * Unit conversion factor, e.g. {@link #DPI DPI} or {@link
+ * #DPCM DPCM}.
*
* @return Feed direction resolution.
*
* @exception IllegalArgumentException
- * (unchecked exception) Thrown if <CODE>units</CODE> < 1.
+ * (unchecked exception) Thrown if {@code units < 1}.
*/
public int getFeedResolution(int units) {
return convertFromDphi (feedResolution, units);
@@ -229,8 +229,8 @@
* rounded to the nearest integer.
*
* @param units
- * Unit conversion factor, e.g. {@link #DPI <CODE>DPI</CODE>} or {@link
- * #DPCM <CODE>DPCM</CODE>}.
+ * Unit conversion factor, e.g. {@link #DPI CODE>DPI} or {@link
+ * #DPCM DPCM}.
* @param unitsName
* Units name string, e.g. <CODE>"dpi"</CODE> or <CODE>"dpcm"</CODE>. If
* null, no units name is appended to the result.
@@ -238,7 +238,7 @@
* @return String version of this resolution attribute.
*
* @exception IllegalArgumentException
- * (unchecked exception) Thrown if <CODE>units</CODE> < 1.
+ * (unchecked exception) Thrown if {@code units < 1}.
*/
public String toString(int units, String unitsName) {
StringBuffer result = new StringBuffer();
--- a/jdk/src/share/classes/javax/print/attribute/Size2DSyntax.java Wed Jul 31 13:11:31 2013 +0400
+++ b/jdk/src/share/classes/javax/print/attribute/Size2DSyntax.java Tue Aug 06 13:38:27 2013 -0700
@@ -38,8 +38,8 @@
* values are measured. Methods are provided to return a two-dimensional size
* attribute's values, indicating the units in which the values are to be
* returned. The two most common size units are inches (in) and millimeters
- * (mm), and exported constants {@link #INCH <CODE>INCH</CODE>} and {@link #MM
- * <CODE>MM</CODE>} are provided for indicating those units.
+ * (mm), and exported constants {@link #INCH INCH} and {@link #MM
+ * MM} are provided for indicating those units.
* <P>
* Once constructed, a two-dimensional size attribute's value is immutable.
* <P>
@@ -66,9 +66,9 @@
* units, you have to search for a media size of 215.9 x 279.4 mm; rounding off
* to an integral 216 x 279 mm will not match.
* <P>
- * The exported constant {@link #INCH <CODE>INCH</CODE>} is actually the
+ * The exported constant {@link #INCH INCH} is actually the
* conversion factor by which to multiply a value in inches to get the value in
- * µm. Likewise, the exported constant {@link #MM <CODE>MM</CODE>} is the
+ * µm. Likewise, the exported constant {@link #MM MM} is the
* conversion factor by which to multiply a value in mm to get the value in
* µm. A client can specify a resolution value in units other than inches
* or mm by supplying its own conversion factor. However, since the internal
@@ -117,12 +117,12 @@
* @param x X dimension.
* @param y Y dimension.
* @param units
- * Unit conversion factor, e.g. {@link #INCH <CODE>INCH</CODE>} or
- * {@link #MM <CODE>MM</CODE>}.
+ * Unit conversion factor, e.g. {@link #INCH INCH} or
+ * {@link #MM MM}.
*
* @exception IllegalArgumentException
- * (Unchecked exception) Thrown if <CODE>x</CODE> < 0 or <CODE>y</CODE>
- * < 0 or <CODE>units</CODE> < 1.
+ * (Unchecked exception) Thrown if {@code x < 0} or {@code y < 0} or
+ * {@code units < 1}.
*/
protected Size2DSyntax(float x, float y, int units) {
if (x < 0.0f) {
@@ -145,12 +145,12 @@
* @param x X dimension.
* @param y Y dimension.
* @param units
- * Unit conversion factor, e.g. {@link #INCH <CODE>INCH</CODE>} or
- * {@link #MM <CODE>MM</CODE>}.
+ * Unit conversion factor, e.g. {@link #INCH INCH} or
+ * {@link #MM MM}.
*
* @exception IllegalArgumentException
- * (Unchecked exception) Thrown if <CODE>x</CODE> < 0 or <CODE>y</CODE>
- * < 0 or <CODE>units</CODE> < 1.
+ * (Unchecked exception) Thrown if {@code x < 0} or {@code y < 0}
+ * or {@code units < 1}.
*/
protected Size2DSyntax(int x, int y, int units) {
if (x < 0) {
@@ -193,14 +193,13 @@
* as floating-point values.
*
* @param units
- * Unit conversion factor, e.g. {@link #INCH <CODE>INCH</CODE>} or
- * {@link #MM <CODE>MM</CODE>}.
+ * Unit conversion factor, e.g. {@link #INCH INCH} or {@link #MM MM}.
*
* @return A two-element array with the X dimension at index 0 and the Y
* dimension at index 1.
*
* @exception IllegalArgumentException
- * (unchecked exception) Thrown if <CODE>units</CODE> < 1.
+ * (unchecked exception) Thrown if {@code units < 1}.
*/
public float[] getSize(int units) {
return new float[] {getX(units), getY(units)};
@@ -211,13 +210,12 @@
* units as a floating-point value.
*
* @param units
- * Unit conversion factor, e.g. {@link #INCH <CODE>INCH</CODE>} or
- * {@link #MM <CODE>MM</CODE>}.
+ * Unit conversion factor, e.g. {@link #INCH INCH} or {@link #MM MM}.
*
* @return X dimension.
*
* @exception IllegalArgumentException
- * (unchecked exception) Thrown if <CODE>units</CODE> < 1.
+ * (unchecked exception) Thrown if {@code units < 1}.
*/
public float getX(int units) {
return convertFromMicrometers(x, units);
@@ -228,13 +226,12 @@
* units as a floating-point value.
*
* @param units
- * Unit conversion factor, e.g. {@link #INCH <CODE>INCH</CODE>} or
- * {@link #MM <CODE>MM</CODE>}.
+ * Unit conversion factor, e.g. {@link #INCH INCH} or {@link #MM MM}.
*
* @return Y dimension.
*
* @exception IllegalArgumentException
- * (unchecked exception) Thrown if <CODE>units</CODE> < 1.
+ * (unchecked exception) Thrown if {@code units < 1}.
*/
public float getY(int units) {
return convertFromMicrometers(y, units);
@@ -248,16 +245,16 @@
* floating point.
*
* @param units
- * Unit conversion factor, e.g. {@link #INCH <CODE>INCH</CODE>} or
- * {@link #MM <CODE>MM</CODE>}.
+ * Unit conversion factor, e.g. {@link #INCH INCH} or {@link #MM MM}.
+ *
* @param unitsName
- * Units name string, e.g. <CODE>"in"</CODE> or <CODE>"mm"</CODE>. If
+ * Units name string, e.g. {@code in} or {@code mm}. If
* null, no units name is appended to the result.
*
* @return String version of this two-dimensional size attribute.
*
* @exception IllegalArgumentException
- * (unchecked exception) Thrown if <CODE>units</CODE> < 1.
+ * (unchecked exception) Thrown if {@code units < 1}.
*/
public String toString(int units, String unitsName) {
StringBuffer result = new StringBuffer();
--- a/jdk/src/share/classes/javax/print/attribute/standard/Chromaticity.java Wed Jul 31 13:11:31 2013 +0400
+++ b/jdk/src/share/classes/javax/print/attribute/standard/Chromaticity.java Tue Aug 06 13:38:27 2013 -0700
@@ -40,11 +40,11 @@
* can be verified to support color printing.
* <P>
* The table below shows the effects of specifying a Chromaticity attribute of
- * {@link #MONOCHROME <CODE>MONOCHROME</CODE>} or {@link #COLOR
- * <CODE>COLOR</CODE>} for a monochrome or color document.
+ * {@link #MONOCHROME MONOCHROME} or {@link #COLOR COLOR}
+ * for a monochrome or color document.
* <P>
* <TABLE BORDER=1 CELLPADDING=2 CELLSPACING=1 SUMMARY="Shows effects of specifying MONOCHROME or COLOR Chromaticity attributes">
- * <TR BGCOLOR="#E5E5E5">
+ * <TR>
* <TH>
* Chromaticity<BR>Attribute
* </TH>
@@ -57,7 +57,7 @@
* </TR>
* <TR>
* <TD>
- * {@link #MONOCHROME <CODE>MONOCHROME</CODE>}
+ * {@link #MONOCHROME MONOCHROME}
* </TD>
* <TD>
* Printed as is, in monochrome
@@ -68,7 +68,7 @@
* </TR>
* <TR>
* <TD>
- * {@link #COLOR <CODE>COLOR</CODE>}
+ * {@link #COLOR COLOR}
* </TD>
* <TD>
* Printed as is, in monochrome
--- a/jdk/src/share/classes/javax/print/attribute/standard/Compression.java Wed Jul 31 13:11:31 2013 +0400
+++ b/jdk/src/share/classes/javax/print/attribute/standard/Compression.java Tue Aug 06 13:38:27 2013 -0700
@@ -34,7 +34,7 @@
* print data (the doc), not of the Print Job. If a Compression attribute is not
* specified for a doc, the printer assumes the doc's print data is uncompressed
* (i.e., the default Compression value is always {@link #NONE
- * <CODE>NONE</CODE>}).
+ * NONE}).
* <P>
* <B>IPP Compatibility:</B> The category name returned by
* <CODE>getName()</CODE> is the IPP attribute name. The enumeration's
--- a/jdk/src/share/classes/javax/print/attribute/standard/Finishings.java Wed Jul 31 13:11:31 2013 +0400
+++ b/jdk/src/share/classes/javax/print/attribute/standard/Finishings.java Tue Aug 06 13:38:27 2013 -0700
@@ -46,13 +46,13 @@
*
* </TD>
* <TD WIDTH=27%>
- * {@link #NONE <CODE>NONE</CODE>}
+ * {@link #NONE NONE}
* </TD>
* <TD WIDTH=27%>
- * {@link #STAPLE <CODE>STAPLE</CODE>}
+ * {@link #STAPLE STAPLE}
* </TD>
* <TD WIDTH=36%>
- * {@link #EDGE_STITCH <CODE>EDGE_STITCH</CODE>}
+ * {@link #EDGE_STITCH EDGE_STITCH}
* </TD>
* </TR>
* <TR>
@@ -60,13 +60,13 @@
*
* </TD>
* <TD>
- * {@link #BIND <CODE>BIND</CODE>}
+ * {@link #BIND BIND}
* </TD>
* <TD>
- * {@link #SADDLE_STITCH <CODE>SADDLE_STITCH</CODE>}
+ * {@link #SADDLE_STITCH SADDLE_STITCH}
* </TD>
* <TD>
- * {@link #COVER <CODE>COVER</CODE>}
+ * {@link #COVER COVER}
* </TD>
* <TD>
*
@@ -82,13 +82,13 @@
*
* </TD>
* <TD WIDTH=27%>
- * {@link #STAPLE_TOP_LEFT <CODE>STAPLE_TOP_LEFT</CODE>}
+ * {@link #STAPLE_TOP_LEFT STAPLE_TOP_LEFT}
* </TD>
* <TD WIDTH=27%>
- * {@link #EDGE_STITCH_LEFT <CODE>EDGE_STITCH_LEFT</CODE>}
+ * {@link #EDGE_STITCH_LEFT EDGE_STITCH_LEFT}
* </TD>
* <TD WIDTH=27%>
- * {@link #STAPLE_DUAL_LEFT <CODE>STAPLE_DUAL_LEFT</CODE>}
+ * {@link #STAPLE_DUAL_LEFT STAPLE_DUAL_LEFT}
* </TD>
* <TD WIDTH=9%>
*
@@ -99,13 +99,13 @@
*
* </TD>
* <TD WIDTH=27%>
- * {@link #STAPLE_BOTTOM_LEFT <CODE>STAPLE_BOTTOM_LEFT</CODE>}
+ * {@link #STAPLE_BOTTOM_LEFT STAPLE_BOTTOM_LEFT}
* </TD>
* <TD WIDTH=27%>
- * {@link #EDGE_STITCH_TOP <CODE>EDGE_STITCH_TOP</CODE>}
+ * {@link #EDGE_STITCH_TOP EDGE_STITCH_TOP}
* </TD>
* <TD WIDTH=27%>
- * {@link #STAPLE_DUAL_TOP <CODE>STAPLE_DUAL_TOP</CODE>}
+ * {@link #STAPLE_DUAL_TOP STAPLE_DUAL_TOP}
* </TD>
* <TD WIDTH=9%>
*
@@ -116,13 +116,13 @@
*
* </TD>
* <TD WIDTH=27%>
- * {@link #STAPLE_TOP_RIGHT <CODE>STAPLE_TOP_RIGHT</CODE>}
+ * {@link #STAPLE_TOP_RIGHT STAPLE_TOP_RIGHT}
* </TD>
* <TD WIDTH=27%>
- * {@link #EDGE_STITCH_RIGHT <CODE>EDGE_STITCH_RIGHT</CODE>}
+ * {@link #EDGE_STITCH_RIGHT EDGE_STITCH_RIGHT}
* </TD>
* <TD WIDTH=27%>
- * {@link #STAPLE_DUAL_RIGHT <CODE>STAPLE_DUAL_RIGHT</CODE>}
+ * {@link #STAPLE_DUAL_RIGHT STAPLE_DUAL_RIGHT}
* </TD>
* <TD WIDTH=9%>
*
@@ -133,13 +133,13 @@
*
* </TD>
* <TD WIDTH=27%>
- * {@link #STAPLE_BOTTOM_RIGHT <CODE>STAPLE_BOTTOM_RIGHT</CODE>}
+ * {@link #STAPLE_BOTTOM_RIGHT STAPLE_BOTTOM_RIGHT}
* </TD>
* <TD WIDTH=27%>
- * {@link #EDGE_STITCH_BOTTOM <CODE>EDGE_STITCH_BOTTOM</CODE>}
+ * {@link #EDGE_STITCH_BOTTOM EDGE_STITCH_BOTTOM}
* </TD>
* <TD WIDTH=27%>
- * {@link #STAPLE_DUAL_BOTTOM <CODE>STAPLE_DUAL_BOTTOM</CODE>}
+ * {@link #STAPLE_DUAL_BOTTOM STAPLE_DUAL_BOTTOM}
* </TD>
* <TD WIDTH=9%>
*
@@ -147,16 +147,16 @@
* </TR>
* </TABLE>
* <P>
- * The <CODE>STAPLE_<I>XXX</I></CODE> values are specified with respect to the
+ * The STAPLE_<I>XXX</I> 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 <CODE>STAPLE_BOTTOM_LEFT</CODE> value (since landscape is
+ * 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
* reverse-landscape document when held for reading, the client supplies the
- * <CODE>STAPLE_TOP_RIGHT</CODE> value (since reverse-landscape is defined as a
+ * STAPLE_TOP_RIGHT value (since reverse-landscape is defined as a
* -90 degree rotation from portrait, i.e., clockwise).
* <P>
* The angle (vertical, horizontal, angled) of each staple with respect to the
--- a/jdk/src/share/classes/javax/print/attribute/standard/JobKOctets.java Wed Jul 31 13:11:31 2013 +0400
+++ b/jdk/src/share/classes/javax/print/attribute/standard/JobKOctets.java Tue Aug 06 13:38:27 2013 -0700
@@ -67,7 +67,7 @@
* shown in the table below.
* <P>
* <TABLE BORDER=1 CELLPADDING=2 CELLSPACING=1 SUMMARY="Table showing computation of doc sizes">
- * <TR BGCOLOR="#E5E5E5">
+ * <TR>
* <TH>Representation Class</TH>
* <TH>Document Size</TH>
* </TR>
--- a/jdk/src/share/classes/javax/print/attribute/standard/MediaPrintableArea.java Wed Jul 31 13:11:31 2013 +0400
+++ b/jdk/src/share/classes/javax/print/attribute/standard/MediaPrintableArea.java Tue Aug 06 13:38:27 2013 -0700
@@ -62,7 +62,7 @@
* The (x,y) origin is positioned at the top-left of the paper in portrait
* mode regardless of the orientation specified in the requesting context.
* For example a printable area for A4 paper in portrait or landscape
- * orientation will have height > width.
+ * orientation will have height {@literal >} width.
* <p>
* A printable area attribute's values are stored
* internally as integers in units of micrometers (µm), where 1 micrometer
@@ -107,9 +107,9 @@
* @param units in which the values are expressed.
*
* @exception IllegalArgumentException
- * Thrown if <CODE>x</CODE> < 0 or <CODE>y</CODE> < 0
- * or <CODE>w</CODE> <= 0 or <CODE>h</CODE> <= 0 or
- * <CODE>units</CODE> < 1.
+ * Thrown if {@code x < 0} or {@code y < 0}
+ * or {@code w <= 0} or {@code h <= 0} or
+ * {@code units < 1}.
*/
public MediaPrintableArea(float x, float y, float w, float h, int units) {
if ((x < 0.0) || (y < 0.0) || (w <= 0.0) || (h <= 0.0) ||
@@ -133,9 +133,9 @@
* @param units in which the values are expressed.
*
* @exception IllegalArgumentException
- * Thrown if <CODE>x</CODE> < 0 or <CODE>y</CODE> < 0
- * or <CODE>w</CODE> <= 0 or <CODE>h</CODE> <= 0 or
- * <CODE>units</CODE> < 1.
+ * Thrown if {@code x < 0} or {@code y < 0}
+ * or {@code w <= 0} or {@code h <= 0} or
+ * {@code units < 1}.
*/
public MediaPrintableArea(int x, int y, int w, int h, int units) {
if ((x < 0) || (y < 0) || (w <= 0) || (h <= 0) ||
@@ -159,7 +159,7 @@
* @return printable area as array of x, y, w, h in the specified units.
*
* @exception IllegalArgumentException
- * (unchecked exception) Thrown if <CODE>units</CODE> < 1.
+ * (unchecked exception) Thrown if {@code units < 1}.
*/
public float[] getPrintableArea(int units) {
return new float[] { getX(units), getY(units),
@@ -177,7 +177,7 @@
* specified units.
*
* @exception IllegalArgumentException
- * (unchecked exception) Thrown if <CODE>units</CODE> < 1.
+ * (unchecked exception) Thrown if {@code units < 1}.
*/
public float getX(int units) {
return convertFromMicrometers(x, units);
@@ -194,7 +194,7 @@
* specified units.
*
* @exception IllegalArgumentException
- * (unchecked exception) Thrown if <CODE>units</CODE> < 1.
+ * (unchecked exception) Thrown if {@code units < 1}.
*/
public float getY(int units) {
return convertFromMicrometers(y, units);
@@ -209,7 +209,7 @@
* @return width of the printable area in the specified units.
*
* @exception IllegalArgumentException
- * (unchecked exception) Thrown if <CODE>units</CODE> < 1.
+ * (unchecked exception) Thrown if {@code units < 1}.
*/
public float getWidth(int units) {
return convertFromMicrometers(w, units);
@@ -224,7 +224,7 @@
* @return height of the printable area in the specified units.
*
* @exception IllegalArgumentException
- * (unchecked exception) Thrown if <CODE>units</CODE> < 1.
+ * (unchecked exception) Thrown if {@code units < 1}.
*/
public float getHeight(int units) {
return convertFromMicrometers(h, units);
@@ -301,7 +301,7 @@
* @return String version of this two-dimensional size attribute.
*
* @exception IllegalArgumentException
- * (unchecked exception) Thrown if <CODE>units</CODE> < 1.
+ * (unchecked exception) Thrown if {@code units < 1}.
*/
public String toString(int units, String unitsName) {
if (unitsName == null) {
--- a/jdk/src/share/classes/javax/print/attribute/standard/MediaSize.java Wed Jul 31 13:11:31 2013 +0400
+++ b/jdk/src/share/classes/javax/print/attribute/standard/MediaSize.java Tue Aug 06 13:38:27 2013 -0700
@@ -45,7 +45,7 @@
* <code>MediaSize.getMediaSizeForName(MediaSizeName)</code>
* to find the physical dimensions of the MediaSizeName instances
* enumerated in this API. This is useful for clients which need this
- * information to format & paginate printing.
+ * information to format {@literal &} paginate printing.
* <P>
*
* @author Phil Race, Alan Kaminsky
@@ -71,8 +71,8 @@
* <CODE>Size2DSyntax.MM</CODE>.
*
* @exception IllegalArgumentException
- * (Unchecked exception) Thrown if <CODE>x</CODE> < 0 or <CODE>y</CODE>
- * < 0 or <CODE>units</CODE> < 1 or <CODE>x</CODE> > <CODE>y</CODE>.
+ * (Unchecked exception) Thrown if {@code x < 0} or {@code y < 0} or
+ * {@code units < 1} or {@code x > y}.
*/
public MediaSize(float x, float y,int units) {
super (x, y, units);
@@ -92,8 +92,8 @@
* <CODE>Size2DSyntax.MM</CODE>.
*
* @exception IllegalArgumentException
- * (Unchecked exception) Thrown if <CODE>x</CODE> < 0 or <CODE>y</CODE>
- * < 0 or <CODE>units</CODE> < 1 or <CODE>x</CODE> > <CODE>y</CODE>.
+ * (Unchecked exception) Thrown if {@code x < 0} or {@code y < 0} or
+ * {@code units < 1} or {@code x > y}.
*/
public MediaSize(int x, int y,int units) {
super (x, y, units);
@@ -115,8 +115,8 @@
* @param media a media name to associate with this MediaSize
*
* @exception IllegalArgumentException
- * (Unchecked exception) Thrown if <CODE>x</CODE> < 0 or <CODE>y</CODE>
- * < 0 or <CODE>units</CODE> < 1 or <CODE>x</CODE> > <CODE>y</CODE>.
+ * (Unchecked exception) Thrown if {@code x < 0} or {@code y < 0} or
+ * {@code units < 1} or {@code x > y}.
*/
public MediaSize(float x, float y,int units, MediaSizeName media) {
super (x, y, units);
@@ -141,8 +141,8 @@
* @param media a media name to associate with this MediaSize
*
* @exception IllegalArgumentException
- * (Unchecked exception) Thrown if <CODE>x</CODE> < 0 or <CODE>y</CODE>
- * < 0 or <CODE>units</CODE> < 1 or <CODE>x</CODE> > <CODE>y</CODE>.
+ * (Unchecked exception) Thrown if {@code x < 0} or {@code y < 0} or
+ * {@code units < 1} or {@code x > y}.
*/
public MediaSize(int x, int y,int units, MediaSizeName media) {
super (x, y, units);
@@ -194,7 +194,8 @@
* Unit conversion factor, e.g. <CODE>Size2DSyntax.INCH</CODE> or
* <CODE>Size2DSyntax.MM</CODE>
* @return MediaSizeName matching these dimensions, or null.
- * @exception IllegalArgumentException if x <= 0, y <= 0, or units < 1
+ * @exception IllegalArgumentException if {@code x <= 0},
+ * {@code y <= 0}, or {@code units < 1}.
*
*/
public static MediaSizeName findMedia(float x, float y, int units) {
--- a/jdk/src/share/classes/javax/print/attribute/standard/PresentationDirection.java Wed Jul 31 13:11:31 2013 +0400
+++ b/jdk/src/share/classes/javax/print/attribute/standard/PresentationDirection.java Tue Aug 06 13:38:27 2013 -0700
@@ -56,56 +56,56 @@
/**
* Pages are laid out in columns starting at the top left,
- * proceeeding towards the bottom & right.
+ * proceeeding towards the bottom {@literal &} right.
*/
public static final PresentationDirection TOBOTTOM_TORIGHT =
new PresentationDirection(0);
/**
* Pages are laid out in columns starting at the top right,
- * proceeeding towards the bottom & left.
+ * proceeeding towards the bottom {@literal &} left.
*/
public static final PresentationDirection TOBOTTOM_TOLEFT =
new PresentationDirection(1);
/**
* Pages are laid out in columns starting at the bottom left,
- * proceeeding towards the top & right.
+ * proceeeding towards the top {@literal &} right.
*/
public static final PresentationDirection TOTOP_TORIGHT =
new PresentationDirection(2);
/**
* Pages are laid out in columns starting at the bottom right,
- * proceeeding towards the top & left.
+ * proceeeding towards the top {@literal &} left.
*/
public static final PresentationDirection TOTOP_TOLEFT =
new PresentationDirection(3);
/**
* Pages are laid out in rows starting at the top left,
- * proceeeding towards the right & bottom.
+ * proceeeding towards the right {@literal &} bottom.
*/
public static final PresentationDirection TORIGHT_TOBOTTOM =
new PresentationDirection(4);
/**
* Pages are laid out in rows starting at the bottom left,
- * proceeeding towards the right & top.
+ * proceeeding towards the right {@literal &} top.
*/
public static final PresentationDirection TORIGHT_TOTOP =
new PresentationDirection(5);
/**
* Pages are laid out in rows starting at the top right,
- * proceeeding towards the left & bottom.
+ * proceeeding towards the left {@literal &} bottom.
*/
public static final PresentationDirection TOLEFT_TOBOTTOM =
new PresentationDirection(6);
/**
* Pages are laid out in rows starting at the bottom right,
- * proceeeding towards the left & top.
+ * proceeeding towards the left {@literal &} top.
*/
public static final PresentationDirection TOLEFT_TOTOP =
new PresentationDirection(7);
--- a/jdk/src/share/classes/javax/print/attribute/standard/PrinterMoreInfoManufacturer.java Wed Jul 31 13:11:31 2013 +0400
+++ b/jdk/src/share/classes/javax/print/attribute/standard/PrinterMoreInfoManufacturer.java Tue Aug 06 13:38:27 2013 -0700
@@ -40,7 +40,7 @@
* details on color support). The information is intended to be germane to
* this kind of printer without regard to site specific modifications or
* services.
- * <P
+ * <P>
* In contrast, the {@link PrinterMoreInfo PrinterMoreInfo} attribute is used
* to find out more information about this specific printer rather than this
* general kind of printer.
--- a/jdk/src/share/classes/javax/print/attribute/standard/PrinterResolution.java Wed Jul 31 13:11:31 2013 +0400
+++ b/jdk/src/share/classes/javax/print/attribute/standard/PrinterResolution.java Tue Aug 06 13:38:27 2013 -0700
@@ -84,11 +84,11 @@
* Feed direction resolution.
* @param units
* Unit conversion factor, e.g. <code>ResolutionSyntax.DPI</CODE>
- * or <code>ResolutionSyntax.>DPCM</CODE>.
+ * or <code>ResolutionSyntax.DPCM</CODE>.
*
* @exception IllegalArgumentException
- * (unchecked exception) Thrown if <CODE>crossFeedResolution</CODE> <
- * 1 or <CODE>feedResolution</CODE> < 1 or <CODE>units</CODE> < 1.
+ * (unchecked exception) Thrown if {@code crossFeedResolution < 1} or
+ * {@code feedResolution < 1} or {@code units < 1}.
*/
public PrinterResolution(int crossFeedResolution, int feedResolution,
int units) {