From bd1ab99c87b1d85b71d3494c79c9f30afc036cb0 Mon Sep 17 00:00:00 2001 From: Jonathan Gibbons Date: Thu, 27 Apr 2017 09:47:40 -0700 Subject: [PATCH] 8179370: Replace use of ,
and tags in java.base Reviewed-by: darcy, alanb, mchung --- jdk/make/gensrc/GensrcCharsetCoder.gmk | 4 +- .../share/classes/java/io/DataInput.java | 40 +++++++++---------- .../share/classes/java/net/URLConnection.java | 4 +- .../classes/java/util/ServiceLoader.java | 14 +++---- .../javax/net/ssl/TrustManagerFactory.java | 2 +- 5 files changed, 32 insertions(+), 32 deletions(-) diff --git a/jdk/make/gensrc/GensrcCharsetCoder.gmk b/jdk/make/gensrc/GensrcCharsetCoder.gmk index e992b19a3fa..47dab1cfbc0 100644 --- a/jdk/make/gensrc/GensrcCharsetCoder.gmk +++ b/jdk/make/gensrc/GensrcCharsetCoder.gmk @@ -54,7 +54,7 @@ $(GENSRC_CHARSETCODER_DST)/CharsetDecoder.java: $(GENSRC_CHARSETCODER_TEMPLATE) -DOtherCoder='Encoder' \ -DreplTypeName='string' \ -DdefaultRepl='"\\uFFFD"' \ - -DdefaultReplName='"\\uFFFD"<\/tt>' \ + -DdefaultReplName='"\\uFFFD"<\/code>' \ -DreplType='String' \ -DreplFQType='java.lang.String' \ -DreplLength='length()' \ @@ -89,7 +89,7 @@ $(GENSRC_CHARSETCODER_DST)/CharsetEncoder.java: $(GENSRC_CHARSETCODER_TEMPLATE) -DOtherCoder='Decoder' \ -DreplTypeName='byte array' \ -DdefaultRepl='new byte[] { (byte)'"'"\\?"'"' }' \ - -DdefaultReplName='{<\/tt>\ (byte)'"'"\\?"'"'<\/tt>\ }<\/tt>' \ + -DdefaultReplName='{<\/code>\ (byte)'"'"\\?"'"'<\/code>\ }<\/code>' \ -DreplType='byte[]' \ -DreplFQType='byte[]' \ -DreplLength='length' \ diff --git a/jdk/src/java.base/share/classes/java/io/DataInput.java b/jdk/src/java.base/share/classes/java/io/DataInput.java index c66fefb6f5a..acc7f996878 100644 --- a/jdk/src/java.base/share/classes/java/io/DataInput.java +++ b/jdk/src/java.base/share/classes/java/io/DataInput.java @@ -72,8 +72,8 @@ package java.io; * * * Byte 1 - *
0
- *
bits 6-0
+ * 0 + * bits 6-0 * * * @@ -87,16 +87,16 @@ package java.io; * * * Byte 1 - *
1
- *
1
- *
0
- *
bits 10-6
+ * 1 + * 1 + * 0 + * bits 10-6 * * * Byte 2 - *
1
- *
0
- *
bits 5-0
+ * 1 + * 0 + * bits 5-0 * * * @@ -109,23 +109,23 @@ package java.io; * * * Byte 1 - *
1
- *
1
- *
1
- *
0
- *
bits 15-12
+ * 1 + * 1 + * 1 + * 0 + * bits 15-12 * * * Byte 2 - *
1
- *
0
- *
bits 11-6
+ * 1 + * 0 + * bits 11-6 * * * Byte 3 - *
1
- *
0
- *
bits 5-0
+ * 1 + * 0 + * bits 5-0 * * * diff --git a/jdk/src/java.base/share/classes/java/net/URLConnection.java b/jdk/src/java.base/share/classes/java/net/URLConnection.java index e2ed0cfcbdd..e88c2f5f40c 100644 --- a/jdk/src/java.base/share/classes/java/net/URLConnection.java +++ b/jdk/src/java.base/share/classes/java/net/URLConnection.java @@ -54,7 +54,7 @@ import sun.security.action.GetPropertyAction; * read from and to write to the resource referenced by the URL. In * general, creating a connection to a URL is a multistep process: * - *
+ *
* * * *
{@code openConnection()}{@code connect()}
Manipulate parameters that affect the connection to the remote @@ -63,7 +63,7 @@ import sun.security.action.GetPropertyAction; * contents.
* ----------------------------> - *
time
+ *
time * *
    *
  1. The connection object is created by invoking the diff --git a/jdk/src/java.base/share/classes/java/util/ServiceLoader.java b/jdk/src/java.base/share/classes/java/util/ServiceLoader.java index db4ff4e78ec..8d4cd8de611 100644 --- a/jdk/src/java.base/share/classes/java/util/ServiceLoader.java +++ b/jdk/src/java.base/share/classes/java/util/ServiceLoader.java @@ -125,13 +125,13 @@ import jdk.internal.reflect.Reflection; * *

    A service provider that is packaged as a JAR file for the class path is * identified by placing a provider-configuration file in the resource - * directory META-INF/services. The file's name is the fully-qualified + * directory {@code META-INF/services}. The file's name is the fully-qualified * binary name of the service's * type. The file contains a list of fully-qualified binary names of concrete * provider classes, one per line. Space and tab characters surrounding each * name, as well as blank lines, are ignored. The comment character is - * '#' ('\u0023', - * NUMBER SIGN); on + * {@code '#'} ('\u0023', + * NUMBER SIGN); on * each line all characters following the first comment character are ignored. * The file must be encoded in UTF-8. * If a particular concrete provider class is named in more than one @@ -257,7 +257,7 @@ import jdk.internal.reflect.Reflection; * method in this class will cause a {@link NullPointerException} to be thrown. * *

    Example

    - *

    Suppose we have a service type com.example.CodecSet which is + *

    Suppose we have a service type {@code com.example.CodecSet} which is * intended to represent sets of encoder/decoder pairs for some protocol. In * this case it is an abstract class with two abstract methods: * @@ -265,11 +265,11 @@ import jdk.internal.reflect.Reflection; * public abstract Encoder getEncoder(String encodingName); * public abstract Decoder getDecoder(String encodingName); * - * Each method returns an appropriate object or null if the provider + * Each method returns an appropriate object or {@code null} if the provider * does not support the given encoding. Typical providers support more than * one encoding. * - *

    The CodecSet class creates and saves a single service instance + *

    The {@code CodecSet} class creates and saves a single service instance * at initialization: * * 

    {@code
@@ -1402,7 +1402,7 @@ public final class ServiceLoader
      *
      * @param  loader
      *         The class loader to be used to load provider-configuration files
-     *         and provider classes, or null if the system class
+     *         and provider classes, or {@code null} if the system class
      *         loader (or, failing that, the bootstrap class loader) is to be
      *         used
      *
diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/TrustManagerFactory.java b/jdk/src/java.base/share/classes/javax/net/ssl/TrustManagerFactory.java
index 0f999e8d0aa..466d52f1d7e 100644
--- a/jdk/src/java.base/share/classes/javax/net/ssl/TrustManagerFactory.java
+++ b/jdk/src/java.base/share/classes/javax/net/ssl/TrustManagerFactory.java
@@ -40,7 +40,7 @@ import sun.security.jca.GetInstance;
  * 
     Every implementation of the Java platform is required to support the
  * following standard {@code TrustManagerFactory} algorithm:
  * 
      
- * 
    • PKIX
      • 
+ * 
    • {@code PKIX}
      • 
  * 
    
  * This algorithm is described in the