# HG changeset patch # User igerasim # Date 1585303603 25200 # Fri Mar 27 03:06:43 2020 -0700 # Node ID c7140c1d40b27430949853a354de0df52a14ca34 # Parent 7e710082a8aa86a2b7f9d740bbdb4dce02a2e3d5 [mq]: 8241727-Typos-empty-lines-in-javadoc-inconsistent-indents-etc diff --git a/src/java.base/share/classes/java/io/FileInputStream.java b/src/java.base/share/classes/java/io/FileInputStream.java --- a/src/java.base/share/classes/java/io/FileInputStream.java +++ b/src/java.base/share/classes/java/io/FileInputStream.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1994, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -52,7 +52,6 @@ * called when the FileInputStream is unreachable. * Otherwise, it is implementation specific how the resource cleanup described in * {@link #close} is performed. - * * @author Arthur van Hoff * @see java.io.File diff --git a/src/java.base/share/classes/java/io/ObjectInputStream.java b/src/java.base/share/classes/java/io/ObjectInputStream.java --- a/src/java.base/share/classes/java/io/ObjectInputStream.java +++ b/src/java.base/share/classes/java/io/ObjectInputStream.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -517,7 +517,7 @@ /** * This method is called by trusted subclasses of ObjectInputStream that - + constructed ObjectInputStream using the protected no-arg constructor. + * constructed ObjectInputStream using the protected no-arg constructor. * The subclass is expected to provide an override method with the modifier * "final". * diff --git a/src/java.base/share/classes/java/io/PipedReader.java b/src/java.base/share/classes/java/io/PipedReader.java --- a/src/java.base/share/classes/java/io/PipedReader.java +++ b/src/java.base/share/classes/java/io/PipedReader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -87,7 +87,7 @@ * to the piped writer {@code src} and uses the specified * pipe size for the pipe's buffer. Data written to {@code src} * will then be available as input from this stream. - + * * @param src the stream to connect to. * @param pipeSize the size of the pipe's buffer. * @throws IOException if an I/O error occurs. diff --git a/src/java.base/share/classes/java/io/RandomAccessFile.java b/src/java.base/share/classes/java/io/RandomAccessFile.java --- a/src/java.base/share/classes/java/io/RandomAccessFile.java +++ b/src/java.base/share/classes/java/io/RandomAccessFile.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1994, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -529,8 +529,8 @@ /** * Writes a sub array as a sequence of bytes. + * * @param b the data to be written - * @param off the start offset in the data * @param len the number of bytes that are written * @throws IOException If an I/O error has occurred. diff --git a/src/java.base/share/classes/java/lang/Boolean.java b/src/java.base/share/classes/java/lang/Boolean.java --- a/src/java.base/share/classes/java/lang/Boolean.java +++ b/src/java.base/share/classes/java/lang/Boolean.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1994, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -228,7 +228,7 @@ return value ? 1231 : 1237; } - /** + /** * Returns {@code true} if and only if the argument is not * {@code null} and is a {@code Boolean} object that * represents the same {@code boolean} value as this object. diff --git a/src/java.base/share/classes/java/lang/Character.java b/src/java.base/share/classes/java/lang/Character.java --- a/src/java.base/share/classes/java/lang/Character.java +++ b/src/java.base/share/classes/java/lang/Character.java @@ -390,7 +390,7 @@ public static final byte DIRECTIONALITY_RIGHT_TO_LEFT = 1; /** - * Strong bidirectional character type "AL" in the Unicode specification. + * Strong bidirectional character type "AL" in the Unicode specification. * @since 1.4 */ public static final byte DIRECTIONALITY_RIGHT_TO_LEFT_ARABIC = 2; @@ -3181,7 +3181,7 @@ "MAYAN NUMERALS", "MAYANNUMERALS"); - /** + /** * Constant for the "Indic Siyaq Numbers" Unicode * character block. * @since 12 @@ -4773,7 +4773,7 @@ */ WARANG_CITI, - /** + /** * Unicode script "Ahom". * @since 9 */ @@ -8590,7 +8590,7 @@ * values is a valid * * Unicode surrogate pair. - + * *

This method is equivalent to the expression: *

