Merge pull request #21473 from pshipton/blockquote0.51

keithc-ca · web-flow · commit 9a4e79ac1cfd · 2025-03-25T17:06:33.000-04:00
(0.51) Remove inappropriate usage of &lt;blockquote&gt; in javadoc
diff --git a/jcl/src/java.base/share/classes/com/ibm/jit/JITHelpers.java b/jcl/src/java.base/share/classes/com/ibm/jit/JITHelpers.java
@@ -38,7 +38,7 @@
 /*[ENDIF] JAVA_SPEC_VERSION >= 9 */
 
 /**
- * The <code>JITHelpers</code> class contains methods used by the JIT to optimize certain primitive operations.
+ * The {@code JITHelpers} class contains methods used by the JIT to optimize certain primitive operations.
  */
 @SuppressWarnings("javadoc")
 @J9UnmodifiableClass
@@ -585,13 +585,13 @@ public boolean canEncodeAsLatin1(byte[] array, int start, int length) {
 	 * offset.
 	 *
 	 * <p>This API implicitly assumes the following:
-	 * <blockquote><pre>
-	 *     - s1Value != null
-	 *     - s2Value != null
-	 *     - 0 <= s1len <= s1Value.length * 2
-	 *     - 1 <= s2len <= s2Value.length * 2
-	 *     - 0 <= start < s1len
-	 * <blockquote><pre>
+	 * <ul>
+	 * <li>{@code s1Value != null}</li>
+	 * <li>{@code s2Value != null}</li>
+	 * <li>{@code 0 <= s1len <= s1Value.length * 2}</li>
+	 * <li>{@code 1 <= s2len <= s2Value.length * 2}</li>
+	 * <li>{@code 0 <= start < s1len}</li>
+	 * </ul>
 	 *
 	 * @param s1Value the source character array to search in.
 	 * @param s1len   the length (in number of characters) of the source array.
@@ -631,13 +631,13 @@ public int intrinsicIndexOfStringLatin1(Object s1Value, int s1len, Object s2Valu
 	 * offset.
 	 *
 	 * <p>This API implicitly assumes the following:
-	 * <blockquote><pre>
-	 *     - s1Value != null
-	 *     - s2Value != null
-	 *     - 0 <= s1len <= s1Value.length
-	 *     - 1 <= s2len <= s2Value.length
-	 *     - 0 <= start < s1len
-	 * <blockquote><pre>
+	 * <ul>
+	 * <li>{@code s1Value != null}</li>
+	 * <li>{@code s2Value != null}</li>
+	 * <li>{@code 0 <= s1len <= s1Value.length}</li>
+	 * <li>{@code 1 <= s2len <= s2Value.length}</li>
+	 * <li>{@code 0 <= start < s1len}</li>
+	 * </ul>
 	 *
 	 * @param s1Value the source character array to search in.
 	 * @param s1len   the length (in number of characters) of the source array.
@@ -676,11 +676,11 @@ public int intrinsicIndexOfStringUTF16(Object s1Value, int s1len, Object s2Value
 	 * Returns the first index of the character within the source character array starting from the specified offset.
 	 *
 	 * <p>This API implicitly assumes the following:
-	 * <blockquote><pre>
-	 *     - array != null
-	 *     - 0 <= offset < length <= array.length * 1 (if array instanceof byte[])
-	 *     - 0 <= offset < length <= array.length * 2 (if array instanceof char[])
-	 * <blockquote><pre>
+	 * <ul>
+	 * <li>{@code array != null}</li>
+	 * <li>{@code 0 <= offset < length <= array.length * 1 (if array instanceof byte[])}</li>
+	 * <li>{@code 0 <= offset < length <= array.length * 2 (if array instanceof char[])}</li>
+	 * </ul>
 	 *
 	 * @param array  the source character array to search in.
 	 * @param ch     the character to search for.
@@ -702,11 +702,11 @@ public int intrinsicIndexOfLatin1(Object array, byte ch, int offset, int length)
 	 * Returns the first index of the character within the source character array starting from the specified offset.
 	 *
 	 * <p>This API implicitly assumes the following:
-	 * <blockquote><pre>
-	 *     - array != null
-	 *     - 0 <= offset < length <= array.length * 1 (if array instanceof byte[])
-	 *     - 0 <= offset < length <= array.length * 2 (if array instanceof char[])
-	 * <blockquote><pre>
+	 * <ul>
+	 * <li>{@code array != null}</li>
+	 * <li>{@code 0 <= offset < length <= array.length * 1 (if array instanceof byte[])}</li>
+	 * <li>{@code 0 <= offset < length <= array.length * 2 (if array instanceof char[])}</li>
+	 * </ul>
 	 *
 	 * @param array  the source character array to search in.
 	 * @param ch     the character to search for.
diff --git a/jcl/src/java.base/share/classes/java/lang/String.java b/jcl/src/java.base/share/classes/java/lang/String.java
@@ -279,11 +279,11 @@ static void initCompressionFlag() {
 	 * Latin1 string.
 	 *
 	 * <p>This API implicitly assumes the following:
-	 * <blockquote><pre>
-	 *     - {@code length >= 0}
-	 *     - {@code start >= 0}
-	 *     - {@code start + length <= data.length}
-	 * <blockquote><pre>
+	 * <ul>
+	 * <li>{@code length >= 0}</li>
+	 * <li>{@code start >= 0}</li>
+	 * <li>{@code start + length <= c.length}</li>
+	 * </ul>
 	 *
 	 * @param c      the array of characters to check
 	 * @param start  the starting offset in the character array
@@ -4252,11 +4252,11 @@ static void initCompressionFlag() {
 	 * Latin1 string.
 	 *
 	 * <p>This API implicitly assumes the following:
-	 * <blockquote><pre>
-	 *     - {@code length >= 0}
-	 *     - {@code start >= 0}
-	 *     - {@code start + length <= data.length}
-	 * <blockquote><pre>
+	 * <ul>
+	 * <li>{@code length >= 0}</li>
+	 * <li>{@code start >= 0}</li>
+	 * <li>{@code start + length <= c.length}</li>
+	 * </ul>
 	 *
 	 * @param c      the array of characters to check
 	 * @param start  the starting offset in the character array
diff --git a/jcl/src/java.management/share/classes/java/lang/management/LockInfo.java b/jcl/src/java.management/share/classes/java/lang/management/LockInfo.java
@@ -88,12 +88,12 @@ public int getIdentityHashCode() {
 	/**
 	 * Returns a {@code LockInfo} object represented by the given
 	 * {@code CompositeData}. The given {@code CompositeData} must contain the
-	 * following attributes: <blockquote>
-	 * <table>
+	 * following attributes:
+	 * <br><br><table border=1>
 	 * <caption>The attributes and the types the given CompositeData contains</caption>
 	 * <tr>
-	 * <th style="float:left">Attribute Name</th>
-	 * <th style="float:left">Type</th>
+	 * <th style="text-align:left">Attribute Name</th>
+	 * <th style="text-align:left">Type</th>
 	 * </tr>
 	 * <tr>
 	 * <td>className</td>
@@ -104,7 +104,6 @@ public int getIdentityHashCode() {
 	 * <td><code>java.lang.Integer</code></td>
 	 * </tr>
 	 * </table>
-	 * </blockquote>
 	 *
 	 * @param compositeData
 	 *            {@code CompositeData} representing a {@code LockInfo}
diff --git a/jcl/src/jdk.management/share/classes/com/ibm/virtualization/management/HypervisorMXBean.java b/jcl/src/jdk.management/share/classes/com/ibm/virtualization/management/HypervisorMXBean.java
@@ -27,7 +27,7 @@
 
 /**
  * This interface provides information on whether the current Operating System is running directly on physical hardware
- * or running as a Guest (Virtual Machine (VM)/Logical Partition (LPAR)) on top of a Hypervisor.
+ * or running as a Guest (Virtual Machine (VM)/Logical Partition (LPAR)) on a Hypervisor.
  * If the Operating System is running as a Guest, the interface provides information about the Hypervisor.
  * <b>Where there are multiple levels of Hypervisor, only the top level Hypervisor information is returned.</b>
  * The supported Hypervisors and the platforms on which they are supported:
diff --git a/jcl/src/jdk.management/share/classes/com/sun/management/GarbageCollectionNotificationInfo.java b/jcl/src/jdk.management/share/classes/com/sun/management/GarbageCollectionNotificationInfo.java
@@ -56,7 +56,7 @@
  * a {@code CompositeData} to a {@code GarbageCollectionNotificationInfo}
  * object. For example:
  *
- * <blockquote><pre>
+ * <pre>
  *      Notification notif;
  *
  *      // receive the notification emitted by a GarbageCollectorMXBean and save in notif
@@ -69,7 +69,7 @@
  *          GarbageCollectionNotificationInfo info = GarbageCollectionNotificationInfo.from(cd);
  *          ...
  *      }
- * </pre></blockquote>
+ * </pre>
  *
  * <p>
  * The type of the notification emitted by a {@code GarbageCollectorMXBean} is:
@@ -175,8 +175,7 @@ public GcInfo getGcInfo() {
 	 * Returns a {@code GarbageCollectionNotificationInfo} object represented by the
 	 * given {@code CompositeData}.
 	 * The given {@code CompositeData} must contain the following attributes:
-	 * <blockquote>
-	 * <table border=1>
+	 * <br><br><table border=1>
 	 * <caption>CompositeData attributes</caption>
 	 * <tr>
 	 *   <th style="text-align:left">Attribute Name</th>
@@ -199,7 +198,6 @@ public GcInfo getGcInfo() {
 	 *   <td>{@code com.ibm.lang.management.GcInfo}</td>
 	 * </tr>
 	 * </table>
-	 * </blockquote>
 	 *
 	 * @param cd {@code CompositeData} representing a
 	 *     {@code GarbageCollectionNotificationInfo}
diff --git a/jcl/src/jdk.management/share/classes/com/sun/management/GcInfo.java b/jcl/src/jdk.management/share/classes/com/sun/management/GcInfo.java
@@ -39,15 +39,13 @@
  * Garbage collection information.  It contains the following
  * information for one garbage collection as well as GC-specific
  * attributes:
- * <blockquote>
  * <ul>
  *   <li>Start time</li>
  *   <li>End time</li>
  *   <li>Duration</li>
  *   <li>Memory usage before the collection starts</li>
  *   <li>Memory usage after the collection ends</li>
  * </ul>
- * </blockquote>
  *
  * @since 9
  */
@@ -187,8 +185,7 @@ public Map<String, MemoryUsage> getMemoryUsageAfterGc() {
 	 * <code>CompositeData</code> must contain
 	 * all the following attributes:
 	 *
-	 * <blockquote>
-	 * <table border=1>
+	 * <br><br><table border=1>
 	 * <caption>CompositeData attributes</caption>
 	 * <tr>
 	 *   <th style="text-align:left">Attribute Name</th>
@@ -215,7 +212,7 @@ public Map<String, MemoryUsage> getMemoryUsageAfterGc() {
 	 *   <td><code>javax.management.openmbean.TabularData</code></td>
 	 * </tr>
 	 * </table>
-	 * </blockquote>
+	 *
 	 * @param cd <code>CompositeData</code> representing a <code>GcInfo</code>
 	 *
 	 * @throws IllegalArgumentException if <code>cd</code> does not
