diff --git a/jdk/src/java.base/share/classes/java/text/ChoiceFormat.java b/jdk/src/java.base/share/classes/java/text/ChoiceFormat.java index 601b019e886..8355dee87d4 100644 --- a/jdk/src/java.base/share/classes/java/text/ChoiceFormat.java +++ b/jdk/src/java.base/share/classes/java/text/ChoiceFormat.java @@ -490,7 +490,7 @@ public class ChoiceFormat extends NumberFormat { } /** - * Equality comparision between two + * Equality comparison between two */ public boolean equals(Object obj) { if (obj == null) return false; diff --git a/jdk/src/java.base/share/classes/java/util/ArrayPrefixHelpers.java b/jdk/src/java.base/share/classes/java/util/ArrayPrefixHelpers.java index 089b90039cc..abcdb2b35aa 100644 --- a/jdk/src/java.base/share/classes/java/util/ArrayPrefixHelpers.java +++ b/jdk/src/java.base/share/classes/java/util/ArrayPrefixHelpers.java @@ -85,7 +85,7 @@ class ArrayPrefixHelpers { * * As usual for this sort of utility, there are 4 versions, that * are simple copy/paste/adapt variants of each other. (The - * double and int versions differ from long version soley by + * double and int versions differ from long version solely by * replacing "long" (with case-matching)). */ diff --git a/jdk/src/java.base/share/classes/java/util/Calendar.java b/jdk/src/java.base/share/classes/java/util/Calendar.java index 80849001e74..6d696aaee87 100644 --- a/jdk/src/java.base/share/classes/java/util/Calendar.java +++ b/jdk/src/java.base/share/classes/java/util/Calendar.java @@ -1172,7 +1172,7 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable - * setFeilds(Calendar.YEAR, 2013, + * setFields(Calendar.YEAR, 2013, * Calendar.MONTH, Calendar.DECEMBER, * Calendar.DAY_OF_MONTH, 23); * is equivalent to the sequence of the following @@ -1298,7 +1298,7 @@ public abstract class Calendar implements Serializable, Cloneable, ComparableTimeZone} will be used in the {@link #build() build} * method. @@ -3316,7 +3316,7 @@ public abstract class Calendar implements Serializable, Cloneable, Comparablefield is negative, - * equal to or greater then FIELD_COUNT. + * equal to or greater than {@code FIELD_COUNT}. */ static String getFieldName(int field) { return FIELD_NAME[field]; diff --git a/jdk/src/java.base/share/classes/java/util/Collection.java b/jdk/src/java.base/share/classes/java/util/Collection.java index 4545faa6143..3a01908d73e 100644 --- a/jdk/src/java.base/share/classes/java/util/Collection.java +++ b/jdk/src/java.base/share/classes/java/util/Collection.java @@ -537,7 +537,7 @@ public interface Collection extends Iterable { * @implSpec * The default implementation creates a * late-binding spliterator - * from the collections's {@code Iterator}. The spliterator inherits the + * from the collection's {@code Iterator}. The spliterator inherits the * fail-fast properties of the collection's iterator. *

* The created {@code Spliterator} reports {@link Spliterator#SIZED}. diff --git a/jdk/src/java.base/share/classes/java/util/Locale.java b/jdk/src/java.base/share/classes/java/util/Locale.java index ffea237b34a..e3b12c5769c 100644 --- a/jdk/src/java.base/share/classes/java/util/Locale.java +++ b/jdk/src/java.base/share/classes/java/util/Locale.java @@ -719,7 +719,7 @@ public final class Locale implements Cloneable, Serializable { * created and cached. * * @param language lowercase 2 to 8 language code. - * @param country uppercase two-letter ISO-3166 code and numric-3 UN M.49 area code. + * @param country uppercase two-letter ISO-3166 code and numeric-3 UN M.49 area code. * @param variant vendor and browser specific code. See class description. * @return the Locale instance requested * @exception NullPointerException if any argument is null. @@ -1236,7 +1236,7 @@ public final class Locale implements Cloneable, Serializable { /** * Package private method returning the Locale's LocaleExtensions, * used by ResourceBundle. - * @return locale exnteions of this Locale, + * @return locale extensions of this Locale, * or {@code null} if no extensions are defined */ LocaleExtensions getLocaleExtensions() { @@ -2609,7 +2609,7 @@ public final class Locale implements Cloneable, Serializable { * href="./Locale.html#def_locale_extension">well-formed or an exception * is thrown. * - *

Attribute comparision for removal is case-insensitive. + *

Attribute comparison for removal is case-insensitive. * * @param attribute the attribute * @return This builder. diff --git a/jdk/src/java.base/share/classes/java/util/TreeMap.java b/jdk/src/java.base/share/classes/java/util/TreeMap.java index c04053656cf..a5ed0f5e91c 100644 --- a/jdk/src/java.base/share/classes/java/util/TreeMap.java +++ b/jdk/src/java.base/share/classes/java/util/TreeMap.java @@ -859,7 +859,7 @@ public class TreeMap * Returns a {@link Set} view of the mappings contained in this map. * *

The set's iterator returns the entries in ascending key order. The - * sets's spliterator is + * set's spliterator is * late-binding, * fail-fast, and additionally reports {@link Spliterator#SORTED} and * {@link Spliterator#ORDERED} with an encounter order that is ascending key @@ -2643,7 +2643,7 @@ public class TreeMap * child, also serving as origin for the split-off spliterator. * Left-hands are symmetric. Descending versions place the origin * at the end and invert ascending split rules. This base class - * is non-commital about directionality, or whether the top-level + * is non-committal about directionality, or whether the top-level * spliterator covers the whole tree. This means that the actual * split mechanics are located in subclasses. Some of the subclass * trySplit methods are identical (except for return types), but diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentHashMap.java b/jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentHashMap.java index b50bc5930c3..2ffaef68010 100644 --- a/jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentHashMap.java +++ b/jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentHashMap.java @@ -481,7 +481,7 @@ public class ConcurrentHashMap extends AbstractMap * * Maintaining API and serialization compatibility with previous * versions of this class introduces several oddities. Mainly: We - * leave untouched but unused constructor arguments refering to + * leave untouched but unused constructor arguments referring to * concurrencyLevel. We accept a loadFactor constructor argument, * but apply it only to initial table capacity (which is the only * time that we can guarantee to honor it.) We also declare an diff --git a/jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListMap.java b/jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListMap.java index 7c2effb95b7..4daee40a362 100644 --- a/jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListMap.java +++ b/jdk/src/java.base/share/classes/java/util/concurrent/ConcurrentSkipListMap.java @@ -2710,7 +2710,7 @@ public class ConcurrentSkipListMap extends AbstractMap } /** - * Returns lowest absolute key (ignoring directonality). + * Returns lowest absolute key (ignoring directionality). */ K lowestKey() { Comparator cmp = m.comparator; @@ -2722,7 +2722,7 @@ public class ConcurrentSkipListMap extends AbstractMap } /** - * Returns highest absolute key (ignoring directonality). + * Returns highest absolute key (ignoring directionality). */ K highestKey() { Comparator cmp = m.comparator; diff --git a/jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/Parser.java b/jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/Parser.java index 6db4d4fdb6d..57115f2139d 100644 --- a/jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/Parser.java +++ b/jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/Parser.java @@ -145,12 +145,12 @@ public abstract class Parser { /** * ASCII character type array. * - * This array maps an ASCII (7 bit) character to the character type.
- * Possible character type values are:
- ' ' for any kind of white - * space character;
- 'a' for any lower case alphabetical character - * value;
- 'A' for any upper case alphabetical character value;
- * - 'd' for any decimal digit character value;
- 'z' for any - * character less then ' ' except '\t', '\n', '\r';
An ASCII (7 bit) + * This array maps an ASCII (7 bit) character to the character type.
+ * Possible character type values are:
- ' ' for any kind of white + * space character;
- 'a' for any lower case alphabetical character + * value;
- 'A' for any upper case alphabetical character value;
+ * - 'd' for any decimal digit character value;
- 'z' for any + * character less than ' ' except '\t', '\n', '\r';
An ASCII (7 bit) * character which does not fall in any category listed above is mapped to * it self. */ @@ -158,11 +158,11 @@ public abstract class Parser { /** * NMTOKEN character type array. * - * This array maps an ASCII (7 bit) character to the character type.
- * Possible character type values are:
- 0 for underscore ('_') or any - * lower and upper case alphabetical character value;
- 1 for colon - * (':') character;
- 2 for dash ('-') and dot ('.') or any decimal - * digit character value;
- 3 for any kind of white space character
+ * Possible character type values are:
- 0 for underscore ('_') or any + * lower and upper case alphabetical character value;
- 1 for colon + * (':') character;
- 2 for dash ('-') and dot ('.') or any decimal + * digit character value;
- 3 for any kind of white space character
An ASCII (7 bit) character which does not fall in any category listed * above is mapped to 0xff. */ @@ -1841,10 +1841,12 @@ public abstract class Parser { /** * Reads an attribute value. * - * The grammar which this method can read is:
- * eqstr := S "=" qstr
- * qstr := S ("'" string "'") | - * ('"' string '"')
This method resolves entities + * The grammar this method can read is: + * 

{@code
+     * eqstr := S "=" qstr
+     * qstr  := S ("'" string "'") | ('"' string '"')
+     * }
+ * This method resolves entities * inside a string unless the parser parses DTD. * * @param flag The '=' character forces the method to accept the '=' @@ -2633,7 +2635,7 @@ public abstract class Parser { * Reports characters and empties the parser's buffer. This method is called * only if parser is going to return control to the main loop. This means * that this method may use parser buffer to report white space without - * copeing characters to temporary buffer. + * copying characters to temporary buffer. */ protected abstract void bflash() throws Exception; @@ -2642,7 +2644,7 @@ public abstract class Parser { * Reports white space characters and empties the parser's buffer. This * method is called only if parser is going to return control to the main * loop. This means that this method may use parser buffer to report white - * space without copeing characters to temporary buffer. + * space without copying characters to temporary buffer. */ protected abstract void bflash_ws() throws Exception; @@ -3290,16 +3292,20 @@ public abstract class Parser { } /** - * Maps a character to it's type. + * Maps a character to its type. * - * Possible character type values are:
- ' ' for any kind of white - * space character;
- 'a' for any lower case alphabetical character - * value;
- 'A' for any upper case alphabetical character value;
- * - 'd' for any decimal digit character value;
- 'z' for any - * character less then ' ' except '\t', '\n', '\r';
- 'X' for any not - * ASCII character;
- 'Z' for EOS character.
An ASCII (7 bit) - * character which does not fall in any category listed above is mapped to - * it self. + * Possible character type values are: + *
    + *
  • ' ' - for any kind of whitespace character;
    • + *
  • 'a' - for any lower case alphabetical character value;
    • + *
  • 'A' - for any upper case alphabetical character value;
    • + *
  • 'd' - for any decimal digit character value;
    • + *
  • 'z' - for any character less than ' ' except '\t', '\n', '\r';
    • + *
  • 'X' - for any not ASCII character;
    • + *
  • 'Z' - for EOS character.
    • + *
+ * An ASCII (7 bit) character which does not fall in any category + * listed above is mapped to itself. * * @param ch The character to map. * @return The type of character. diff --git a/jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/ParserSAX.java b/jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/ParserSAX.java index da921dc4936..733f2665972 100644 --- a/jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/ParserSAX.java +++ b/jdk/src/java.base/share/classes/jdk/internal/util/xml/impl/ParserSAX.java @@ -649,7 +649,7 @@ final class ParserSAX * Reports characters and empties the parser's buffer. This method is called * only if parser is going to return control to the main loop. This means * that this method may use parser buffer to report white space without - * copeing characters to temporary buffer. + * copying characters to temporary buffer. */ protected void bflash() throws SAXException { if (mBuffIdx >= 0) { @@ -663,7 +663,7 @@ final class ParserSAX * Reports white space characters and empties the parser's buffer. This * method is called only if parser is going to return control to the main * loop. This means that this method may use parser buffer to report white - * space without copeing characters to temporary buffer. + * space without copying characters to temporary buffer. */ protected void bflash_ws() throws SAXException { if (mBuffIdx >= 0) { diff --git a/jdk/src/java.base/share/classes/sun/misc/Cache.java b/jdk/src/java.base/share/classes/sun/misc/Cache.java index 467481183a6..fb0a9ea8724 100644 --- a/jdk/src/java.base/share/classes/sun/misc/Cache.java +++ b/jdk/src/java.base/share/classes/sun/misc/Cache.java @@ -196,8 +196,8 @@ public /** * Gets the object associated with the specified key in the Cache. * @param key the key in the hash table - * @returns the element for the key or null if the key - * is not defined in the hash table. + * @return the element for the key or null if the key + * is not defined in the hash table. * @see Cache#put */ public synchronized Object get(Object key) { diff --git a/jdk/src/java.base/share/classes/sun/misc/CharacterDecoder.java b/jdk/src/java.base/share/classes/sun/misc/CharacterDecoder.java index c076f46df28..07cbd413594 100644 --- a/jdk/src/java.base/share/classes/sun/misc/CharacterDecoder.java +++ b/jdk/src/java.base/share/classes/sun/misc/CharacterDecoder.java @@ -120,7 +120,7 @@ public abstract class CharacterDecoder { /** * This method does an actual decode. It takes the decoded bytes and * writes them to the OutputStream. The integer l tells the - * method how many bytes are required. This is always <= bytesPerAtom(). + * method how many bytes are required. This is always {@literal <=} bytesPerAtom(). */ protected void decodeAtom(PushbackInputStream aStream, OutputStream bStream, int l) throws IOException { throw new CEStreamExhausted(); diff --git a/jdk/src/java.base/share/classes/sun/misc/CharacterEncoder.java b/jdk/src/java.base/share/classes/sun/misc/CharacterEncoder.java index d152f954cf9..4042cb2c6e7 100644 --- a/jdk/src/java.base/share/classes/sun/misc/CharacterEncoder.java +++ b/jdk/src/java.base/share/classes/sun/misc/CharacterEncoder.java @@ -68,7 +68,7 @@ import java.nio.ByteBuffer; * referenced in the See Also list below. * * @author Chuck McManis - * @see CharacterDecoder; + * @see CharacterDecoder * @see UCEncoder * @see UUEncoder * @see BASE64Encoder @@ -107,7 +107,7 @@ public abstract class CharacterEncoder { /** * Encode the suffix that ends every output line. By default - * this method just prints a into the output stream. + * this method just prints a newline into the output stream. */ protected void encodeLineSuffix(OutputStream aStream) throws IOException { pStream.println(); diff --git a/jdk/src/java.base/share/classes/sun/misc/ConditionLock.java b/jdk/src/java.base/share/classes/sun/misc/ConditionLock.java index e1af5252117..60a6fa5ee04 100644 --- a/jdk/src/java.base/share/classes/sun/misc/ConditionLock.java +++ b/jdk/src/java.base/share/classes/sun/misc/ConditionLock.java @@ -34,7 +34,7 @@ package sun.misc; * with the lock() and unlock() methods. However if there is a thread * waiting for the state variable to become a particular value and you * simply call Unlock(), that thread will not be able to acquire the - * lock until the state variable equals its desired value.

+ * lock until the state variable equals its desired value. * * @author Peter King */ diff --git a/jdk/src/java.base/share/classes/sun/misc/ExtensionDependency.java b/jdk/src/java.base/share/classes/sun/misc/ExtensionDependency.java index c013169fa2f..97c9480efd8 100644 --- a/jdk/src/java.base/share/classes/sun/misc/ExtensionDependency.java +++ b/jdk/src/java.base/share/classes/sun/misc/ExtensionDependency.java @@ -45,26 +45,26 @@ import java.net.MalformedURLException; import sun.net.www.ParseUtil; /** - *

* This class checks dependent extensions a particular jar file may have * declared through its manifest attributes. - *

+ *

* Jar file declared dependent extensions through the extension-list * attribute. The extension-list contains a list of keys used to * fetch the other attributes describing the required extension. * If key is the extension key declared in the extension-list * attribute, the following describing attribute can be found in - * the manifest : - * key-Extension-Name: (Specification package name) - * key-Specification-Version: (Specification-Version) - * key-Implementation-Version: (Implementation-Version) - * key-Implementation-Vendor-Id: (Imlementation-Vendor-Id) - * key-Implementation-Version: (Implementation version) - * key-Implementation-URL: (URL to download the requested extension) + * the manifest: + *

    + *
  • key-Extension-Name: (Specification package name)
    • + *
  • key-Specification-Version: (Specification-Version)
    • + *
  • key-Implementation-Version: (Implementation-Version)
    • + *
  • key-Implementation-Vendor-Id: (Imlementation-Vendor-Id)
    • + *
  • key-Implementation-Version: (Implementation version)
    • + *
  • key-Implementation-URL: (URL to download the requested extension)
    • + *
*

* This class also maintain versioning consistency of installed * extensions dependencies declared in jar file manifest. - *

* * @deprecated this class will be removed in a future release. * @author Jerome Dochez @@ -76,10 +76,9 @@ public class ExtensionDependency { private static Vector providers; /** - *

* Register an ExtensionInstallationProvider. The provider is responsible * for handling the installation (upgrade) of any missing extensions. - *

+ * * @param eip ExtensionInstallationProvider implementation */ public synchronized static void addExtensionInstallationProvider @@ -92,9 +91,7 @@ public class ExtensionDependency { } /** - *

* Unregister a previously installed installation provider - *

*/ public synchronized static void removeExtensionInstallationProvider (ExtensionInstallationProvider eip) @@ -103,10 +100,9 @@ public class ExtensionDependency { } /** - *

* Checks the dependencies of the jar file on installed extension. - *

- * @param jarFile containing the attriutes declaring the dependencies + * + * @param jar containing the attributes declaring the dependencies */ public static boolean checkExtensionsDependencies(JarFile jar) { @@ -182,9 +178,8 @@ public class ExtensionDependency { /* - *

* Check that a particular dependency on an extension is satisfied. - *

+ * * @param extensionName is the key used for the attributes in the manifest * @param attr is the attributes of the manifest file * @@ -204,10 +199,9 @@ public class ExtensionDependency { } /* - *

* Check if a particular extension is part of the currently installed * extensions. - *

+ * * @param extensionName is the key for the attributes in the manifest * @param attr is the attributes of the manifest * @@ -262,11 +256,9 @@ public class ExtensionDependency { } /* - *

* Check if the requested extension described by the attributes * in the manifest under the key extensionName is compatible with * the jar file. - *

* * @param extensionName key in the attribute list * @param attr manifest file attributes @@ -337,10 +329,8 @@ public class ExtensionDependency { } /* - *

* An required extension is missing, if an ExtensionInstallationProvider is * registered, delegate the installation of that particular extension to it. - *

* * @param reqInfo Missing extension information * @param instInfo Older installed version information @@ -380,11 +370,9 @@ public class ExtensionDependency { } /** - *

* Checks if the extension, that is specified in the extension-list in * the applet jar manifest, is already installed (i.e. exists in the * extension directory). - *

* * @param extensionName extension name in the extension-list * @@ -428,9 +416,7 @@ public class ExtensionDependency { } /** - *

* @return the java.ext.dirs property as a list of directory - *

*/ private static File[] getExtDirs() { String s = java.security.AccessController.doPrivileged( @@ -456,9 +442,8 @@ public class ExtensionDependency { } /* - *

* Scan the directories and return all files installed in those - *

+ * * @param dirs list of directories to scan * * @return the list of files installed in all the directories @@ -483,9 +468,7 @@ public class ExtensionDependency { } /* - *

* @return the list of installed extensions jar files - *

*/ private File[] getInstalledExtensions() throws IOException { return AccessController.doPrivileged( @@ -503,9 +486,7 @@ public class ExtensionDependency { } /* - *

* Add the newly installed jar file to the extension class loader. - *

* * @param cl the current installed extension class loader * diff --git a/jdk/src/java.base/share/classes/sun/misc/ExtensionInfo.java b/jdk/src/java.base/share/classes/sun/misc/ExtensionInfo.java index e6aad939eb8..c3680cd00ec 100644 --- a/jdk/src/java.base/share/classes/sun/misc/ExtensionInfo.java +++ b/jdk/src/java.base/share/classes/sun/misc/ExtensionInfo.java @@ -45,9 +45,7 @@ import java.lang.Character.*; public class ExtensionInfo { /** - *

* public static values returned by the isCompatible method - *

*/ public static final int COMPATIBLE = 0; public static final int REQUIRE_SPECIFICATION_UPGRADE = 1; @@ -56,10 +54,8 @@ public class ExtensionInfo { public static final int INCOMPATIBLE = 4; /** - *

* attributes fully describer an extension. The underlying described * extension may be installed and requested. - *

*/ public String title; public String name; @@ -76,15 +72,12 @@ public class ExtensionInfo { /** - *

* Create a new uninitialized extension information object - *

*/ public ExtensionInfo() { } /** - *

* Create and initialize an extension information object. * The initialization uses the attributes passed as being * the content of a manifest file to load the extension @@ -93,7 +86,7 @@ public class ExtensionInfo { * extension they may depend on, the extension key parameter * is prepanded to the attribute name to make the key used * to retrieve the attribute from the manifest file - *

+ * * @param extensionKey unique extension key in the manifest * @param attr Attributes of a manifest file */ @@ -149,13 +142,11 @@ public class ExtensionInfo { } /** - *

* @return true if the extension described by this extension information * is compatible with the extension described by the extension * information passed as a parameter - *

* - * @param the requested extension information to compare to + * @param ei the requested extension information to compare to */ public int isCompatibleWith(ExtensionInfo ei) { @@ -204,10 +195,8 @@ public class ExtensionInfo { } /** - *

* helper method to print sensible information on the undelying described * extension - *

*/ public String toString() { return "Extension : title(" + title + "), name(" + name + "), spec vendor(" + @@ -217,15 +206,15 @@ public class ExtensionInfo { } /* - *

* helper method to compare two versions. * version are in the x.y.z.t pattern. - *

+ * * @param source version to compare to * @param target version used to compare against - * @return < 0 if source < version - * > 0 if source > version - * = 0 if source = version + * @return 
{@code
+     *   < 0 if source < version
+     *   > 0 if source > version
+     *   = 0 if source = version}
*/ private int compareExtensionVersion(String source, String target) throws NumberFormatException @@ -238,15 +227,15 @@ public class ExtensionInfo { /* - *

* helper method to compare two versions. * version are in the x.y.z.t pattern. - *

+ * * @param source version to compare to * @param target version used to compare against - * @return < 0 if source < version - * > 0 if source > version - * = 0 if source = version + * @return 
{@code
+     *   < 0 if source < version
+     *   > 0 if source > version
+     *   = 0 if source = version}
*/ private int strictCompareExtensionVersion(String source, String target) throws NumberFormatException diff --git a/jdk/src/java.base/share/classes/sun/misc/FDBigInteger.java b/jdk/src/java.base/share/classes/sun/misc/FDBigInteger.java index 77d6fbc08b6..972ccd1ef5f 100644 --- a/jdk/src/java.base/share/classes/sun/misc/FDBigInteger.java +++ b/jdk/src/java.base/share/classes/sun/misc/FDBigInteger.java @@ -384,8 +384,8 @@ public /*@ spec_bigint_math @*/ class FDBigInteger { * Retrieves the normalization bias of the FDBigIntger. The * normalization bias is a left shift such that after it the highest word * of the value will have the 4 highest bits equal to zero: - * (highestWord & 0xf0000000) == 0, but the next bit should be 1 - * (highestWord & 0x08000000) != 0. + * {@code (highestWord & 0xf0000000) == 0}, but the next bit should be 1 + * {@code (highestWord & 0x08000000) != 0}. * * @return The normalization bias. */ @@ -546,9 +546,9 @@ public /*@ spec_bigint_math @*/ class FDBigInteger { * We assume that S has been normalized, as above, and that * "this" has been left-shifted accordingly. * Also assumed, of course, is that the result, q, can be expressed - * as an integer, 0 <= q < 10. + * as an integer, {@code 0 <= q < 10}. * - * @param The divisor of this FDBigInteger. + * @param S The divisor of this FDBigInteger. * @return q = (int)(this / S). */ /*@ @@ -685,7 +685,7 @@ public /*@ spec_bigint_math @*/ class FDBigInteger { * * @param p5 The exponent of the power-of-five factor. * @param p2 The exponent of the power-of-two factor. - * @return + * @return The multiplication result. */ /*@ @ requires this.value() == 0 || p5 == 0 && p2 == 0; @@ -931,11 +931,11 @@ public /*@ spec_bigint_math @*/ class FDBigInteger { /** * Compares the parameter with this FDBigInteger. Returns an * integer accordingly as: - * 
-     * >0: this > other
-     *  0: this == other
-     * <0: this < other
-     *
+ * 
{@code
+     * > 0: this > other
+     *   0: this == other
+     * < 0: this < other
+     * }
* * @param other The FDBigInteger to compare. * @return A negative value, zero, or a positive value according to the @@ -974,11 +974,11 @@ public /*@ spec_bigint_math @*/ class FDBigInteger { * Compares this FDBigInteger with * 5p5 * 2p2. * Returns an integer accordingly as: - * 
-     * >0: this > other
-     *  0: this == other
-     * <0: this < other
-     *
+ * 
{@code
+     * > 0: this > other
+     *   0: this == other
+     * < 0: this < other
+     * }
* @param p5 The exponent of the power-of-five factor. * @param p2 The exponent of the power-of-two factor. * @return A negative value, zero, or a positive value according to the @@ -1011,11 +1011,11 @@ public /*@ spec_bigint_math @*/ class FDBigInteger { /** * Compares this FDBigInteger with x + y. Returns a * value according to the comparison as: - * 
+     * 
{@code
      * -1: this <  x + y
      *  0: this == x + y
      *  1: this >  x + y
-     * 

+     * }
* @param x The first addend of the sum to compare. * @param y The second addend of the sum to compare. * @return -1, 0, or 1 according to the result of the comparison. diff --git a/jdk/src/java.base/share/classes/sun/misc/FloatingDecimal.java b/jdk/src/java.base/share/classes/sun/misc/FloatingDecimal.java index eef4caf9905..b3a4a2a7575 100644 --- a/jdk/src/java.base/share/classes/sun/misc/FloatingDecimal.java +++ b/jdk/src/java.base/share/classes/sun/misc/FloatingDecimal.java @@ -154,7 +154,7 @@ public class FloatingDecimal{ /** * Indicates the sign of the value. - * @return value < 0.0. + * @return {@code value < 0.0}. */ public boolean isNegative(); diff --git a/jdk/src/java.base/share/classes/sun/misc/IOUtils.java b/jdk/src/java.base/share/classes/sun/misc/IOUtils.java index 57f8918975a..bd4b1430c4e 100644 --- a/jdk/src/java.base/share/classes/sun/misc/IOUtils.java +++ b/jdk/src/java.base/share/classes/sun/misc/IOUtils.java @@ -39,7 +39,7 @@ public class IOUtils { /** * Read up to length of bytes from in * until EOF is detected. - * @param in input stream, must not be null + * @param is input stream, must not be null * @param length number of bytes to read, -1 or Integer.MAX_VALUE means * read as much as possible * @param readAll if true, an EOFException will be thrown if not enough diff --git a/jdk/src/java.base/share/classes/sun/misc/JarFilter.java b/jdk/src/java.base/share/classes/sun/misc/JarFilter.java index b4db96db08f..9036ecaed87 100644 --- a/jdk/src/java.base/share/classes/sun/misc/JarFilter.java +++ b/jdk/src/java.base/share/classes/sun/misc/JarFilter.java @@ -29,10 +29,8 @@ import java.io.File; import java.io.FilenameFilter; /** - *

* This class checks that only jar and zip files are included in the file list. * This class is used in extension installation support (ExtensionDependency). - *

* * @deprecated this class will be removed in a future release. * @author Michael Colburn diff --git a/jdk/src/java.base/share/classes/sun/misc/JavaLangAccess.java b/jdk/src/java.base/share/classes/sun/misc/JavaLangAccess.java index a86453df430..db37e18fffe 100644 --- a/jdk/src/java.base/share/classes/sun/misc/JavaLangAccess.java +++ b/jdk/src/java.base/share/classes/sun/misc/JavaLangAccess.java @@ -91,14 +91,14 @@ public interface JavaLangAccess { * may be added to the delete on exit list by the application shutdown * hooks. * - * @params slot the slot in the shutdown hook array, whose element - * will be invoked in order during shutdown - * @params registerShutdownInProgress true to allow the hook - * to be registered even if the shutdown is in progress. - * @params hook the hook to be registered + * @param slot the slot in the shutdown hook array, whose element + * will be invoked in order during shutdown + * @param registerShutdownInProgress true to allow the hook + * to be registered even if the shutdown is in progress. + * @param hook the hook to be registered * - * @throw IllegalStateException if shutdown is in progress and - * the slot is not valid to register. + * @throws IllegalStateException if shutdown is in progress and + * the slot is not valid to register. */ void registerShutdownHook(int slot, boolean registerShutdownInProgress, Runnable hook); diff --git a/jdk/src/java.base/share/classes/sun/misc/Perf.java b/jdk/src/java.base/share/classes/sun/misc/Perf.java index bafd39dd90c..311e92c8f64 100644 --- a/jdk/src/java.base/share/classes/sun/misc/Perf.java +++ b/jdk/src/java.base/share/classes/sun/misc/Perf.java @@ -67,13 +67,13 @@ public final class Perf { * AccessController.doPrivileged(PrivilegedAction). *

Here is a suggested idiom for use of this class: * - * 

+     * 
{@code
      * class MyTrustedClass {
      *   private static final Perf perf =
      *       AccessController.doPrivileged(new Perf.GetPerfAction());
      *   ...
      * }
-     * 

+     * }
*

* In the presence of a security manager, the MyTrustedClass * class in the above example will need to be granted the @@ -171,8 +171,7 @@ public final class Perf { * The attach mode specifies the access permissions requested for the * instrumentation buffer of the target virtual machine. The permitted * access permissions are: - *

- * + *

    *
  • "r" - Read only access. This Java virtual machine has only * read access to the instrumentation buffer for the target Java * virtual machine. @@ -180,7 +179,7 @@ public final class Perf { * write access to the instrumentation buffer for the target Java virtual * machine. This mode is currently not supported and is reserved for * future enhancements. - * + *
* * @param lvmid an integer that uniquely identifies the * target local Java virtual machine. diff --git a/jdk/src/java.base/share/classes/sun/misc/PerfCounter.java b/jdk/src/java.base/share/classes/sun/misc/PerfCounter.java index 6d6969a1f69..21a36a8cf8d 100644 --- a/jdk/src/java.base/share/classes/sun/misc/PerfCounter.java +++ b/jdk/src/java.base/share/classes/sun/misc/PerfCounter.java @@ -37,7 +37,7 @@ import java.security.AccessController; * The perf counters will be created in the jvmstat perf buffer * that the HotSpot VM creates. The default size is 32K and thus * the number of counters is bounded. You can alter the size - * with -XX:PerfDataMemorySize= option. If there is + * with {@code -XX:PerfDataMemorySize=} option. If there is * insufficient memory in the jvmstat perf buffer, the C heap memory * will be used and thus the application will continue to run if * the counters added exceeds the buffer size but the counters diff --git a/jdk/src/java.base/share/classes/sun/misc/PerformanceLogger.java b/jdk/src/java.base/share/classes/sun/misc/PerformanceLogger.java index 9f4a9e490ec..6e8917b4545 100644 --- a/jdk/src/java.base/share/classes/sun/misc/PerformanceLogger.java +++ b/jdk/src/java.base/share/classes/sun/misc/PerformanceLogger.java @@ -51,10 +51,12 @@ import java.io.Writer; *

* To automatically track startup performance in an app or applet, * use the command-line parameter sun.perflog as follows:
+ * 

{@code
  *     -Dsun.perflog[=file:]
+ * }
*
* where simply using the parameter with no value will enable output - * to the console and a value of "file:" will cause + * to the console and a value of "{@code file:}" will cause * that given filename to be created and used for all output. *

* By default, times are measured using System.currentTimeMillis(). To use diff --git a/jdk/src/java.base/share/classes/sun/misc/Resource.java b/jdk/src/java.base/share/classes/sun/misc/Resource.java index b314872a5eb..4ebf58144e4 100644 --- a/jdk/src/java.base/share/classes/sun/misc/Resource.java +++ b/jdk/src/java.base/share/classes/sun/misc/Resource.java @@ -154,7 +154,8 @@ public abstract class Resource { /** * Returns the Resource data as a ByteBuffer, but only if the input stream - * was implemented on top of a ByteBuffer. Return null otherwise. + * was implemented on top of a ByteBuffer. Return {@code null} otherwise. + * @return Resource data or null. */ public ByteBuffer getByteBuffer() throws IOException { InputStream in = cachedInputStream(); diff --git a/jdk/src/java.base/share/classes/sun/misc/Signal.java b/jdk/src/java.base/share/classes/sun/misc/Signal.java index a00ee9f089d..92438833737 100644 --- a/jdk/src/java.base/share/classes/sun/misc/Signal.java +++ b/jdk/src/java.base/share/classes/sun/misc/Signal.java @@ -50,7 +50,7 @@ import java.util.Hashtable; * Signal objects are created based on their names. For example: * 

  * new Signal("INT");
- *
+ * * constructs a signal object corresponding to SIGINT, which is * typically produced when the user presses Ctrl-C at the command line. * The Signal constructor throws IllegalArgumentException @@ -64,7 +64,7 @@ import java.util.Hashtable; * } * }; * Signal.handle(new Signal("INT"), handler); - * + * * * @author Sheng Liang * @author Bill Shannon @@ -149,7 +149,7 @@ public final class Signal { * * @param sig a signal * @param handler the handler to be registered with the given signal. - * @result the old handler + * @return the old handler * @exception IllegalArgumentException the signal is in use by the VM * @see sun.misc.Signal#raise(Signal sig) * @see sun.misc.SignalHandler diff --git a/jdk/src/java.base/share/classes/sun/misc/Unsafe.java b/jdk/src/java.base/share/classes/sun/misc/Unsafe.java index 1d3454e281e..6d7078a9751 100644 --- a/jdk/src/java.base/share/classes/sun/misc/Unsafe.java +++ b/jdk/src/java.base/share/classes/sun/misc/Unsafe.java @@ -641,9 +641,9 @@ public final class Unsafe { *
  • String: any object (not just a java.lang.String) *
  • InterfaceMethodRef: (NYI) a method handle to invoke on that call site's arguments * - * @params hostClass context for linkage, access control, protection domain, and class loader - * @params data bytes of a class file - * @params cpPatches where non-null entries exist, they replace corresponding CP entries in data + * @param hostClass context for linkage, access control, protection domain, and class loader + * @param data bytes of a class file + * @param cpPatches where non-null entries exist, they replace corresponding CP entries in data */ public native Class defineAnonymousClass(Class hostClass, byte[] data, Object[] cpPatches); @@ -808,9 +808,9 @@ public final class Unsafe { * The system imposes a maximum of 3 samples, representing * averages over the last 1, 5, and 15 minutes, respectively. * - * @params loadavg an array of double of size nelems - * @params nelems the number of samples to be retrieved and - * must be 1 to 3. + * @param loadavg an array of double of size nelems + * @param nelems the number of samples to be retrieved and + * must be 1 to 3. * * @return the number of samples actually retrieved; or -1 * if the load average is unobtainable. @@ -1108,7 +1108,6 @@ public final class Unsafe { *

    * 8-byte atomicity is only guaranteed on platforms on which * support atomic accesses to longs. - *

    * * @param o Java heap object in which the value resides, if any, else * null diff --git a/jdk/src/java.base/share/classes/sun/misc/VM.java b/jdk/src/java.base/share/classes/sun/misc/VM.java index 36bfb606495..8cb765758b4 100644 --- a/jdk/src/java.base/share/classes/sun/misc/VM.java +++ b/jdk/src/java.base/share/classes/sun/misc/VM.java @@ -315,7 +315,7 @@ public class VM { } /* - * Add n to the objects pending for finalization count. + * Add {@code n} to the objects pending for finalization count. * * @param n an integer value to be added to the objects pending * for finalization count diff --git a/jdk/src/java.base/share/classes/sun/misc/resources/Messages.java b/jdk/src/java.base/share/classes/sun/misc/resources/Messages.java index 56f76bb2876..4cf913210a7 100644 --- a/jdk/src/java.base/share/classes/sun/misc/resources/Messages.java +++ b/jdk/src/java.base/share/classes/sun/misc/resources/Messages.java @@ -26,7 +26,7 @@ package sun.misc.resources; /** - *

    This class represents the ResourceBundle + * This class represents the {@code ResourceBundle} * for sun.misc. * * @author Michael Colburn @@ -35,9 +35,9 @@ package sun.misc.resources; public class Messages extends java.util.ListResourceBundle { /** - * Returns the contents of this ResourceBundle. - *

    - * @return the contents of this ResourceBundle. + * Returns the contents of this {@code ResourceBundle}. + * + * @return the contents of this {@code ResourceBundle}. */ public Object[][] getContents() { return contents; diff --git a/jdk/src/java.base/share/classes/sun/misc/resources/Messages_de.java b/jdk/src/java.base/share/classes/sun/misc/resources/Messages_de.java index e2961c52e84..d22b1e592ec 100644 --- a/jdk/src/java.base/share/classes/sun/misc/resources/Messages_de.java +++ b/jdk/src/java.base/share/classes/sun/misc/resources/Messages_de.java @@ -26,7 +26,7 @@ package sun.misc.resources; /** - *

    This class represents the ResourceBundle + * This class represents the {@code ResourceBundle} * for sun.misc. * * @author Michael Colburn @@ -35,9 +35,9 @@ package sun.misc.resources; public class Messages_de extends java.util.ListResourceBundle { /** - * Returns the contents of this ResourceBundle. - *

    - * @return the contents of this ResourceBundle. + * Returns the contents of this {@code ResourceBundle}. + * + * @return the contents of this {@code ResourceBundle}. */ public Object[][] getContents() { return contents; diff --git a/jdk/src/java.base/share/classes/sun/misc/resources/Messages_es.java b/jdk/src/java.base/share/classes/sun/misc/resources/Messages_es.java index 9e762017a45..1d4bc2de250 100644 --- a/jdk/src/java.base/share/classes/sun/misc/resources/Messages_es.java +++ b/jdk/src/java.base/share/classes/sun/misc/resources/Messages_es.java @@ -26,7 +26,7 @@ package sun.misc.resources; /** - *

    This class represents the ResourceBundle + * This class represents the {@code ResourceBundle} * for sun.misc. * * @author Michael Colburn @@ -35,9 +35,9 @@ package sun.misc.resources; public class Messages_es extends java.util.ListResourceBundle { /** - * Returns the contents of this ResourceBundle. - *

    - * @return the contents of this ResourceBundle. + * Returns the contents of this {@code ResourceBundle}. + * + * @return the contents of this {@code ResourceBundle}. */ public Object[][] getContents() { return contents; diff --git a/jdk/src/java.base/share/classes/sun/misc/resources/Messages_fr.java b/jdk/src/java.base/share/classes/sun/misc/resources/Messages_fr.java index b742b26ef06..8f74b9b063e 100644 --- a/jdk/src/java.base/share/classes/sun/misc/resources/Messages_fr.java +++ b/jdk/src/java.base/share/classes/sun/misc/resources/Messages_fr.java @@ -26,7 +26,7 @@ package sun.misc.resources; /** - *

    This class represents the ResourceBundle + * This class represents the {@code ResourceBundle} * for sun.misc. * * @author Michael Colburn @@ -35,9 +35,9 @@ package sun.misc.resources; public class Messages_fr extends java.util.ListResourceBundle { /** - * Returns the contents of this ResourceBundle. - *

    - * @return the contents of this ResourceBundle. + * Returns the contents of this {@code ResourceBundle}. + * + * @return the contents of this {@code ResourceBundle}. */ public Object[][] getContents() { return contents; diff --git a/jdk/src/java.base/share/classes/sun/misc/resources/Messages_it.java b/jdk/src/java.base/share/classes/sun/misc/resources/Messages_it.java index ee7dd0a33c8..2b23c638b31 100644 --- a/jdk/src/java.base/share/classes/sun/misc/resources/Messages_it.java +++ b/jdk/src/java.base/share/classes/sun/misc/resources/Messages_it.java @@ -26,7 +26,7 @@ package sun.misc.resources; /** - *

    This class represents the ResourceBundle + * This class represents the {@code ResourceBundle} * for sun.misc. * * @author Michael Colburn @@ -35,9 +35,9 @@ package sun.misc.resources; public class Messages_it extends java.util.ListResourceBundle { /** - * Returns the contents of this ResourceBundle. - *

    - * @return the contents of this ResourceBundle. + * Returns the contents of this {@code ResourceBundle}. + * + * @return the contents of this {@code ResourceBundle}. */ public Object[][] getContents() { return contents; diff --git a/jdk/src/java.base/share/classes/sun/misc/resources/Messages_ja.java b/jdk/src/java.base/share/classes/sun/misc/resources/Messages_ja.java index 4f1455187b4..c5242bf108c 100644 --- a/jdk/src/java.base/share/classes/sun/misc/resources/Messages_ja.java +++ b/jdk/src/java.base/share/classes/sun/misc/resources/Messages_ja.java @@ -26,7 +26,7 @@ package sun.misc.resources; /** - *

    This class represents the ResourceBundle + * This class represents the {@code ResourceBundle} * for sun.misc. * * @author Michael Colburn @@ -35,9 +35,9 @@ package sun.misc.resources; public class Messages_ja extends java.util.ListResourceBundle { /** - * Returns the contents of this ResourceBundle. - *

    - * @return the contents of this ResourceBundle. + * Returns the contents of this {@code ResourceBundle}. + * + * @return the contents of this {@code ResourceBundle}. */ public Object[][] getContents() { return contents; diff --git a/jdk/src/java.base/share/classes/sun/misc/resources/Messages_ko.java b/jdk/src/java.base/share/classes/sun/misc/resources/Messages_ko.java index 53c32fc3f03..63119101d46 100644 --- a/jdk/src/java.base/share/classes/sun/misc/resources/Messages_ko.java +++ b/jdk/src/java.base/share/classes/sun/misc/resources/Messages_ko.java @@ -26,7 +26,7 @@ package sun.misc.resources; /** - *

    This class represents the ResourceBundle + * This class represents the {@code ResourceBundle} * for sun.misc. * * @author Michael Colburn @@ -35,9 +35,9 @@ package sun.misc.resources; public class Messages_ko extends java.util.ListResourceBundle { /** - * Returns the contents of this ResourceBundle. - *

    - * @return the contents of this ResourceBundle. + * Returns the contents of this {@code ResourceBundle}. + * + * @return the contents of this {@code ResourceBundle}. */ public Object[][] getContents() { return contents; diff --git a/jdk/src/java.base/share/classes/sun/misc/resources/Messages_pt_BR.java b/jdk/src/java.base/share/classes/sun/misc/resources/Messages_pt_BR.java index 4781700e06f..ec756d2c4b0 100644 --- a/jdk/src/java.base/share/classes/sun/misc/resources/Messages_pt_BR.java +++ b/jdk/src/java.base/share/classes/sun/misc/resources/Messages_pt_BR.java @@ -26,7 +26,7 @@ package sun.misc.resources; /** - *

    This class represents the ResourceBundle + * This class represents the {@code ResourceBundle} * for sun.misc. * * @author Michael Colburn @@ -35,9 +35,9 @@ package sun.misc.resources; public class Messages_pt_BR extends java.util.ListResourceBundle { /** - * Returns the contents of this ResourceBundle. - *

    - * @return the contents of this ResourceBundle. + * Returns the contents of this {@code ResourceBundle}. + * + * @return the contents of this {@code ResourceBundle}. */ public Object[][] getContents() { return contents; diff --git a/jdk/src/java.base/share/classes/sun/misc/resources/Messages_sv.java b/jdk/src/java.base/share/classes/sun/misc/resources/Messages_sv.java index a813852caa8..3c7402854ab 100644 --- a/jdk/src/java.base/share/classes/sun/misc/resources/Messages_sv.java +++ b/jdk/src/java.base/share/classes/sun/misc/resources/Messages_sv.java @@ -26,7 +26,7 @@ package sun.misc.resources; /** - *

    This class represents the ResourceBundle + * This class represents the {@code ResourceBundle} * for sun.misc. * * @author Michael Colburn @@ -35,9 +35,9 @@ package sun.misc.resources; public class Messages_sv extends java.util.ListResourceBundle { /** - * Returns the contents of this ResourceBundle. - *

    - * @return the contents of this ResourceBundle. + * Returns the contents of this {@code ResourceBundle}. + * + * @return the contents of this {@code ResourceBundle}. */ public Object[][] getContents() { return contents; diff --git a/jdk/src/java.base/share/classes/sun/misc/resources/Messages_zh_CN.java b/jdk/src/java.base/share/classes/sun/misc/resources/Messages_zh_CN.java index d884f74a114..efd2ff0ba8d 100644 --- a/jdk/src/java.base/share/classes/sun/misc/resources/Messages_zh_CN.java +++ b/jdk/src/java.base/share/classes/sun/misc/resources/Messages_zh_CN.java @@ -26,7 +26,7 @@ package sun.misc.resources; /** - *

    This class represents the ResourceBundle + * This class represents the {@code ResourceBundle} * for sun.misc. * * @author Michael Colburn @@ -35,9 +35,9 @@ package sun.misc.resources; public class Messages_zh_CN extends java.util.ListResourceBundle { /** - * Returns the contents of this ResourceBundle. - *

    - * @return the contents of this ResourceBundle. + * Returns the contents of this {@code ResourceBundle}. + * + * @return the contents of this {@code ResourceBundle}. */ public Object[][] getContents() { return contents; diff --git a/jdk/src/java.base/share/classes/sun/misc/resources/Messages_zh_TW.java b/jdk/src/java.base/share/classes/sun/misc/resources/Messages_zh_TW.java index 530a7cdef52..da6938f84a9 100644 --- a/jdk/src/java.base/share/classes/sun/misc/resources/Messages_zh_TW.java +++ b/jdk/src/java.base/share/classes/sun/misc/resources/Messages_zh_TW.java @@ -26,7 +26,7 @@ package sun.misc.resources; /** - *

    This class represents the ResourceBundle + * This class represents the {@code ResourceBundle} * for sun.misc. * * @author Michael Colburn @@ -35,9 +35,9 @@ package sun.misc.resources; public class Messages_zh_TW extends java.util.ListResourceBundle { /** - * Returns the contents of this ResourceBundle. - *

    - * @return the contents of this ResourceBundle. + * Returns the contents of this {@code ResourceBundle}. + * + * @return the contents of this {@code ResourceBundle}. */ public Object[][] getContents() { return contents; diff --git a/jdk/src/java.base/share/classes/sun/nio/cs/Surrogate.java b/jdk/src/java.base/share/classes/sun/nio/cs/Surrogate.java index 8b2fcf6765f..96e30275866 100644 --- a/jdk/src/java.base/share/classes/sun/nio/cs/Surrogate.java +++ b/jdk/src/java.base/share/classes/sun/nio/cs/Surrogate.java @@ -175,10 +175,10 @@ public class Surrogate { * @param in The source buffer, from which one more character * will be consumed if c is a high surrogate * - * @returns Either a parsed UCS-4 character, in which case the isPair() - * and increment() methods will return meaningful values, or - * -1, in which case error() will return a descriptive result - * object + * @return Either a parsed UCS-4 character, in which case the isPair() + * and increment() methods will return meaningful values, or + * -1, in which case error() will return a descriptive result + * object */ public int parse(char c, CharBuffer in) { if (Character.isHighSurrogate(c)) { @@ -216,10 +216,10 @@ public class Surrogate { * @param ip The input index * @param il The input limit * - * @returns Either a parsed UCS-4 character, in which case the isPair() - * and increment() methods will return meaningful values, or - * -1, in which case error() will return a descriptive result - * object + * @return Either a parsed UCS-4 character, in which case the isPair() + * and increment() methods will return meaningful values, or + * -1, in which case error() will return a descriptive result + * object */ public int parse(char c, char[] ia, int ip, int il) { assert (ia[ip] == c); @@ -280,9 +280,9 @@ public class Surrogate { * @param dst The destination buffer, to which one or two UTF-16 * characters will be written * - * @returns Either a positive count of the number of UTF-16 characters - * written to the destination buffer, or -1, in which case - * error() will return a descriptive result object + * @return Either a positive count of the number of UTF-16 characters + * written to the destination buffer, or -1, in which case + * error() will return a descriptive result object */ public int generate(int uc, int len, CharBuffer dst) { if (Character.isBmpCodePoint(uc)) { @@ -325,9 +325,9 @@ public class Surrogate { * @param dp The destination position * @param dl The destination limit * - * @returns Either a positive count of the number of UTF-16 characters - * written to the destination buffer, or -1, in which case - * error() will return a descriptive result object + * @return Either a positive count of the number of UTF-16 characters + * written to the destination buffer, or -1, in which case + * error() will return a descriptive result object */ public int generate(int uc, int len, char[] da, int dp, int dl) { if (Character.isBmpCodePoint(uc)) { diff --git a/jdk/src/java.base/share/classes/sun/text/CompactByteArray.java b/jdk/src/java.base/share/classes/sun/text/CompactByteArray.java index 412bc0df36d..d9fa1da513f 100644 --- a/jdk/src/java.base/share/classes/sun/text/CompactByteArray.java +++ b/jdk/src/java.base/share/classes/sun/text/CompactByteArray.java @@ -49,7 +49,7 @@ package sun.text; * Han ideographs have the same value. However, lookup is much faster than a * hash table. * A compact array of any primitive data type serves two purposes: - *

      + *
        *
      • Fast access of the indexed values. *
      • Smaller memory footprint. *
      diff --git a/jdk/src/java.base/share/classes/sun/text/ComposedCharIter.java b/jdk/src/java.base/share/classes/sun/text/ComposedCharIter.java index 12560002455..53e0acb9cb1 100644 --- a/jdk/src/java.base/share/classes/sun/text/ComposedCharIter.java +++ b/jdk/src/java.base/share/classes/sun/text/ComposedCharIter.java @@ -50,7 +50,7 @@ public final class ComposedCharIter { } /** - * Construct a new ComposedCharIter. The iterator will return + * Construct a new {@code ComposedCharIter}. The iterator will return * all Unicode characters with canonical decompositions, excluding Korean * Hangul characters. */ @@ -58,10 +58,10 @@ public final class ComposedCharIter { /** * Returns the next precomposed Unicode character. - * Repeated calls to next return all of the precomposed characters defined + * Repeated calls to {@code next} return all of the precomposed characters defined * by Unicode, in ascending order. After all precomposed characters have - * been returned, {@link #hasNext} will return false and further calls - * to next will return {@link #DONE}. + * been returned, {@link #hasNext} will return {@code false} and further calls + * to {@code next} will return {@link #DONE}. */ public int next() { if (curChar == decompNum - 1) { diff --git a/jdk/src/java.base/share/classes/sun/text/Normalizer.java b/jdk/src/java.base/share/classes/sun/text/Normalizer.java index 3d393920559..82a6ebd9e40 100644 --- a/jdk/src/java.base/share/classes/sun/text/Normalizer.java +++ b/jdk/src/java.base/share/classes/sun/text/Normalizer.java @@ -32,7 +32,7 @@ import sun.text.normalizer.NormalizerImpl; * This Normalizer is for Unicode 3.2 support for IDNA only. * Developers should not use this class. * - * @ since 1.6 + * @since 1.6 */ public final class Normalizer { diff --git a/jdk/src/java.base/share/classes/sun/text/bidi/BidiBase.java b/jdk/src/java.base/share/classes/sun/text/bidi/BidiBase.java index bbf1b4b6a21..4691dbc853b 100644 --- a/jdk/src/java.base/share/classes/sun/text/bidi/BidiBase.java +++ b/jdk/src/java.base/share/classes/sun/text/bidi/BidiBase.java @@ -81,14 +81,13 @@ import sun.text.normalizer.UTF16; * *

      General remarks about the API:

      * - * The "limit" of a sequence of characters is the position just after + * The "limit" of a sequence of characters is the position just after * their last character, i.e., one more than that position. *

      * - * Some of the API methods provide access to "runs". Such a - * "run" is defined as a sequence of characters that are at the same + * Some of the API methods provide access to "runs". Such a + * "run" is defined as a sequence of characters that are at the same * embedding level after performing the Bidi algorithm. - *

      * *

      Basic concept: paragraph

      * A piece of text can be divided into several paragraphs by characters @@ -141,7 +140,8 @@ import sun.text.normalizer.UTF16; * these special values are designed that way. Also, the implementation * assumes that MAX_EXPLICIT_LEVEL is odd. * - *
        See Also: + *

        See Also: + *

          *
        • {@link #LEVEL_DEFAULT_LTR} *
        • {@link #LEVEL_DEFAULT_RTL} *
        • {@link #LEVEL_OVERRIDE} @@ -153,7 +153,8 @@ import sun.text.normalizer.UTF16; * Reordering mode values indicate which variant of the Bidi algorithm to * use. * - *
            See Also: + *

            See Also: + *

              *
            • {@link #setReorderingMode} *
            • {@link #REORDER_DEFAULT} *
            • {@link #REORDER_NUMBERS_SPECIAL} @@ -166,7 +167,8 @@ import sun.text.normalizer.UTF16; * *

              Basic concept: Reordering Options

              * Reordering options can be applied during Bidi text transformations. - *
                See Also: + *

                See Also: + *

                  *
                • {@link #setReorderingOptions} *
                • {@link #OPTION_DEFAULT} *
                • {@link #OPTION_INSERT_MARKS} @@ -202,7 +204,7 @@ import sun.text.normalizer.UTF16; * and therefore its implementation omitted from this sample code.
                  • *
                * - * 
                + * 
                {@code
  *
  *  package com.ibm.icu.dev.test.bidi;
  *
@@ -451,7 +453,7 @@ import sun.text.normalizer.UTF16;
  *      }
  *  }
  *
- * 
                
+ * }
                */ public class BidiBase { @@ -2419,9 +2421,9 @@ public class BidiBase { * (same index) character if the level has the * LEVEL_OVERRIDE bit set.

                * Except for that bit, it must be - * paraLevel<=embeddingLevels[]<=MAX_EXPLICIT_LEVEL, + * {@code paraLevel<=embeddingLevels[]<=MAX_EXPLICIT_LEVEL}, * with one exception: a level of zero may be specified for a - * paragraph separator even if paraLevel>0 when multiple + * paragraph separator even if {@code paraLevel > 0} when multiple * paragraphs are submitted in the same call to setPara().

                * Caution: A reference to this array, not a copy * of the levels, will be stored in the Bidi object; @@ -2680,7 +2682,7 @@ public class BidiBase { * For example, in pure LTR text with numbers the numbers would get * a resolved level of 2 higher than the surrounding text according to * the algorithm. This implementation may set all resolved levels to - * the same value in such a case.

                + * the same value in such a case. * * @param paragraph a paragraph of text with optional character and * paragraph attribute information @@ -2817,7 +2819,7 @@ public class BidiBase { } /** - * Get the index of a paragraph, given a position within the text.

                + * Get the index of a paragraph, given a position within the text. * * @param charIndex is the index of a character within the text, in the * range [0..getProcessedLength()-1]. diff --git a/jdk/src/java.base/share/classes/sun/text/bidi/BidiRun.java b/jdk/src/java.base/share/classes/sun/text/bidi/BidiRun.java index 07519db3934..c0323834c60 100644 --- a/jdk/src/java.base/share/classes/sun/text/bidi/BidiRun.java +++ b/jdk/src/java.base/share/classes/sun/text/bidi/BidiRun.java @@ -42,7 +42,7 @@ package sun.text.bidi; /** * A BidiRun represents a sequence of characters at the same embedding level. * The Bidi algorithm decomposes a piece of text into sequences of characters - * at the same embedding level, each such sequence is called a run. + * at the same embedding level, each such sequence is called a "run". * *

                A BidiRun represents such a run by storing its essential properties, * but does not duplicate the characters which form the run. diff --git a/jdk/src/java.base/share/classes/sun/text/normalizer/ICUBinary.java b/jdk/src/java.base/share/classes/sun/text/normalizer/ICUBinary.java index 20984d3b8fb..3e0c348a163 100644 --- a/jdk/src/java.base/share/classes/sun/text/normalizer/ICUBinary.java +++ b/jdk/src/java.base/share/classes/sun/text/normalizer/ICUBinary.java @@ -65,7 +65,7 @@ public final class ICUBinary /** *

                ICU data header reader method. * Takes a ICU generated big-endian input stream, parse the ICU standard - * file header and authenticates them.

                + * file header and authenticates them. *

                Header format: *

                  *
                • Header size (char) @@ -84,7 +84,7 @@ public final class ICUBinary * [0] major [1] minor [2] milli [3] micro *
                • Unicode version (4 bytes) this ICU is based on. *
                - *

                + * *

                * Example of use:
                * 

                @@ -98,7 +98,7 @@ public final class ICUBinary
     *    System.out.println("This is not a ICU data file");
     * }
     *
                - *

                + * * @param inputStream input stream that contains the ICU data header * @param dataFormatIDExpected Data format expected. An array of 4 bytes * information about the data format. diff --git a/jdk/src/java.base/share/classes/sun/text/normalizer/IntTrie.java b/jdk/src/java.base/share/classes/sun/text/normalizer/IntTrie.java index ddc2cc40e58..4be2d6e5862 100644 --- a/jdk/src/java.base/share/classes/sun/text/normalizer/IntTrie.java +++ b/jdk/src/java.base/share/classes/sun/text/normalizer/IntTrie.java @@ -58,7 +58,7 @@ public class IntTrie extends Trie * trie.

                * @param inputStream file input stream to a ICU data file, containing * the trie - * @param dataManipulate object which provides methods to parse the char + * @param datamanipulate object which provides methods to parse the char * data * @throws IOException thrown when data reading fails * @draft 2.1 diff --git a/jdk/src/java.base/share/classes/sun/text/normalizer/NormalizerBase.java b/jdk/src/java.base/share/classes/sun/text/normalizer/NormalizerBase.java index b49db438449..43c4e10167c 100644 --- a/jdk/src/java.base/share/classes/sun/text/normalizer/NormalizerBase.java +++ b/jdk/src/java.base/share/classes/sun/text/normalizer/NormalizerBase.java @@ -55,16 +55,16 @@ import java.text.Normalizer; * In Unicode, this can be encoded as a single character (the * "composed" form): * - *

                + * 

                  *      00C1    LATIN CAPITAL LETTER A WITH ACUTE
- * 
                
+ *
                * * or as two separate characters (the "decomposed" form): * - *

                + * 

                  *      0041    LATIN CAPITAL LETTER A
  *      0301    COMBINING ACUTE ACCENT
- * 
                
+ *
                * * To a user of your program, however, both of these sequences should be * treated as the same "user-level" character "A with acute accent". When you @@ -76,17 +76,17 @@ import java.text.Normalizer; * * Similarly, the string "ffi" can be encoded as three separate letters: * - *

                + * 

                  *      0066    LATIN SMALL LETTER F
  *      0066    LATIN SMALL LETTER F
  *      0069    LATIN SMALL LETTER I
- * 
                
+ *
                * * or as the single character * - *

                + * 

                  *      FB03    LATIN SMALL LIGATURE FFI
- * 
                
+ *
                * * The ffi ligature is not a distinct semantic character, and strictly speaking * it shouldn't be in Unicode at all, but it was included for compatibility @@ -555,12 +555,12 @@ public final class NormalizerBase implements Cloneable { //------------------------------------------------------------------------- /** - * Creates a new Normalizer object for iterating over the + * Creates a new {@code Normalizer} object for iterating over the * normalized form of a given string. *

                - * The options parameter specifies which optional - * Normalizer features are to be enabled for this object. - *

                + * The {@code options} parameter specifies which optional + * {@code Normalizer} features are to be enabled for this object. + * * @param str The string to be normalized. The normalization * will start at the beginning of the string. * @@ -579,9 +579,9 @@ public final class NormalizerBase implements Cloneable { } /** - * Creates a new Normalizer object for iterating over the + * Creates a new {@code Normalizer} object for iterating over the * normalized form of the given text. - *

                + * * @param iter The input text to be normalized. The normalization * will start at the beginning of the string. * @@ -592,9 +592,9 @@ public final class NormalizerBase implements Cloneable { } /** - * Creates a new Normalizer object for iterating over the + * Creates a new {@code Normalizer} object for iterating over the * normalized form of the given text. - *

                + * * @param iter The input text to be normalized. The normalization * will start at the beginning of the string. * @@ -615,13 +615,13 @@ public final class NormalizerBase implements Cloneable { } /** - * Clones this Normalizer object. All properties of this + * Clones this {@code Normalizer} object. All properties of this * object are duplicated in the new object, including the cloning of any * {@link CharacterIterator} that was passed in to the constructor * or to {@link #setText(CharacterIterator) setText}. * However, the text storage underlying - * the CharacterIterator is not duplicated unless the - * iterator's clone method does so. + * the {@code CharacterIterator} is not duplicated unless the + * iterator's {@code clone} method does so. * @stable ICU 2.8 */ public Object clone() { @@ -791,7 +791,7 @@ public final class NormalizerBase implements Cloneable { //------------------------------------------------------------------------- /** - * Return the current character in the normalized text-> + * Return the current character in the normalized text. * @return The codepoint as an int * @stable ICU 2.8 */ @@ -872,10 +872,10 @@ public final class NormalizerBase implements Cloneable { * while {@link #next} and {@link #previous} iterate through characters * in the normalized output. This means that there is not * necessarily a one-to-one correspondence between characters returned - * by next and previous and the indices passed to and - * returned from setIndex and {@link #getIndex}. - *

                - * @param index the desired index in the input text-> + * by {@code next} and {@code previous} and the indices passed to and + * returned from {@code setIndex} and {@link #getIndex}. + * + * @param index the desired index in the input text. * * @return the first normalized character that is the result of iterating * forward starting at the given index. @@ -894,8 +894,8 @@ public final class NormalizerBase implements Cloneable { /** * Retrieve the index of the start of the input text. This is the begin - * index of the CharacterIterator or the start (i.e. 0) of the - * String over which this Normalizer is iterating + * index of the {@code CharacterIterator} or the start (i.e. 0) of the + * {@code String} over which this {@code Normalizer} is iterating * @deprecated ICU 2.2. Use startIndex() instead. * @return The codepoint as an int * @see #startIndex @@ -907,8 +907,8 @@ public final class NormalizerBase implements Cloneable { /** * Retrieve the index of the end of the input text. This is the end index - * of the CharacterIterator or the length of the String - * over which this Normalizer is iterating + * of the {@code CharacterIterator} or the length of the {@code String} + * over which this {@code Normalizer} is iterating * @deprecated ICU 2.2. Use endIndex() instead. * @return The codepoint as an int * @see #endIndex @@ -927,9 +927,9 @@ public final class NormalizerBase implements Cloneable { * Note: This method sets the position in the input, while * {@link #next} and {@link #previous} iterate through characters in the * output. This means that there is not necessarily a one-to-one - * correspondence between characters returned by next and - * previous and the indices passed to and returned from - * setIndex and {@link #getIndex}. + * correspondence between characters returned by {@code next} and + * {@code previous} and the indices passed to and returned from + * {@code setIndex} and {@link #getIndex}. * @return The current iteration position * @stable ICU 2.8 */ @@ -942,9 +942,9 @@ public final class NormalizerBase implements Cloneable { } /** - * Retrieve the index of the end of the input text-> This is the end index - * of the CharacterIterator or the length of the String - * over which this Normalizer is iterating + * Retrieve the index of the end of the input text. This is the end index + * of the {@code CharacterIterator} or the length of the {@code String} + * over which this {@code Normalizer} is iterating * @return The current iteration position * @stable ICU 2.8 */ @@ -963,9 +963,9 @@ public final class NormalizerBase implements Cloneable { * return previously buffers characters in the old normalization mode * until the iteration is able to re-sync at the next base character. * It is safest to call {@link #setText setText()}, {@link #first}, - * {@link #last}, etc. after calling setMode. - *

                - * @param newMode the new mode for this Normalizer. + * {@link #last}, etc. after calling {@code setMode}. + * + * @param newMode the new mode for this {@code Normalizer}. * The supported modes are: *

                  *
                • {@link #COMPOSE} - Unicode canonical decompositiion @@ -985,7 +985,7 @@ public final class NormalizerBase implements Cloneable { mode = newMode; } /** - * Return the basic operation performed by this Normalizer + * Return the basic operation performed by this {@code Normalizer} * * @see #setMode * @stable ICU 2.8 @@ -995,8 +995,8 @@ public final class NormalizerBase implements Cloneable { } /** - * Set the input text over which this Normalizer will iterate. - * The iteration position is set to the beginning of the input text-> + * Set the input text over which this {@code Normalizer} will iterate. + * The iteration position is set to the beginning of the input text. * @param newText The new string to be normalized. * @stable ICU 2.8 */ @@ -1011,8 +1011,8 @@ public final class NormalizerBase implements Cloneable { } /** - * Set the input text over which this Normalizer will iterate. - * The iteration position is set to the beginning of the input text-> + * Set the input text over which this {@code Normalizer} will iterate. + * The iteration position is set to the beginning of the input text. * @param newText The new string to be normalized. * @stable ICU 2.8 */ @@ -1571,7 +1571,7 @@ public final class NormalizerBase implements Cloneable { // /** - * Creates a new Normalizer object for iterating over the + * Creates a new {@code Normalizer} object for iterating over the * normalized form of a given string. * * @param str The string to be normalized. The normalization @@ -1646,7 +1646,6 @@ public final class NormalizerBase implements Cloneable { * perform further tests to arrive at a true/false result. * @param str the input string to be checked to see if it is normalized * @param form the normalization form - * @param options the optional features to be enabled. */ public static boolean isNormalized(String str, Normalizer.Form form) { return isNormalized(str, form, UNICODE_LATEST); diff --git a/jdk/src/java.base/share/classes/sun/text/normalizer/RangeValueIterator.java b/jdk/src/java.base/share/classes/sun/text/normalizer/RangeValueIterator.java index 71604fde007..771703859fe 100644 --- a/jdk/src/java.base/share/classes/sun/text/normalizer/RangeValueIterator.java +++ b/jdk/src/java.base/share/classes/sun/text/normalizer/RangeValueIterator.java @@ -38,12 +38,13 @@ package sun.text.normalizer; /** - *

                  Interface for enabling iteration over sets of , + *

                  Interface for enabling iteration over sets of + * {@code }, * where index is the sorted integer index in ascending order and value, its - * associated integer value.

                  + * associated integer value. *

                  The result for each iteration is the consecutive range of - * with the same value. Result is represented by - * where

                  + * {@code } with the same value. Result is represented by + * {@code } where *
                    *
                  • start is the starting integer of the result range *
                  • limit is 1 after the maximum integer that follows start, such that @@ -56,10 +57,10 @@ package sun.text.normalizer; * Hence value(start) = value(start + 1) = .... = value(start + n) = .... = * value(limit - 1). However value(start -1) != value(start) and * value(limit) != value(start). - *

                    + * *

                    Most implementations will be created by factory methods, such as the * character type iterator in UCharacter.getTypeIterator. See example below. - *

                    + * * Example of use:
                    * 
                      * RangeValueIterator iterator = UCharacter.getTypeIterator();
diff --git a/jdk/src/java.base/share/classes/sun/text/normalizer/Replaceable.java b/jdk/src/java.base/share/classes/sun/text/normalizer/Replaceable.java
index 5cf2bba578a..e05593540b8 100644
--- a/jdk/src/java.base/share/classes/sun/text/normalizer/Replaceable.java
+++ b/jdk/src/java.base/share/classes/sun/text/normalizer/Replaceable.java
@@ -71,10 +71,9 @@ package sun.text.normalizer;
  *   
                  • If there is no previous character (i.e. start == 0), use the
  *   following character
                    • 
  *   
                  • If there is no following character (i.e. the replaceable was
- *   empty), use default metadata
                    
+ *   empty), use default metadata
                    • 
  *   
                  • If the code point U+FFFF is seen, it should be interpreted as
- *   a special marker having no metadata
                  • 
- *   
                    • 
+ *   a special marker having no metadata
                    • *
                  * If this is not the behavior, the subclass should document any differences. * @@ -111,10 +110,10 @@ public interface Replaceable { * starting at index dstStart and ending at index * dstStart + (srcLimit-srcStart) - 1. * - * @param srcStart the beginning index to copy, inclusive; 0 - * <= start <= limit. + * @param srcStart the beginning index to copy, inclusive; + * {@code 0 <= start <= limit}. * @param srcLimit the ending index to copy, exclusive; - * start <= limit <= length(). + * {@code start <= limit <= length()}. * @param dst the destination array. * @param dstStart the start offset in the destination array. * @stable ICU 2.0 diff --git a/jdk/src/java.base/share/classes/sun/text/normalizer/ReplaceableString.java b/jdk/src/java.base/share/classes/sun/text/normalizer/ReplaceableString.java index 0610d6964e3..eb2c4399cd2 100644 --- a/jdk/src/java.base/share/classes/sun/text/normalizer/ReplaceableString.java +++ b/jdk/src/java.base/share/classes/sun/text/normalizer/ReplaceableString.java @@ -109,10 +109,10 @@ public class ReplaceableString implements Replaceable { * starting at index dstStart and ending at index * dstStart + (srcLimit-srcStart) - 1. * - * @param srcStart the beginning index to copy, inclusive; 0 - * <= start <= limit. + * @param srcStart the beginning index to copy, inclusive; + * {@code 0 <= start <= limit}. * @param srcLimit the ending index to copy, exclusive; - * start <= limit <= length(). + * {@code start <= limit <= length()}. * @param dst the destination array. * @param dstStart the start offset in the destination array. * @stable ICU 2.0 diff --git a/jdk/src/java.base/share/classes/sun/text/normalizer/ReplaceableUCharacterIterator.java b/jdk/src/java.base/share/classes/sun/text/normalizer/ReplaceableUCharacterIterator.java index 9eabcba4697..8227ca78124 100644 --- a/jdk/src/java.base/share/classes/sun/text/normalizer/ReplaceableUCharacterIterator.java +++ b/jdk/src/java.base/share/classes/sun/text/normalizer/ReplaceableUCharacterIterator.java @@ -150,14 +150,12 @@ public class ReplaceableUCharacterIterator extends UCharacterIterator { } /** - *

                  Sets the currentIndex to the specified currentIndex in the text and returns that + * Sets the currentIndex to the specified currentIndex in the text and returns that * single UTF16 character at currentIndex. - * This assumes the text is stored as 16-bit code units.

                  + * This assumes the text is stored as 16-bit code units. * @param currentIndex the currentIndex within the text. * @exception IllegalArgumentException is thrown if an invalid currentIndex is * supplied. i.e. currentIndex is out of bounds. - * @return the character at the specified currentIndex or DONE if the specified - * currentIndex is equal to the end of the text. */ public void setIndex(int currentIndex) { if (currentIndex < 0 || currentIndex > replaceable.length()) { diff --git a/jdk/src/java.base/share/classes/sun/text/normalizer/RuleCharacterIterator.java b/jdk/src/java.base/share/classes/sun/text/normalizer/RuleCharacterIterator.java index 029ceecb5e5..a287400ed4f 100644 --- a/jdk/src/java.base/share/classes/sun/text/normalizer/RuleCharacterIterator.java +++ b/jdk/src/java.base/share/classes/sun/text/normalizer/RuleCharacterIterator.java @@ -101,22 +101,25 @@ public class RuleCharacterIterator { public static final int DONE = -1; /** - * Bitmask option to enable parsing of variable names. If (options & - * PARSE_VARIABLES) != 0, then an embedded variable will be expanded to + * Bitmask option to enable parsing of variable names. + * If {@code (options & PARSE_VARIABLES) != 0}, + * then an embedded variable will be expanded to * its value. Variables are parsed using the SymbolTable API. */ public static final int PARSE_VARIABLES = 1; /** - * Bitmask option to enable parsing of escape sequences. If (options & - * PARSE_ESCAPES) != 0, then an embedded escape sequence will be expanded + * Bitmask option to enable parsing of escape sequences. + * If {@code (options & PARSE_ESCAPES) != 0}, + * then an embedded escape sequence will be expanded * to its value. Escapes are parsed using Utility.unescapeAt(). */ public static final int PARSE_ESCAPES = 2; /** - * Bitmask option to enable skipping of whitespace. If (options & - * SKIP_WHITESPACE) != 0, then whitespace characters will be silently + * Bitmask option to enable skipping of whitespace. + * If {@code (options & SKIP_WHITESPACE) != 0}, + * then whitespace characters will be silently * skipped, as if they were not present in the input. Whitespace * characters are defined by UCharacterProperty.isRuleWhiteSpace(). */ diff --git a/jdk/src/java.base/share/classes/sun/text/normalizer/SymbolTable.java b/jdk/src/java.base/share/classes/sun/text/normalizer/SymbolTable.java index f49110e6fa9..305cec72867 100644 --- a/jdk/src/java.base/share/classes/sun/text/normalizer/SymbolTable.java +++ b/jdk/src/java.base/share/classes/sun/text/normalizer/SymbolTable.java @@ -78,7 +78,7 @@ public interface SymbolTable { /** * Lookup the characters associated with this string and return it. - * Return null if no such name exists. The resultant + * Return {@code null} if no such name exists. The resultant * array may have length zero. * @param s the symbolic name to lookup * @return a char array containing the name's value, or null if @@ -91,7 +91,7 @@ public interface SymbolTable { /** * Lookup the UnicodeMatcher associated with the given character, and - * return it. Return null if not found. + * return it. Return {@code null} if not found. * @param ch a 32-bit code point from 0 to 0x10FFFF inclusive. * @return the UnicodeMatcher object represented by the given * character, or null if there is no mapping for ch. diff --git a/jdk/src/java.base/share/classes/sun/text/normalizer/Trie.java b/jdk/src/java.base/share/classes/sun/text/normalizer/Trie.java index 0430bf5e955..f90b2990bd7 100644 --- a/jdk/src/java.base/share/classes/sun/text/normalizer/Trie.java +++ b/jdk/src/java.base/share/classes/sun/text/normalizer/Trie.java @@ -160,8 +160,10 @@ public abstract class Trie /** * Lead surrogate code points' index displacement in the index array. + * 
                  {@code
     * 0x10000-0xd800=0x2800
     * 0x2800 >> INDEX_STAGE_1_SHIFT_
+    * }
                  */ protected static final int LEAD_INDEX_OFFSET_ = 0x2800 >> 5; /** @@ -191,7 +193,7 @@ public abstract class Trie /** * Number of index (stage 1) entries per lead surrogate. * Same as number of index entries for 1024 trail surrogates, - * ==0x400>>INDEX_STAGE_1_SHIFT_ + * {@code ==0x400>>INDEX_STAGE_1_SHIFT_} */ protected static final int SURROGATE_BLOCK_COUNT=(1<Class enabling iteration of the values in a Trie.

                  + * Class enabling iteration of the values in a Trie. *

                  Result of each iteration contains the interval of codepoints that have - * the same value type and the value type itself.

                  + * the same value type and the value type itself. *

                  The comparison of each codepoint value is done via extract(), which the - * default implementation is to return the value as it is.

                  + * default implementation is to return the value as it is. *

                  Method extract() can be overwritten to perform manipulations on - * codepoint values in order to perform specialized comparison.

                  + * codepoint values in order to perform specialized comparison. *

                  TrieIterator is designed to be a generic iterator for the CharTrie * and the IntTrie, hence to accommodate both types of data, the return - * result will be in terms of int (32 bit) values.

                  - *

                  See com.ibm.icu.text.UCharacterTypeIterator for examples of use.

                  + * result will be in terms of int (32 bit) values. + *

                  See com.ibm.icu.text.UCharacterTypeIterator for examples of use. *

                  Notes for porting utrie_enum from icu4c to icu4j:
                  * Internally, icu4c's utrie_enum performs all iterations in its body. In Java * sense, the caller will have to pass a object with a callback function @@ -63,18 +63,17 @@ package sun.text.normalizer; * the method extract(int) (equivalent to UTrieEnumValue). Independent of icu4j, * the caller will have to code his own iteration and flesh out the task * (equivalent to UTrieEnumRange) to be performed in the iteration loop. - *

                  - *

                  There are basically 3 usage scenarios for porting:

                  + * + *

                  There are basically 3 usage scenarios for porting: *

                  1) UTrieEnumValue is the only implemented callback then just implement a * subclass of TrieIterator and override the extract(int) method. The * extract(int) method is analogus to UTrieEnumValue callback. - *

                  + * *

                  2) UTrieEnumValue and UTrieEnumRange both are implemented then implement - * a subclass of TrieIterator, override the extract method and iterate, e.g - *

                  - *

                  utrie_enum(&normTrie, _enumPropertyStartsValue, _enumPropertyStartsRange, - * set);
                  - * In Java :
                  + * a subclass of TrieIterator, override the extract method and iterate, e.g.
                  + * {@code utrie_enum(&normTrie, _enumPropertyStartsValue, _enumPropertyStartsRange, + * set);}
                  + * In Java:
                  * 

                    * class TrieIteratorImpl extends TrieIterator{
  *     public TrieIteratorImpl(Trie data){
@@ -90,17 +89,17 @@ package sun.text.normalizer;
  *     // port the implementation of _enumPropertyStartsRange
  * }
  *
                  - *

                  + * *

                  3) UTrieEnumRange is the only implemented callback then just implement * the while loop, when utrie_enum is called - * 

                  + * 
                  {@code
  * // utrie_enum(&fcdTrie, NULL, _enumPropertyStartsRange, set);
  * TrieIterator fcdIter  = new TrieIterator(fcdTrieImpl.fcdTrie);
  * while(fcdIter.next(result)){
  *     set.add(result.start);
  * }
- * 
                  
- * 
                  
+ * }
                  + * * @author synwee * @see com.ibm.icu.impl.Trie * @see com.ibm.icu.lang.UCharacterTypeIterator diff --git a/jdk/src/java.base/share/classes/sun/text/normalizer/UCharacter.java b/jdk/src/java.base/share/classes/sun/text/normalizer/UCharacter.java index 2992eed9146..5382d16012d 100644 --- a/jdk/src/java.base/share/classes/sun/text/normalizer/UCharacter.java +++ b/jdk/src/java.base/share/classes/sun/text/normalizer/UCharacter.java @@ -128,7 +128,7 @@ import java.util.MissingResourceException; * Annex C: Compatibility Properties of UTS #18 Unicode Regular Expressions * (http://www.unicode.org/reports/tr18/#Compatibility_Properties). *

                  - *

                  + * 

                  {@code
  * API access for C/POSIX character classes is as follows:
  * - alpha:     isUAlphabetic(c) or hasBinaryProperty(c, UProperty.ALPHABETIC)
  * - lower:     isULowercase(c) or hasBinaryProperty(c, UProperty.LOWERCASE)
@@ -142,7 +142,7 @@ import java.util.MissingResourceException;
  * - cntrl:     getType(c)==CONTROL
  * - graph:     hasBinaryProperty(c, UProperty.POSIX_GRAPH)
  * - print:     hasBinaryProperty(c, UProperty.POSIX_PRINT)
- * 
                  
+ * }
                  *

                  * The C/POSIX character classes are also available in UnicodeSet patterns, * using patterns like [:graph:] or \p{graph}. diff --git a/jdk/src/java.base/share/classes/sun/text/normalizer/UCharacterIterator.java b/jdk/src/java.base/share/classes/sun/text/normalizer/UCharacterIterator.java index e5059d7b8ee..f8c41831aeb 100644 --- a/jdk/src/java.base/share/classes/sun/text/normalizer/UCharacterIterator.java +++ b/jdk/src/java.base/share/classes/sun/text/normalizer/UCharacterIterator.java @@ -200,8 +200,7 @@ public abstract class UCharacterIterator * iterator obtained by calling getLength(). * Usage: * - * - * 

                  +     * 
                  {@code
      *         UChacterIterator iter = new UCharacterIterator.getInstance(text);
      *         char[] buf = new char[iter.getLength()];
      *         iter.getText(buf);
@@ -217,15 +216,14 @@ public abstract class UCharacterIterator
      *                 buf = new char[iter.getLength()];
      *             }
      *         }
-     * 
                  
-     *                   
+     * }
                  * * @param fillIn an array of chars to fill with the underlying UTF-16 code * units. * @param offset the position within the array to start putting the data. * @return the number of code units added to fillIn, as a convenience * @exception IndexOutOfBounds exception if there is not enough - * room after offset in the array, or if offset < 0. + * room after offset in the array, or if offset {@literal <} 0. * @stable ICU 2.4 */ public abstract int getText(char[] fillIn, int offset); diff --git a/jdk/src/java.base/share/classes/sun/text/normalizer/UTF16.java b/jdk/src/java.base/share/classes/sun/text/normalizer/UTF16.java index 0342a55648c..f705364b1c8 100644 --- a/jdk/src/java.base/share/classes/sun/text/normalizer/UTF16.java +++ b/jdk/src/java.base/share/classes/sun/text/normalizer/UTF16.java @@ -38,26 +38,26 @@ package sun.text.normalizer; /** *

                  Standalone utility class providing UTF16 character conversions and - * indexing conversions.

                  + * indexing conversions. *

                  Code that uses strings alone rarely need modification. * By design, UTF-16 does not allow overlap, so searching for strings is a safe * operation. Similarly, concatenation is always safe. Substringing is safe if * the start and end are both on UTF-32 boundaries. In normal code, the values * for start and end are on those boundaries, since they arose from operations * like searching. If not, the nearest UTF-32 boundaries can be determined - * using bounds().

                  + * using bounds(). * Examples: *

                  The following examples illustrate use of some of these methods. - * 

                  + * 
                  {@code
  * // iteration forwards: Original
- * for (int i = 0; i < s.length(); ++i) {
+ * for (int i = 0; i < s.length(); ++i) {
  *     char ch = s.charAt(i);
  *     doSomethingWith(ch);
  * }
  *
  * // iteration forwards: Changes for UTF-32
  * int ch;
- * for (int i = 0; i < s.length(); i+=UTF16.getCharCount(ch)) {
+ * for (int i = 0; i < s.length(); i+=UTF16.getCharCount(ch)) {
  *     ch = UTF16.charAt(s,i);
  *     doSomethingWith(ch);
  * }
@@ -74,7 +74,7 @@ package sun.text.normalizer;
  *     ch = UTF16.charAt(s,i);
  *     doSomethingWith(ch);
  * }
- * 
                  
+ * }
                  * Notes: *
                    *
                  • @@ -515,12 +515,12 @@ public final class UTF16 /** *

                    Converts argument code point and returns a String object representing - * the code point's value in UTF16 format.

                    + * the code point's value in UTF16 format. *

                    This method does not check for the validity of the codepoint, the * results are not guaranteed if a invalid codepoint is passed as - * argument.

                    + * argument. *

                    The result is a string whose length is 1 for non-supplementary code - * points, 2 otherwise.

                    + * points, 2 otherwise. * @param ch code point * @return string representation of the code point */ diff --git a/jdk/src/java.base/share/classes/sun/text/normalizer/UnicodeMatcher.java b/jdk/src/java.base/share/classes/sun/text/normalizer/UnicodeMatcher.java index d1815c21ca7..52808c9860f 100644 --- a/jdk/src/java.base/share/classes/sun/text/normalizer/UnicodeMatcher.java +++ b/jdk/src/java.base/share/classes/sun/text/normalizer/UnicodeMatcher.java @@ -45,7 +45,8 @@ package sun.text.normalizer; public interface UnicodeMatcher { /** - * The character at index i, where i < contextStart || i >= contextLimit, + * The character at index {@code i}, where + * {@code i < contextStart || i >= contextLimit}, * is ETHER. This allows explicit matching by rules and UnicodeSets * of text outside the context. In traditional terms, this allows anchoring * at the start and/or end. diff --git a/jdk/src/java.base/share/classes/sun/text/normalizer/UnicodeSet.java b/jdk/src/java.base/share/classes/sun/text/normalizer/UnicodeSet.java index a1784652be8..f3ee71aa969 100644 --- a/jdk/src/java.base/share/classes/sun/text/normalizer/UnicodeSet.java +++ b/jdk/src/java.base/share/classes/sun/text/normalizer/UnicodeSet.java @@ -107,8 +107,8 @@ import java.util.TreeSet; * * * [a{ab}{ac}] - * The character 'a' and the multicharacter strings "ab" and - * "ac" + * The character 'a' and the multicharacter strings "ab" and + * "ac" * * * [\p{Lu}] @@ -148,10 +148,10 @@ import java.util.TreeSet; * literal. Thus "[a\\-b]", "[-ab]", and "[ab-]" all indicate the same * set of three characters, 'a', 'b', and '-'. * - *

                    Sets may be intersected using the '&' operator or the asymmetric + *

                    Sets may be intersected using the {@literal '&'} operator or the asymmetric * set difference may be taken using the '-' operator, for example, - * "[[:L:]&[\\u0000-\\u0FFF]]" indicates the set of all Unicode letters - * with values less than 4096. Operators ('&' and '|') have equal + * "{@code [[:L:]&[\\u0000-\\u0FFF]]}" indicates the set of all Unicode letters + * with values less than 4096. Operators ({@literal '&'} and '|') have equal * precedence and bind left-to-right. Thus * "[[:L:]-[a-z]-[\\u0100-\\u01FF]]" is equivalent to * "[[[:L:]-[a-z]]-[\\u0100-\\u01FF]]". This only really matters for @@ -166,7 +166,7 @@ import java.util.TreeSet; * that is, U+0000 through 'a'-1 and 'z'+1 through U+10FFFF * [[pat1][pat2]] * The union of sets specified by pat1 and pat2 - * [[pat1]&[pat2]] + * [[pat1]&[pat2]] * The intersection of sets specified by pat1 and pat2 * [[pat1]-[pat2]] * The asymmetric difference of sets specified by pat1 and @@ -227,7 +227,7 @@ import java.util.TreeSet; * * * property :=  - * a Unicode property set pattern + * a Unicode property set pattern * * *
                    @@ -337,8 +337,8 @@ public class UnicodeSet implements UnicodeMatcher { } /** - * Constructs a set containing the given range. If end > - * start then an empty set is created. + * Constructs a set containing the given range. + * If {@code end > start} then an empty set is created. * * @param start first character, inclusive, of range * @param end last character, inclusive, of range @@ -651,7 +651,7 @@ public class UnicodeSet implements UnicodeMatcher { * Adds the specified multicharacter to this set if it is not already * present. If this set already contains the multicharacter, * the call leaves this set unchanged. - * Thus "ch" => {"ch"} + * Thus {@code "ch" => {"ch"}} *
                    Warning: you cannot add an empty string ("") to a UnicodeSet. * @param s the source string * @return this object, for chaining @@ -691,7 +691,7 @@ public class UnicodeSet implements UnicodeMatcher { /** * Complements the specified range in this set. Any character in * the range will be removed if it is in this set, or will be - * added if it is not in this set. If end > start + * added if it is not in this set. If {@code end > start} * then an empty range is complemented, leaving the set unchanged. * * @param start first character, inclusive, of range to be removed @@ -1698,8 +1698,8 @@ public class UnicodeSet implements UnicodeMatcher { * Modifies this set to contain those code points which have the * given value for the given property. Prior contents of this * set are lost. - * @param propertyAlias - * @param valueAlias + * @param propertyAlias the property alias + * @param valueAlias the value alias * @param symbols if not null, then symbols are first called to see if a property * is available. If true, then everything else is skipped. * @return this set diff --git a/jdk/src/java.base/share/classes/sun/text/normalizer/UnicodeSetIterator.java b/jdk/src/java.base/share/classes/sun/text/normalizer/UnicodeSetIterator.java index 770745226c8..98544705349 100644 --- a/jdk/src/java.base/share/classes/sun/text/normalizer/UnicodeSetIterator.java +++ b/jdk/src/java.base/share/classes/sun/text/normalizer/UnicodeSetIterator.java @@ -73,35 +73,35 @@ import java.util.Iterator; public class UnicodeSetIterator { /** - * Value of codepoint if the iterator points to a string. - * If codepoint == IS_STRING, then examine - * string for the current iteration result. + * Value of {@code codepoint} if the iterator points to a string. + * If {@code codepoint == IS_STRING}, then examine + * {@code string} for the current iteration result. * @stable ICU 2.0 */ public static int IS_STRING = -1; /** - * Current code point, or the special value IS_STRING, if + * Current code point, or the special value {@code IS_STRING}, if * the iterator points to a string. * @stable ICU 2.0 */ public int codepoint; /** - * When iterating over ranges using nextRange(), - * codepointEnd contains the inclusive end of the - * iteration range, if codepoint != IS_STRING. If - * iterating over code points using next(), or if - * codepoint == IS_STRING, then the value of - * codepointEnd is undefined. + * When iterating over ranges using {@code nextRange()}, + * {@code codepointEnd} contains the inclusive end of the + * iteration range, if {@code codepoint != IS_STRING}. If + * iterating over code points using {@code next()}, or if + * {@code codepoint == IS_STRING}, then the value of + * {@code codepointEnd} is undefined. * @stable ICU 2.0 */ public int codepointEnd; /** - * If codepoint == IS_STRING, then string points - * to the current string. If codepoint != IS_STRING, the - * value of string is undefined. + * If {@code codepoint == IS_STRING}, then {@code string} points + * to the current string. If {@code codepoint != IS_STRING}, the + * value of {@code string} is undefined. * @stable ICU 2.0 */ public String string; @@ -118,17 +118,17 @@ public class UnicodeSetIterator { /** * Returns the next element in the set, either a code point range * or a string. If there are no more elements in the set, return - * false. If codepoint == IS_STRING, the value is a - * string in the string field. Otherwise the value is a - * range of one or more code points from codepoint to - * codepointeEnd inclusive. + * false. If {@code codepoint == IS_STRING}, the value is a + * string in the {@code string} field. Otherwise the value is a + * range of one or more code points from {@code codepoint} to + * {@code codepointeEnd} inclusive. * *

                    The order of iteration is all code points ranges in sorted * order, followed by all strings sorted order. Ranges are - * disjoint and non-contiguous. string is undefined - * unless codepoint == IS_STRING. Do not mix calls to - * next() and nextRange() without calling - * reset() between them. The results of doing so are + * disjoint and non-contiguous. {@code string} is undefined + * unless {@code codepoint == IS_STRING}. Do not mix calls to + * {@code next()} and {@code nextRange()} without calling + * {@code reset()} between them. The results of doing so are * undefined. * * @return true if there was another element in the set and this @@ -162,8 +162,8 @@ public class UnicodeSetIterator { /** * Sets this iterator to visit the elements of the given set and * resets it to the start of that set. The iterator is valid only - * so long as set is valid. - * @param set the set to iterate over. + * so long as {@code set} is valid. + * @param uset the set to iterate over. * @stable ICU 2.0 */ public void reset(UnicodeSet uset) { diff --git a/jdk/src/java.base/share/classes/sun/text/normalizer/Utility.java b/jdk/src/java.base/share/classes/sun/text/normalizer/Utility.java index 841e2119f93..59fb57189c0 100644 --- a/jdk/src/java.base/share/classes/sun/text/normalizer/Utility.java +++ b/jdk/src/java.base/share/classes/sun/text/normalizer/Utility.java @@ -227,7 +227,7 @@ public final class Utility { /** * Convert a integer to size width hex uppercase digits. - * E.g., hex('a', 4, str) => "0041". + * E.g., {@code hex('a', 4, str) => "0041"}. * Append the output to the given StringBuffer. * If width is too small to fit, nothing will be appended to output. */ @@ -237,7 +237,7 @@ public final class Utility { /** * Convert a integer to size width (minimum) hex uppercase digits. - * E.g., hex('a', 4, str) => "0041". If the integer requires more + * E.g., {@code hex('a', 4, str) => "0041"}. If the integer requires more * than width digits, more will be used. */ public static String hex(int ch, int width) { @@ -334,8 +334,8 @@ public final class Utility { } /** - * Escape unprintable characters using uxxxx notation - * for U+0000 to U+FFFF and Uxxxxxxxx for U+10000 and + * Escape unprintable characters using {@code uxxxx} notation + * for U+0000 to U+FFFF and {@code Uxxxxxxxx} for U+10000 and * above. If the character is printable ASCII, then do nothing * and return FALSE. Otherwise, append the escaped notation and * return TRUE. diff --git a/jdk/src/java.base/share/classes/sun/text/normalizer/VersionInfo.java b/jdk/src/java.base/share/classes/sun/text/normalizer/VersionInfo.java index 09f13b9ceca..d55fe0b996c 100644 --- a/jdk/src/java.base/share/classes/sun/text/normalizer/VersionInfo.java +++ b/jdk/src/java.base/share/classes/sun/text/normalizer/VersionInfo.java @@ -53,7 +53,7 @@ public final class VersionInfo * @param version version String in the format of "major.minor.milli.micro" * or "major.minor.milli" or "major.minor" or "major", * where major, minor, milli, micro are non-negative numbers - * <= 255. If the trailing version numbers are + * {@literal <=} 255. If the trailing version numbers are * not specified they are taken as 0s. E.g. Version "3.1" is * equivalent to "3.1.0.0". * @return an instance of VersionInfo with the argument version. @@ -98,12 +98,12 @@ public final class VersionInfo /** * Returns an instance of VersionInfo with the argument version. - * @param major major version, non-negative number <= 255. - * @param minor minor version, non-negative number <= 255. - * @param milli milli version, non-negative number <= 255. - * @param micro micro version, non-negative number <= 255. + * @param major major version, non-negative number {@literal <=} 255. + * @param minor minor version, non-negative number {@literal <=} 255. + * @param milli milli version, non-negative number {@literal <=} 255. + * @param micro micro version, non-negative number {@literal <=} 255. * @exception throws an IllegalArgumentException when either arguments are - * negative or > 255 + * negative or {@literal >} 255 * @stable ICU 2.6 */ public static VersionInfo getInstance(int major, int minor, int milli, diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/DefaultMXBeanMappingFactory.java b/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/DefaultMXBeanMappingFactory.java index 63ec9cc347d..740732b2f82 100644 --- a/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/DefaultMXBeanMappingFactory.java +++ b/jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver/DefaultMXBeanMappingFactory.java @@ -79,44 +79,46 @@ import sun.reflect.misc.ReflectUtil; /** *

                    A converter between Java types and the limited set of classes - * defined by Open MBeans.

                    + * defined by Open MBeans. * - *

                    A Java type is an instance of java.lang.reflect.Type. For our + *

                    A Java type is an instance of java.lang.reflect.Type. For our * purposes, it is either a Class, such as String.class or int.class; - * or a ParameterizedType, such as List or Map. On J2SE 1.4 and earlier, it can only be a Class.

                    + * or a ParameterizedType, such as {@code List} or + * {@code Map}. + * On J2SE 1.4 and earlier, it can only be a Class. * - *

                    Each Type is associated with an DefaultMXBeanMappingFactory. The - * DefaultMXBeanMappingFactory defines an OpenType corresponding to the Type, plus a - * Java class corresponding to the OpenType. For example:

                    + *

                    Each Type is associated with an DefaultMXBeanMappingFactory. The + * DefaultMXBeanMappingFactory defines an + * OpenType corresponding to the Type, plus a + * Java class corresponding to the OpenType. For example: * - * 

                    + *   
                    {@code
  *   Type                     Open class     OpenType
  *   ----                     ----------     --------
- *   Integer                Integer        SimpleType.INTEGER
- *   int                            int            SimpleType.INTEGER
- *   Integer[]              Integer[]      ArrayType(1, SimpleType.INTEGER)
- *   int[]                  Integer[]      ArrayType(SimpleType.INTEGER, true)
- *   String[][]             String[][]     ArrayType(2, SimpleType.STRING)
- *   List                   String[]       ArrayType(1, SimpleType.STRING)
+ *   Integer                  Integer        SimpleType.INTEGER
+ *   int                      int            SimpleType.INTEGER
+ *   Integer[]                Integer[]      ArrayType(1, SimpleType.INTEGER)
+ *   int[]                    Integer[]      ArrayType(SimpleType.INTEGER, true)
+ *   String[][]               String[][]     ArrayType(2, SimpleType.STRING)
+ *   List             String[]       ArrayType(1, SimpleType.STRING)
  *   ThreadState (an Enum)    String         SimpleType.STRING
- *   Map   TabularData          TabularType(
+ *   Map   TabularData    TabularType(
  *                                           CompositeType(
  *                                             {"key", SimpleType.INTEGER},
  *                                             {"value",
  *                                               ArrayType(1,
  *                                                SimpleType.STRING)}),
  *                                           indexNames={"key"})
- *   
                    
+ *   }
                    * *

                    Apart from simple types, arrays, and collections, Java types are * converted through introspection into CompositeType. The Java type * must have at least one getter (method such as "int getSize()" or * "boolean isBig()"), and we must be able to deduce how to * reconstruct an instance of the Java class from the values of the - * getters using one of various heuristics.

                    + * getters using one of various heuristics. * - * @since 1.6 + * @since 1.6 */ public class DefaultMXBeanMappingFactory extends MXBeanMappingFactory { static abstract class NonNullMXBeanMapping extends MXBeanMapping { @@ -148,8 +150,8 @@ public class DefaultMXBeanMappingFactory extends MXBeanMappingFactory { throws OpenDataException; /** - *

                    True if and only if this MXBeanMapping's toOpenValue and - * fromOpenValue methods are the identity function.

                    + * True if and only if this MXBeanMapping's toOpenValue and + * fromOpenValue methods are the identity function. */ boolean isIdentity() { return false; diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/ServerCommunicatorAdmin.java b/jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/ServerCommunicatorAdmin.java index f943bf5ce68..6df86f5931b 100644 --- a/jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/ServerCommunicatorAdmin.java +++ b/jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/ServerCommunicatorAdmin.java @@ -57,8 +57,8 @@ public abstract class ServerCommunicatorAdmin { * rspOutgoing to inform that a response is sent out * for the received request. * @return the value of the termination flag: - *
                      true if the connection is already being terminated, - *
                      false otherwise.
                    + * true if the connection is already being terminated, + * false otherwise. */ public boolean reqIncoming() { if (logger.traceOn()) { @@ -80,8 +80,8 @@ public abstract class ServerCommunicatorAdmin { /** * Tells that a response is sent out for a received request. * @return the value of the termination flag: - *
                      true if the connection is already being terminated, - *
                      false otherwise.
                    + * true if the connection is already being terminated, + * false otherwise. */ public boolean rspOutgoing() { if (logger.traceOn()) { diff --git a/jdk/src/java.management/share/classes/com/sun/jmx/remote/util/EnvHelp.java b/jdk/src/java.management/share/classes/com/sun/jmx/remote/util/EnvHelp.java index bf951df715f..b92ecc847b2 100644 --- a/jdk/src/java.management/share/classes/com/sun/jmx/remote/util/EnvHelp.java +++ b/jdk/src/java.management/share/classes/com/sun/jmx/remote/util/EnvHelp.java @@ -55,17 +55,17 @@ import javax.management.remote.JMXConnectorServer; public class EnvHelp { /** - *

                    Name of the attribute that specifies a default class loader + * Name of the attribute that specifies a default class loader * object. - * The value associated with this attribute is a ClassLoader object

                    + * The value associated with this attribute is a ClassLoader object. */ private static final String DEFAULT_CLASS_LOADER = JMXConnectorFactory.DEFAULT_CLASS_LOADER; /** - *

                    Name of the attribute that specifies a default class loader - * ObjectName. - * The value associated with this attribute is an ObjectName object

                    + * Name of the attribute that specifies a default class loader + * ObjectName. + * The value associated with this attribute is an ObjectName object. */ private static final String DEFAULT_CLASS_LOADER_NAME = JMXConnectorServerFactory.DEFAULT_CLASS_LOADER_NAME; @@ -74,7 +74,6 @@ public class EnvHelp { * Get the Connector Server default class loader. *

                    * Returns: - *

                    *

                      *
                    • * The ClassLoader object found in env for @@ -114,6 +113,7 @@ public class EnvHelp { * jmx.remote.default.class.loader.name is specified * but mbs is null. *
                      • + *
                    * @exception InstanceNotFoundException if * jmx.remote.default.class.loader.name is specified * and the ClassLoader MBean is not found in mbs. @@ -172,7 +172,6 @@ public class EnvHelp { * Get the Connector Client default class loader. *

                    * Returns: - *

                    *

                      *
                    • * The ClassLoader object found in env for @@ -232,7 +231,7 @@ public class EnvHelp { /** * Returns the cause field of a {@code Throwable} object. * The cause field can be got only if t has an - * {@link Throwable#getCause()} method (JDK Version >= 1.4) + * {@link Throwable#getCause()} method (JDK Version {@literal >=} 1.4) * @param t {@code Throwable} on which the cause must be set. * @return the cause if getCause() succeeded and the got value is not * null, otherwise return the t. @@ -254,7 +253,7 @@ public class EnvHelp { /** - *

                      Name of the attribute that specifies the size of a notification + * Name of the attribute that specifies the size of a notification * buffer for a connector server. The default value is 1000. */ public static final String BUFFER_SIZE_PROPERTY = @@ -316,10 +315,10 @@ public class EnvHelp { } /** - *

                      Name of the attribute that specifies the maximum number of - * notifications that a client will fetch from its server.. The + * Name of the attribute that specifies the maximum number of + * notifications that a client will fetch from its server. The * value associated with this attribute should be an - * Integer object. The default value is 1000.

                      + * {@code Integer} object. The default value is 1000. */ public static final String MAX_FETCH_NOTIFS = "jmx.remote.x.notification.fetch.max"; @@ -334,10 +333,10 @@ public class EnvHelp { } /** - *

                      Name of the attribute that specifies the timeout for a + * Name of the attribute that specifies the timeout for a * client to fetch notifications from its server. The value * associated with this attribute should be a Long - * object. The default value is 60000 milliseconds.

                      + * object. The default value is 60000 milliseconds. */ public static final String FETCH_TIMEOUT = "jmx.remote.x.notification.fetch.timeout"; @@ -351,11 +350,12 @@ public class EnvHelp { } /** - *

                      Name of the attribute that specifies an object that will check + * Name of the attribute that specifies an object that will check * accesses to add/removeNotificationListener and also attempts to * receive notifications. The value associated with this attribute * should be a NotificationAccessController object. - * The default value is null.

                      + * The default value is null. + *

                      * This field is not public because of its com.sun dependency. */ public static final String NOTIF_ACCESS_CONTROLLER = @@ -630,9 +630,9 @@ public class EnvHelp { } /** - *

                      Name of the attribute that specifies the timeout to keep a + * Name of the attribute that specifies the timeout to keep a * server side connection after answering last client request. - * The default value is 120000 milliseconds.

                      + * The default value is 120000 milliseconds. */ public static final String SERVER_CONNECTION_TIMEOUT = "jmx.remote.x.server.connection.timeout"; @@ -646,9 +646,9 @@ public class EnvHelp { } /** - *

                      Name of the attribute that specifies the period in - * millisecond for a client to check its connection. The default - * value is 60000 milliseconds.

                      + * Name of the attribute that specifies the period in + * millisecond for a client to check its connection. The default + * value is 60000 milliseconds. */ public static final String CLIENT_CONNECTION_CHECK_PERIOD = "jmx.remote.x.client.connection.check.period"; @@ -741,13 +741,13 @@ public class EnvHelp { } /** - *

                      Name of the attribute that specifies whether a connector server + * Name of the attribute that specifies whether a connector server * should not prevent the VM from exiting */ public static final String JMX_SERVER_DAEMON = "jmx.remote.x.daemon"; /** - * Returns true if {@value SERVER_DAEMON} is specified in the {@code env} + * Returns true if {@value JMX_SERVER_DAEMON} is specified in the {@code env} * as a key and its value is a String and it is equal to true ignoring case. * * @param env diff --git a/jdk/src/java.management/share/classes/sun/management/HotspotRuntimeMBean.java b/jdk/src/java.management/share/classes/sun/management/HotspotRuntimeMBean.java index a38a9b230a0..5d99b21fb64 100644 --- a/jdk/src/java.management/share/classes/sun/management/HotspotRuntimeMBean.java +++ b/jdk/src/java.management/share/classes/sun/management/HotspotRuntimeMBean.java @@ -64,7 +64,7 @@ public interface HotspotRuntimeMBean { * Returns a list of internal counters maintained in the Java * virtual machine for the runtime system. * - * @return a List of internal counters maintained in the VM + * @return a {@code List} of internal counters maintained in the VM * for the runtime system. */ public java.util.List getInternalRuntimeCounters(); diff --git a/jdk/src/java.management/share/classes/sun/management/HotspotThreadMBean.java b/jdk/src/java.management/share/classes/sun/management/HotspotThreadMBean.java index 4af0546b375..e69e2377086 100644 --- a/jdk/src/java.management/share/classes/sun/management/HotspotThreadMBean.java +++ b/jdk/src/java.management/share/classes/sun/management/HotspotThreadMBean.java @@ -40,12 +40,11 @@ public interface HotspotThreadMBean { public int getInternalThreadCount(); /** - * Returns a Map of the name of all VM internal threads + * Returns a {@code Map} of the name of all VM internal threads * to the thread CPU time in nanoseconds. The returned value is * of nanoseconds precision but not necessarily nanoseconds accuracy. - *

                      * - * @return a Map object of the name of all VM internal threads + * @return a {@code Map} object of the name of all VM internal threads * to the thread CPU time in nanoseconds. * * @throws java.lang.UnsupportedOperationException if the Java virtual diff --git a/jdk/src/java.management/share/classes/sun/management/MappedMXBeanType.java b/jdk/src/java.management/share/classes/sun/management/MappedMXBeanType.java index 85cdfdf1833..2de0e00758b 100644 --- a/jdk/src/java.management/share/classes/sun/management/MappedMXBeanType.java +++ b/jdk/src/java.management/share/classes/sun/management/MappedMXBeanType.java @@ -45,13 +45,15 @@ import static javax.management.openmbean.SimpleType.*; * A mapped mxbean type maps a Java type to an open type. * Only the following Java types are mappable * (currently required by the platform MXBeans): - * 1. Primitive types - * 2. Wrapper classes such java.lang.Integer, etc - * 3. Classes with only getter methods and with a static "from" method - * that takes a CompositeData argument. - * 4. E[] where E is a type of 1-4 (can be multi-dimensional array) - * 5. List where E is a type of 1-3 - * 6. Map where K and V are a type of 1-4 + *

                        + *
                      1. Primitive types
                        2. + *
                      2. Wrapper classes such java.lang.Integer, etc
                        3. + *
                      3. Classes with only getter methods and with a static "from" method + * that takes a CompositeData argument.
                        4. + *
                      4. {@code E[]} where {@code E} is a type of 1-4 (can be multi-dimensional array)
                        5. + *
                      5. {@code List} where E is a type of 1-3
                        6. + *
                      6. {@code Map} where {@code K} and {@code V} are a type of 1-4
                        7. + *
                      * * OpenDataException will be thrown if a Java type is not supported. */ diff --git a/jdk/src/java.management/share/classes/sun/management/Sensor.java b/jdk/src/java.management/share/classes/sun/management/Sensor.java index 44ff29ad1c6..8b82b859d25 100644 --- a/jdk/src/java.management/share/classes/sun/management/Sensor.java +++ b/jdk/src/java.management/share/classes/sun/management/Sensor.java @@ -34,12 +34,12 @@ import java.util.HashMap; * An abstract sensor. * *

                      - * A AbstractSensor object consists of two attributes: + * A {@code AbstractSensor} object consists of two attributes: *

                        - *
                      • on is a boolean flag indicating if a sensor is + *
                      • {@code on} is a boolean flag indicating if a sensor is * triggered. This flag will be set or cleared by the * component that owns the sensor.
                        • - *
                      • count is the total number of times that a sensor + *
                      • {@code count} is the total number of times that a sensor * has been triggered.
                        • *
                      * @@ -54,7 +54,7 @@ public abstract class Sensor { private boolean on; /** - * Constructs a Sensor object. + * Constructs a {@code Sensor} object. * * @param name The name of this sensor. */ @@ -88,8 +88,8 @@ public abstract class Sensor { /** * Tests if this sensor is currently on. * - * @return true if the sensor is currently on; - * false otherwise. + * @return {@code true} if the sensor is currently on; + * {@code false} otherwise. * */ public boolean isOn() { @@ -112,7 +112,7 @@ public abstract class Sensor { /** * Triggers this sensor. This method sets this sensor on - * and increments the count with the input increment. + * and increments the count with the input {@code increment}. */ public void trigger(int increment) { synchronized (lock) { @@ -126,7 +126,7 @@ public abstract class Sensor { /** * Triggers this sensor piggybacking a memory usage object. * This method sets this sensor on - * and increments the count with the input increment. + * and increments the count with the input {@code increment}. */ public void trigger(int increment, MemoryUsage usage) { synchronized (lock) { @@ -150,7 +150,7 @@ public abstract class Sensor { /** * Clears this sensor - * and increments the count with the input increment. + * and increments the count with the input {@code increment}. */ public void clear(int increment) { synchronized (lock) { diff --git a/jdk/src/java.management/share/classes/sun/management/counter/Counter.java b/jdk/src/java.management/share/classes/sun/management/counter/Counter.java index 00d9d35f7f2..01ac36b3e70 100644 --- a/jdk/src/java.management/share/classes/sun/management/counter/Counter.java +++ b/jdk/src/java.management/share/classes/sun/management/counter/Counter.java @@ -63,7 +63,7 @@ public interface Counter extends java.io.Serializable { public Object getValue(); /** - * Returns true if this counter is an internal counter. + * Returns {@code true} if this counter is an internal counter. */ public boolean isInternal(); diff --git a/jdk/src/java.management/share/classes/sun/management/counter/perf/InstrumentationException.java b/jdk/src/java.management/share/classes/sun/management/counter/perf/InstrumentationException.java index 80685a1fdc1..e5c3e1f9930 100644 --- a/jdk/src/java.management/share/classes/sun/management/counter/perf/InstrumentationException.java +++ b/jdk/src/java.management/share/classes/sun/management/counter/perf/InstrumentationException.java @@ -27,14 +27,14 @@ package sun.management.counter.perf; public class InstrumentationException extends RuntimeException { /** - * Constructs a InstrumentationException with no + * Constructs a {@code InstrumentationException} with no * detail message. */ public InstrumentationException() { } /** - * Constructs a InstrumentationException with a specified + * Constructs a {@code InstrumentationException} with a specified * detail message. * * @param message the detail message diff --git a/jdk/src/java.management/share/classes/sun/management/jdp/JdpController.java b/jdk/src/java.management/share/classes/sun/management/jdp/JdpController.java index a90705d577a..344d2db2b9e 100644 --- a/jdk/src/java.management/share/classes/sun/management/jdp/JdpController.java +++ b/jdk/src/java.management/share/classes/sun/management/jdp/JdpController.java @@ -37,19 +37,18 @@ import sun.management.VMManagement; import sun.misc.ManagedLocalsThread; /** - * JdpController is responsible to create and manage a broadcast loop + * JdpController is responsible to create and manage a broadcast loop. * *

                      Other part of code has no access to broadcast loop and have to use * provided static methods * {@link #startDiscoveryService(InetAddress,int,String,String) startDiscoveryService} - * and {@link #stopDiscoveryService() stopDiscoveryService}

                      + * and {@link #stopDiscoveryService() stopDiscoveryService} *

                      {@link #startDiscoveryService(InetAddress,int,String,String) startDiscoveryService} could be called multiple - * times as it stops the running service if it is necessary. Call to {@link #stopDiscoveryService() stopDiscoveryService} - * ignored if service isn't run

                      + * times as it stops the running service if it is necessary. + * Call to {@link #stopDiscoveryService() stopDiscoveryService} + * ignored if service isn't run. * * - *

                      - * *

                      System properties below could be used to control broadcast loop behavior. * Property below have to be set explicitly in command line. It's not possible to * set it in management.config file. Careless changes of these properties could @@ -59,9 +58,9 @@ import sun.misc.ManagedLocalsThread; *

                    • com.sun.management.jdp.pause - set broadcast interval in seconds
                      • *
                    • com.sun.management.jdp.source_addr - an address of interface to use for broadcast
                      • *
                    -

                    + * *

                    null parameters values are filtered out on {@link JdpPacketWriter} level and - * corresponding keys are not placed to packet.

                    + * corresponding keys are not placed to packet. */ public final class JdpController { diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/BasicControl.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/BasicControl.java index a7599d2f368..ba2a5543f6c 100644 --- a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/BasicControl.java +++ b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/BasicControl.java @@ -28,7 +28,7 @@ package com.sun.jndi.ldap; import javax.naming.ldap.*; /** - * This class provides a basic implementation of the Control + * This class provides a basic implementation of the {@code Control} * interface. It represents an LDAPv3 Control as defined in RFC-2251. * * @author Vincent Ryan diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/BerDecoder.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/BerDecoder.java index 9feefb47feb..ef03ca4d587 100644 --- a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/BerDecoder.java +++ b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/BerDecoder.java @@ -295,7 +295,7 @@ public final class BerDecoder extends Ber { * the relative parsed position is not returned. * @return A non-null array containing the octet string. * @throws DecodeException If the next byte in the BER buffer is not - * tag, or if length specified in the BER buffer exceeds the + * {@code tag}, or if length specified in the BER buffer exceeds the * number of bytes left in the buffer. */ public byte[] parseOctetString(int tag, int rlen[]) throws DecodeException { diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/EventQueue.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/EventQueue.java index 85bc38076f5..3df7dc6063c 100644 --- a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/EventQueue.java +++ b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/EventQueue.java @@ -73,16 +73,16 @@ final class EventQueue implements Runnable { // package private; /** * Enqueue an event. - * @param event Either a NamingExceptionEvent or a subclass - * of NamingEvent or - * UnsolicitedNotificationEvent. - * If it is a subclass of NamingEvent, all listeners must implement - * the corresponding subinterface of NamingListener. - * For example, for a ObjectAddedEvent, all listeners must - * implement the ObjectAddedListener interface. + * @param event Either a {@code NamingExceptionEvent} or a subclass + * of {@code NamingEvent} or + * {@code UnsolicitedNotificationEvent}. + * If it is a subclass of {@code NamingEvent}, all listeners must implement + * the corresponding subinterface of {@code NamingListener}. + * For example, for a {@code ObjectAddedEvent}, all listeners must + * implement the {@code ObjectAddedListener} interface. * The current implementation does not check this before dispatching * the event. - * If the event is a NamingExceptionEvent, then all listeners + * If the event is a {@code NamingExceptionEvent}, then all listeners * are notified. * @param vector List of NamingListeners that will be notified of event. */ diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/EventSupport.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/EventSupport.java index 5edf4eaadd6..de78c1f11ab 100644 --- a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/EventSupport.java +++ b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/EventSupport.java @@ -55,14 +55,14 @@ import javax.naming.ldap.UnsolicitedNotification; *
                  • The filter (default is "(objectclass=*)"). *
                  • The search controls (default is null SearchControls). *
                  • The events that the listener is interested in. This is determined by - * finding out which NamingListener interface the listener supports. + * finding out which {@code NamingListener} interface the listener supports. *
                  *

                  - *A notifier (NamingEventNotifier) is a worker thread that is responsible + *A notifier ({@code NamingEventNotifier}) is a worker thread that is responsible *for gathering information for generating events requested by its listeners. *Each notifier maintains its own list of listeners; these listeners have *all made the same registration request (at different times) and implements - *the same NamingListener interfaces. + *the same {@code NamingListener} interfaces. *

                  *For unsolicited listeners, this class maintains a vector, unsolicited. *When an unsolicited listener is registered, this class adds itself @@ -93,7 +93,7 @@ import javax.naming.ldap.UnsolicitedNotification; *The notifiers are responsible for gather information for generating events *requested by their respective listeners. When a notifier gets sufficient *information to generate an event, it creates invokes the - *appropriate fireXXXEvent on this class with the information and list of + *appropriate {@code fireXXXEvent} on this class with the information and list of *listeners. This causes an event and the list of listeners to be added *to the event queue. *This class maintains an event queue and a dispatching thread that dequeues @@ -138,7 +138,7 @@ final class EventSupport { } /** - * Adds l to list of listeners interested in nm. + * Adds {@code l} to list of listeners interested in {@code nm}. */ /* * Make the add/removeNamingListeners synchronized to: @@ -173,7 +173,7 @@ final class EventSupport { } /** - * Adds l to list of listeners interested in nm + * Adds {@code l} to list of listeners interested in {@code nm} * and filter. */ synchronized void addNamingListener(String nm, String filter, @@ -201,7 +201,7 @@ final class EventSupport { } /** - * Removes l from all notifiers in this context. + * Removes {@code l} from all notifiers in this context. */ synchronized void removeNamingListener(NamingListener l) { if (debug) System.err.println("EventSupport removing listener"); diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapName.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapName.java index b3f76d9ab0b..896ffd280d7 100644 --- a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapName.java +++ b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapName.java @@ -336,7 +336,7 @@ public final class LdapName implements Name { * characters: *

                    *
                  • leading and trailing whitespace - *
                  • , = + < > # ; " \
                    + *
                  • {@literal , = + < > # ; " \}
                    *
                  * If the value is a byte array, it is converted to hex * notation (such as "#CEB1DF80"). diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapReferralException.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapReferralException.java index 5adffa441d9..4b3e06d9285 100644 --- a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapReferralException.java +++ b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/LdapReferralException.java @@ -35,7 +35,7 @@ import java.util.Vector; * This exception is raised when a referral to an alternative context * is encountered. *

                  - * An LdapReferralException object contains one or more referrals. + * An {@code LdapReferralException} object contains one or more referrals. * Each referral is an alternative location for the same target entry. * For example, a referral may be an LDAP URL. * The referrals are attempted in sequence until one is successful or @@ -46,20 +46,20 @@ import java.util.Vector; * of an authentication error, a referral may be retried with different * environment properties. *

                  - * An LdapReferralException object may also contain a reference - * to a chain of unprocessed LdapReferralException objects. + * An {@code LdapReferralException} object may also contain a reference + * to a chain of unprocessed {@code LdapReferralException} objects. * Once the current set of referrals have been exhausted and unprocessed - * LdapReferralException objects remain, then the - * LdapReferralException object referenced by the current + * {@code LdapReferralException} objects remain, then the + * {@code LdapReferralException} object referenced by the current * object is thrown and the cycle continues. *

                  - * If new LdapReferralException objects are generated while + * If new {@code LdapReferralException} objects are generated while * following an existing referral then these new objects are appended - * to the end of the chain of unprocessed LdapReferralException + * to the end of the chain of unprocessed {@code LdapReferralException} * objects. *

                  * If an exception was recorded while processing a chain of - * LdapReferralException objects then it is throw once + * {@code LdapReferralException} objects then it is throw once * processing has completed. * * @author Vincent Ryan diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/UnsolicitedResponseImpl.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/UnsolicitedResponseImpl.java index cb03114593d..500ff35a52a 100644 --- a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/UnsolicitedResponseImpl.java +++ b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/UnsolicitedResponseImpl.java @@ -65,7 +65,7 @@ final class UnsolicitedResponseImpl implements UnsolicitedNotification { * Retrieves the object identifier of the response. * * @return A possibly null object identifier string representing the LDAP - * ExtendedResponse.responseName component. + * {@code ExtendedResponse.responseName} component. */ public String getID() { return oid; @@ -79,7 +79,7 @@ final class UnsolicitedResponseImpl implements UnsolicitedNotification { * the response value. It does not include the response OID. * * @return A possibly null byte array representing the ASN.1 BER encoded - * contents of the LDAP ExtendedResponse.response + * contents of the LDAP {@code ExtendedResponse.response} * component. */ public byte[] getEncodedValue() { diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/ext/StartTlsResponseImpl.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/ext/StartTlsResponseImpl.java index 53d197c5e62..c7f73337cc8 100644 --- a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/ext/StartTlsResponseImpl.java +++ b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/ext/StartTlsResponseImpl.java @@ -52,10 +52,10 @@ import com.sun.jndi.ldap.Connection; * The object identifier for StartTLS is 1.3.6.1.4.1.1466.20037 * and no extended response value is defined. * - *

                  + *

                  * The Start TLS extended request and response are used to establish * a TLS connection over the existing LDAP connection associated with - * the JNDI context on which extendedOperation() is invoked. + * the JNDI context on which {@code extendedOperation()} is invoked. * * @see StartTlsRequest * @author Vincent Ryan @@ -124,7 +124,7 @@ final public class StartTlsResponseImpl extends StartTlsResponse { /** * Overrides the default list of cipher suites enabled for use on the * TLS connection. The cipher suites must have already been listed by - * SSLSocketFactory.getSupportedCipherSuites() as being supported. + * {@code SSLSocketFactory.getSupportedCipherSuites()} as being supported. * Even if a suite has been enabled, it still might not be used because * the peer does not support it, or because the requisite certificates * (and private keys) are not available. @@ -140,12 +140,12 @@ final public class StartTlsResponseImpl extends StartTlsResponse { } /** - * Overrides the default hostname verifier used by negotiate() + * Overrides the default hostname verifier used by {@code negotiate()} * after the TLS handshake has completed. If - * setHostnameVerifier() has not been called before - * negotiate() is invoked, negotiate() + * {@code setHostnameVerifier()} has not been called before + * {@code negotiate()} is invoked, {@code negotiate()} * will perform a simple case ignore match. If called after - * negotiate(), this method does not do anything. + * {@code negotiate()}, this method does not do anything. * * @param verifier The non-null hostname verifier callback. * @see #negotiate @@ -157,10 +157,10 @@ final public class StartTlsResponseImpl extends StartTlsResponse { /** * Negotiates a TLS session using the default SSL socket factory. *

                  - * This method is equivalent to negotiate(null). + * This method is equivalent to {@code negotiate(null)}. * * @return The negotiated SSL session - * @throw IOException If an IO error was encountered while establishing + * @throws IOException If an IO error was encountered while establishing * the TLS session. * @see #setEnabledCipherSuites * @see #setHostnameVerifier @@ -177,7 +177,7 @@ final public class StartTlsResponseImpl extends StartTlsResponse { * attaches it to the existing connection. Performs the TLS handshake * and returns the negotiated session information. *

                  - * If cipher suites have been set via setEnabledCipherSuites + * If cipher suites have been set via {@code setEnabledCipherSuites} * then they are enabled before the TLS handshake begins. *

                  * Hostname verification is performed after the TLS handshake completes. @@ -186,7 +186,7 @@ final public class StartTlsResponseImpl extends StartTlsResponse { * hostname is extracted from the subjectAltName in the server's * certificate (if present). Otherwise the value of the common name * attribute of the subject name is used. If a callback has - * been set via setHostnameVerifier then that verifier is used if + * been set via {@code setHostnameVerifier} then that verifier is used if * the default check fails. *

                  * If an error occurs then the SSL socket is closed and an IOException @@ -195,7 +195,7 @@ final public class StartTlsResponseImpl extends StartTlsResponse { * @param factory The possibly null SSL socket factory to use. * If null, the default SSL socket factory is used. * @return The negotiated SSL session - * @throw IOException If an IO error was encountered while establishing + * @throws IOException If an IO error was encountered while establishing * the TLS session. * @see #setEnabledCipherSuites * @see #setHostnameVerifier @@ -252,7 +252,7 @@ final public class StartTlsResponseImpl extends StartTlsResponse { * Closes the TLS connection gracefully and reverts back to the underlying * connection. * - * @throw IOException If an IO error was encountered while closing the + * @throws IOException If an IO error was encountered while closing the * TLS connection */ public void close() throws IOException { diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/sasl/LdapSasl.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/sasl/LdapSasl.java index ef527370e62..ee85dd7bf66 100644 --- a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/sasl/LdapSasl.java +++ b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/sasl/LdapSasl.java @@ -72,12 +72,12 @@ final public class LdapSasl { * property has not been set, Context.SECURITY_PRINCIPAL is used. * If SASL_CALLBACK has been set, use that instead of the default * CallbackHandler. - *

                  + *

                  * If bind is successful and the selected SASL mechanism has a security * layer, set inStream and outStream to be filter streams that use * the security layer. These will be used for subsequent communication * with the server. - *

                  + * * @param conn The non-null connection to use for sending an LDAP BIND * @param server Non-null string name of host to connect to * @param dn Non-null DN to bind as; also used as authentication ID diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/Continuation.java b/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/Continuation.java index 44bc245bad4..595f9303e72 100644 --- a/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/Continuation.java +++ b/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/Continuation.java @@ -329,7 +329,7 @@ public class Continuation extends ResolveResult { *

                  * After this method is called, isContinuing() returns true. * - * @param resObj The possibly null resolved object. + * @param obj The possibly null resolved object. * @param relResName The non-null resolved name relative to currCtx. * @param currCtx The non-null context from which relResName is to be resolved. */ @@ -349,7 +349,7 @@ public class Continuation extends ResolveResult { *

                  * After this method is called, isContinuing() returns true. * - * @param resObj The possibly null resolved object. + * @param obj The possibly null resolved object. * @param relResName The non-null resolved name relative to currCtx. * @param currCtx The non-null context from which relResName is to be resolved. * @param remain The non-null remaining name. @@ -366,7 +366,7 @@ public class Continuation extends ResolveResult { /** * String overload. * - * @param resObj The possibly null resolved object. + * @param obj The possibly null resolved object. * @param relResName The non-null resolved name relative to currCtx. * @param currCtx The non-null context from which relResName is to be resolved. * @param remain The non-null remaining name. diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/PartialCompositeContext.java b/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/PartialCompositeContext.java index 891a8621b29..e2d9d4ae2ad 100644 --- a/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/PartialCompositeContext.java +++ b/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx/PartialCompositeContext.java @@ -452,14 +452,14 @@ public abstract class PartialCompositeContext implements Context, Resolver { * nonempty component, and if 'prefix' ends with an empty component or * 'name' starts with one, then one empty component is dropped. * For example: - * 

                  +     * 
                  {@code
      *                            elideEmpty=false     elideEmpty=true
      * {"a"} + {"b"}          =>  {"a", "b"}           {"a", "b"}
      * {"a"} + {""}           =>  {"a", ""}            {"a", ""}
      * {"a"} + {"", "b"}      =>  {"a", "", "b"}       {"a", "b"}
      * {"a", ""} + {"b", ""}  =>  {"a", "", "b", ""}   {"a", "b", ""}
      * {"a", ""} + {"", "b"}  =>  {"a", "", "", "b"}   {"a", "", "b"}
-     * 
                  
+     * }
                  */ public Name composeName(Name name, Name prefix) throws NamingException { Name res = (Name)prefix.clone(); diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/dir/HierMemDirCtx.java b/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/dir/HierMemDirCtx.java index 35895db2395..e4059bfc688 100644 --- a/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/dir/HierMemDirCtx.java +++ b/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/dir/HierMemDirCtx.java @@ -32,8 +32,8 @@ import java.util.*; /** * A sample service provider that implements a hierarchical directory in memory. * Every operation begins by doing a lookup on the name passed to it and then - * calls a corresponding "do" on the result of the lookup. The - * "do" does the work without any further resolution (it assumes + * calls a corresponding "{@code do}" on the result of the lookup. The + * "{@code do}" does the work without any further resolution (it assumes * that it is the target context). */ diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/dir/SearchFilter.java b/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/dir/SearchFilter.java index 695238309f3..bc56d4a6174 100644 --- a/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/dir/SearchFilter.java +++ b/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/dir/SearchFilter.java @@ -548,8 +548,8 @@ public class SearchFilter implements AttrFilter { /** - * Finds the first occurrence of ch in val starting - * from position start. It doesn't count if ch + * Finds the first occurrence of {@code ch} in {@code val} starting + * from position {@code start}. It doesn't count if {@code ch} * has been escaped by a backslash (\) */ public static int findUnescaped(char ch, String val, int start) { @@ -568,8 +568,8 @@ public class SearchFilter implements AttrFilter { } /** - * Formats the expression expr using arguments from the array - * args. + * Formats the expression {@code expr} using arguments from the array + * {@code args}. * * {i} specifies the i'th element from * the array args is to be substituted for the diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/url/GenericURLContext.java b/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/url/GenericURLContext.java index 8493330135b..3fbd5eb9782 100644 --- a/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/url/GenericURLContext.java +++ b/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/url/GenericURLContext.java @@ -107,12 +107,14 @@ abstract public class GenericURLContext implements Context { * the subclass must override getURLSuffix() to get the correct behavior. * Remember, the behavior must match getRootURLContext(). * + * 
                  {@code
       * URL                                     Suffix
       * foo://host:port                         
       * foo://host:port/rest/of/name            rest/of/name
       * foo:///rest/of/name                     rest/of/name
       * foo:/rest/of/name                       rest/of/name
       * foo:rest/of/name                        rest/of/name
+      * }
                  */ protected Name getURLSuffix(String prefix, String url) throws NamingException { String suffix = url.substring(prefix.length()); diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/url/Uri.java b/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/url/Uri.java index da5771ae318..aaeb0eab6c7 100644 --- a/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/url/Uri.java +++ b/jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/url/Uri.java @@ -47,7 +47,7 @@ import java.net.MalformedURLException; * still run on pre-1.4 platforms not containing that class. * *

                  The format of an absolute URI (see the RFCs mentioned above) is: - * 

                  + * 
                  {@code
  *      absoluteURI   = scheme ":" ( hier_part | opaque_part )
  *
  *      scheme        = alpha *( alpha | digit | "+" | "-" | "." )
@@ -94,12 +94,12 @@ import java.net.MalformedURLException;
  *      mark          = "-" | "_" | "." | "!" | "~" | "*" | "'" | "(" | ")"
  *      escaped       = "%" hex hex
  *      unwise        = "{" | "}" | "|" | "\" | "^" | "`"
- * 
                  
+ * }
                  * - *

                  Currently URIs containing userinfo or reg_name + *

                  Currently URIs containing {@code userinfo} or {@code reg_name} * are not supported. - * The opaque_part of a non-hierarchical URI is treated as if - * if were a path without a leading slash. + * The {@code opaque_part} of a non-hierarchical URI is treated as if + * if were a {@code path} without a leading slash. */ diff --git a/jdk/src/java.rmi/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java b/jdk/src/java.rmi/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java index 28119ef169f..587915877e4 100644 --- a/jdk/src/java.rmi/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java +++ b/jdk/src/java.rmi/share/classes/com/sun/rmi/rmid/ExecOptionPermission.java @@ -32,7 +32,6 @@ import java.util.*; /** * The ExecOptionPermission class represents permission for rmid to use * a specific command-line option when launching an activation group. - *

                  * * @author Ann Wollrath * @@ -68,9 +67,9 @@ public final class ExecOptionPermission extends Permission * Checks if the specified permission is "implied" by * this object. *

                  - * More specifically, this method returns true if:

                  + * More specifically, this method returns true if: *

                    - *
                  • p's class is the same as this object's class, and

                    + *

                  • p's class is the same as this object's class, and *
                  • p's name equals or (in the case of wildcards) * is implied by this object's * name. For example, "a.b.*" implies "a.b.c", and @@ -111,7 +110,7 @@ public final class ExecOptionPermission extends Permission * Checks two ExecOptionPermission objects for equality. * Checks that obj's class is the same as this object's class * and has the same name as this object. - *

                    + * * @param obj the object we are testing for equality with this object. * @return true if obj is an ExecOptionPermission, and has the same * name as this ExecOptionPermission object, false otherwise. @@ -154,7 +153,7 @@ public final class ExecOptionPermission extends Permission * Returns a new PermissionCollection object for storing * ExecOptionPermission objects. *

                    - * A ExecOptionPermissionCollection stores a collection of + * An ExecOptionPermissionCollection stores a collection of * ExecOptionPermission permissions. * *

                    ExecOptionPermission objects must be stored in a manner that allows diff --git a/jdk/src/java.rmi/share/classes/com/sun/rmi/rmid/ExecPermission.java b/jdk/src/java.rmi/share/classes/com/sun/rmi/rmid/ExecPermission.java index 3c119e80c10..e445542f9a8 100644 --- a/jdk/src/java.rmi/share/classes/com/sun/rmi/rmid/ExecPermission.java +++ b/jdk/src/java.rmi/share/classes/com/sun/rmi/rmid/ExecPermission.java @@ -40,14 +40,13 @@ import java.util.*; * all the files and directories contained in that directory. A pathname * that ends with "/-" indicates (recursively) all files * and subdirectories contained in that directory. A pathname consisting of - * the special token "<<ALL FILES>>" matches any file. + * the special token "{@code <>}" matches any file. *

                    * Note: A pathname consisting of a single "*" indicates all the files * in the current directory, while a pathname consisting of a single "-" * indicates all the files in the current directory and * (recursively) all files and subdirectories contained in the current * directory. - *

                    * * * @author Ann Wollrath @@ -72,7 +71,7 @@ public final class ExecPermission extends Permission * a directory and all the files contained in that directory. A pathname * that ends with "/-" indicates a directory and (recursively) all files * and subdirectories contained in that directory. The special pathname - * "<<ALL FILES>>" matches all files. + * "{@code <>}" matches all files. * *

                    A pathname consisting of a single "*" indicates all the files * in the current directory, while a pathname consisting of a single "-" @@ -96,7 +95,7 @@ public final class ExecPermission extends Permission * a directory and all the files contained in that directory. A pathname * that ends with "/-" indicates a directory and (recursively) all files * and subdirectories contained in that directory. The special pathname - * "<<ALL FILES>>" matches all files. + * "{@code <>}" matches all files. * *

                    A pathname consisting of a single "*" indicates all the files * in the current directory, while a pathname consisting of a single "-" @@ -114,9 +113,9 @@ public final class ExecPermission extends Permission /** * Checks if this ExecPermission object "implies" the specified permission. *

                    - * More specifically, this method returns true if:

                    + * More specifically, this method returns true if: *

                      - *
                    • p is an instanceof ExecPermission,

                      and + *

                    • p is an instanceof ExecPermission, and *
                    • p's pathname is implied by this object's * pathname. For example, "/tmp/*" implies "/tmp/foo", since * "/tmp/*" encompasses the "/tmp" directory and all files in that @@ -140,7 +139,7 @@ public final class ExecPermission extends Permission * Checks two ExecPermission objects for equality. * Checks that obj's class is the same as this object's class * and has the same name as this object. - *

                      + * * @param obj the object we are testing for equality with this object. * @return true if obj is an ExecPermission, and has the same * pathname as this ExecPermission object, false otherwise. diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/log/LogInputStream.java b/jdk/src/java.rmi/share/classes/sun/rmi/log/LogInputStream.java index e0bf5c8767a..319e9741155 100644 --- a/jdk/src/java.rmi/share/classes/sun/rmi/log/LogInputStream.java +++ b/jdk/src/java.rmi/share/classes/sun/rmi/log/LogInputStream.java @@ -35,7 +35,7 @@ class LogInputStream extends InputStream { /** * Creates a log input file with the specified system dependent * file descriptor. - * @param fd the system dependent file descriptor + * @param in the system dependent file descriptor * @param length the total number of bytes allowed to be read * @exception IOException If an I/O error has occurred. */ diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/log/LogOutputStream.java b/jdk/src/java.rmi/share/classes/sun/rmi/log/LogOutputStream.java index 7d8ebdc6515..15cea2b1c9b 100644 --- a/jdk/src/java.rmi/share/classes/sun/rmi/log/LogOutputStream.java +++ b/jdk/src/java.rmi/share/classes/sun/rmi/log/LogOutputStream.java @@ -35,7 +35,7 @@ class LogOutputStream extends OutputStream { /** * Creates an output file with the specified system dependent * file descriptor. - * @param fd the system dependent file descriptor + * @param raf the system dependent file descriptor. * @exception IOException If an I/O error has occurred. */ public LogOutputStream(RandomAccessFile raf) throws IOException { diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/log/ReliableLog.java b/jdk/src/java.rmi/share/classes/sun/rmi/log/ReliableLog.java index 3c097c4c44a..9e9372eb9d3 100644 --- a/jdk/src/java.rmi/share/classes/sun/rmi/log/ReliableLog.java +++ b/jdk/src/java.rmi/share/classes/sun/rmi/log/ReliableLog.java @@ -124,7 +124,7 @@ public class ReliableLog { * stable storage directory. * * @param dirPath path to the stable storage directory - * @param logCl the closure object containing callbacks for logging and + * @param handler the closure object containing callbacks for logging and * recovery * @param pad ignored * @exception IOException If a directory creation error has @@ -170,8 +170,8 @@ public class ReliableLog { * stable storage directory. * * @param dirPath path to the stable storage directory - * @param logCl the closure object containing callbacks for logging and - * recovery + * @param handler the closure object containing callbacks for logging and + * recovery * @exception IOException If a directory creation error has * occurred or if initialSnapshot callback raises an exception */ diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/registry/RegistryImpl.java b/jdk/src/java.rmi/share/classes/sun/rmi/registry/RegistryImpl.java index 7fd4d5b55ad..9db17967a18 100644 --- a/jdk/src/java.rmi/share/classes/sun/rmi/registry/RegistryImpl.java +++ b/jdk/src/java.rmi/share/classes/sun/rmi/registry/RegistryImpl.java @@ -155,7 +155,7 @@ public class RegistryImpl extends java.rmi.server.RemoteServer /** * Returns the remote object for specified name in the registry. * @exception RemoteException If remote operation failed. - * @exception NotBound If name is not currently bound. + * @exception NotBoundException If name is not currently bound. */ public Remote lookup(String name) throws RemoteException, NotBoundException @@ -188,7 +188,7 @@ public class RegistryImpl extends java.rmi.server.RemoteServer /** * Unbind the name. * @exception RemoteException If remote operation failed. - * @exception NotBound If name is not currently bound. + * @exception NotBoundException If name is not currently bound. */ public void unbind(String name) throws RemoteException, NotBoundException, AccessException diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/runtime/Log.java b/jdk/src/java.rmi/share/classes/sun/rmi/runtime/Log.java index 9a152b69e2c..9ba58a55539 100644 --- a/jdk/src/java.rmi/share/classes/sun/rmi/runtime/Log.java +++ b/jdk/src/java.rmi/share/classes/sun/rmi/runtime/Log.java @@ -96,7 +96,7 @@ public abstract class Log { * care to interpret a range of values between BRIEF, VERBOSE and * SILENT. * - * An override < 0 is interpreted to mean that the logging + * An override {@literal <} 0 is interpreted to mean that the logging * configuration should not be overridden. The level passed to the * factories createLog method will be null in this case. * diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/server/ActivationGroupImpl.java b/jdk/src/java.rmi/share/classes/sun/rmi/server/ActivationGroupImpl.java index 118de821e3b..110bb11941c 100644 --- a/jdk/src/java.rmi/share/classes/sun/rmi/server/ActivationGroupImpl.java +++ b/jdk/src/java.rmi/share/classes/sun/rmi/server/ActivationGroupImpl.java @@ -345,7 +345,7 @@ public class ActivationGroupImpl extends ActivationGroup { * request. * * @param id the object's activation identifier - * @returns true if the operation succeeds (the operation will + * @return true if the operation succeeds (the operation will * succeed if the object in currently known to be active and is * either already unexported or is currently exported and has no * pending/executing calls); false is returned if the object has @@ -430,7 +430,7 @@ public class ActivationGroupImpl extends ActivationGroup { * hasn't already done so. * * @param id the object's identifier - * @param obj the remote object implementation + * @param impl the remote object implementation * @exception UnknownObjectException if object is not registered * @exception RemoteException if call informing monitor fails */ diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/server/ActivationGroupInit.java b/jdk/src/java.rmi/share/classes/sun/rmi/server/ActivationGroupInit.java index 3e1d9672153..2947069fda3 100644 --- a/jdk/src/java.rmi/share/classes/sun/rmi/server/ActivationGroupInit.java +++ b/jdk/src/java.rmi/share/classes/sun/rmi/server/ActivationGroupInit.java @@ -36,7 +36,7 @@ import java.rmi.activation.ActivationGroup; * The activator spawns (as a child process) an activation group as needed * and directs activation requests to the appropriate activation * group. After spawning the VM, the activator passes some - * information to the bootstrap code via its stdin:

                      + * information to the bootstrap code via its stdin: *

                        *
                      • the activation group's id, *
                      • the activation group's descriptor (an instance of the class diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/transport/Channel.java b/jdk/src/java.rmi/share/classes/sun/rmi/transport/Channel.java index f34cd7c0507..09701886e6b 100644 --- a/jdk/src/java.rmi/share/classes/sun/rmi/transport/Channel.java +++ b/jdk/src/java.rmi/share/classes/sun/rmi/transport/Channel.java @@ -42,7 +42,7 @@ public interface Channel { /** * Free the connection generated by this channel. - * @param c The connection + * @param conn The connection. * @param reuse If true, the connection is in a state in which it * can be reused for another method call. */ diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/transport/LiveRef.java b/jdk/src/java.rmi/share/classes/sun/rmi/transport/LiveRef.java index e6c4fdd891a..7b1da512a13 100644 --- a/jdk/src/java.rmi/share/classes/sun/rmi/transport/LiveRef.java +++ b/jdk/src/java.rmi/share/classes/sun/rmi/transport/LiveRef.java @@ -56,7 +56,7 @@ public class LiveRef implements Cloneable { /** * Construct a "well-known" live reference to a remote object - * @param isLocalServer If true, indicates this ref specifies a local + * @param isLocal If true, indicates this ref specifies a local * server in this address space; if false, the ref is for a remote * object (hence a surrogate or proxy) in another address space. */ diff --git a/jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/CGIHandler.java b/jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/CGIHandler.java index 343810da8ae..546ccd8ea10 100644 --- a/jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/CGIHandler.java +++ b/jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy/CGIHandler.java @@ -81,7 +81,7 @@ interface CGICommandHandler { /** * The CGIHandler class contains methods for executing as a CGI program. * The main function interprets the query string as a command of the form - * "=". + * "{@code =}". * * This class depends on the CGI 1.0 environment variables being set as * properties of the same name in this Java VM. diff --git a/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/FilteredRowSetImpl.java b/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/FilteredRowSetImpl.java index 8d72277cd00..32ef3cf4081 100644 --- a/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/FilteredRowSetImpl.java +++ b/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/FilteredRowSetImpl.java @@ -466,7 +466,7 @@ public class FilteredRowSetImpl extends WebRowSetImpl implements Serializable, C * passed to the evaluate function. * 2. updateXXXstream() - here it would suffice to pass the stream handle * to the evaluate function and the implementation - * of the evaluate function can do the comparision + * of the evaluate function can do the comparison * based on the stream and also type of data. */ diff --git a/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/JoinRowSetImpl.java b/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/JoinRowSetImpl.java index 93386b1ea30..1da997d6905 100644 --- a/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/JoinRowSetImpl.java +++ b/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/JoinRowSetImpl.java @@ -4063,14 +4063,16 @@ public class JoinRowSetImpl extends WebRowSetImpl implements JoinRowSet { } /** - * Provide interface coverage for getURL(int) in ResultSet->RowSet + * Provide interface coverage for getURL(int) in + * ResultSet{@literal ->}RowSet */ public java.net.URL getURL(int columnIndex) throws SQLException { return crsInternal.getURL(columnIndex); } /** - * Provide interface coverage for getURL(String) in ResultSet->RowSet + * Provide interface coverage for getURL(String) in + * ResultSet{@literal ->}RowSet */ public java.net.URL getURL(String columnName) throws SQLException { return crsInternal.getURL(columnName); diff --git a/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/providers/RIOptimisticProvider.java b/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/providers/RIOptimisticProvider.java index 0d8dff3232f..b990d6fbba3 100644 --- a/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/providers/RIOptimisticProvider.java +++ b/jdk/src/java.sql.rowset/share/classes/com/sun/rowset/providers/RIOptimisticProvider.java @@ -36,7 +36,7 @@ import com.sun.rowset.internal.*; * The reference implementation of a JDBC Rowset synchronization provider * providing optimistic synchronization with a relational datastore * using any JDBC technology-enabled driver. - *

                        + * *

                        1.0 Backgroud

                        * This synchronization provider is registered with the * SyncFactory by default as the diff --git a/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/RMIGenerator.java b/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/RMIGenerator.java index 4dc745ff8ab..9725872a373 100644 --- a/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/RMIGenerator.java +++ b/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/RMIGenerator.java @@ -79,7 +79,7 @@ public class RMIGenerator implements RMIConstants, Generator { * Examine and consume command line arguments. * @param argv The command line arguments. Ignore null * and unknown arguments. Set each consumed argument to null. - * @param error Report any errors using the main.error() methods. + * @param main Report any errors using the main.error() methods. * @return true if no errors, false otherwise. */ public boolean parseArgs(String argv[], Main main) { diff --git a/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/RemoteClass.java b/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/RemoteClass.java index e9ec3fa67ea..6187d5ca866 100644 --- a/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/RemoteClass.java +++ b/jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/RemoteClass.java @@ -111,7 +111,7 @@ public class RemoteClass implements sun.rmi.rmic.RMIConstants { * the remote methods implemented by this class, i.e. all of the * methods in the class's remote interfaces. * - * The methods in the array are ordered according to the comparision + * The methods in the array are ordered according to the comparison * of the strings consisting of their method name followed by their * type signature, so each method's index in the array corresponds * to its "operation number" in the JDK 1.1 version of the