{@code
      * isHighSurrogate(high) && isLowSurrogate(low)
@@ -10967,7 +10967,6 @@
      * Compares two {@code Character} objects numerically.
      *
      * @param   anotherCharacter   the {@code Character} to be compared.
-
      * @return  the value {@code 0} if the argument {@code Character}
      *          is equal to this {@code Character}; a value less than
      *          {@code 0} if this {@code Character} is numerically less
diff --git a/src/java.base/share/classes/java/lang/ClassLoader.java b/src/java.base/share/classes/java/lang/ClassLoader.java
--- a/src/java.base/share/classes/java/lang/ClassLoader.java
+++ b/src/java.base/share/classes/java/lang/ClassLoader.java
@@ -734,7 +734,6 @@
      *         The module name; or {@code null} to find the class in the
      *         {@linkplain #getUnnamedModule() unnamed module} for this
      *         class loader
-
      * @param  name
      *         The binary name of the class
      *
diff --git a/src/java.base/share/classes/java/lang/Float.java b/src/java.base/share/classes/java/lang/Float.java
--- a/src/java.base/share/classes/java/lang/Float.java
+++ b/src/java.base/share/classes/java/lang/Float.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -694,7 +694,6 @@
     }
 
     /**
-
      * Compares this object against the specified object.  The result
      * is {@code true} if and only if the argument is not
      * {@code null} and is a {@code Float} object that
diff --git a/src/java.base/share/classes/java/lang/Package.java b/src/java.base/share/classes/java/lang/Package.java
--- a/src/java.base/share/classes/java/lang/Package.java
+++ b/src/java.base/share/classes/java/lang/Package.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -155,7 +155,7 @@
      * 
*
SpecificationVersion: *
Digits RefinedVersionopt - + * *
RefinedVersion: *
{@code .} Digits *
{@code .} Digits RefinedVersion diff --git a/src/java.base/share/classes/java/lang/ProcessBuilder.java b/src/java.base/share/classes/java/lang/ProcessBuilder.java --- a/src/java.base/share/classes/java/lang/ProcessBuilder.java +++ b/src/java.base/share/classes/java/lang/ProcessBuilder.java @@ -1217,9 +1217,9 @@ * String directory = "/home/duke/src"; * ProcessBuilder[] builders = { * new ProcessBuilder("find", directory, "-type", "f"), - new ProcessBuilder("xargs", "grep", "-h", "^import "), - new ProcessBuilder("awk", "{print $2;}"), - new ProcessBuilder("sort", "-u")}; + * new ProcessBuilder("xargs", "grep", "-h", "^import "), + * new ProcessBuilder("awk", "{print $2;}"), + * new ProcessBuilder("sort", "-u")}; * List processes = ProcessBuilder.startPipeline( * Arrays.asList(builders)); * Process last = processes.get(processes.size()-1); diff --git a/src/java.base/share/classes/java/lang/ProcessHandleImpl.java b/src/java.base/share/classes/java/lang/ProcessHandleImpl.java --- a/src/java.base/share/classes/java/lang/ProcessHandleImpl.java +++ b/src/java.base/share/classes/java/lang/ProcessHandleImpl.java @@ -340,14 +340,14 @@ } /** - * Signal the process to terminate. - * The process is signaled only if its start time matches the known start time. - * - * @param pid process id to kill - * @param startTime the start time of the process - * @param forcibly true to forcibly terminate (SIGKILL vs SIGTERM) - * @return true if the process was signaled without error; false otherwise - */ + * Signal the process to terminate. + * The process is signaled only if its start time matches the known start time. + * + * @param pid process id to kill + * @param startTime the start time of the process + * @param forcibly true to forcibly terminate (SIGKILL vs SIGTERM) + * @return true if the process was signaled without error; false otherwise + */ private static native boolean destroy0(long pid, long startTime, boolean forcibly); @Override diff --git a/src/java.base/share/classes/java/lang/RuntimePermission.java b/src/java.base/share/classes/java/lang/RuntimePermission.java --- a/src/java.base/share/classes/java/lang/RuntimePermission.java +++ b/src/java.base/share/classes/java/lang/RuntimePermission.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -291,8 +291,7 @@ * the code would normally not be able to invoke those methods and/or * access the fields because * it can't cast the object to the class/interface with those methods - * and fields. - + * and fields. * * * queuePrintJob diff --git a/src/java.base/share/classes/java/lang/StrictMath.java b/src/java.base/share/classes/java/lang/StrictMath.java --- a/src/java.base/share/classes/java/lang/StrictMath.java +++ b/src/java.base/share/classes/java/lang/StrictMath.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -1225,7 +1225,7 @@ * @param a an argument. * @param b another argument. * @return the larger of {@code a} and {@code b}. - */ + */ public static long max(long a, long b) { return Math.max(a, b); } diff --git a/src/java.base/share/classes/java/lang/String.java b/src/java.base/share/classes/java/lang/String.java --- a/src/java.base/share/classes/java/lang/String.java +++ b/src/java.base/share/classes/java/lang/String.java @@ -462,7 +462,7 @@ * * @param length * The number of bytes to decode - + * * @param charsetName * The name of a supported {@linkplain java.nio.charset.Charset * charset} @@ -2300,10 +2300,10 @@ */ public String[] split(String regex, int limit) { /* fastpath if the regex is a - (1)one-char String and this character is not one of the - RegEx's meta characters ".$|()[{^?*+\\", or - (2)two-char String and the first char is the backslash and - the second is not the ascii digit or ascii letter. + * (1) one-char String and this character is not one of the + * RegEx's meta characters ".$|()[{^?*+\\", or + * (2) two-char String and the first char is the backslash and + * the second is not the ascii digit or ascii letter. */ char ch = 0; if (((regex.length() == 1 && diff --git a/src/java.base/share/classes/java/lang/System.java b/src/java.base/share/classes/java/lang/System.java --- a/src/java.base/share/classes/java/lang/System.java +++ b/src/java.base/share/classes/java/lang/System.java @@ -1618,7 +1618,7 @@ * the Java Runtime. See the class specification of how the * {@link LoggerFinder LoggerFinder} implementation is located and * loaded. - + * * @return the {@link LoggerFinder LoggerFinder} instance. * @throws SecurityException if a security manager is present and its * {@code checkPermission} method doesn't allow the diff --git a/src/java.base/share/classes/java/lang/Thread.java b/src/java.base/share/classes/java/lang/Thread.java --- a/src/java.base/share/classes/java/lang/Thread.java +++ b/src/java.base/share/classes/java/lang/Thread.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1994, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -242,7 +242,7 @@ */ public static final int MIN_PRIORITY = 1; - /** + /** * The default priority that is assigned to a thread. */ public static final int NORM_PRIORITY = 5; diff --git a/src/java.base/share/classes/java/lang/annotation/Annotation.java b/src/java.base/share/classes/java/lang/annotation/Annotation.java --- a/src/java.base/share/classes/java/lang/annotation/Annotation.java +++ b/src/java.base/share/classes/java/lang/annotation/Annotation.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -101,7 +101,7 @@ * {@link Long}, {@link Short}, or {@link Boolean}). * *
  • The hash code of a string, enum, class, or annotation member-value - I {@code v} is computed as by calling + * {@code v} is computed as by calling * v.hashCode(). (In the case of annotation * member values, this is a recursive definition.) * diff --git a/src/java.base/share/classes/java/lang/invoke/ConstantGroup.java b/src/java.base/share/classes/java/lang/invoke/ConstantGroup.java --- a/src/java.base/share/classes/java/lang/invoke/ConstantGroup.java +++ b/src/java.base/share/classes/java/lang/invoke/ConstantGroup.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -135,9 +135,9 @@ * must always return true. *

    * If this method returns {@code false}, nothing in particular - * can be inferred, since the query only concerns the internal + * can be inferred, since the query only concerns the internal * logic of the {@code ConstantGroup} object which ensures that - a successful * query to a constant will always remain successful. + * a successful query to a constant will always remain successful. * The only way to force a permanent decision about whether * a constant is available is to call {@link #get(int)} and * be ready for an exception if the constant is unavailable. diff --git a/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java b/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java --- a/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java +++ b/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -1151,25 +1151,25 @@ } /** - * Emit bytecode for the guardWithCatch idiom. - * - * The pattern looks like (Cf. MethodHandleImpl.makeGuardWithCatch): - *

    {@code
    -      *  guardWithCatch=Lambda(a0:L,a1:L,a2:L,a3:L,a4:L,a5:L,a6:L,a7:L)=>{
    -      *    t8:L=MethodHandle.invokeBasic(a4:L,a6:L,a7:L);
    -      *    t9:L=MethodHandleImpl.guardWithCatch(a1:L,a2:L,a3:L,t8:L);
    -      *   t10:I=MethodHandle.invokeBasic(a5:L,t9:L);t10:I}
    -      * }
    - * - * It is compiled into bytecode equivalent of the following code: - *
    {@code
    -      *  try {
    -      *      return a1.invokeBasic(a6, a7);
    -      *  } catch (Throwable e) {
    -      *      if (!a2.isInstance(e)) throw e;
    -      *      return a3.invokeBasic(ex, a6, a7);
    -      *  }}
    - */ + * Emit bytecode for the guardWithCatch idiom. + * + * The pattern looks like (Cf. MethodHandleImpl.makeGuardWithCatch): + *
    {@code
    +     *  guardWithCatch=Lambda(a0:L,a1:L,a2:L,a3:L,a4:L,a5:L,a6:L,a7:L)=>{
    +     *    t8:L=MethodHandle.invokeBasic(a4:L,a6:L,a7:L);
    +     *    t9:L=MethodHandleImpl.guardWithCatch(a1:L,a2:L,a3:L,t8:L);
    +     *   t10:I=MethodHandle.invokeBasic(a5:L,t9:L);t10:I}
    +     * }
    + * + * It is compiled into bytecode equivalent of the following code: + *
    {@code
    +     *  try {
    +     *      return a1.invokeBasic(a6, a7);
    +     *  } catch (Throwable e) {
    +     *      if (!a2.isInstance(e)) throw e;
    +     *      return a3.invokeBasic(ex, a6, a7);
    +     *  }}
    + */ private Name emitGuardWithCatch(int pos) { Name args = lambdaForm.names[pos]; Name invoker = lambdaForm.names[pos+1]; diff --git a/src/java.base/share/classes/java/lang/invoke/MethodHandle.java b/src/java.base/share/classes/java/lang/invoke/MethodHandle.java --- a/src/java.base/share/classes/java/lang/invoke/MethodHandle.java +++ b/src/java.base/share/classes/java/lang/invoke/MethodHandle.java @@ -1073,36 +1073,37 @@ throw newIllegalArgumentException("array length is not legal for long[] or double[]", arrayLength); } } + /** - * Adapts this method handle to be {@linkplain #asVarargsCollector variable arity} - * if the boolean flag is true, else {@linkplain #asFixedArity fixed arity}. - * If the method handle is already of the proper arity mode, it is returned - * unchanged. - * @apiNote - *

    This method is sometimes useful when adapting a method handle that - * may be variable arity, to ensure that the resulting adapter is also - * variable arity if and only if the original handle was. For example, - * this code changes the first argument of a handle {@code mh} to {@code int} without - * disturbing its variable arity property: - * {@code mh.asType(mh.type().changeParameterType(0,int.class)) - * .withVarargs(mh.isVarargsCollector())} - *

    - * This call is approximately equivalent to the following code: - *

    {@code
    -      * if (makeVarargs == isVarargsCollector())
    -      *   return this;
    -      * else if (makeVarargs)
    -      *   return asVarargsCollector(type().lastParameterType());
    -      * else
    -      *   return asFixedArity();
    -      * }
    - * @param makeVarargs true if the return method handle should have variable arity behavior - * @return a method handle of the same type, with possibly adjusted variable arity behavior - * @throws IllegalArgumentException if {@code makeVarargs} is true and - * this method handle does not have a trailing array parameter - * @since 9 - * @see #asVarargsCollector - * @see #asFixedArity + * Adapts this method handle to be {@linkplain #asVarargsCollector variable arity} + * if the boolean flag is true, else {@linkplain #asFixedArity fixed arity}. + * If the method handle is already of the proper arity mode, it is returned + * unchanged. + * @apiNote + *

    This method is sometimes useful when adapting a method handle that + * may be variable arity, to ensure that the resulting adapter is also + * variable arity if and only if the original handle was. For example, + * this code changes the first argument of a handle {@code mh} to {@code int} without + * disturbing its variable arity property: + * {@code mh.asType(mh.type().changeParameterType(0,int.class)) + * .withVarargs(mh.isVarargsCollector())} + *

    + * This call is approximately equivalent to the following code: + *

    {@code
    +     * if (makeVarargs == isVarargsCollector())
    +     *   return this;
    +     * else if (makeVarargs)
    +     *   return asVarargsCollector(type().lastParameterType());
    +     * else
    +     *   return asFixedArity();
    +     * }
    + * @param makeVarargs true if the return method handle should have variable arity behavior + * @return a method handle of the same type, with possibly adjusted variable arity behavior + * @throws IllegalArgumentException if {@code makeVarargs} is true and + * this method handle does not have a trailing array parameter + * @since 9 + * @see #asVarargsCollector + * @see #asFixedArity */ public MethodHandle withVarargs(boolean makeVarargs) { assert(!isVarargsCollector()); // subclass responsibility diff --git a/src/java.base/share/classes/java/lang/invoke/MethodType.java b/src/java.base/share/classes/java/lang/invoke/MethodType.java --- a/src/java.base/share/classes/java/lang/invoke/MethodType.java +++ b/src/java.base/share/classes/java/lang/invoke/MethodType.java @@ -461,7 +461,7 @@ return insertParameterTypes(parameterCount(), ptypesToInsert); } - /** + /** * Finds or creates a method type with modified parameter types. * Convenience method for {@link #methodType(java.lang.Class, java.lang.Class[]) methodType}. * @param start the position (zero-based) of the first replaced parameter type(s) diff --git a/src/java.base/share/classes/java/lang/invoke/package-info.java b/src/java.base/share/classes/java/lang/invoke/package-info.java --- a/src/java.base/share/classes/java/lang/invoke/package-info.java +++ b/src/java.base/share/classes/java/lang/invoke/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -162,7 +162,6 @@ * call site or constant, the JVM must choose one bootstrap method result and install it visibly to * all threads. Any other bootstrap method calls are allowed to complete, but their * results are ignored. - *

    * Discussion: * These rules do not enable the JVM to share call sites, diff --git a/src/java.base/share/classes/java/lang/module/package-info.java b/src/java.base/share/classes/java/lang/module/package-info.java --- a/src/java.base/share/classes/java/lang/module/package-info.java +++ b/src/java.base/share/classes/java/lang/module/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -66,7 +66,7 @@ * Because an automatic module has no explicit module declaration, it has no * 'requires' directives of its own, although its name may be given by a * 'requires' directive of an explicit module declaration.

    - + * *

    The set of root modules, whose names are the initial input to this * algorithm, is determined in an implementation specific manner. The set of * root modules may include automatic modules.

    diff --git a/src/java.base/share/classes/java/lang/reflect/AnnotatedElement.java b/src/java.base/share/classes/java/lang/reflect/AnnotatedElement.java --- a/src/java.base/share/classes/java/lang/reflect/AnnotatedElement.java +++ b/src/java.base/share/classes/java/lang/reflect/AnnotatedElement.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -274,7 +274,7 @@ return getAnnotation(annotationClass) != null; } - /** + /** * Returns this element's annotation for the specified type if * such an annotation is present, else null. * diff --git a/src/java.base/share/classes/java/lang/reflect/InvocationTargetException.java b/src/java.base/share/classes/java/lang/reflect/InvocationTargetException.java --- a/src/java.base/share/classes/java/lang/reflect/InvocationTargetException.java +++ b/src/java.base/share/classes/java/lang/reflect/InvocationTargetException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -47,7 +47,7 @@ @java.io.Serial private static final long serialVersionUID = 4085088731926701167L; - /** + /** * This field holds the target if the * InvocationTargetException(Throwable target) constructor was * used to instantiate the object diff --git a/src/java.base/share/classes/java/math/BigDecimal.java b/src/java.base/share/classes/java/math/BigDecimal.java --- a/src/java.base/share/classes/java/math/BigDecimal.java +++ b/src/java.base/share/classes/java/math/BigDecimal.java @@ -4323,7 +4323,7 @@ return asInt; } - /** + /** * Returns the compact value for given {@code BigInteger}, or * INFLATED if too big. Relies on internal representation of * {@code BigInteger}. diff --git a/src/java.base/share/classes/java/math/BigInteger.java b/src/java.base/share/classes/java/math/BigInteger.java --- a/src/java.base/share/classes/java/math/BigInteger.java +++ b/src/java.base/share/classes/java/math/BigInteger.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -4595,13 +4595,13 @@ } /** - * Returns the index of the int that contains the first nonzero int in the - * little-endian binary representation of the magnitude (int 0 is the - * least significant). If the magnitude is zero, return value is undefined. - * - *

    Note: never used for a BigInteger with a magnitude of zero. - * @see #getInt. - */ + * Returns the index of the int that contains the first nonzero int in the + * little-endian binary representation of the magnitude (int 0 is the + * least significant). If the magnitude is zero, return value is undefined. + * + *

    Note: never used for a BigInteger with a magnitude of zero. + * @see #getInt. + */ private int firstNonzeroIntNum() { int fn = firstNonzeroIntNumPlusTwo - 2; if (fn == -2) { // firstNonzeroIntNum not initialized yet diff --git a/src/java.base/share/classes/java/math/MutableBigInteger.java b/src/java.base/share/classes/java/math/MutableBigInteger.java --- a/src/java.base/share/classes/java/math/MutableBigInteger.java +++ b/src/java.base/share/classes/java/math/MutableBigInteger.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -1074,7 +1074,7 @@ z.value = zval; } - /** + /** * This method is used for division of an n word dividend by a one word * divisor. The quotient is placed into quotient. The one word divisor is * specified by divisor. diff --git a/src/java.base/share/classes/java/math/SignedMutableBigInteger.java b/src/java.base/share/classes/java/math/SignedMutableBigInteger.java --- a/src/java.base/share/classes/java/math/SignedMutableBigInteger.java +++ b/src/java.base/share/classes/java/math/SignedMutableBigInteger.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -46,7 +46,7 @@ class SignedMutableBigInteger extends MutableBigInteger { - /** + /** * The sign of this MutableBigInteger. */ int sign = 1; @@ -77,9 +77,9 @@ super(val); } - // Arithmetic Operations + // Arithmetic Operations - /** + /** * Signed addition built upon unsigned add and subtract. */ void signedAdd(SignedMutableBigInteger addend) { @@ -90,7 +90,7 @@ } - /** + /** * Signed addition built upon unsigned add and subtract. */ void signedAdd(MutableBigInteger addend) { @@ -101,7 +101,7 @@ } - /** + /** * Signed subtraction built upon unsigned add and subtract. */ void signedSubtract(SignedMutableBigInteger addend) { @@ -112,7 +112,7 @@ } - /** + /** * Signed subtraction built upon unsigned add and subtract. */ void signedSubtract(MutableBigInteger addend) { diff --git a/src/java.base/share/classes/java/text/DateFormat.java b/src/java.base/share/classes/java/text/DateFormat.java --- a/src/java.base/share/classes/java/text/DateFormat.java +++ b/src/java.base/share/classes/java/text/DateFormat.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -365,10 +365,10 @@ FieldPosition fieldPosition); /** - * Formats a {@link Date} into a date-time string. - * - * @param date the time value to be formatted into a date-time string. - * @return the formatted date-time string. + * Formats a {@link Date} into a date-time string. + * + * @param date the time value to be formatted into a date-time string. + * @return the formatted date-time string. */ public final String format(Date date) { diff --git a/src/java.base/share/classes/java/text/DateFormatSymbols.java b/src/java.base/share/classes/java/text/DateFormatSymbols.java --- a/src/java.base/share/classes/java/text/DateFormatSymbols.java +++ b/src/java.base/share/classes/java/text/DateFormatSymbols.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -98,7 +98,7 @@ *

    * New {@code DateFormatSymbols} subclasses may be added to support * {@code SimpleDateFormat} for date-time formatting for additional locales. - + * * @see DateFormat * @see SimpleDateFormat * @see java.util.SimpleTimeZone @@ -176,7 +176,6 @@ * Short month strings. For example: "Jan", "Feb", etc. An array of * 13 strings (some calendars have 13 months), indexed by * {@code Calendar.JANUARY}, {@code Calendar.FEBRUARY}, etc. - * @serial */ String shortMonths[] = null; diff --git a/src/java.base/share/classes/java/text/MessageFormat.java b/src/java.base/share/classes/java/text/MessageFormat.java --- a/src/java.base/share/classes/java/text/MessageFormat.java +++ b/src/java.base/share/classes/java/text/MessageFormat.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -826,7 +826,7 @@ * @param arguments an array of objects to be formatted and substituted. * @param result where text is appended. * @param pos keeps track on the position of the first replaced argument - in the output string. + * in the output string. * @return the string buffer passed in as {@code result}, with formatted * text appended * @throws IllegalArgumentException if an argument in the diff --git a/src/java.base/share/classes/java/text/NumberFormat.java b/src/java.base/share/classes/java/text/NumberFormat.java --- a/src/java.base/share/classes/java/text/NumberFormat.java +++ b/src/java.base/share/classes/java/text/NumberFormat.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -313,7 +313,7 @@ return parse(source, pos); } - /** + /** * Specialization of format. * * @param number the double number to format @@ -338,7 +338,7 @@ */ String fastFormat(double number) { return null; } - /** + /** * Specialization of format. * * @param number the long number to format @@ -352,7 +352,7 @@ DontCareFieldPosition.INSTANCE).toString(); } - /** + /** * Specialization of format. * * @param number the double number to format @@ -375,7 +375,7 @@ StringBuffer toAppendTo, FieldPosition pos); - /** + /** * Specialization of format. * * @param number the long number to format @@ -398,7 +398,7 @@ StringBuffer toAppendTo, FieldPosition pos); - /** + /** * Returns a Long if possible (e.g., within the range [Long.MIN_VALUE, * Long.MAX_VALUE] and with no decimals), otherwise a Double. * If IntegerOnly is set, will stop at a decimal diff --git a/src/java.base/share/classes/java/text/RBCollationTables.java b/src/java.base/share/classes/java/text/RBCollationTables.java --- a/src/java.base/share/classes/java/text/RBCollationTables.java +++ b/src/java.base/share/classes/java/text/RBCollationTables.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -183,15 +183,15 @@ } /** - * Return the maximum length of any expansion sequences that end - * with the specified comparison order. - * - * @param order a collation order returned by previous or next. - * @return the maximum length of any expansion seuences ending - * with the specified order. - * - * @see CollationElementIterator#getMaxExpansion - */ + * Return the maximum length of any expansion sequences that end + * with the specified comparison order. + * + * @param order a collation order returned by previous or next. + * @return the maximum length of any expansion seuences ending + * with the specified order. + * + * @see CollationElementIterator#getMaxExpansion + */ int getMaxExpansion(int order) { int result = 1; diff --git a/src/java.base/share/classes/java/text/RuleBasedCollator.java b/src/java.base/share/classes/java/text/RuleBasedCollator.java --- a/src/java.base/share/classes/java/text/RuleBasedCollator.java +++ b/src/java.base/share/classes/java/text/RuleBasedCollator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -54,7 +54,7 @@ * for efficiency (other subclasses may be used for more complex languages) : *

      *
    1. If a special collation rule controlled by a <modifier> is - specified it applies to the whole collator object. + * specified it applies to the whole collator object. *
    2. All non-mentioned characters are at the end of the * collation order. *
    diff --git a/src/java.base/share/classes/java/util/BitSet.java b/src/java.base/share/classes/java/util/BitSet.java --- a/src/java.base/share/classes/java/util/BitSet.java +++ b/src/java.base/share/classes/java/util/BitSet.java @@ -295,7 +295,7 @@ * @return a byte array containing a little-endian representation * of all the bits in this bit set * @since 1.7 - */ + */ public byte[] toByteArray() { int n = wordsInUse; if (n == 0) @@ -324,7 +324,7 @@ * @return a long array containing a little-endian representation * of all the bits in this bit set * @since 1.7 - */ + */ public long[] toLongArray() { return Arrays.copyOf(words, wordsInUse); } diff --git a/src/java.base/share/classes/java/util/Calendar.java b/src/java.base/share/classes/java/util/Calendar.java --- a/src/java.base/share/classes/java/util/Calendar.java +++ b/src/java.base/share/classes/java/util/Calendar.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -116,7 +116,7 @@ * the calendar fields are normalized. For example, a lenient * {@code GregorianCalendar} interprets {@code MONTH == JANUARY}, * {@code DAY_OF_MONTH == 32} as February 1. - + * *

    When a {@code Calendar} is in non-lenient mode, it throws an * exception if there is any inconsistency in its calendar fields. For * example, a {@code GregorianCalendar} always produces diff --git a/src/java.base/share/classes/java/util/Collections.java b/src/java.base/share/classes/java/util/Collections.java --- a/src/java.base/share/classes/java/util/Collections.java +++ b/src/java.base/share/classes/java/util/Collections.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -3366,7 +3366,7 @@ } } -/** + /** * Returns a dynamically typesafe view of the specified navigable set. * Any attempt to insert an element of the wrong type will result in an * immediate {@link ClassCastException}. Assuming a navigable set diff --git a/src/java.base/share/classes/java/util/Comparator.java b/src/java.base/share/classes/java/util/Comparator.java --- a/src/java.base/share/classes/java/util/Comparator.java +++ b/src/java.base/share/classes/java/util/Comparator.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -403,7 +403,7 @@ * Accepts a function that extracts a sort key from a type {@code T}, and * returns a {@code Comparator} that compares by that sort key using * the specified {@link Comparator}. - * + * *

    The returned comparator is serializable if the specified function * and comparator are both serializable. * diff --git a/src/java.base/share/classes/java/util/Currency.java b/src/java.base/share/classes/java/util/Currency.java --- a/src/java.base/share/classes/java/util/Currency.java +++ b/src/java.base/share/classes/java/util/Currency.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -564,7 +564,7 @@ * -1 is returned. * * @return the default number of fraction digits used with this currency - */ + */ public int getDefaultFractionDigits() { return defaultFractionDigits; } @@ -939,7 +939,7 @@ * - oldCurrencyNumericCode: numeric code for old currencies * - newCurrencyNumericCode: numeric code for new currencies, 0 for countries * that are not changing currencies - */ + */ private static class SpecialCaseEntry { final private long cutOverTime; diff --git a/src/java.base/share/classes/java/util/EnumMap.java b/src/java.base/share/classes/java/util/EnumMap.java --- a/src/java.base/share/classes/java/util/EnumMap.java +++ b/src/java.base/share/classes/java/util/EnumMap.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -48,7 +48,7 @@ * throw {@link NullPointerException}. Attempts to test for the * presence of a null key or to remove one will, however, function properly. * Null values are permitted. - + * *

    Like most collection implementations {@code EnumMap} is not * synchronized. If multiple threads access an enum map concurrently, and at * least one of the threads modifies the map, it should be synchronized diff --git a/src/java.base/share/classes/java/util/GregorianCalendar.java b/src/java.base/share/classes/java/util/GregorianCalendar.java --- a/src/java.base/share/classes/java/util/GregorianCalendar.java +++ b/src/java.base/share/classes/java/util/GregorianCalendar.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -167,7 +167,7 @@ * Field * * - Default Value + * Default Value * * * @@ -296,7 +296,6 @@ * + (calendar.get(Calendar.ZONE_OFFSET)/(60*60*1000))); * System.out.println("DST_OFFSET: " * + (calendar.get(Calendar.DST_OFFSET)/(60*60*1000))); - * System.out.println("Current Time, with hour reset to 3"); * calendar.clear(Calendar.HOUR_OF_DAY); // so doesn't override * calendar.set(Calendar.HOUR, 3); diff --git a/src/java.base/share/classes/java/util/Scanner.java b/src/java.base/share/classes/java/util/Scanner.java --- a/src/java.base/share/classes/java/util/Scanner.java +++ b/src/java.base/share/classes/java/util/Scanner.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -614,7 +614,7 @@ /* * This method is added so that null-check on charset can be performed before * creating InputStream as an existing test required it. - */ + */ private static Readable makeReadable(Path source, Charset charset) throws IOException { Objects.requireNonNull(charset, "charset"); diff --git a/src/java.base/share/classes/java/util/ServiceLoader.java b/src/java.base/share/classes/java/util/ServiceLoader.java --- a/src/java.base/share/classes/java/util/ServiceLoader.java +++ b/src/java.base/share/classes/java/util/ServiceLoader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -199,7 +199,7 @@ * module does not export the package containing the service provider. There is * no support for a module specifying, in a provides directive, a service * provider in another module. - + * *

    A service provider that is developed in a module has no control over when * it is instantiated, since that occurs at the behest of the application, but it * does have control over how it is instantiated: diff --git a/src/java.base/share/classes/java/util/SimpleTimeZone.java b/src/java.base/share/classes/java/util/SimpleTimeZone.java --- a/src/java.base/share/classes/java/util/SimpleTimeZone.java +++ b/src/java.base/share/classes/java/util/SimpleTimeZone.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -575,7 +575,7 @@ return offset; } - /** + /** * Returns the difference in milliseconds between local time and * UTC, taking into account both the raw offset and the effect of * daylight saving, for the specified date and time. This method diff --git a/src/java.base/share/classes/java/util/regex/Matcher.java b/src/java.base/share/classes/java/util/regex/Matcher.java --- a/src/java.base/share/classes/java/util/regex/Matcher.java +++ b/src/java.base/share/classes/java/util/regex/Matcher.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -356,21 +356,21 @@ } /** - * Changes the {@code Pattern} that this {@code Matcher} uses to - * find matches with. - * - *

    This method causes this matcher to lose information - * about the groups of the last match that occurred. The - * matcher's position in the input is maintained and its - * last append position is unaffected.

    - * - * @param newPattern - * The new pattern used by this matcher - * @return This matcher - * @throws IllegalArgumentException - * If newPattern is {@code null} - * @since 1.5 - */ + * Changes the {@code Pattern} that this {@code Matcher} uses to + * find matches with. + * + *

    This method causes this matcher to lose information + * about the groups of the last match that occurred. The + * matcher's position in the input is maintained and its + * last append position is unaffected.

    + * + * @param newPattern + * The new pattern used by this matcher + * @return This matcher + * @throws IllegalArgumentException + * If newPattern is {@code null} + * @since 1.5 + */ public Matcher usePattern(Pattern newPattern) { if (newPattern == null) throw new IllegalArgumentException("Pattern cannot be null"); diff --git a/src/java.base/share/classes/java/util/spi/AbstractResourceBundleProvider.java b/src/java.base/share/classes/java/util/spi/AbstractResourceBundleProvider.java --- a/src/java.base/share/classes/java/util/spi/AbstractResourceBundleProvider.java +++ b/src/java.base/share/classes/java/util/spi/AbstractResourceBundleProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -84,7 +84,6 @@ * Resource Bundles and Named Modules * @since 9 * @spec JPMS - */ public abstract class AbstractResourceBundleProvider implements ResourceBundleProvider { private static final JavaUtilResourceBundleAccess RB_ACCESS = diff --git a/src/java.base/share/classes/java/util/stream/DoubleStream.java b/src/java.base/share/classes/java/util/stream/DoubleStream.java --- a/src/java.base/share/classes/java/util/stream/DoubleStream.java +++ b/src/java.base/share/classes/java/util/stream/DoubleStream.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -480,7 +480,7 @@ * * @apiNote Sum, min, max, and average are all special cases of reduction. * Summing a stream of numbers can be expressed as: - + * *
    {@code
          *     double sum = numbers.reduce(0, (a, b) -> a+b);
          * }
    diff --git a/src/java.base/share/classes/java/util/stream/package-info.java b/src/java.base/share/classes/java/util/stream/package-info.java --- a/src/java.base/share/classes/java/util/stream/package-info.java +++ b/src/java.base/share/classes/java/util/stream/package-info.java @@ -729,7 +729,6 @@ * timing of binding to the data, since the data could change between the time * the spliterator is created and the time the stream pipeline is executed. * Ideally, a spliterator for a stream would report a characteristic of - * {@code IMMUTABLE} or {@code CONCURRENT}; if not it should be * late-binding. If a source * cannot directly supply a recommended spliterator, it may indirectly supply diff --git a/src/java.base/share/classes/jdk/internal/icu/impl/CharTrie.java b/src/java.base/share/classes/jdk/internal/icu/impl/CharTrie.java --- a/src/java.base/share/classes/jdk/internal/icu/impl/CharTrie.java +++ b/src/java.base/share/classes/jdk/internal/icu/impl/CharTrie.java @@ -52,16 +52,16 @@ // public constructors --------------------------------------------- /** - *

    Creates a new Trie with the settings for the trie data.

    - *

    Unserialize the 32-bit-aligned input stream and use the data for the - * trie.

    - * @param inputStream file input stream to a ICU data file, containing - * the trie - * @param dataManipulate object which provides methods to parse the char - * data - * @throws IOException thrown when data reading fails - * @draft 2.1 - */ + *

    Creates a new Trie with the settings for the trie data.

    + *

    Unserialize the 32-bit-aligned input stream and use the data for the + * trie.

    + * @param inputStream file input stream to a ICU data file, containing + * the trie + * @param dataManipulate object which provides methods to parse the char + * data + * @throws IOException thrown when data reading fails + * @draft 2.1 + */ public CharTrie(InputStream inputStream, DataManipulate dataManipulate) throws IOException { @@ -103,14 +103,14 @@ } /** - * Gets the value to the data which this lead surrogate character points - * to. - * Returned data may contain folding offset information for the next - * trailing surrogate character. - * This method does not guarantee correct results for trail surrogates. - * @param ch lead surrogate character - * @return data value - */ + * Gets the value to the data which this lead surrogate character points + * to. + * Returned data may contain folding offset information for the next + * trailing surrogate character. + * This method does not guarantee correct results for trail surrogates. + * @param ch lead surrogate character + * @return data value + */ public final char getLeadValue(char ch) { return m_data_[getLeadOffset(ch)]; @@ -119,11 +119,11 @@ // protected methods ----------------------------------------------- /** - *

    Parses the input stream and stores its trie content into a index and - * data array

    - * @param inputStream data input stream containing trie data - * @exception IOException thrown when data reading fails - */ + *

    Parses the input stream and stores its trie content into a index and + * data array

    + * @param inputStream data input stream containing trie data + * @exception IOException thrown when data reading fails + */ protected final void unserialize(InputStream inputStream) throws IOException { @@ -138,12 +138,12 @@ } /** - * Gets the offset to the data which the surrogate pair points to. - * @param lead lead surrogate - * @param trail trailing surrogate - * @return offset to data - * @draft 2.1 - */ + * Gets the offset to the data which the surrogate pair points to. + * @param lead lead surrogate + * @param trail trailing surrogate + * @return offset to data + * @draft 2.1 + */ protected final int getSurrogateOffset(char lead, char trail) { if (m_dataManipulate_ == null) { diff --git a/src/java.base/share/classes/jdk/internal/icu/impl/ICUBinary.java b/src/java.base/share/classes/jdk/internal/icu/impl/ICUBinary.java --- a/src/java.base/share/classes/jdk/internal/icu/impl/ICUBinary.java +++ b/src/java.base/share/classes/jdk/internal/icu/impl/ICUBinary.java @@ -303,20 +303,20 @@ // private variables ------------------------------------------------- /** - * Magic numbers to authenticate the data file - */ + * Magic numbers to authenticate the data file + */ private static final byte MAGIC1 = (byte)0xda; private static final byte MAGIC2 = (byte)0x27; /** - * File format authentication values - */ + * File format authentication values + */ private static final byte CHAR_SET_ = 0; private static final byte CHAR_SIZE_ = 2; /** - * Error messages - */ + * Error messages + */ private static final String MAGIC_NUMBER_AUTHENTICATION_FAILED_ = "ICUBinary data file error: Magic number authentication failed"; private static final String HEADER_AUTHENTICATION_FAILED_ = diff --git a/src/java.base/share/classes/jdk/internal/icu/impl/StringPrepDataReader.java b/src/java.base/share/classes/jdk/internal/icu/impl/StringPrepDataReader.java --- a/src/java.base/share/classes/jdk/internal/icu/impl/StringPrepDataReader.java +++ b/src/java.base/share/classes/jdk/internal/icu/impl/StringPrepDataReader.java @@ -76,10 +76,10 @@ char[] mappingTable) throws IOException{ - //Read the bytes that make up the idnaTrie + // Read the bytes that make up the idnaTrie dataInputStream.read(idnaBytes); - //Read the extra data + // Read the extra data for(int i=0;i - * getRawOffset(0, ch); - *

    - * will do. Otherwise if it is a supplementary character formed by - * surrogates lead and trail. Then we would have to call getRawOffset() - * with getFoldingIndexOffset(). See getSurrogateOffset(). - * @param offset index offset which ch is to start from - * @param ch index to be used after offset - * @return offset to the data - */ + * Gets the offset to the data which the index ch after variable offset + * points to. + * Note for locating a non-supplementary character data offset, calling + *

    + * getRawOffset(0, ch); + *

    + * will do. Otherwise if it is a supplementary character formed by + * surrogates lead and trail. Then we would have to call getRawOffset() + * with getFoldingIndexOffset(). See getSurrogateOffset(). + * @param offset index offset which ch is to start from + * @param ch index to be used after offset + * @return offset to the data + */ protected final int getRawOffset(int offset, char ch) { return (m_index_[offset + (ch >> INDEX_STAGE_1_SHIFT_)] @@ -224,11 +224,11 @@ } /** - * Gets the offset to data which the BMP character points to - * Treats a lead surrogate as a normal code point. - * @param ch BMP character - * @return offset to data - */ + * Gets the offset to data which the BMP character points to + * Treats a lead surrogate as a normal code point. + * @param ch BMP character + * @return offset to data + */ protected final int getBMPOffset(char ch) { return (ch >= UTF16.LEAD_SURROGATE_MIN_VALUE @@ -239,13 +239,13 @@ } /** - * Gets the offset to the data which this lead surrogate character points - * to. - * Data at the returned offset may contain folding offset information for - * the next trailing surrogate character. - * @param ch lead surrogate character - * @return offset to data - */ + * Gets the offset to the data which this lead surrogate character points + * to. + * Data at the returned offset may contain folding offset information for + * the next trailing surrogate character. + * @param ch lead surrogate character + * @return offset to data + */ protected final int getLeadOffset(char ch) { return getRawOffset(0, ch); @@ -282,11 +282,11 @@ } /** - *

    Parses the inputstream and creates the trie index with it.

    - *

    This is overwritten by the child classes. - * @param inputStream input stream containing the trie information - * @exception IOException thrown when data reading fails. - */ + *

    Parses the inputstream and creates the trie index with it.

    + *

    This is overwritten by the child classes. + * @param inputStream input stream containing the trie information + * @exception IOException thrown when data reading fails. + */ protected void unserialize(InputStream inputStream) throws IOException { //indexLength is a multiple of 1024 >> INDEX_STAGE_2_SHIFT_ @@ -298,9 +298,9 @@ } /** - * Determines if this is a 16 bit trie - * @return true if this is a 16 bit trie - */ + * Determines if this is a 16 bit trie + * @return true if this is a 16 bit trie + */ protected final boolean isCharTrie() { return (m_options_ & HEADER_OPTIONS_DATA_IS_32_BIT_) == 0; @@ -313,12 +313,12 @@ */ protected static final int HEADER_OPTIONS_LATIN1_IS_LINEAR_MASK_ = 0x200; /** - * Constant number to authenticate the byte block - */ + * Constant number to authenticate the byte block + */ protected static final int HEADER_SIGNATURE_ = 0x54726965; /** - * Header option formatting - */ + * Header option formatting + */ private static final int HEADER_OPTIONS_SHIFT_MASK_ = 0xF; protected static final int HEADER_OPTIONS_INDEX_SHIFT_ = 4; protected static final int HEADER_OPTIONS_DATA_IS_32_BIT_ = 0x100; diff --git a/src/java.base/share/classes/jdk/internal/icu/impl/Trie2.java b/src/java.base/share/classes/jdk/internal/icu/impl/Trie2.java --- a/src/java.base/share/classes/jdk/internal/icu/impl/Trie2.java +++ b/src/java.base/share/classes/jdk/internal/icu/impl/Trie2.java @@ -327,17 +327,17 @@ //-------------------------------------------------------------------------------- /** - * Trie2 data structure in serialized form: - * - * UTrie2Header header; - * uint16_t index[header.index2Length]; - * uint16_t data[header.shiftedDataLength<<2]; -- or uint32_t data[...] - * - * For Java, this is read from the stream into an instance of UTrie2Header. - * (The C version just places a struct over the raw serialized data.) - * - * @internal - */ + * Trie2 data structure in serialized form: + * + * UTrie2Header header; + * uint16_t index[header.index2Length]; + * uint16_t data[header.shiftedDataLength<<2]; -- or uint32_t data[...] + * + * For Java, this is read from the stream into an instance of UTrie2Header. + * (The C version just places a struct over the raw serialized data.) + * + * @internal + */ static class UTrie2Header { /** "Tri2" in big-endian US-ASCII (0x54726932) */ int signature; diff --git a/src/java.base/share/classes/jdk/internal/icu/impl/UCharacterProperty.java b/src/java.base/share/classes/jdk/internal/icu/impl/UCharacterProperty.java --- a/src/java.base/share/classes/jdk/internal/icu/impl/UCharacterProperty.java +++ b/src/java.base/share/classes/jdk/internal/icu/impl/UCharacterProperty.java @@ -67,18 +67,18 @@ public static final UCharacterProperty INSTANCE; /** - * Trie data - */ + * Trie data + */ public Trie2_16 m_trie_; /** - * Unicode version - */ + * Unicode version + */ public VersionInfo m_unicodeVersion_; /** - * Character type mask - */ + * Character type mask + */ public static final int TYPE_MASK = 0x1F; // uprops.h enum UPropertySource --------------------------------------- *** @@ -97,10 +97,10 @@ // public methods ---------------------------------------------------- /** - * Gets the main property value for code point ch. - * @param ch code point whose property value is to be retrieved - * @return property value of code point - */ + * Gets the main property value for code point ch. + * @param ch code point whose property value is to be retrieved + * @return property value of code point + */ public final int getProperty(int ch) { return m_trie_.get(ch); @@ -228,13 +228,13 @@ } /** - * Forms a supplementary code point from the argument character
    - * Note this is for internal use hence no checks for the validity of the - * surrogate characters are done - * @param lead lead surrogate character - * @param trail trailing surrogate character - * @return code point of the supplementary character - */ + * Forms a supplementary code point from the argument character
    + * Note this is for internal use hence no checks for the validity of the + * surrogate characters are done + * @param lead lead surrogate character + * @param trail trailing surrogate character + * @return code point of the supplementary character + */ public static int getRawSupplementary(char lead, char trail) { return (lead << LEAD_SURROGATE_SHIFT_) + trail + SURROGATE_OFFSET_; @@ -318,8 +318,8 @@ // private variables ------------------------------------------------- /** - * Default name of the datafile - */ + * Default name of the datafile + */ @SuppressWarnings("deprecation") private static final String DATA_FILE_NAME_ = "/jdk/internal/icu/impl/data/icudt" + @@ -327,12 +327,12 @@ "/uprops.icu"; /** - * Shift value for lead surrogate to form a supplementary character. - */ + * Shift value for lead surrogate to form a supplementary character. + */ private static final int LEAD_SURROGATE_SHIFT_ = 10; /** - * Offset to add to combined surrogate pair to avoid masking. - */ + * Offset to add to combined surrogate pair to avoid masking. + */ private static final int SURROGATE_OFFSET_ = UTF16.SUPPLEMENTARY_MIN_VALUE - (UTF16.SURROGATE_MIN_VALUE << diff --git a/src/java.base/share/classes/jdk/internal/icu/lang/UCharacterEnums.java b/src/java.base/share/classes/jdk/internal/icu/lang/UCharacterEnums.java --- a/src/java.base/share/classes/jdk/internal/icu/lang/UCharacterEnums.java +++ b/src/java.base/share/classes/jdk/internal/icu/lang/UCharacterEnums.java @@ -263,7 +263,7 @@ * This name is compatible with java.lang.Character's name for this type. * @see #INITIAL_PUNCTUATION * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @deprecated This is a draft API and might change in a future release of ICU. */ @Deprecated public static final int INITIAL_QUOTE_PUNCTUATION = 28; @@ -280,7 +280,7 @@ * This name is compatible with java.lang.Character's name for this type. * @see #FINAL_PUNCTUATION * @draft ICU 2.8 - * @deprecated This is a draft API and might change in a future release of ICU. + * @deprecated This is a draft API and might change in a future release of ICU. */ @Deprecated public static final int FINAL_QUOTE_PUNCTUATION = 29; @@ -313,7 +313,7 @@ /** * JDK-compatible synonum for LEFT_TO_RIGHT. * @draft ICU 3.0 - * @deprecated This is a draft API and might change in a future release of ICU. + * @deprecated This is a draft API and might change in a future release of ICU. */ @Deprecated public static final byte DIRECTIONALITY_LEFT_TO_RIGHT = (byte)LEFT_TO_RIGHT; @@ -327,7 +327,7 @@ /** * JDK-compatible synonum for RIGHT_TO_LEFT. * @draft ICU 3.0 - * @deprecated This is a draft API and might change in a future release of ICU. + * @deprecated This is a draft API and might change in a future release of ICU. */ @Deprecated public static final byte DIRECTIONALITY_RIGHT_TO_LEFT = (byte)RIGHT_TO_LEFT; @@ -341,7 +341,7 @@ /** * JDK-compatible synonum for EUROPEAN_NUMBER. * @draft ICU 3.0 - * @deprecated This is a draft API and might change in a future release of ICU. + * @deprecated This is a draft API and might change in a future release of ICU. */ @Deprecated public static final byte DIRECTIONALITY_EUROPEAN_NUMBER = (byte)EUROPEAN_NUMBER; @@ -355,7 +355,7 @@ /** * JDK-compatible synonum for EUROPEAN_NUMBER_SEPARATOR. * @draft ICU 3.0 - * @deprecated This is a draft API and might change in a future release of ICU. + * @deprecated This is a draft API and might change in a future release of ICU. */ @Deprecated public static final byte DIRECTIONALITY_EUROPEAN_NUMBER_SEPARATOR = (byte)EUROPEAN_NUMBER_SEPARATOR; @@ -369,7 +369,7 @@ /** * JDK-compatible synonum for EUROPEAN_NUMBER_TERMINATOR. * @draft ICU 3.0 - * @deprecated This is a draft API and might change in a future release of ICU. + * @deprecated This is a draft API and might change in a future release of ICU. */ @Deprecated public static final byte DIRECTIONALITY_EUROPEAN_NUMBER_TERMINATOR = (byte)EUROPEAN_NUMBER_TERMINATOR; @@ -383,7 +383,7 @@ /** * JDK-compatible synonum for ARABIC_NUMBER. * @draft ICU 3.0 - * @deprecated This is a draft API and might change in a future release of ICU. + * @deprecated This is a draft API and might change in a future release of ICU. */ @Deprecated public static final byte DIRECTIONALITY_ARABIC_NUMBER = (byte)ARABIC_NUMBER; @@ -397,7 +397,7 @@ /** * JDK-compatible synonum for COMMON_NUMBER_SEPARATOR. * @draft ICU 3.0 - * @deprecated This is a draft API and might change in a future release of ICU. + * @deprecated This is a draft API and might change in a future release of ICU. */ @Deprecated public static final byte DIRECTIONALITY_COMMON_NUMBER_SEPARATOR = (byte)COMMON_NUMBER_SEPARATOR; @@ -411,7 +411,7 @@ /** * JDK-compatible synonum for BLOCK_SEPARATOR. * @draft ICU 3.0 - * @deprecated This is a draft API and might change in a future release of ICU. + * @deprecated This is a draft API and might change in a future release of ICU. */ @Deprecated public static final byte DIRECTIONALITY_PARAGRAPH_SEPARATOR = (byte)BLOCK_SEPARATOR; @@ -425,7 +425,7 @@ /** * JDK-compatible synonum for SEGMENT_SEPARATOR. * @draft ICU 3.0 - * @deprecated This is a draft API and might change in a future release of ICU. + * @deprecated This is a draft API and might change in a future release of ICU. */ @Deprecated public static final byte DIRECTIONALITY_SEGMENT_SEPARATOR = (byte)SEGMENT_SEPARATOR; @@ -439,7 +439,7 @@ /** * JDK-compatible synonum for WHITE_SPACE_NEUTRAL. * @draft ICU 3.0 - * @deprecated This is a draft API and might change in a future release of ICU. + * @deprecated This is a draft API and might change in a future release of ICU. */ @Deprecated public static final byte DIRECTIONALITY_WHITESPACE = (byte)WHITE_SPACE_NEUTRAL; @@ -453,7 +453,7 @@ /** * JDK-compatible synonum for OTHER_NEUTRAL. * @draft ICU 3.0 - * @deprecated This is a draft API and might change in a future release of ICU. + * @deprecated This is a draft API and might change in a future release of ICU. */ @Deprecated public static final byte DIRECTIONALITY_OTHER_NEUTRALS = (byte)OTHER_NEUTRAL; @@ -467,7 +467,7 @@ /** * JDK-compatible synonum for LEFT_TO_RIGHT_EMBEDDING. * @draft ICU 3.0 - * @deprecated This is a draft API and might change in a future release of ICU. + * @deprecated This is a draft API and might change in a future release of ICU. */ @Deprecated public static final byte DIRECTIONALITY_LEFT_TO_RIGHT_EMBEDDING = (byte)LEFT_TO_RIGHT_EMBEDDING; @@ -481,7 +481,7 @@ /** * JDK-compatible synonum for LEFT_TO_RIGHT_OVERRIDE. * @draft ICU 3.0 - * @deprecated This is a draft API and might change in a future release of ICU. + * @deprecated This is a draft API and might change in a future release of ICU. */ @Deprecated public static final byte DIRECTIONALITY_LEFT_TO_RIGHT_OVERRIDE = (byte)LEFT_TO_RIGHT_OVERRIDE; @@ -495,7 +495,7 @@ /** * JDK-compatible synonum for RIGHT_TO_LEFT_ARABIC. * @draft ICU 3.0 - * @deprecated This is a draft API and might change in a future release of ICU. + * @deprecated This is a draft API and might change in a future release of ICU. */ @Deprecated public static final byte DIRECTIONALITY_RIGHT_TO_LEFT_ARABIC = (byte)RIGHT_TO_LEFT_ARABIC; @@ -509,7 +509,7 @@ /** * JDK-compatible synonum for RIGHT_TO_LEFT_EMBEDDING. * @draft ICU 3.0 - * @deprecated This is a draft API and might change in a future release of ICU. + * @deprecated This is a draft API and might change in a future release of ICU. */ @Deprecated public static final byte DIRECTIONALITY_RIGHT_TO_LEFT_EMBEDDING = (byte)RIGHT_TO_LEFT_EMBEDDING; @@ -523,7 +523,7 @@ /** * JDK-compatible synonum for RIGHT_TO_LEFT_OVERRIDE. * @draft ICU 3.0 - * @deprecated This is a draft API and might change in a future release of ICU. + * @deprecated This is a draft API and might change in a future release of ICU. */ @Deprecated public static final byte DIRECTIONALITY_RIGHT_TO_LEFT_OVERRIDE = (byte)RIGHT_TO_LEFT_OVERRIDE; @@ -537,7 +537,7 @@ /** * JDK-compatible synonum for POP_DIRECTIONAL_FORMAT. * @draft ICU 3.0 - * @deprecated This is a draft API and might change in a future release of ICU. + * @deprecated This is a draft API and might change in a future release of ICU. */ @Deprecated public static final byte DIRECTIONALITY_POP_DIRECTIONAL_FORMAT = (byte)POP_DIRECTIONAL_FORMAT; @@ -551,7 +551,7 @@ /** * JDK-compatible synonum for DIR_NON_SPACING_MARK. * @draft ICU 3.0 - * @deprecated This is a draft API and might change in a future release of ICU. + * @deprecated This is a draft API and might change in a future release of ICU. */ @Deprecated public static final byte DIRECTIONALITY_NON_SPACING_MARK = (byte)DIR_NON_SPACING_MARK; @@ -565,7 +565,7 @@ /** * JDK-compatible synonum for BOUNDARY_NEUTRAL. * @draft ICU 3.0 - * @deprecated This is a draft API and might change in a future release of ICU. + * @deprecated This is a draft API and might change in a future release of ICU. */ @Deprecated public static final byte DIRECTIONALITY_BOUNDARY_NEUTRAL = (byte)BOUNDARY_NEUTRAL; @@ -579,8 +579,8 @@ /** * Undefined bidirectional character type. Undefined char * values have undefined directionality in the Unicode specification. - * @draft ICU 3.0 - * @deprecated This is a draft API and might change in a future release of ICU. + * @draft ICU 3.0 + * @deprecated This is a draft API and might change in a future release of ICU. */ @Deprecated public static final byte DIRECTIONALITY_UNDEFINED = -1; diff --git a/src/java.base/share/classes/jdk/internal/icu/text/UCharacterIterator.java b/src/java.base/share/classes/jdk/internal/icu/text/UCharacterIterator.java --- a/src/java.base/share/classes/jdk/internal/icu/text/UCharacterIterator.java +++ b/src/java.base/share/classes/jdk/internal/icu/text/UCharacterIterator.java @@ -95,7 +95,7 @@ return new ReplaceableUCharacterIterator(source); } - /** + /** * Returns a UCharacterIterator object given a * CharacterIterator. * @param source a valid CharacterIterator object. diff --git a/src/java.base/share/classes/jdk/internal/jimage/ImageReader.java b/src/java.base/share/classes/jdk/internal/jimage/ImageReader.java --- a/src/java.base/share/classes/jdk/internal/jimage/ImageReader.java +++ b/src/java.base/share/classes/jdk/internal/jimage/ImageReader.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -287,7 +287,7 @@ /** * Lazily build a node from a name. - */ + */ synchronized Node buildNode(String name) { Node n; boolean isPackages = name.startsWith("/packages"); diff --git a/src/java.base/share/classes/jdk/internal/logger/LoggerWrapper.java b/src/java.base/share/classes/jdk/internal/logger/LoggerWrapper.java --- a/src/java.base/share/classes/jdk/internal/logger/LoggerWrapper.java +++ b/src/java.base/share/classes/jdk/internal/logger/LoggerWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -32,7 +32,7 @@ /** * An implementation of {@link Logger} that redirects all calls to a wrapped - instance of Logger. + * instance of Logger. * * @param Type of the wrapped Logger: {@code Logger} or an * extension of that interface. diff --git a/src/java.base/share/classes/jdk/internal/misc/Unsafe.java b/src/java.base/share/classes/jdk/internal/misc/Unsafe.java --- a/src/java.base/share/classes/jdk/internal/misc/Unsafe.java +++ b/src/java.base/share/classes/jdk/internal/misc/Unsafe.java @@ -883,7 +883,7 @@ checkPrimitivePointer(destBase, destOffset); } - /** + /** * Copies all elements from one block of memory to another block, byte swapping the * elements on the fly. * @@ -2224,14 +2224,14 @@ } /* - * Versions of {@link #putReferenceVolatile(Object, long, Object)} - * that do not guarantee immediate visibility of the store to - * other threads. This method is generally only useful if the - * underlying field is a Java volatile (or if an array cell, one - * that is otherwise only accessed using volatile accesses). - * - * Corresponds to C11 atomic_store_explicit(..., memory_order_release). - */ + * Versions of {@link #putReferenceVolatile(Object, long, Object)} + * that do not guarantee immediate visibility of the store to + * other threads. This method is generally only useful if the + * underlying field is a Java volatile (or if an array cell, one + * that is otherwise only accessed using volatile accesses). + * + * Corresponds to C11 atomic_store_explicit(..., memory_order_release). + */ /** Release version of {@link #putReferenceVolatile(Object, long, Object)} */ @HotSpotIntrinsicCandidate diff --git a/src/java.base/share/classes/jdk/internal/util/Preconditions.java b/src/java.base/share/classes/jdk/internal/util/Preconditions.java --- a/src/java.base/share/classes/jdk/internal/util/Preconditions.java +++ b/src/java.base/share/classes/jdk/internal/util/Preconditions.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -239,7 +239,7 @@ * perform unsigned comparisons of the index and length when it is known the * length is a non-negative value (such as that of an array length or from * the upper bound of a loop) - */ + */ @HotSpotIntrinsicCandidate public static int checkIndex(int index, int length, diff --git a/src/java.base/share/classes/jdk/internal/util/xml/impl/Parser.java b/src/java.base/share/classes/jdk/internal/util/xml/impl/Parser.java --- a/src/java.base/share/classes/jdk/internal/util/xml/impl/Parser.java +++ b/src/java.base/share/classes/jdk/internal/util/xml/impl/Parser.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -2991,7 +2991,7 @@ private Reader utf16(InputStream is) throws Exception { if (mChIdx != 0) { - //The bom method has read ONE byte into the buffer. + // The bom method has read ONE byte into the buffer. byte b0 = (byte)mChars[0]; if (b0 == 0x00 || b0 == 0x3C) { int b1 = is.read(); @@ -3008,9 +3008,9 @@ mChars[mChIdx++] = (char)(b2); return new ReaderUTF16(is, 'l'); } else { - /**not every InputStream supports reset, so we have to remember + /* not every InputStream supports reset, so we have to remember * the state for further parsing - **/ + */ mChars[0] = (char)(b0); mChars[mChIdx++] = (char)(b1); mChars[mChIdx++] = (char)(b2); diff --git a/src/java.base/share/classes/sun/reflect/generics/reflectiveObjects/TypeVariableImpl.java b/src/java.base/share/classes/sun/reflect/generics/reflectiveObjects/TypeVariableImpl.java --- a/src/java.base/share/classes/sun/reflect/generics/reflectiveObjects/TypeVariableImpl.java +++ b/src/java.base/share/classes/sun/reflect/generics/reflectiveObjects/TypeVariableImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -118,7 +118,7 @@ * for any reason * @return an array of Types representing the upper bound(s) of this * type variable - */ + */ public Type[] getBounds() { Object[] value = bounds; if (value instanceof FieldTypeSignature[]) { diff --git a/src/java.base/share/classes/sun/reflect/generics/repository/ClassRepository.java b/src/java.base/share/classes/sun/reflect/generics/repository/ClassRepository.java --- a/src/java.base/share/classes/sun/reflect/generics/repository/ClassRepository.java +++ b/src/java.base/share/classes/sun/reflect/generics/repository/ClassRepository.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -48,7 +48,7 @@ /** The generic superinterface info. Lazily initialized. */ private volatile Type[] superInterfaces; - // private, to enforce use of static factory + // private, to enforce use of static factory private ClassRepository(String rawSig, GenericsFactory f) { super(rawSig, f); } @@ -70,15 +70,15 @@ return new ClassRepository(rawSig, f); } - /* - * When queried for a particular piece of type information, the - * general pattern is to consult the corresponding cached value. - * If the corresponding field is non-null, it is returned. - * If not, it is created lazily. This is done by selecting the appropriate - * part of the tree and transforming it into a reflective object - * using a visitor, which is created by feeding it the factory - * with which the repository was created. - */ + /* + * When queried for a particular piece of type information, the + * general pattern is to consult the corresponding cached value. + * If the corresponding field is non-null, it is returned. + * If not, it is created lazily. This is done by selecting the appropriate + * part of the tree and transforming it into a reflective object + * using a visitor, which is created by feeding it the factory + * with which the repository was created. + */ public Type getSuperclass() { Type value = superclass; diff --git a/src/java.base/share/classes/sun/reflect/generics/repository/ConstructorRepository.java b/src/java.base/share/classes/sun/reflect/generics/repository/ConstructorRepository.java --- a/src/java.base/share/classes/sun/reflect/generics/repository/ConstructorRepository.java +++ b/src/java.base/share/classes/sun/reflect/generics/repository/ConstructorRepository.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -49,7 +49,7 @@ /** The generic exception types. Lazily initialized. */ private volatile Type[] exceptionTypes; - // protected, to enforce use of static factory yet allow subclassing + // protected, to enforce use of static factory yet allow subclassing protected ConstructorRepository(String rawSig, GenericsFactory f) { super(rawSig, f); } @@ -71,15 +71,15 @@ return new ConstructorRepository(rawSig, f); } - /* - * When queried for a particular piece of type information, the - * general pattern is to consult the corresponding cached value. - * If the corresponding field is non-null, it is returned. - * If not, it is created lazily. This is done by selecting the appropriate - * part of the tree and transforming it into a reflective object - * using a visitor, which is created by feeding it the factory - * with which the repository was created. - */ + /* + * When queried for a particular piece of type information, the + * general pattern is to consult the corresponding cached value. + * If the corresponding field is non-null, it is returned. + * If not, it is created lazily. This is done by selecting the appropriate + * part of the tree and transforming it into a reflective object + * using a visitor, which is created by feeding it the factory + * with which the repository was created. + */ public Type[] getParameterTypes() { Type[] value = parameterTypes; diff --git a/src/java.base/share/classes/sun/reflect/generics/repository/FieldRepository.java b/src/java.base/share/classes/sun/reflect/generics/repository/FieldRepository.java --- a/src/java.base/share/classes/sun/reflect/generics/repository/FieldRepository.java +++ b/src/java.base/share/classes/sun/reflect/generics/repository/FieldRepository.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -44,7 +44,7 @@ /** The generic type info. Lazily initialized. */ private volatile Type genericType; - // protected, to enforce use of static factory yet allow subclassing + // protected, to enforce use of static factory yet allow subclassing protected FieldRepository(String rawSig, GenericsFactory f) { super(rawSig, f); } @@ -66,15 +66,15 @@ return new FieldRepository(rawSig, f); } - /* - * When queried for a particular piece of type information, the - * general pattern is to consult the corresponding cached value. - * If the corresponding field is non-null, it is returned. - * If not, it is created lazily. This is done by selecting the appropriate - * part of the tree and transforming it into a reflective object - * using a visitor, which is created by feeding it the factory - * with which the repository was created. - */ + /* + * When queried for a particular piece of type information, the + * general pattern is to consult the corresponding cached value. + * If the corresponding field is non-null, it is returned. + * If not, it is created lazily. This is done by selecting the appropriate + * part of the tree and transforming it into a reflective object + * using a visitor, which is created by feeding it the factory + * with which the repository was created. + */ public Type getGenericType() { Type value = genericType; diff --git a/src/java.base/share/classes/sun/reflect/generics/repository/GenericDeclRepository.java b/src/java.base/share/classes/sun/reflect/generics/repository/GenericDeclRepository.java --- a/src/java.base/share/classes/sun/reflect/generics/repository/GenericDeclRepository.java +++ b/src/java.base/share/classes/sun/reflect/generics/repository/GenericDeclRepository.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -49,15 +49,15 @@ super(rawSig, f); } - /* - * When queried for a particular piece of type information, the - * general pattern is to consult the corresponding cached value. - * If the corresponding field is non-null, it is returned. - * If not, it is created lazily. This is done by selecting the appropriate - * part of the tree and transforming it into a reflective object - * using a visitor, which is created by feeding it the factory - * with which the repository was created. - */ + /* + * When queried for a particular piece of type information, the + * general pattern is to consult the corresponding cached value. + * If the corresponding field is non-null, it is returned. + * If not, it is created lazily. This is done by selecting the appropriate + * part of the tree and transforming it into a reflective object + * using a visitor, which is created by feeding it the factory + * with which the repository was created. + */ /** * Returns the formal type parameters of this generic declaration. diff --git a/src/java.base/share/classes/sun/text/BreakDictionary.java b/src/java.base/share/classes/sun/text/BreakDictionary.java --- a/src/java.base/share/classes/sun/text/BreakDictionary.java +++ b/src/java.base/share/classes/sun/text/BreakDictionary.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -63,8 +63,8 @@ //========================================================================= /** - * The version of the dictionary that was read in. - */ + * The version of the dictionary that was read in. + */ private static int supportedVersion = 1; /** diff --git a/src/java.base/share/classes/sun/text/CompactByteArray.java b/src/java.base/share/classes/sun/text/CompactByteArray.java --- a/src/java.base/share/classes/sun/text/CompactByteArray.java +++ b/src/java.base/share/classes/sun/text/CompactByteArray.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -152,8 +152,8 @@ } /** - *Compact the array. - */ + * Compact the array. + */ public void compact() { if (!isCompact) { @@ -241,17 +241,19 @@ return hashes[i] != 0; } - /** For internal use only. Do not modify the result, the behavior of - * modified results are undefined. - */ + /** + * For internal use only. Do not modify the result, the behavior of + * modified results are undefined. + */ public short[] getIndexArray() { return indices; } - /** For internal use only. Do not modify the result, the behavior of - * modified results are undefined. - */ + /** + * For internal use only. Do not modify the result, the behavior of + * modified results are undefined. + */ public byte[] getStringArray() { return values; @@ -297,7 +299,6 @@ /** * Generates the hash code for the compact array object */ - public int hashCode() { int result = 0; int increment = Math.min(3, values.length/16); @@ -307,12 +308,9 @@ return result; } - // -------------------------------------------------------------- - // package private - // -------------------------------------------------------------- /** - * Expanding takes the array back to a 65536 element array. - */ + * Expanding takes the array back to a 65536 element array. + */ private void expand() { int i; diff --git a/src/java.base/share/classes/sun/util/calendar/ZoneInfo.java b/src/java.base/share/classes/sun/util/calendar/ZoneInfo.java --- a/src/java.base/share/classes/sun/util/calendar/ZoneInfo.java +++ b/src/java.base/share/classes/sun/util/calendar/ZoneInfo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -342,7 +342,7 @@ return low - 1; } - /** + /** * Returns the difference in milliseconds between local time and * UTC, taking into account both the raw offset and the effect of * daylight savings, for the specified date and time. This method