diff --git a/src/java.base/share/classes/java/io/BufferedInputStream.java b/src/java.base/share/classes/java/io/BufferedInputStream.java
index e7502e4e9fc..363bdd589a1 100644
--- a/src/java.base/share/classes/java/io/BufferedInputStream.java
+++ b/src/java.base/share/classes/java/io/BufferedInputStream.java
@@ -192,7 +192,7 @@ class BufferedInputStream extends FilterInputStream {
*
* @param in the underlying input stream.
* @param size the buffer size.
- * @exception IllegalArgumentException if {@code size <= 0}.
+ * @throws IllegalArgumentException if {@code size <= 0}.
*/
public BufferedInputStream(InputStream in, int size) {
super(in);
@@ -254,7 +254,7 @@ class BufferedInputStream extends FilterInputStream {
*
* @return the next byte of data, or -1 if the end of the
* stream is reached.
- * @exception IOException if this input stream has been closed by
+ * @throws IOException if this input stream has been closed by
* invoking its {@link #close()} method,
* or an I/O error occurs.
* @see java.io.FilterInputStream#in
@@ -325,7 +325,7 @@ class BufferedInputStream extends FilterInputStream {
* @param len maximum number of bytes to read.
* @return the number of bytes read, or -1 if the end of
* the stream has been reached.
- * @exception IOException if this input stream has been closed by
+ * @throws IOException if this input stream has been closed by
* invoking its {@link #close()} method,
* or an I/O error occurs.
*/
@@ -400,7 +400,7 @@ class BufferedInputStream extends FilterInputStream {
*
* @return an estimate of the number of bytes that can be read (or skipped
* over) from this input stream without blocking.
- * @exception IOException if this input stream has been closed by
+ * @throws IOException if this input stream has been closed by
* invoking its {@link #close()} method,
* or an I/O error occurs.
*/
@@ -435,7 +435,7 @@ class BufferedInputStream extends FilterInputStream {
* is thrown. Otherwise, pos is
* set equal to markpos.
*
- * @exception IOException if this stream has not been marked or,
+ * @throws IOException if this stream has not been marked or,
* if the mark has been invalidated, or the stream
* has been closed by invoking its {@link #close()}
* method, or an I/O error occurs.
@@ -470,7 +470,7 @@ class BufferedInputStream extends FilterInputStream {
* or skip() invocations will throw an IOException.
* Closing a previously closed stream has no effect.
*
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
public void close() throws IOException {
byte[] buffer;
diff --git a/src/java.base/share/classes/java/io/BufferedOutputStream.java b/src/java.base/share/classes/java/io/BufferedOutputStream.java
index 768872cdbb4..18dc4d007d4 100644
--- a/src/java.base/share/classes/java/io/BufferedOutputStream.java
+++ b/src/java.base/share/classes/java/io/BufferedOutputStream.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1994, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2019, 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
@@ -65,7 +65,7 @@ public class BufferedOutputStream extends FilterOutputStream {
*
* @param out the underlying output stream.
* @param size the buffer size.
- * @exception IllegalArgumentException if size <= 0.
+ * @throws IllegalArgumentException if size <= 0.
*/
public BufferedOutputStream(OutputStream out, int size) {
super(out);
@@ -87,7 +87,7 @@ public class BufferedOutputStream extends FilterOutputStream {
* Writes the specified byte to this buffered output stream.
*
* @param b the byte to be written.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
@Override
public synchronized void write(int b) throws IOException {
@@ -111,7 +111,7 @@ public class BufferedOutputStream extends FilterOutputStream {
* @param b the data.
* @param off the start offset in the data.
* @param len the number of bytes to write.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
@Override
public synchronized void write(byte b[], int off, int len) throws IOException {
@@ -134,7 +134,7 @@ public class BufferedOutputStream extends FilterOutputStream {
* Flushes this buffered output stream. This forces any buffered
* output bytes to be written out to the underlying output stream.
*
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
* @see java.io.FilterOutputStream#out
*/
@Override
diff --git a/src/java.base/share/classes/java/io/BufferedReader.java b/src/java.base/share/classes/java/io/BufferedReader.java
index 84e1a9e9462..c61dd6c151d 100644
--- a/src/java.base/share/classes/java/io/BufferedReader.java
+++ b/src/java.base/share/classes/java/io/BufferedReader.java
@@ -95,7 +95,7 @@ public class BufferedReader extends Reader {
* @param in A Reader
* @param sz Input-buffer size
*
- * @exception IllegalArgumentException If {@code sz <= 0}
+ * @throws IllegalArgumentException If {@code sz <= 0}
*/
public BufferedReader(Reader in, int sz) {
super(in);
@@ -172,7 +172,7 @@ public class BufferedReader extends Reader {
* @return The character read, as an integer in the range
* 0 to 65535 ({@code 0x00-0xffff}), or -1 if the
* end of the stream has been reached
- * @exception IOException If an I/O error occurs
+ * @throws IOException If an I/O error occurs
*/
public int read() throws IOException {
synchronized (lock) {
@@ -271,8 +271,8 @@ public class BufferedReader extends Reader {
* @return The number of characters read, or -1 if the end of the
* stream has been reached
*
- * @exception IOException If an I/O error occurs
- * @exception IndexOutOfBoundsException {@inheritDoc}
+ * @throws IOException If an I/O error occurs
+ * @throws IndexOutOfBoundsException {@inheritDoc}
*/
public int read(char cbuf[], int off, int len) throws IOException {
synchronized (lock) {
@@ -311,7 +311,7 @@ public class BufferedReader extends Reader {
*
* @see java.io.LineNumberReader#readLine()
*
- * @exception IOException If an I/O error occurs
+ * @throws IOException If an I/O error occurs
*/
String readLine(boolean ignoreLF, boolean[] term) throws IOException {
StringBuffer s = null;
@@ -388,7 +388,7 @@ public class BufferedReader extends Reader {
* any line-termination characters, or null if the end of the
* stream has been reached without reading any characters
*
- * @exception IOException If an I/O error occurs
+ * @throws IOException If an I/O error occurs
*
* @see java.nio.file.Files#readAllLines
*/
@@ -403,8 +403,8 @@ public class BufferedReader extends Reader {
*
* @return The number of characters actually skipped
*
- * @exception IllegalArgumentException If n is negative.
- * @exception IOException If an I/O error occurs
+ * @throws IllegalArgumentException If n is negative.
+ * @throws IOException If an I/O error occurs
*/
public long skip(long n) throws IOException {
if (n < 0L) {
@@ -444,7 +444,7 @@ public class BufferedReader extends Reader {
* stream is ready if the buffer is not empty, or if the underlying
* character stream is ready.
*
- * @exception IOException If an I/O error occurs
+ * @throws IOException If an I/O error occurs
*/
public boolean ready() throws IOException {
synchronized (lock) {
@@ -491,8 +491,8 @@ public class BufferedReader extends Reader {
* whose size is no smaller than limit.
* Therefore large values should be used with care.
*
- * @exception IllegalArgumentException If {@code readAheadLimit < 0}
- * @exception IOException If an I/O error occurs
+ * @throws IllegalArgumentException If {@code readAheadLimit < 0}
+ * @throws IOException If an I/O error occurs
*/
public void mark(int readAheadLimit) throws IOException {
if (readAheadLimit < 0) {
@@ -509,7 +509,7 @@ public class BufferedReader extends Reader {
/**
* Resets the stream to the most recent mark.
*
- * @exception IOException If the stream has never been marked,
+ * @throws IOException If the stream has never been marked,
* or if the mark has been invalidated
*/
public void reset() throws IOException {
diff --git a/src/java.base/share/classes/java/io/BufferedWriter.java b/src/java.base/share/classes/java/io/BufferedWriter.java
index 3d8e1ee1b19..efd9f0002a1 100644
--- a/src/java.base/share/classes/java/io/BufferedWriter.java
+++ b/src/java.base/share/classes/java/io/BufferedWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2019, 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
@@ -89,7 +89,7 @@ public class BufferedWriter extends Writer {
* @param out A Writer
* @param sz Output-buffer size, a positive integer
*
- * @exception IllegalArgumentException If {@code sz <= 0}
+ * @throws IllegalArgumentException If {@code sz <= 0}
*/
public BufferedWriter(Writer out, int sz) {
super(out);
@@ -125,7 +125,7 @@ public class BufferedWriter extends Writer {
/**
* Writes a single character.
*
- * @exception IOException If an I/O error occurs
+ * @throws IOException If an I/O error occurs
*/
public void write(int c) throws IOException {
synchronized (lock) {
@@ -240,7 +240,7 @@ public class BufferedWriter extends Writer {
* system property {@code line.separator}, and is not necessarily a single
* newline ('\n') character.
*
- * @exception IOException If an I/O error occurs
+ * @throws IOException If an I/O error occurs
*/
public void newLine() throws IOException {
write(System.lineSeparator());
@@ -249,7 +249,7 @@ public class BufferedWriter extends Writer {
/**
* Flushes the stream.
*
- * @exception IOException If an I/O error occurs
+ * @throws IOException If an I/O error occurs
*/
public void flush() throws IOException {
synchronized (lock) {
diff --git a/src/java.base/share/classes/java/io/CharArrayReader.java b/src/java.base/share/classes/java/io/CharArrayReader.java
index 08b13811d35..3656ffa643f 100644
--- a/src/java.base/share/classes/java/io/CharArrayReader.java
+++ b/src/java.base/share/classes/java/io/CharArrayReader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2019, 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
@@ -95,7 +95,7 @@ public class CharArrayReader extends Reader {
/**
* Reads a single character.
*
- * @exception IOException If an I/O error occurs
+ * @throws IOException If an I/O error occurs
*/
public int read() throws IOException {
synchronized (lock) {
@@ -109,14 +109,14 @@ public class CharArrayReader extends Reader {
/**
* Reads characters into a portion of an array.
- * @param b Destination buffer
- * @param off Offset at which to start storing characters
- * @param len Maximum number of characters to read
+ * @param b Destination buffer
+ * @param off Offset at which to start storing characters
+ * @param len Maximum number of characters to read
* @return The actual number of characters read, or -1 if
* the end of the stream has been reached
*
- * @exception IOException If an I/O error occurs
- * @exception IndexOutOfBoundsException {@inheritDoc}
+ * @throws IOException If an I/O error occurs
+ * @throws IndexOutOfBoundsException {@inheritDoc}
*/
public int read(char b[], int off, int len) throws IOException {
synchronized (lock) {
@@ -153,9 +153,9 @@ public class CharArrayReader extends Reader {
* an exception in this case. If n is negative, then
* this method does nothing and returns 0.
*
- * @param n The number of characters to skip
- * @return The number of characters actually skipped
- * @exception IOException If the stream is closed, or an I/O error occurs
+ * @param n The number of characters to skip
+ * @return The number of characters actually skipped
+ * @throws IOException If the stream is closed, or an I/O error occurs
*/
public long skip(long n) throws IOException {
synchronized (lock) {
@@ -177,7 +177,7 @@ public class CharArrayReader extends Reader {
* Tells whether this stream is ready to be read. Character-array readers
* are always ready to be read.
*
- * @exception IOException If an I/O error occurs
+ * @throws IOException If an I/O error occurs
*/
public boolean ready() throws IOException {
synchronized (lock) {
@@ -203,7 +203,7 @@ public class CharArrayReader extends Reader {
* there is no actual limit; hence this argument is
* ignored.
*
- * @exception IOException If an I/O error occurs
+ * @throws IOException If an I/O error occurs
*/
public void mark(int readAheadLimit) throws IOException {
synchronized (lock) {
@@ -216,7 +216,7 @@ public class CharArrayReader extends Reader {
* Resets the stream to the most recent mark, or to the beginning if it has
* never been marked.
*
- * @exception IOException If an I/O error occurs
+ * @throws IOException If an I/O error occurs
*/
public void reset() throws IOException {
synchronized (lock) {
diff --git a/src/java.base/share/classes/java/io/CharArrayWriter.java b/src/java.base/share/classes/java/io/CharArrayWriter.java
index e8bf2c36167..80a76fde8af 100644
--- a/src/java.base/share/classes/java/io/CharArrayWriter.java
+++ b/src/java.base/share/classes/java/io/CharArrayWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2019, 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
@@ -61,8 +61,8 @@ class CharArrayWriter extends Writer {
/**
* Creates a new CharArrayWriter with the specified initial size.
*
- * @param initialSize an int specifying the initial buffer size.
- * @exception IllegalArgumentException if initialSize is negative
+ * @param initialSize an int specifying the initial buffer size.
+ * @throws IllegalArgumentException if initialSize is negative
*/
public CharArrayWriter(int initialSize) {
if (initialSize < 0) {
diff --git a/src/java.base/share/classes/java/io/DataInput.java b/src/java.base/share/classes/java/io/DataInput.java
index 303b612e8be..9f7aa7f343b 100644
--- a/src/java.base/share/classes/java/io/DataInput.java
+++ b/src/java.base/share/classes/java/io/DataInput.java
@@ -268,7 +268,7 @@ interface DataInput {
*
* @param n the number of bytes to be skipped.
* @return the number of bytes actually skipped.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
int skipBytes(int n) throws IOException;
@@ -281,9 +281,9 @@ interface DataInput {
* method of interface {@code DataOutput}.
*
* @return the {@code boolean} value read.
- * @exception EOFException if this stream reaches the end before reading
+ * @throws EOFException if this stream reaches the end before reading
* all the bytes.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
boolean readBoolean() throws IOException;
@@ -297,9 +297,9 @@ interface DataInput {
* method of interface {@code DataOutput}.
*
* @return the 8-bit value read.
- * @exception EOFException if this stream reaches the end before reading
+ * @throws EOFException if this stream reaches the end before reading
* all the bytes.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
byte readByte() throws IOException;
@@ -317,9 +317,9 @@ interface DataInput {
* {@code 0} through {@code 255}.
*
* @return the unsigned 8-bit value read.
- * @exception EOFException if this stream reaches the end before reading
+ * @throws EOFException if this stream reaches the end before reading
* all the bytes.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
int readUnsignedByte() throws IOException;
@@ -338,9 +338,9 @@ interface DataInput {
* interface {@code DataOutput}.
*
* @return the 16-bit value read.
- * @exception EOFException if this stream reaches the end before reading
+ * @throws EOFException if this stream reaches the end before reading
* all the bytes.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
short readShort() throws IOException;
@@ -361,9 +361,9 @@ interface DataInput {
* {@code 0} through {@code 65535}.
*
* @return the unsigned 16-bit value read.
- * @exception EOFException if this stream reaches the end before reading
+ * @throws EOFException if this stream reaches the end before reading
* all the bytes.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
int readUnsignedShort() throws IOException;
@@ -381,9 +381,9 @@ interface DataInput {
* {@code DataOutput}.
*
* @return the {@code char} value read.
- * @exception EOFException if this stream reaches the end before reading
+ * @throws EOFException if this stream reaches the end before reading
* all the bytes.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
char readChar() throws IOException;
@@ -400,9 +400,9 @@ interface DataInput {
* method of interface {@code DataOutput}.
*
* @return the {@code int} value read.
- * @exception EOFException if this stream reaches the end before reading
+ * @throws EOFException if this stream reaches the end before reading
* all the bytes.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
int readInt() throws IOException;
@@ -427,9 +427,9 @@ interface DataInput {
* method of interface {@code DataOutput}.
*
* @return the {@code long} value read.
- * @exception EOFException if this stream reaches the end before reading
+ * @throws EOFException if this stream reaches the end before reading
* all the bytes.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
long readLong() throws IOException;
@@ -447,9 +447,9 @@ interface DataInput {
* method of interface {@code DataOutput}.
*
* @return the {@code float} value read.
- * @exception EOFException if this stream reaches the end before reading
+ * @throws EOFException if this stream reaches the end before reading
* all the bytes.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
float readFloat() throws IOException;
@@ -467,9 +467,9 @@ interface DataInput {
* method of interface {@code DataOutput}.
*
* @return the {@code double} value read.
- * @exception EOFException if this stream reaches the end before reading
+ * @throws EOFException if this stream reaches the end before reading
* all the bytes.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
double readDouble() throws IOException;
@@ -510,7 +510,7 @@ interface DataInput {
* @return the next line of text from the input stream,
* or {@code null} if the end of file is
* encountered before a byte can be read.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
String readLine() throws IOException;
@@ -593,10 +593,10 @@ interface DataInput {
* may be used to write data that is suitable
* for reading by this method.
* @return a Unicode string.
- * @exception EOFException if this stream reaches the end
+ * @throws EOFException if this stream reaches the end
* before reading all the bytes.
- * @exception IOException if an I/O error occurs.
- * @exception UTFDataFormatException if the bytes do not represent a
+ * @throws IOException if an I/O error occurs.
+ * @throws UTFDataFormatException if the bytes do not represent a
* valid modified UTF-8 encoding of a string.
*/
String readUTF() throws IOException;
diff --git a/src/java.base/share/classes/java/io/DataInputStream.java b/src/java.base/share/classes/java/io/DataInputStream.java
index f92c4f91b0c..1d595c58072 100644
--- a/src/java.base/share/classes/java/io/DataInputStream.java
+++ b/src/java.base/share/classes/java/io/DataInputStream.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1994, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2019, 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
@@ -89,10 +89,10 @@ class DataInputStream extends FilterInputStream implements DataInput {
* @return the total number of bytes read into the buffer, or
* -1 if there is no more data because the end
* of the stream has been reached.
- * @exception IOException if the first byte cannot be read for any reason
- * other than end of file, the stream has been closed and the underlying
- * input stream does not support reading after close, or another I/O
- * error occurs.
+ * @throws IOException if the first byte cannot be read for any reason
+ * other than end of file, the stream has been closed and the underlying
+ * input stream does not support reading after close, or another I/O
+ * error occurs.
* @see java.io.FilterInputStream#in
* @see java.io.InputStream#read(byte[], int, int)
*/
@@ -129,19 +129,19 @@ class DataInputStream extends FilterInputStream implements DataInput {
* b[b.length-1] are unaffected.
*
* @param b the buffer into which the data is read.
- * @param off the start offset in the destination array b
+ * @param off the start offset in the destination array b
* @param len the maximum number of bytes read.
* @return the total number of bytes read into the buffer, or
* -1 if there is no more data because the end
* of the stream has been reached.
- * @exception NullPointerException If b is null.
- * @exception IndexOutOfBoundsException If off is negative,
- * len is negative, or len is greater than
- * b.length - off
- * @exception IOException if the first byte cannot be read for any reason
- * other than end of file, the stream has been closed and the underlying
- * input stream does not support reading after close, or another I/O
- * error occurs.
+ * @throws NullPointerException If b is null.
+ * @throws IndexOutOfBoundsException If off is negative,
+ * len is negative, or len is greater than
+ * b.length - off
+ * @throws IOException if the first byte cannot be read for any reason
+ * other than end of file, the stream has been closed and the underlying
+ * input stream does not support reading after close, or another I/O
+ * error occurs.
* @see java.io.FilterInputStream#in
* @see java.io.InputStream#read(byte[], int, int)
*/
@@ -181,13 +181,13 @@ class DataInputStream extends FilterInputStream implements DataInput {
* @param b the buffer into which the data is read.
* @param off the start offset in the data array {@code b}.
* @param len the number of bytes to read.
- * @exception NullPointerException if {@code b} is {@code null}.
- * @exception IndexOutOfBoundsException if {@code off} is negative,
+ * @throws NullPointerException if {@code b} is {@code null}.
+ * @throws IndexOutOfBoundsException if {@code off} is negative,
* {@code len} is negative, or {@code len} is greater than
* {@code b.length - off}.
- * @exception EOFException if this input stream reaches the end before
+ * @throws EOFException if this input stream reaches the end before
* reading all the bytes.
- * @exception IOException the stream has been closed and the contained
+ * @throws IOException the stream has been closed and the contained
* input stream does not support reading after close, or
* another I/O error occurs.
* @see java.io.FilterInputStream#in
@@ -213,7 +213,7 @@ class DataInputStream extends FilterInputStream implements DataInput {
*
* @param n the number of bytes to be skipped.
* @return the actual number of bytes skipped.
- * @exception IOException if the contained input stream does not support
+ * @throws IOException if the contained input stream does not support
* seek, or the stream has been closed and
* the contained input stream does not support
* reading after close, or another I/O error occurs.
@@ -237,8 +237,8 @@ class DataInputStream extends FilterInputStream implements DataInput {
* input stream.
*
* @return the boolean value read.
- * @exception EOFException if this input stream has reached the end.
- * @exception IOException the stream has been closed and the contained
+ * @throws EOFException if this input stream has reached the end.
+ * @throws IOException the stream has been closed and the contained
* input stream does not support reading after close, or
* another I/O error occurs.
* @see java.io.FilterInputStream#in
@@ -260,8 +260,8 @@ class DataInputStream extends FilterInputStream implements DataInput {
*
* @return the next byte of this input stream as a signed 8-bit
* byte.
- * @exception EOFException if this input stream has reached the end.
- * @exception IOException the stream has been closed and the contained
+ * @throws EOFException if this input stream has reached the end.
+ * @throws IOException the stream has been closed and the contained
* input stream does not support reading after close, or
* another I/O error occurs.
* @see java.io.FilterInputStream#in
@@ -283,8 +283,8 @@ class DataInputStream extends FilterInputStream implements DataInput {
*
* @return the next byte of this input stream, interpreted as an
* unsigned 8-bit number.
- * @exception EOFException if this input stream has reached the end.
- * @exception IOException the stream has been closed and the contained
+ * @throws EOFException if this input stream has reached the end.
+ * @throws IOException the stream has been closed and the contained
* input stream does not support reading after close, or
* another I/O error occurs.
* @see java.io.FilterInputStream#in
@@ -306,9 +306,9 @@ class DataInputStream extends FilterInputStream implements DataInput {
*
* @return the next two bytes of this input stream, interpreted as a
* signed 16-bit number.
- * @exception EOFException if this input stream reaches the end before
+ * @throws EOFException if this input stream reaches the end before
* reading two bytes.
- * @exception IOException the stream has been closed and the contained
+ * @throws IOException the stream has been closed and the contained
* input stream does not support reading after close, or
* another I/O error occurs.
* @see java.io.FilterInputStream#in
@@ -331,9 +331,9 @@ class DataInputStream extends FilterInputStream implements DataInput {
*
* @return the next two bytes of this input stream, interpreted as an
* unsigned 16-bit integer.
- * @exception EOFException if this input stream reaches the end before
+ * @throws EOFException if this input stream reaches the end before
* reading two bytes.
- * @exception IOException the stream has been closed and the contained
+ * @throws IOException the stream has been closed and the contained
* input stream does not support reading after close, or
* another I/O error occurs.
* @see java.io.FilterInputStream#in
@@ -356,9 +356,9 @@ class DataInputStream extends FilterInputStream implements DataInput {
*
* @return the next two bytes of this input stream, interpreted as a
* char.
- * @exception EOFException if this input stream reaches the end before
+ * @throws EOFException if this input stream reaches the end before
* reading two bytes.
- * @exception IOException the stream has been closed and the contained
+ * @throws IOException the stream has been closed and the contained
* input stream does not support reading after close, or
* another I/O error occurs.
* @see java.io.FilterInputStream#in
@@ -381,9 +381,9 @@ class DataInputStream extends FilterInputStream implements DataInput {
*
* @return the next four bytes of this input stream, interpreted as an
* int.
- * @exception EOFException if this input stream reaches the end before
+ * @throws EOFException if this input stream reaches the end before
* reading four bytes.
- * @exception IOException the stream has been closed and the contained
+ * @throws IOException the stream has been closed and the contained
* input stream does not support reading after close, or
* another I/O error occurs.
* @see java.io.FilterInputStream#in
@@ -410,9 +410,9 @@ class DataInputStream extends FilterInputStream implements DataInput {
*
* @return the next eight bytes of this input stream, interpreted as a
* long.
- * @exception EOFException if this input stream reaches the end before
+ * @throws EOFException if this input stream reaches the end before
* reading eight bytes.
- * @exception IOException the stream has been closed and the contained
+ * @throws IOException the stream has been closed and the contained
* input stream does not support reading after close, or
* another I/O error occurs.
* @see java.io.FilterInputStream#in
@@ -439,9 +439,9 @@ class DataInputStream extends FilterInputStream implements DataInput {
*
* @return the next four bytes of this input stream, interpreted as a
* float.
- * @exception EOFException if this input stream reaches the end before
+ * @throws EOFException if this input stream reaches the end before
* reading four bytes.
- * @exception IOException the stream has been closed and the contained
+ * @throws IOException the stream has been closed and the contained
* input stream does not support reading after close, or
* another I/O error occurs.
* @see java.io.DataInputStream#readInt()
@@ -461,9 +461,9 @@ class DataInputStream extends FilterInputStream implements DataInput {
*
* @return the next eight bytes of this input stream, interpreted as a
* double.
- * @exception EOFException if this input stream reaches the end before
+ * @throws EOFException if this input stream reaches the end before
* reading eight bytes.
- * @exception IOException the stream has been closed and the contained
+ * @throws IOException the stream has been closed and the contained
* input stream does not support reading after close, or
* another I/O error occurs.
* @see java.io.DataInputStream#readLong()
@@ -498,7 +498,7 @@ class DataInputStream extends FilterInputStream implements DataInput {
*
*
* @return the next line of text from this input stream.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
* @see java.io.BufferedReader#readLine()
* @see java.io.FilterInputStream#in
*/
@@ -556,12 +556,12 @@ loop: while (true) {
* input stream.
*
* @return a Unicode string.
- * @exception EOFException if this input stream reaches the end before
+ * @throws EOFException if this input stream reaches the end before
* reading all the bytes.
- * @exception IOException the stream has been closed and the contained
+ * @throws IOException the stream has been closed and the contained
* input stream does not support reading after close, or
* another I/O error occurs.
- * @exception UTFDataFormatException if the bytes do not represent a valid
+ * @throws UTFDataFormatException if the bytes do not represent a valid
* modified UTF-8 encoding of a string.
* @see java.io.DataInputStream#readUTF(java.io.DataInput)
*/
@@ -581,12 +581,12 @@ loop: while (true) {
*
* @param in a data input stream.
* @return a Unicode string.
- * @exception EOFException if the input stream reaches the end
+ * @throws EOFException if the input stream reaches the end
* before all the bytes.
- * @exception IOException the stream has been closed and the contained
+ * @throws IOException the stream has been closed and the contained
* input stream does not support reading after close, or
* another I/O error occurs.
- * @exception UTFDataFormatException if the bytes do not represent a
+ * @throws UTFDataFormatException if the bytes do not represent a
* valid modified UTF-8 encoding of a Unicode string.
* @see java.io.DataInputStream#readUnsignedShort()
*/
diff --git a/src/java.base/share/classes/java/io/DataOutputStream.java b/src/java.base/share/classes/java/io/DataOutputStream.java
index 580612232e0..a79929ea078 100644
--- a/src/java.base/share/classes/java/io/DataOutputStream.java
+++ b/src/java.base/share/classes/java/io/DataOutputStream.java
@@ -81,7 +81,7 @@ class DataOutputStream extends FilterOutputStream implements DataOutput {
* Implements the write method of OutputStream.
*
* @param b the byte to be written.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
* @see java.io.FilterOutputStream#out
*/
public synchronized void write(int b) throws IOException {
@@ -98,7 +98,7 @@ class DataOutputStream extends FilterOutputStream implements DataOutput {
* @param b the data.
* @param off the start offset in the data.
* @param len the number of bytes to write.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
* @see java.io.FilterOutputStream#out
*/
public synchronized void write(byte b[], int off, int len)
@@ -115,7 +115,7 @@ class DataOutputStream extends FilterOutputStream implements DataOutput {
* The flush method of DataOutputStream
* calls the flush method of its underlying output stream.
*
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
* @see java.io.FilterOutputStream#out
* @see java.io.OutputStream#flush()
*/
@@ -132,7 +132,7 @@ class DataOutputStream extends FilterOutputStream implements DataOutput {
* 1.
*
* @param v a boolean value to be written.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
* @see java.io.FilterOutputStream#out
*/
public final void writeBoolean(boolean v) throws IOException {
@@ -146,7 +146,7 @@ class DataOutputStream extends FilterOutputStream implements DataOutput {
* written is incremented by 1.
*
* @param v a byte value to be written.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
* @see java.io.FilterOutputStream#out
*/
public final void writeByte(int v) throws IOException {
@@ -160,7 +160,7 @@ class DataOutputStream extends FilterOutputStream implements DataOutput {
* written is incremented by 2.
*
* @param v a short to be written.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
* @see java.io.FilterOutputStream#out
*/
public final void writeShort(int v) throws IOException {
@@ -175,7 +175,7 @@ class DataOutputStream extends FilterOutputStream implements DataOutput {
* counter written is incremented by 2.
*
* @param v a char value to be written.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
* @see java.io.FilterOutputStream#out
*/
public final void writeChar(int v) throws IOException {
@@ -190,7 +190,7 @@ class DataOutputStream extends FilterOutputStream implements DataOutput {
* written is incremented by 4.
*
* @param v an int to be written.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
* @see java.io.FilterOutputStream#out
*/
public final void writeInt(int v) throws IOException {
@@ -209,7 +209,7 @@ class DataOutputStream extends FilterOutputStream implements DataOutput {
* written is incremented by 8.
*
* @param v a long to be written.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
* @see java.io.FilterOutputStream#out
*/
public final void writeLong(long v) throws IOException {
@@ -234,7 +234,7 @@ class DataOutputStream extends FilterOutputStream implements DataOutput {
* incremented by 4.
*
* @param v a float value to be written.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
* @see java.io.FilterOutputStream#out
* @see java.lang.Float#floatToIntBits(float)
*/
@@ -251,7 +251,7 @@ class DataOutputStream extends FilterOutputStream implements DataOutput {
* incremented by 8.
*
* @param v a double value to be written.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
* @see java.io.FilterOutputStream#out
* @see java.lang.Double#doubleToLongBits(double)
*/
@@ -267,7 +267,7 @@ class DataOutputStream extends FilterOutputStream implements DataOutput {
* length of s.
*
* @param s a string of bytes to be written.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
* @see java.io.FilterOutputStream#out
*/
public final void writeBytes(String s) throws IOException {
@@ -286,7 +286,7 @@ class DataOutputStream extends FilterOutputStream implements DataOutput {
* the length of s.
*
* @param s a String value to be written.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
* @see java.io.DataOutputStream#writeChar(int)
* @see java.io.FilterOutputStream#out
*/
diff --git a/src/java.base/share/classes/java/io/Externalizable.java b/src/java.base/share/classes/java/io/Externalizable.java
index f5f3f9a2b26..09f21fdf646 100644
--- a/src/java.base/share/classes/java/io/Externalizable.java
+++ b/src/java.base/share/classes/java/io/Externalizable.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2019, 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
@@ -76,8 +76,8 @@ public interface Externalizable extends java.io.Serializable {
* relate the element to a public/protected field and/or
* method of this Externalizable class.
*
- * @param out the stream to write the object to
- * @exception IOException Includes any I/O exceptions that may occur
+ * @param out the stream to write the object to
+ * @throws IOException Includes any I/O exceptions that may occur
*/
void writeExternal(ObjectOutput out) throws IOException;
@@ -88,10 +88,10 @@ public interface Externalizable extends java.io.Serializable {
* readExternal method must read the values in the same sequence
* and with the same types as were written by writeExternal.
*
- * @param in the stream to read data from in order to restore the object
- * @exception IOException if I/O errors occur
- * @exception ClassNotFoundException If the class for an object being
- * restored cannot be found.
+ * @param in the stream to read data from in order to restore the object
+ * @throws IOException if I/O errors occur
+ * @throws ClassNotFoundException If the class for an object being
+ * restored cannot be found.
*/
void readExternal(ObjectInput in) throws IOException, ClassNotFoundException;
}
diff --git a/src/java.base/share/classes/java/io/FileDescriptor.java b/src/java.base/share/classes/java/io/FileDescriptor.java
index b976b0ad394..ddaac6d6f5d 100644
--- a/src/java.base/share/classes/java/io/FileDescriptor.java
+++ b/src/java.base/share/classes/java/io/FileDescriptor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2019, 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 @@ public final class FileDescriptor {
* be flushed into the FileDescriptor (for example, by invoking
* OutputStream.flush) before that data will be affected by sync.
*
- * @exception SyncFailedException
+ * @throws SyncFailedException
* Thrown when the buffers cannot be flushed,
* or because the system cannot guarantee that all the
* buffers have been synchronized with physical media.
diff --git a/src/java.base/share/classes/java/io/FileInputStream.java b/src/java.base/share/classes/java/io/FileInputStream.java
index 0d5dca8a1a0..69869b1b341 100644
--- 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, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2019, 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
@@ -97,13 +97,13 @@ class FileInputStream extends InputStream
* FileNotFoundException is thrown.
*
* @param name the system-dependent file name.
- * @exception FileNotFoundException if the file does not exist,
- * is a directory rather than a regular file,
- * or for some other reason cannot be opened for
- * reading.
- * @exception SecurityException if a security manager exists and its
- * checkRead method denies read access
- * to the file.
+ * @throws FileNotFoundException if the file does not exist,
+ * is a directory rather than a regular file,
+ * or for some other reason cannot be opened for
+ * reading.
+ * @throws SecurityException if a security manager exists and its
+ * checkRead method denies read access
+ * to the file.
* @see java.lang.SecurityManager#checkRead(java.lang.String)
*/
public FileInputStream(String name) throws FileNotFoundException {
@@ -128,12 +128,12 @@ class FileInputStream extends InputStream
* FileNotFoundException is thrown.
*
* @param file the file to be opened for reading.
- * @exception FileNotFoundException if the file does not exist,
- * is a directory rather than a regular file,
- * or for some other reason cannot be opened for
- * reading.
- * @exception SecurityException if a security manager exists and its
- * checkRead method denies read access to the file.
+ * @throws FileNotFoundException if the file does not exist,
+ * is a directory rather than a regular file,
+ * or for some other reason cannot be opened for
+ * reading.
+ * @throws SecurityException if a security manager exists and its
+ * checkRead method denies read access to the file.
* @see java.io.File#getPath()
* @see java.lang.SecurityManager#checkRead(java.lang.String)
*/
@@ -176,8 +176,8 @@ class FileInputStream extends InputStream
*
* @param fdObj the file descriptor to be opened for reading.
* @throws SecurityException if a security manager exists and its
- * checkRead method denies read access to the
- * file descriptor.
+ * checkRead method denies read access to the
+ * file descriptor.
* @see SecurityManager#checkRead(java.io.FileDescriptor)
*/
public FileInputStream(FileDescriptor fdObj) {
@@ -219,7 +219,7 @@ class FileInputStream extends InputStream
*
* @return the next byte of data, or -1 if the end of the
* file is reached.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
public int read() throws IOException {
return read0();
@@ -229,10 +229,10 @@ class FileInputStream extends InputStream
/**
* Reads a subarray 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
- * @exception IOException If an I/O error has occurred.
+ * @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.
*/
private native int readBytes(byte b[], int off, int len) throws IOException;
@@ -245,7 +245,7 @@ class FileInputStream extends InputStream
* @return the total number of bytes read into the buffer, or
* -1 if there is no more data because the end of
* the file has been reached.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
public int read(byte b[]) throws IOException {
return readBytes(b, 0, b.length);
@@ -263,11 +263,11 @@ class FileInputStream extends InputStream
* @return the total number of bytes read into the buffer, or
* -1 if there is no more data because the end of
* the file has been reached.
- * @exception NullPointerException If b is null.
- * @exception IndexOutOfBoundsException If off is negative,
- * len is negative, or len is greater than
- * b.length - off
- * @exception IOException if an I/O error occurs.
+ * @throws NullPointerException If b is null.
+ * @throws IndexOutOfBoundsException If off is negative,
+ * len is negative, or len is greater than
+ * b.length - off
+ * @throws IOException if an I/O error occurs.
*/
public int read(byte b[], int off, int len) throws IOException {
return readBytes(b, off, len);
@@ -294,7 +294,7 @@ class FileInputStream extends InputStream
*
* @param n the number of bytes to be skipped.
* @return the actual number of bytes skipped.
- * @exception IOException if n is negative, if the stream does not
+ * @throws IOException if n is negative, if the stream does not
* support seek, or if an I/O error occurs.
*/
public long skip(long n) throws IOException {
@@ -317,7 +317,7 @@ class FileInputStream extends InputStream
*
* @return an estimate of the number of remaining bytes that can be read
* (or skipped over) from this input stream without blocking.
- * @exception IOException if this file input stream has been closed by calling
+ * @throws IOException if this file input stream has been closed by calling
* {@code close} or an I/O error occurs.
*/
public int available() throws IOException {
@@ -341,7 +341,7 @@ class FileInputStream extends InputStream
* If cleanup of native resources is needed, other mechanisms such as
* {@linkplain java.lang.ref.Cleaner} should be used.
*
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*
* @revised 1.4
* @spec JSR-51
@@ -378,7 +378,7 @@ class FileInputStream extends InputStream
* used by this FileInputStream.
*
* @return the file descriptor object associated with this stream.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
* @see java.io.FileDescriptor
*/
public final FileDescriptor getFD() throws IOException {
diff --git a/src/java.base/share/classes/java/io/FileOutputStream.java b/src/java.base/share/classes/java/io/FileOutputStream.java
index 0c5d8b347b6..5c311f58278 100644
--- a/src/java.base/share/classes/java/io/FileOutputStream.java
+++ b/src/java.base/share/classes/java/io/FileOutputStream.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1994, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2019, 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
@@ -112,10 +112,10 @@ class FileOutputStream extends OutputStream
* new FileOutputStream(name, false)}.
*
* @param name the system-dependent filename
- * @exception FileNotFoundException if the file exists but is a directory
+ * @throws FileNotFoundException if the file exists but is a directory
* rather than a regular file, does not exist but cannot
* be created, or cannot be opened for any other reason
- * @exception SecurityException if a security manager exists and its
+ * @throws SecurityException if a security manager exists and its
* checkWrite method denies write access
* to the file.
* @see java.lang.SecurityManager#checkWrite(java.lang.String)
@@ -141,10 +141,10 @@ class FileOutputStream extends OutputStream
* @param name the system-dependent file name
* @param append if true, then bytes will be written
* to the end of the file rather than the beginning
- * @exception FileNotFoundException if the file exists but is a directory
+ * @throws FileNotFoundException if the file exists but is a directory
* rather than a regular file, does not exist but cannot
* be created, or cannot be opened for any other reason.
- * @exception SecurityException if a security manager exists and its
+ * @throws SecurityException if a security manager exists and its
* checkWrite method denies write access
* to the file.
* @see java.lang.SecurityManager#checkWrite(java.lang.String)
@@ -171,10 +171,10 @@ class FileOutputStream extends OutputStream
* reason then a FileNotFoundException is thrown.
*
* @param file the file to be opened for writing.
- * @exception FileNotFoundException if the file exists but is a directory
+ * @throws FileNotFoundException if the file exists but is a directory
* rather than a regular file, does not exist but cannot
* be created, or cannot be opened for any other reason
- * @exception SecurityException if a security manager exists and its
+ * @throws SecurityException if a security manager exists and its
* checkWrite method denies write access
* to the file.
* @see java.io.File#getPath()
@@ -203,10 +203,10 @@ class FileOutputStream extends OutputStream
* @param file the file to be opened for writing.
* @param append if true, then bytes will be written
* to the end of the file rather than the beginning
- * @exception FileNotFoundException if the file exists but is a directory
+ * @throws FileNotFoundException if the file exists but is a directory
* rather than a regular file, does not exist but cannot
* be created, or cannot be opened for any other reason
- * @exception SecurityException if a security manager exists and its
+ * @throws SecurityException if a security manager exists and its
* checkWrite method denies write access
* to the file.
* @see java.io.File#getPath()
@@ -254,7 +254,7 @@ class FileOutputStream extends OutputStream
* I/O on the stream, an IOException is thrown.
*
* @param fdObj the file descriptor to be opened for writing
- * @exception SecurityException if a security manager exists and its
+ * @throws SecurityException if a security manager exists and its
* checkWrite method denies
* write access to the file descriptor
* @see java.lang.SecurityManager#checkWrite(java.io.FileDescriptor)
@@ -306,7 +306,7 @@ class FileOutputStream extends OutputStream
* the write method of OutputStream.
*
* @param b the byte to be written.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
public void write(int b) throws IOException {
write(b, fdAccess.getAppend(fd));
@@ -319,7 +319,7 @@ class FileOutputStream extends OutputStream
* @param len the number of bytes that are written
* @param append {@code true} to first advance the position to the
* end of file
- * @exception IOException If an I/O error has occurred.
+ * @throws IOException If an I/O error has occurred.
*/
private native void writeBytes(byte b[], int off, int len, boolean append)
throws IOException;
@@ -329,7 +329,7 @@ class FileOutputStream extends OutputStream
* to this file output stream.
*
* @param b the data.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
public void write(byte b[]) throws IOException {
writeBytes(b, 0, b.length, fdAccess.getAppend(fd));
@@ -342,7 +342,7 @@ class FileOutputStream extends OutputStream
* @param b the data.
* @param off the start offset in the data.
* @param len the number of bytes to write.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
public void write(byte b[], int off, int len) throws IOException {
writeBytes(b, off, len, fdAccess.getAppend(fd));
@@ -364,7 +364,7 @@ class FileOutputStream extends OutputStream
* If cleanup of native resources is needed, other mechanisms such as
* {@linkplain java.lang.ref.Cleaner} should be used.
*
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*
* @revised 1.4
* @spec JSR-51
@@ -401,7 +401,7 @@ class FileOutputStream extends OutputStream
* the connection to the file in the file system being used
* by this FileOutputStream object.
*
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
* @see java.io.FileDescriptor
*/
public final FileDescriptor getFD() throws IOException {
diff --git a/src/java.base/share/classes/java/io/FilePermission.java b/src/java.base/share/classes/java/io/FilePermission.java
index 453b365f0fa..a50637c8677 100644
--- a/src/java.base/share/classes/java/io/FilePermission.java
+++ b/src/java.base/share/classes/java/io/FilePermission.java
@@ -1127,10 +1127,10 @@ final class FilePermissionCollection extends PermissionCollection
*
* @param permission the Permission object to add.
*
- * @exception IllegalArgumentException - if the permission is not a
+ * @throws IllegalArgumentException - if the permission is not a
* FilePermission
*
- * @exception SecurityException - if this FilePermissionCollection object
+ * @throws SecurityException - if this FilePermissionCollection object
* has been marked readonly
*/
@Override
diff --git a/src/java.base/share/classes/java/io/FileReader.java b/src/java.base/share/classes/java/io/FileReader.java
index d37cd8c9eb6..dd1c6099390 100644
--- a/src/java.base/share/classes/java/io/FileReader.java
+++ b/src/java.base/share/classes/java/io/FileReader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2019, 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
@@ -50,11 +50,11 @@ public class FileReader extends InputStreamReader {
* using the platform's
* {@linkplain java.nio.charset.Charset#defaultCharset() default charset}.
*
- * @param fileName the name of the file to read
- * @exception FileNotFoundException if the named file does not exist,
- * is a directory rather than a regular file,
- * or for some other reason cannot be opened for
- * reading.
+ * @param fileName the name of the file to read
+ * @throws FileNotFoundException if the named file does not exist,
+ * is a directory rather than a regular file,
+ * or for some other reason cannot be opened for
+ * reading.
*/
public FileReader(String fileName) throws FileNotFoundException {
super(new FileInputStream(fileName));
@@ -65,11 +65,11 @@ public class FileReader extends InputStreamReader {
* using the platform's
* {@linkplain java.nio.charset.Charset#defaultCharset() default charset}.
*
- * @param file the {@code File} to read
- * @exception FileNotFoundException if the file does not exist,
- * is a directory rather than a regular file,
- * or for some other reason cannot be opened for
- * reading.
+ * @param file the {@code File} to read
+ * @throws FileNotFoundException if the file does not exist,
+ * is a directory rather than a regular file,
+ * or for some other reason cannot be opened for
+ * reading.
*/
public FileReader(File file) throws FileNotFoundException {
super(new FileInputStream(file));
@@ -90,12 +90,12 @@ public class FileReader extends InputStreamReader {
* Creates a new {@code FileReader}, given the name of the file to read
* and the {@linkplain java.nio.charset.Charset charset}.
*
- * @param fileName the name of the file to read
- * @param charset the {@linkplain java.nio.charset.Charset charset}
- * @exception IOException if the named file does not exist,
- * is a directory rather than a regular file,
- * or for some other reason cannot be opened for
- * reading.
+ * @param fileName the name of the file to read
+ * @param charset the {@linkplain java.nio.charset.Charset charset}
+ * @throws IOException if the named file does not exist,
+ * is a directory rather than a regular file,
+ * or for some other reason cannot be opened for
+ * reading.
*
* @since 11
*/
@@ -107,12 +107,12 @@ public class FileReader extends InputStreamReader {
* Creates a new {@code FileReader}, given the {@code File} to read and
* the {@linkplain java.nio.charset.Charset charset}.
*
- * @param file the {@code File} to read
- * @param charset the {@linkplain java.nio.charset.Charset charset}
- * @exception IOException if the file does not exist,
- * is a directory rather than a regular file,
- * or for some other reason cannot be opened for
- * reading.
+ * @param file the {@code File} to read
+ * @param charset the {@linkplain java.nio.charset.Charset charset}
+ * @throws IOException if the file does not exist,
+ * is a directory rather than a regular file,
+ * or for some other reason cannot be opened for
+ * reading.
*
* @since 11
*/
diff --git a/src/java.base/share/classes/java/io/FilterInputStream.java b/src/java.base/share/classes/java/io/FilterInputStream.java
index 05ab5fa56cb..7598c9768e5 100644
--- a/src/java.base/share/classes/java/io/FilterInputStream.java
+++ b/src/java.base/share/classes/java/io/FilterInputStream.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1994, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2019, 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
@@ -76,7 +76,7 @@ class FilterInputStream extends InputStream {
*
* @return the next byte of data, or -1 if the end of the
* stream is reached.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
* @see java.io.FilterInputStream#in
*/
public int read() throws IOException {
@@ -100,7 +100,7 @@ class FilterInputStream extends InputStream {
* @return the total number of bytes read into the buffer, or
* -1 if there is no more data because the end of
* the stream has been reached.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
* @see java.io.FilterInputStream#read(byte[], int, int)
*/
public int read(byte b[]) throws IOException {
@@ -122,11 +122,11 @@ class FilterInputStream extends InputStream {
* @return the total number of bytes read into the buffer, or
* -1 if there is no more data because the end of
* the stream has been reached.
- * @exception NullPointerException If b is null.
- * @exception IndexOutOfBoundsException If off is negative,
- * len is negative, or len is greater than
- * b.length - off
- * @exception IOException if an I/O error occurs.
+ * @throws NullPointerException If b is null.
+ * @throws IndexOutOfBoundsException If off is negative,
+ * len is negative, or len is greater than
+ * b.length - off
+ * @throws IOException if an I/O error occurs.
* @see java.io.FilterInputStream#in
*/
public int read(byte b[], int off, int len) throws IOException {
@@ -161,7 +161,7 @@ class FilterInputStream extends InputStream {
*
* @return an estimate of the number of bytes that can be read (or skipped
* over) from this input stream without blocking.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
public int available() throws IOException {
return in.available();
@@ -173,7 +173,7 @@ class FilterInputStream extends InputStream {
* This
* method simply performs in.close().
*
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
* @see java.io.FilterInputStream#in
*/
public void close() throws IOException {
@@ -216,7 +216,7 @@ class FilterInputStream extends InputStream {
* If this happens within readlimit bytes, it allows the outer
* code to reset the stream and try another parser.
*
- * @exception IOException if the stream has not been marked or if the
+ * @throws IOException if the stream has not been marked or if the
* mark has been invalidated.
* @see java.io.FilterInputStream#in
* @see java.io.FilterInputStream#mark(int)
diff --git a/src/java.base/share/classes/java/io/FilterOutputStream.java b/src/java.base/share/classes/java/io/FilterOutputStream.java
index 55abe739196..1118b6c5c23 100644
--- a/src/java.base/share/classes/java/io/FilterOutputStream.java
+++ b/src/java.base/share/classes/java/io/FilterOutputStream.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1994, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2019, 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
@@ -80,7 +80,7 @@ public class FilterOutputStream extends OutputStream {
* Implements the abstract {@code write} method of {@code OutputStream}.
*
* @param b the byte.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
@Override
public void write(int b) throws IOException {
@@ -100,7 +100,7 @@ public class FilterOutputStream extends OutputStream {
* the single argument b.
*
* @param b the data to be written.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
* @see java.io.FilterOutputStream#write(byte[], int, int)
*/
@Override
@@ -125,7 +125,7 @@ public class FilterOutputStream extends OutputStream {
* @param b the data.
* @param off the start offset in the data.
* @param len the number of bytes to write.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
* @see java.io.FilterOutputStream#write(int)
*/
@Override
@@ -145,7 +145,7 @@ public class FilterOutputStream extends OutputStream {
* The flush method of FilterOutputStream
* calls the flush method of its underlying output stream.
*
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
* @see java.io.FilterOutputStream#out
*/
@Override
@@ -161,7 +161,7 @@ public class FilterOutputStream extends OutputStream {
* FilterOutputStream} calls its {@code flush} method, and then
* calls the {@code close} method of its underlying output stream.
*
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
* @see java.io.FilterOutputStream#flush()
* @see java.io.FilterOutputStream#out
*/
diff --git a/src/java.base/share/classes/java/io/FilterReader.java b/src/java.base/share/classes/java/io/FilterReader.java
index 60f748f7019..a15b08ca4a7 100644
--- a/src/java.base/share/classes/java/io/FilterReader.java
+++ b/src/java.base/share/classes/java/io/FilterReader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2019, 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
@@ -59,7 +59,7 @@ public abstract class FilterReader extends Reader {
/**
* Reads a single character.
*
- * @exception IOException If an I/O error occurs
+ * @throws IOException If an I/O error occurs
*/
public int read() throws IOException {
return in.read();
@@ -68,8 +68,8 @@ public abstract class FilterReader extends Reader {
/**
* Reads characters into a portion of an array.
*
- * @exception IOException If an I/O error occurs
- * @exception IndexOutOfBoundsException {@inheritDoc}
+ * @throws IOException If an I/O error occurs
+ * @throws IndexOutOfBoundsException {@inheritDoc}
*/
public int read(char cbuf[], int off, int len) throws IOException {
return in.read(cbuf, off, len);
@@ -78,7 +78,7 @@ public abstract class FilterReader extends Reader {
/**
* Skips characters.
*
- * @exception IOException If an I/O error occurs
+ * @throws IOException If an I/O error occurs
*/
public long skip(long n) throws IOException {
return in.skip(n);
@@ -87,7 +87,7 @@ public abstract class FilterReader extends Reader {
/**
* Tells whether this stream is ready to be read.
*
- * @exception IOException If an I/O error occurs
+ * @throws IOException If an I/O error occurs
*/
public boolean ready() throws IOException {
return in.ready();
@@ -103,7 +103,7 @@ public abstract class FilterReader extends Reader {
/**
* Marks the present position in the stream.
*
- * @exception IOException If an I/O error occurs
+ * @throws IOException If an I/O error occurs
*/
public void mark(int readAheadLimit) throws IOException {
in.mark(readAheadLimit);
@@ -112,7 +112,7 @@ public abstract class FilterReader extends Reader {
/**
* Resets the stream.
*
- * @exception IOException If an I/O error occurs
+ * @throws IOException If an I/O error occurs
*/
public void reset() throws IOException {
in.reset();
diff --git a/src/java.base/share/classes/java/io/FilterWriter.java b/src/java.base/share/classes/java/io/FilterWriter.java
index 8272b3cc8bf..119bd9fee38 100644
--- a/src/java.base/share/classes/java/io/FilterWriter.java
+++ b/src/java.base/share/classes/java/io/FilterWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2019, 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
@@ -59,7 +59,7 @@ public abstract class FilterWriter extends Writer {
/**
* Writes a single character.
*
- * @exception IOException If an I/O error occurs
+ * @throws IOException If an I/O error occurs
*/
public void write(int c) throws IOException {
out.write(c);
@@ -104,7 +104,7 @@ public abstract class FilterWriter extends Writer {
/**
* Flushes the stream.
*
- * @exception IOException If an I/O error occurs
+ * @throws IOException If an I/O error occurs
*/
public void flush() throws IOException {
out.flush();
diff --git a/src/java.base/share/classes/java/io/InputStream.java b/src/java.base/share/classes/java/io/InputStream.java
index 717c0b3d554..05936d2b2d6 100644
--- a/src/java.base/share/classes/java/io/InputStream.java
+++ b/src/java.base/share/classes/java/io/InputStream.java
@@ -177,7 +177,7 @@ public abstract class InputStream implements Closeable {
*
* @return the next byte of data, or -1 if the end of the
* stream is reached.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
public abstract int read() throws IOException;
@@ -208,10 +208,10 @@ public abstract class InputStream implements Closeable {
* @return the total number of bytes read into the buffer, or
* -1 if there is no more data because the end of
* the stream has been reached.
- * @exception IOException If the first byte cannot be read for any reason
- * other than the end of the file, if the input stream has been closed, or
- * if some other I/O error occurs.
- * @exception NullPointerException if b is null.
+ * @throws IOException If the first byte cannot be read for any reason
+ * other than the end of the file, if the input stream has been
+ * closed, or if some other I/O error occurs.
+ * @throws NullPointerException if b is null.
* @see java.io.InputStream#read(byte[], int, int)
*/
public int read(byte b[]) throws IOException {
@@ -266,13 +266,13 @@ public abstract class InputStream implements Closeable {
* @return the total number of bytes read into the buffer, or
* -1 if there is no more data because the end of
* the stream has been reached.
- * @exception IOException If the first byte cannot be read for any reason
- * other than end of file, or if the input stream has been closed, or if
- * some other I/O error occurs.
- * @exception NullPointerException If b is null.
- * @exception IndexOutOfBoundsException If off is negative,
- * len is negative, or len is greater than
- * b.length - off
+ * @throws IOException If the first byte cannot be read for any reason
+ * other than end of file, or if the input stream has been closed,
+ * or if some other I/O error occurs.
+ * @throws NullPointerException If b is null.
+ * @throws IndexOutOfBoundsException If off is negative,
+ * len is negative, or len is greater than
+ * b.length - off
* @see java.io.InputStream#read()
*/
public int read(byte b[], int off, int len) throws IOException {
@@ -634,7 +634,7 @@ public abstract class InputStream implements Closeable {
* @return an estimate of the number of bytes that can be read (or
* skipped over) from this input stream without blocking or
* {@code 0} when it reaches the end of the input stream.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
public int available() throws IOException {
return 0;
@@ -647,7 +647,7 @@ public abstract class InputStream implements Closeable {
*
The close method of InputStream does
* nothing.
*
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
public void close() throws IOException {}
@@ -718,8 +718,8 @@ public abstract class InputStream implements Closeable {
*
The method reset for class InputStream
* does nothing except throw an IOException.
*
- * @exception IOException if this stream has not been marked or if the
- * mark has been invalidated.
+ * @throws IOException if this stream has not been marked or if the
+ * mark has been invalidated.
* @see java.io.InputStream#mark(int)
* @see java.io.IOException
*/
diff --git a/src/java.base/share/classes/java/io/InputStreamReader.java b/src/java.base/share/classes/java/io/InputStreamReader.java
index eef495ff4ea..21da1dc704b 100644
--- a/src/java.base/share/classes/java/io/InputStreamReader.java
+++ b/src/java.base/share/classes/java/io/InputStreamReader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2019, 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
@@ -88,7 +88,7 @@ public class InputStreamReader extends Reader {
* The name of a supported
* {@link java.nio.charset.Charset charset}
*
- * @exception UnsupportedEncodingException
+ * @throws UnsupportedEncodingException
* If the named charset is not supported
*/
public InputStreamReader(InputStream in, String charsetName)
@@ -162,7 +162,7 @@ public class InputStreamReader extends Reader {
* @return The character read, or -1 if the end of the stream has been
* reached
*
- * @exception IOException If an I/O error occurs
+ * @throws IOException If an I/O error occurs
*/
public int read() throws IOException {
return sd.read();
@@ -178,8 +178,8 @@ public class InputStreamReader extends Reader {
* @return The number of characters read, or -1 if the end of the
* stream has been reached
*
- * @exception IOException If an I/O error occurs
- * @exception IndexOutOfBoundsException {@inheritDoc}
+ * @throws IOException If an I/O error occurs
+ * @throws IndexOutOfBoundsException {@inheritDoc}
*/
public int read(char cbuf[], int offset, int length) throws IOException {
return sd.read(cbuf, offset, length);
@@ -190,7 +190,7 @@ public class InputStreamReader extends Reader {
* ready if its input buffer is not empty, or if bytes are available to be
* read from the underlying byte stream.
*
- * @exception IOException If an I/O error occurs
+ * @throws IOException If an I/O error occurs
*/
public boolean ready() throws IOException {
return sd.ready();
diff --git a/src/java.base/share/classes/java/io/LineNumberInputStream.java b/src/java.base/share/classes/java/io/LineNumberInputStream.java
index 2235a2b7fd7..0657cfd5e53 100644
--- a/src/java.base/share/classes/java/io/LineNumberInputStream.java
+++ b/src/java.base/share/classes/java/io/LineNumberInputStream.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2019, 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
@@ -83,7 +83,7 @@ class LineNumberInputStream extends FilterInputStream {
*
* @return the next byte of data, or {@code -1} if the end of this
* stream is reached.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
* @see java.io.FilterInputStream#in
* @see java.io.LineNumberInputStream#getLineNumber()
*/
@@ -124,7 +124,7 @@ class LineNumberInputStream extends FilterInputStream {
* @return the total number of bytes read into the buffer, or
* {@code -1} if there is no more data because the end of
* this stream has been reached.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
* @see java.io.LineNumberInputStream#read()
*/
public int read(byte b[], int off, int len) throws IOException {
@@ -173,7 +173,7 @@ class LineNumberInputStream extends FilterInputStream {
*
* @param n the number of bytes to be skipped.
* @return the actual number of bytes skipped.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
* @see java.io.FilterInputStream#in
*/
public long skip(long n) throws IOException {
@@ -234,7 +234,7 @@ class LineNumberInputStream extends FilterInputStream {
*
* @return the number of bytes that can be read from this input stream
* without blocking.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
* @see java.io.FilterInputStream#in
*/
public int available() throws IOException {
@@ -281,7 +281,7 @@ class LineNumberInputStream extends FilterInputStream {
* which, if it happens within readlimit bytes, allows the outer
* code to reset the stream and try another parser.
*
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
* @see java.io.FilterInputStream#in
* @see java.io.LineNumberInputStream#mark(int)
*/
diff --git a/src/java.base/share/classes/java/io/ObjectInput.java b/src/java.base/share/classes/java/io/ObjectInput.java
index 92d3b707058..ac1a9b5c542 100644
--- a/src/java.base/share/classes/java/io/ObjectInput.java
+++ b/src/java.base/share/classes/java/io/ObjectInput.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2019, 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
@@ -41,11 +41,11 @@ public interface ObjectInput extends DataInput, AutoCloseable {
* Read and return an object. The class that implements this interface
* defines where the object is "read" from.
*
- * @return the object read from the stream
- * @exception java.lang.ClassNotFoundException If the class of a serialized
- * object cannot be found.
- * @exception IOException If any of the usual Input/Output
- * related exceptions occur.
+ * @return the object read from the stream
+ * @throws java.lang.ClassNotFoundException If the class of a serialized
+ * object cannot be found.
+ * @throws IOException If any of the usual Input/Output
+ * related exceptions occur.
*/
public Object readObject()
throws ClassNotFoundException, IOException;
@@ -55,45 +55,45 @@ public interface ObjectInput extends DataInput, AutoCloseable {
* available.
* @return the byte read, or -1 if the end of the
* stream is reached.
- * @exception IOException If an I/O error has occurred.
+ * @throws IOException If an I/O error has occurred.
*/
public int read() throws IOException;
/**
* Reads into an array of bytes. This method will
* block until some input is available.
- * @param b the buffer into which the data is read
+ * @param b the buffer into which the data is read
* @return the actual number of bytes read, -1 is
* returned when the end of the stream is reached.
- * @exception IOException If an I/O error has occurred.
+ * @throws IOException If an I/O error has occurred.
*/
public int read(byte b[]) throws IOException;
/**
* Reads into an array of bytes. This method will
* block until some input is available.
- * @param b the buffer into which the data is read
- * @param off the start offset of the data
- * @param len the maximum number of bytes read
+ * @param b the buffer into which the data is read
+ * @param off the start offset of the data
+ * @param len the maximum number of bytes read
* @return the actual number of bytes read, -1 is
* returned when the end of the stream is reached.
- * @exception IOException If an I/O error has occurred.
+ * @throws IOException If an I/O error has occurred.
*/
public int read(byte b[], int off, int len) throws IOException;
/**
* Skips n bytes of input.
- * @param n the number of bytes to be skipped
+ * @param n the number of bytes to be skipped
* @return the actual number of bytes skipped.
- * @exception IOException If an I/O error has occurred.
+ * @throws IOException If an I/O error has occurred.
*/
public long skip(long n) throws IOException;
/**
* Returns the number of bytes that can be read
* without blocking.
- * @return the number of available bytes.
- * @exception IOException If an I/O error has occurred.
+ * @return the number of available bytes.
+ * @throws IOException If an I/O error has occurred.
*/
public int available() throws IOException;
@@ -101,7 +101,7 @@ public interface ObjectInput extends DataInput, AutoCloseable {
* Closes the input stream. Must be called
* to release any resources associated with
* the stream.
- * @exception IOException If an I/O error has occurred.
+ * @throws IOException If an I/O error has occurred.
*/
public void close() throws IOException;
}
diff --git a/src/java.base/share/classes/java/io/ObjectInputValidation.java b/src/java.base/share/classes/java/io/ObjectInputValidation.java
index 09ee8a6583b..de1d8a53825 100644
--- a/src/java.base/share/classes/java/io/ObjectInputValidation.java
+++ b/src/java.base/share/classes/java/io/ObjectInputValidation.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 1999, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2019, 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
@@ -39,7 +39,7 @@ public interface ObjectInputValidation {
/**
* Validates the object.
*
- * @exception InvalidObjectException If the object cannot validate itself.
+ * @throws InvalidObjectException If the object cannot validate itself.
*/
public void validateObject() throws InvalidObjectException;
}
diff --git a/src/java.base/share/classes/java/io/ObjectOutput.java b/src/java.base/share/classes/java/io/ObjectOutput.java
index 720d198a6dd..b8a8d5c095a 100644
--- a/src/java.base/share/classes/java/io/ObjectOutput.java
+++ b/src/java.base/share/classes/java/io/ObjectOutput.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2019, 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
@@ -42,8 +42,8 @@ public interface ObjectOutput extends DataOutput, AutoCloseable {
* class that implements this interface defines how the object is
* written.
*
- * @param obj the object to be written
- * @exception IOException Any of the usual Input/Output related exceptions.
+ * @param obj the object to be written
+ * @throws IOException Any of the usual Input/Output related exceptions.
*/
public void writeObject(Object obj)
throws IOException;
@@ -51,32 +51,32 @@ public interface ObjectOutput extends DataOutput, AutoCloseable {
/**
* Writes a byte. This method will block until the byte is actually
* written.
- * @param b the byte
- * @exception IOException If an I/O error has occurred.
+ * @param b the byte
+ * @throws IOException If an I/O error has occurred.
*/
public void write(int b) throws IOException;
/**
* Writes an array of bytes. This method will block until the bytes
* are actually written.
- * @param b the data to be written
- * @exception IOException If an I/O error has occurred.
+ * @param b the data to be written
+ * @throws IOException If an I/O error has occurred.
*/
public void write(byte b[]) throws IOException;
/**
* Writes a sub array 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
- * @exception IOException If an I/O error has occurred.
+ * @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.
*/
public void write(byte b[], int off, int len) throws IOException;
/**
* Flushes the stream. This will write any buffered
* output bytes.
- * @exception IOException If an I/O error has occurred.
+ * @throws IOException If an I/O error has occurred.
*/
public void flush() throws IOException;
@@ -84,7 +84,7 @@ public interface ObjectOutput extends DataOutput, AutoCloseable {
* Closes the stream. This method must be called
* to release any resources associated with the
* stream.
- * @exception IOException If an I/O error has occurred.
+ * @throws IOException If an I/O error has occurred.
*/
public void close() throws IOException;
}
diff --git a/src/java.base/share/classes/java/io/OutputStream.java b/src/java.base/share/classes/java/io/OutputStream.java
index 3f05ebbb453..2ef76641d16 100644
--- a/src/java.base/share/classes/java/io/OutputStream.java
+++ b/src/java.base/share/classes/java/io/OutputStream.java
@@ -107,7 +107,7 @@ public abstract class OutputStream implements Closeable, Flushable {
* implementation for this method.
*
* @param b the byte.
- * @exception IOException if an I/O error occurs. In particular,
+ * @throws IOException if an I/O error occurs. In particular,
* an IOException may be thrown if the
* output stream has been closed.
*/
@@ -120,7 +120,7 @@ public abstract class OutputStream implements Closeable, Flushable {
* write(b, 0, b.length).
*
* @param b the data.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
* @see java.io.OutputStream#write(byte[], int, int)
*/
public void write(byte b[]) throws IOException {
@@ -151,7 +151,7 @@ public abstract class OutputStream implements Closeable, Flushable {
* @param b the data.
* @param off the start offset in the data.
* @param len the number of bytes to write.
- * @exception IOException if an I/O error occurs. In particular,
+ * @throws IOException if an I/O error occurs. In particular,
* an IOException is thrown if the output
* stream is closed.
*/
@@ -179,7 +179,7 @@ public abstract class OutputStream implements Closeable, Flushable {
*
* The flush method of OutputStream does nothing.
*
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
public void flush() throws IOException {
}
@@ -192,7 +192,7 @@ public abstract class OutputStream implements Closeable, Flushable {
*
* The close method of OutputStream does nothing.
*
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
public void close() throws IOException {
}
diff --git a/src/java.base/share/classes/java/io/OutputStreamWriter.java b/src/java.base/share/classes/java/io/OutputStreamWriter.java
index 71ea81e8c03..0ffea728bed 100644
--- a/src/java.base/share/classes/java/io/OutputStreamWriter.java
+++ b/src/java.base/share/classes/java/io/OutputStreamWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2019, 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 @@ public class OutputStreamWriter extends Writer {
* The name of a supported
* {@link java.nio.charset.Charset charset}
*
- * @exception UnsupportedEncodingException
+ * @throws UnsupportedEncodingException
* If the named encoding is not supported
*/
public OutputStreamWriter(OutputStream out, String charsetName)
@@ -187,7 +187,7 @@ public class OutputStreamWriter extends Writer {
/**
* Writes a single character.
*
- * @exception IOException If an I/O error occurs
+ * @throws IOException If an I/O error occurs
*/
public void write(int c) throws IOException {
se.write(c);
@@ -248,7 +248,7 @@ public class OutputStreamWriter extends Writer {
/**
* Flushes the stream.
*
- * @exception IOException If an I/O error occurs
+ * @throws IOException If an I/O error occurs
*/
public void flush() throws IOException {
se.flush();
diff --git a/src/java.base/share/classes/java/io/PipedInputStream.java b/src/java.base/share/classes/java/io/PipedInputStream.java
index 0a1de74462d..f76d2a50a15 100644
--- a/src/java.base/share/classes/java/io/PipedInputStream.java
+++ b/src/java.base/share/classes/java/io/PipedInputStream.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2019, 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
@@ -100,7 +100,7 @@ public class PipedInputStream extends InputStream {
* as input from this stream.
*
* @param src the stream to connect to.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
public PipedInputStream(PipedOutputStream src) throws IOException {
this(src, DEFAULT_PIPE_SIZE);
@@ -116,8 +116,8 @@ public class PipedInputStream extends InputStream {
*
* @param src the stream to connect to.
* @param pipeSize the size of the pipe's buffer.
- * @exception IOException if an I/O error occurs.
- * @exception IllegalArgumentException if {@code pipeSize <= 0}.
+ * @throws IOException if an I/O error occurs.
+ * @throws IllegalArgumentException if {@code pipeSize <= 0}.
* @since 1.6
*/
public PipedInputStream(PipedOutputStream src, int pipeSize)
@@ -147,7 +147,7 @@ public class PipedInputStream extends InputStream {
* connected} to a PipedOutputStream before being used.
*
* @param pipeSize the size of the pipe's buffer.
- * @exception IllegalArgumentException if {@code pipeSize <= 0}.
+ * @throws IllegalArgumentException if {@code pipeSize <= 0}.
* @since 1.6
*/
public PipedInputStream(int pipeSize) {
@@ -182,7 +182,7 @@ public class PipedInputStream extends InputStream {
* The two calls have the same effect.
*
* @param src The piped output stream to connect to.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
public void connect(PipedOutputStream src) throws IOException {
src.connect(this);
@@ -191,11 +191,11 @@ public class PipedInputStream extends InputStream {
/**
* Receives a byte of data. This method will block if no input is
* available.
- * @param b the byte being received
- * @exception IOException If the pipe is broken,
+ * @param b the byte being received
+ * @throws IOException If the pipe is broken,
* {@link #connect(java.io.PipedOutputStream) unconnected},
* closed, or if an I/O error occurs.
- * @since 1.1
+ * @since 1.1
*/
protected synchronized void receive(int b) throws IOException {
checkStateForReceive();
@@ -215,10 +215,10 @@ public class PipedInputStream extends InputStream {
/**
* Receives data into an array of bytes. This method will
* block until some input is available.
- * @param b the buffer into which the data is received
- * @param off the start offset of the data
- * @param len the maximum number of bytes received
- * @exception IOException If the pipe is broken,
+ * @param b the buffer into which the data is received
+ * @param off the start offset of the data
+ * @param len the maximum number of bytes received
+ * @throws IOException If the pipe is broken,
* {@link #connect(java.io.PipedOutputStream) unconnected},
* closed,or if an I/O error occurs.
*/
@@ -293,9 +293,9 @@ public class PipedInputStream extends InputStream {
* This method blocks until input data is available, the end of the
* stream is detected, or an exception is thrown.
*
- * @return the next byte of data, or -1 if the end of the
- * stream is reached.
- * @exception IOException if the pipe is
+ * @return the next byte of data, or -1 if the end of the
+ * stream is reached.
+ * @throws IOException if the pipe is
* {@link #connect(java.io.PipedOutputStream) unconnected},
* broken, closed,
* or if an I/O error occurs.
@@ -356,11 +356,11 @@ public class PipedInputStream extends InputStream {
* @return the total number of bytes read into the buffer, or
* -1 if there is no more data because the end of
* the stream has been reached.
- * @exception NullPointerException If b is null.
- * @exception IndexOutOfBoundsException If off is negative,
- * len is negative, or len is greater than
- * b.length - off
- * @exception IOException if the pipe is broken,
+ * @throws NullPointerException If b is null.
+ * @throws IndexOutOfBoundsException If off is negative,
+ * len is negative, or len is greater than
+ * b.length - off
+ * @throws IOException if the pipe is broken,
* {@link #connect(java.io.PipedOutputStream) unconnected},
* closed, or if an I/O error occurs.
*/
@@ -418,10 +418,10 @@ public class PipedInputStream extends InputStream {
* without blocking, or {@code 0} if this input stream has been
* closed by invoking its {@link #close()} method, or if the pipe
* is {@link #connect(java.io.PipedOutputStream) unconnected}, or
- * broken.
+ * broken.
*
- * @exception IOException if an I/O error occurs.
- * @since 1.0.2
+ * @throws IOException if an I/O error occurs.
+ * @since 1.0.2
*/
public synchronized int available() throws IOException {
if(in < 0)
@@ -438,7 +438,7 @@ public class PipedInputStream extends InputStream {
* Closes this piped input stream and releases any system resources
* associated with the stream.
*
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
public void close() throws IOException {
closedByReader = true;
diff --git a/src/java.base/share/classes/java/io/PipedOutputStream.java b/src/java.base/share/classes/java/io/PipedOutputStream.java
index 79ffd38e928..7358fbe23ae 100644
--- a/src/java.base/share/classes/java/io/PipedOutputStream.java
+++ b/src/java.base/share/classes/java/io/PipedOutputStream.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2019, 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
@@ -58,7 +58,7 @@ class PipedOutputStream extends OutputStream {
* available as input from snk.
*
* @param snk The piped input stream to connect to.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
public PipedOutputStream(PipedInputStream snk) throws IOException {
connect(snk);
@@ -91,7 +91,7 @@ class PipedOutputStream extends OutputStream {
* The two calls have the same effect.
*
* @param snk the piped input stream to connect to.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
public synchronized void connect(PipedInputStream snk) throws IOException {
if (snk == null) {
@@ -110,8 +110,8 @@ class PipedOutputStream extends OutputStream {
*
* Implements the write method of OutputStream.
*
- * @param b the byte to be written.
- * @exception IOException if the pipe is broken,
+ * @param b the byte to be written.
+ * @throws IOException if the pipe is broken,
* {@link #connect(java.io.PipedInputStream) unconnected},
* closed, or if an I/O error occurs.
*/
@@ -128,10 +128,10 @@ class PipedOutputStream extends OutputStream {
* This method blocks until all the bytes are written to the output
* stream.
*
- * @param b the data.
- * @param off the start offset in the data.
- * @param len the number of bytes to write.
- * @exception IOException if the pipe is broken,
+ * @param b the data.
+ * @param off the start offset in the data.
+ * @param len the number of bytes to write.
+ * @throws IOException if the pipe is broken,
* {@link #connect(java.io.PipedInputStream) unconnected},
* closed, or if an I/O error occurs.
*/
@@ -154,7 +154,7 @@ class PipedOutputStream extends OutputStream {
* to be written out.
* This will notify any readers that bytes are waiting in the pipe.
*
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
public synchronized void flush() throws IOException {
if (sink != null) {
@@ -169,7 +169,7 @@ class PipedOutputStream extends OutputStream {
* associated with this stream. This stream may no longer be used for
* writing bytes.
*
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
public void close() throws IOException {
if (sink != null) {
diff --git a/src/java.base/share/classes/java/io/PipedReader.java b/src/java.base/share/classes/java/io/PipedReader.java
index f1c0d42656d..d2a9b22300f 100644
--- 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, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2019, 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
@@ -76,7 +76,7 @@ public class PipedReader extends Reader {
* will then be available as input from this stream.
*
* @param src the stream to connect to.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
public PipedReader(PipedWriter src) throws IOException {
this(src, DEFAULT_PIPE_SIZE);
@@ -90,8 +90,8 @@ public class PipedReader extends Reader {
* @param src the stream to connect to.
* @param pipeSize the size of the pipe's buffer.
- * @exception IOException if an I/O error occurs.
- * @exception IllegalArgumentException if {@code pipeSize <= 0}.
+ * @throws IOException if an I/O error occurs.
+ * @throws IllegalArgumentException if {@code pipeSize <= 0}.
* @since 1.6
*/
public PipedReader(PipedWriter src, int pipeSize) throws IOException {
@@ -120,8 +120,8 @@ public class PipedReader extends Reader {
* before being used.
*
* @param pipeSize the size of the pipe's buffer.
- * @exception IllegalArgumentException if {@code pipeSize <= 0}.
- * @since 1.6
+ * @throws IllegalArgumentException if {@code pipeSize <= 0}.
+ * @since 1.6
*/
public PipedReader(int pipeSize) {
initPipe(pipeSize);
@@ -155,7 +155,7 @@ public class PipedReader extends Reader {
* The two calls have the same effect.
*
* @param src The piped writer to connect to.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
public void connect(PipedWriter src) throws IOException {
src.connect(this);
@@ -223,9 +223,9 @@ public class PipedReader extends Reader {
* This method blocks until input data is available, the end of
* the stream is detected, or an exception is thrown.
*
- * @return the next character of data, or -1 if the end of the
- * stream is reached.
- * @exception IOException if the pipe is
+ * @return the next character of data, or -1 if the end of the
+ * stream is reached.
+ * @throws IOException if the pipe is
* broken,
* {@link #connect(java.io.PipedWriter) unconnected}, closed,
* or an I/O error occurs.
@@ -282,11 +282,11 @@ public class PipedReader extends Reader {
* @return the total number of characters read into the buffer, or
* -1 if there is no more data because the end of
* the stream has been reached.
- * @exception IOException if the pipe is
- * broken,
- * {@link #connect(java.io.PipedWriter) unconnected}, closed,
- * or an I/O error occurs.
- * @exception IndexOutOfBoundsException {@inheritDoc}
+ * @throws IOException if the pipe is
+ * broken,
+ * {@link #connect(java.io.PipedWriter) unconnected}, closed,
+ * or an I/O error occurs.
+ * @throws IndexOutOfBoundsException {@inheritDoc}
*/
public synchronized int read(char cbuf[], int off, int len) throws IOException {
if (!connected) {
@@ -330,9 +330,9 @@ public class PipedReader extends Reader {
* Tell whether this stream is ready to be read. A piped character
* stream is ready if the circular buffer is not empty.
*
- * @exception IOException if the pipe is
- * broken,
- * {@link #connect(java.io.PipedWriter) unconnected}, or closed.
+ * @throws IOException if the pipe is
+ * broken,
+ * {@link #connect(java.io.PipedWriter) unconnected}, or closed.
*/
public synchronized boolean ready() throws IOException {
if (!connected) {
@@ -354,7 +354,7 @@ public class PipedReader extends Reader {
* Closes this piped stream and releases any system resources
* associated with the stream.
*
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
public void close() throws IOException {
in = -1;
diff --git a/src/java.base/share/classes/java/io/PipedWriter.java b/src/java.base/share/classes/java/io/PipedWriter.java
index a4534b8604c..9587c1fa6ef 100644
--- a/src/java.base/share/classes/java/io/PipedWriter.java
+++ b/src/java.base/share/classes/java/io/PipedWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2019, 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
@@ -53,7 +53,7 @@ public class PipedWriter extends Writer {
* available as input from snk.
*
* @param snk The piped reader to connect to.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
public PipedWriter(PipedReader snk) throws IOException {
connect(snk);
@@ -86,7 +86,7 @@ public class PipedWriter extends Writer {
* The two calls have the same effect.
*
* @param snk the piped reader to connect to.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
public synchronized void connect(PipedReader snk) throws IOException {
if (snk == null) {
@@ -111,8 +111,8 @@ public class PipedWriter extends Writer {
*
* Implements the write method of Writer.
*
- * @param c the char to be written.
- * @exception IOException if the pipe is
+ * @param c the char to be written.
+ * @throw IOException if the pipe is
* broken,
* {@link #connect(java.io.PipedReader) unconnected}, closed
* or an I/O error occurs.
@@ -133,9 +133,9 @@ public class PipedWriter extends Writer {
* stream, but the thread is no longer alive, then an
* {@code IOException} is thrown.
*
- * @param cbuf the data.
- * @param off the start offset in the data.
- * @param len the number of characters to write.
+ * @param cbuf the data.
+ * @param off the start offset in the data.
+ * @param len the number of characters to write.
*
* @throws IndexOutOfBoundsException
* If {@code off} is negative, or {@code len} is negative,
@@ -161,7 +161,7 @@ public class PipedWriter extends Writer {
* to be written out.
* This will notify any readers that characters are waiting in the pipe.
*
- * @exception IOException if the pipe is closed, or an I/O error occurs.
+ * @throws IOException if the pipe is closed, or an I/O error occurs.
*/
public synchronized void flush() throws IOException {
if (sink != null) {
@@ -179,7 +179,7 @@ public class PipedWriter extends Writer {
* associated with this stream. This stream may no longer be used for
* writing characters.
*
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
public void close() throws IOException {
closed = true;
diff --git a/src/java.base/share/classes/java/io/PushbackInputStream.java b/src/java.base/share/classes/java/io/PushbackInputStream.java
index 6c108667ec8..23d677cc280 100644
--- a/src/java.base/share/classes/java/io/PushbackInputStream.java
+++ b/src/java.base/share/classes/java/io/PushbackInputStream.java
@@ -84,7 +84,7 @@ class PushbackInputStream extends FilterInputStream {
*
* @param in the input stream from which bytes will be read.
* @param size the size of the pushback buffer.
- * @exception IllegalArgumentException if {@code size <= 0}
+ * @throws IllegalArgumentException if {@code size <= 0}
* @since 1.1
*/
public PushbackInputStream(InputStream in, int size) {
@@ -123,7 +123,7 @@ class PushbackInputStream extends FilterInputStream {
*
* @return the next byte of data, or -1 if the end of the
* stream has been reached.
- * @exception IOException if this input stream has been closed by
+ * @throws IOException if this input stream has been closed by
* invoking its {@link #close()} method,
* or an I/O error occurs.
* @see java.io.InputStream#read()
@@ -150,11 +150,11 @@ class PushbackInputStream extends FilterInputStream {
* @return the total number of bytes read into the buffer, or
* -1 if there is no more data because the end of
* the stream has been reached.
- * @exception NullPointerException If b is null.
- * @exception IndexOutOfBoundsException If off is negative,
- * len is negative, or len is greater than
- * b.length - off
- * @exception IOException if this input stream has been closed by
+ * @throws NullPointerException If b is null.
+ * @throws IndexOutOfBoundsException If off is negative,
+ * len is negative, or len is greater than
+ * b.length - off
+ * @throws IOException if this input stream has been closed by
* invoking its {@link #close()} method,
* or an I/O error occurs.
* @see java.io.InputStream#read(byte[], int, int)
@@ -196,7 +196,7 @@ class PushbackInputStream extends FilterInputStream {
*
* @param b the int value whose low-order
* byte is to be pushed back.
- * @exception IOException If there is not enough room in the pushback
+ * @throws IOException If there is not enough room in the pushback
* buffer for the byte, or this input stream has been closed by
* invoking its {@link #close()} method.
*/
@@ -214,11 +214,11 @@ class PushbackInputStream extends FilterInputStream {
* read will have the value b[off], the byte after that will
* have the value b[off+1], and so forth.
*
- * @param b the byte array to push back.
- * @param off the start offset of the data.
- * @param len the number of bytes to push back.
- * @exception NullPointerException If b is null.
- * @exception IOException If there is not enough room in the pushback
+ * @param b the byte array to push back.
+ * @param off the start offset of the data.
+ * @param len the number of bytes to push back.
+ * @throws NullPointerException If b is null.
+ * @throws IOException If there is not enough room in the pushback
* buffer for the specified number of bytes,
* or this input stream has been closed by
* invoking its {@link #close()} method.
@@ -239,9 +239,9 @@ class PushbackInputStream extends FilterInputStream {
* will have the value b[0], the byte after that will have the
* value b[1], and so forth.
*
- * @param b the byte array to push back
- * @exception NullPointerException If b is null.
- * @exception IOException If there is not enough room in the pushback
+ * @param b the byte array to push back
+ * @throws NullPointerException If b is null.
+ * @throws IOException If there is not enough room in the pushback
* buffer for the specified number of bytes,
* or this input stream has been closed by
* invoking its {@link #close()} method.
@@ -264,7 +264,7 @@ class PushbackInputStream extends FilterInputStream {
*
* @return the number of bytes that can be read (or skipped over) from
* the input stream without blocking.
- * @exception IOException if this input stream has been closed by
+ * @throws IOException if this input stream has been closed by
* invoking its {@link #close()} method,
* or an I/O error occurs.
* @see java.io.FilterInputStream#in
@@ -327,8 +327,8 @@ class PushbackInputStream extends FilterInputStream {
*
* @return false, since this class does not support the
* mark and reset methods.
- * @see java.io.InputStream#mark(int)
- * @see java.io.InputStream#reset()
+ * @see java.io.InputStream#mark(int)
+ * @see java.io.InputStream#reset()
*/
public boolean markSupported() {
return false;
@@ -355,7 +355,7 @@ class PushbackInputStream extends FilterInputStream {
* PushbackInputStream does nothing except throw an
* IOException.
*
- * @exception IOException if this method is invoked.
+ * @throws IOException if this method is invoked.
* @see java.io.InputStream#mark(int)
* @see java.io.IOException
*/
@@ -370,7 +370,7 @@ class PushbackInputStream extends FilterInputStream {
* available(), reset(), or skip() invocations will throw an IOException.
* Closing a previously closed stream has no effect.
*
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
public synchronized void close() throws IOException {
if (in == null)
diff --git a/src/java.base/share/classes/java/io/PushbackReader.java b/src/java.base/share/classes/java/io/PushbackReader.java
index 85b185441d1..8aa78230e05 100644
--- a/src/java.base/share/classes/java/io/PushbackReader.java
+++ b/src/java.base/share/classes/java/io/PushbackReader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2019, 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 @@ public class PushbackReader extends FilterReader {
*
* @param in The reader from which characters will be read
* @param size The size of the pushback buffer
- * @exception IllegalArgumentException if {@code size <= 0}
+ * @throws IllegalArgumentException if {@code size <= 0}
*/
public PushbackReader(Reader in, int size) {
super(in);
@@ -79,7 +79,7 @@ public class PushbackReader extends FilterReader {
* @return The character read, or -1 if the end of the stream has been
* reached
*
- * @exception IOException If an I/O error occurs
+ * @throws IOException If an I/O error occurs
*/
public int read() throws IOException {
synchronized (lock) {
@@ -101,8 +101,8 @@ public class PushbackReader extends FilterReader {
* @return The number of characters read, or -1 if the end of the
* stream has been reached
*
- * @exception IOException If an I/O error occurs
- * @exception IndexOutOfBoundsException {@inheritDoc}
+ * @throws IOException If an I/O error occurs
+ * @throws IndexOutOfBoundsException {@inheritDoc}
*/
public int read(char cbuf[], int off, int len) throws IOException {
synchronized (lock) {
@@ -146,8 +146,8 @@ public class PushbackReader extends FilterReader {
*
* @param c The int value representing a character to be pushed back
*
- * @exception IOException If the pushback buffer is full,
- * or if some other I/O error occurs
+ * @throws IOException If the pushback buffer is full,
+ * or if some other I/O error occurs
*/
public void unread(int c) throws IOException {
synchronized (lock) {
@@ -165,11 +165,11 @@ public class PushbackReader extends FilterReader {
* character after that will have the value cbuf[off+1], and
* so forth.
*
- * @param cbuf Character array
- * @param off Offset of first character to push back
- * @param len Number of characters to push back
+ * @param cbuf Character array
+ * @param off Offset of first character to push back
+ * @param len Number of characters to push back
*
- * @exception IOException If there is insufficient room in the pushback
+ * @throws IOException If there is insufficient room in the pushback
* buffer, or if some other I/O error occurs
*/
public void unread(char cbuf[], int off, int len) throws IOException {
@@ -188,9 +188,9 @@ public class PushbackReader extends FilterReader {
* read will have the value cbuf[0], the character after that
* will have the value cbuf[1], and so forth.
*
- * @param cbuf Character array to push back
+ * @param cbuf Character array to push back
*
- * @exception IOException If there is insufficient room in the pushback
+ * @throws IOException If there is insufficient room in the pushback
* buffer, or if some other I/O error occurs
*/
public void unread(char cbuf[]) throws IOException {
@@ -200,7 +200,7 @@ public class PushbackReader extends FilterReader {
/**
* Tells whether this stream is ready to be read.
*
- * @exception IOException If an I/O error occurs
+ * @throws IOException If an I/O error occurs
*/
public boolean ready() throws IOException {
synchronized (lock) {
@@ -213,7 +213,7 @@ public class PushbackReader extends FilterReader {
* Marks the present position in the stream. The mark
* for class PushbackReader always throws an exception.
*
- * @exception IOException Always, since mark is not supported
+ * @throws IOException Always, since mark is not supported
*/
public void mark(int readAheadLimit) throws IOException {
throw new IOException("mark/reset not supported");
@@ -223,7 +223,7 @@ public class PushbackReader extends FilterReader {
* Resets the stream. The reset method of
* PushbackReader always throws an exception.
*
- * @exception IOException Always, since reset is not supported
+ * @throws IOException Always, since reset is not supported
*/
public void reset() throws IOException {
throw new IOException("mark/reset not supported");
@@ -244,7 +244,7 @@ public class PushbackReader extends FilterReader {
* Closing a previously closed stream has no effect. This method will block
* while there is another thread blocking on the reader.
*
- * @exception IOException If an I/O error occurs
+ * @throws IOException If an I/O error occurs
*/
public void close() throws IOException {
synchronized (lock) {
@@ -257,12 +257,12 @@ public class PushbackReader extends FilterReader {
* Skips characters. This method will block until some characters are
* available, an I/O error occurs, or the end of the stream is reached.
*
- * @param n The number of characters to skip
+ * @param n The number of characters to skip
*
* @return The number of characters actually skipped
*
- * @exception IllegalArgumentException If n is negative.
- * @exception IOException If an I/O error occurs
+ * @throws IllegalArgumentException If n is negative.
+ * @throws IOException If an I/O error occurs
*/
public long skip(long n) throws IOException {
if (n < 0L)
diff --git a/src/java.base/share/classes/java/io/RandomAccessFile.java b/src/java.base/share/classes/java/io/RandomAccessFile.java
index 1c62ccef28b..4f11a8c226e 100644
--- 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, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2019, 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
@@ -103,17 +103,17 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
*
* @param name the system-dependent filename
* @param mode the access mode
- * @exception IllegalArgumentException if the mode argument is not equal
+ * @throws IllegalArgumentException if the mode argument is not equal
* to one of {@code "r"}, {@code "rw"}, {@code "rws"}, or
* {@code "rwd"}
- * @exception FileNotFoundException
- * if the mode is {@code "r"} but the given string does not
- * denote an existing regular file, or if the mode begins with
- * {@code "rw"} but the given string does not denote an
- * existing, writable regular file and a new regular file of
- * that name cannot be created, or if some other error occurs
- * while opening or creating the file
- * @exception SecurityException if a security manager exists and its
+ * @throws FileNotFoundException
+ * if the mode is {@code "r"} but the given string does not
+ * denote an existing regular file, or if the mode begins with
+ * {@code "rw"} but the given string does not denote an
+ * existing, writable regular file and a new regular file of
+ * that name cannot be created, or if some other error occurs
+ * while opening or creating the file
+ * @throws SecurityException if a security manager exists and its
* {@code checkRead} method denies read access to the file
* or the mode is {@code "rw"} and the security manager's
* {@code checkWrite} method denies write access to the file
@@ -190,17 +190,17 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
* @param file the file object
* @param mode the access mode, as described
* above
- * @exception IllegalArgumentException if the mode argument is not equal
+ * @throws IllegalArgumentException if the mode argument is not equal
* to one of {@code "r"}, {@code "rw"}, {@code "rws"}, or
* {@code "rwd"}
- * @exception FileNotFoundException
- * if the mode is {@code "r"} but the given file object does
- * not denote an existing regular file, or if the mode begins
- * with {@code "rw"} but the given file object does not denote
- * an existing, writable regular file and a new regular file of
- * that name cannot be created, or if some other error occurs
- * while opening or creating the file
- * @exception SecurityException if a security manager exists and its
+ * @throws FileNotFoundException
+ * if the mode is {@code "r"} but the given file object does
+ * not denote an existing regular file, or if the mode begins
+ * with {@code "rw"} but the given file object does not denote
+ * an existing, writable regular file and a new regular file of
+ * that name cannot be created, or if some other error occurs
+ * while opening or creating the file
+ * @throws SecurityException if a security manager exists and its
* {@code checkRead} method denies read access to the file
* or the mode is {@code "rw"} and the security manager's
* {@code checkWrite} method denies write access to the file
@@ -267,7 +267,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
* stream.
*
* @return the file descriptor object associated with this stream.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
* @see java.io.FileDescriptor
*/
public final FileDescriptor getFD() throws IOException {
@@ -361,7 +361,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
*
* @return the next byte of data, or {@code -1} if the end of the
* file has been reached.
- * @exception IOException if an I/O error occurs. Not thrown if
+ * @throws IOException if an I/O error occurs. Not thrown if
* end-of-file has been reached.
*/
public int read() throws IOException {
@@ -372,10 +372,10 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
/**
* Reads a sub array as a sequence of bytes.
- * @param b the buffer into which the data is read.
- * @param off the start offset of the data.
- * @param len the number of bytes to read.
- * @exception IOException If an I/O error has occurred.
+ * @param b the buffer into which the data is read.
+ * @param off the start offset of the data.
+ * @param len the number of bytes to read.
+ * @throws IOException If an I/O error has occurred.
*/
private native int readBytes(byte b[], int off, int len) throws IOException;
@@ -396,13 +396,13 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
* @return the total number of bytes read into the buffer, or
* {@code -1} if there is no more data because the end of
* the file has been reached.
- * @exception IOException If the first byte cannot be read for any reason
- * other than end of file, or if the random access file has been closed, or if
- * some other I/O error occurs.
- * @exception NullPointerException If {@code b} is {@code null}.
- * @exception IndexOutOfBoundsException If {@code off} is negative,
- * {@code len} is negative, or {@code len} is greater than
- * {@code b.length - off}
+ * @throws IOException If the first byte cannot be read for any reason
+ * other than end of file, or if the random access file has been closed,
+ * or if some other I/O error occurs.
+ * @throws NullPointerException If {@code b} is {@code null}.
+ * @throws IndexOutOfBoundsException If {@code off} is negative,
+ * {@code len} is negative, or {@code len} is greater than
+ * {@code b.length - off}
*/
public int read(byte b[], int off, int len) throws IOException {
return readBytes(b, off, len);
@@ -422,10 +422,10 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
* @return the total number of bytes read into the buffer, or
* {@code -1} if there is no more data because the end of
* this file has been reached.
- * @exception IOException If the first byte cannot be read for any reason
- * other than end of file, or if the random access file has been closed, or if
- * some other I/O error occurs.
- * @exception NullPointerException If {@code b} is {@code null}.
+ * @throws IOException If the first byte cannot be read for any reason
+ * other than end of file, or if the random access file has been closed,
+ * or if some other I/O error occurs.
+ * @throws NullPointerException If {@code b} is {@code null}.
*/
public int read(byte b[]) throws IOException {
return readBytes(b, 0, b.length);
@@ -490,7 +490,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
*
* @param n the number of bytes to be skipped.
* @return the actual number of bytes skipped.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
public int skipBytes(int n) throws IOException {
long pos;
@@ -519,7 +519,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
* the current file pointer.
*
* @param b the {@code byte} to be written.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
public void write(int b) throws IOException {
write0(b);
@@ -529,11 +529,11 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
/**
* Writes a sub array as a sequence of bytes.
- * @param b the data to be written
+ * @param b the data to be written
- * @param off the start offset in the data
- * @param len the number of bytes that are written
- * @exception IOException If an I/O error has occurred.
+ * @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.
*/
private native void writeBytes(byte b[], int off, int len) throws IOException;
@@ -542,7 +542,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
* to this file, starting at the current file pointer.
*
* @param b the data.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
public void write(byte b[]) throws IOException {
writeBytes(b, 0, b.length);
@@ -555,7 +555,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
* @param b the data.
* @param off the start offset in the data.
* @param len the number of bytes to write.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
public void write(byte b[], int off, int len) throws IOException {
writeBytes(b, off, len);
@@ -568,7 +568,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
*
* @return the offset from the beginning of the file, in bytes,
* at which the next read or write occurs.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
public native long getFilePointer() throws IOException;
@@ -583,7 +583,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
* @param pos the offset position, measured in bytes from the
* beginning of the file, at which to set the file
* pointer.
- * @exception IOException if {@code pos} is less than
+ * @throws IOException if {@code pos} is less than
* {@code 0} or if an I/O error occurs.
*/
public void seek(long pos) throws IOException {
@@ -600,7 +600,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
* Returns the length of this file.
*
* @return the length of this file, measured in bytes.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
public native long length() throws IOException;
@@ -620,7 +620,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
* the extended portion of the file are not defined.
*
* @param newLength The desired length of the file
- * @exception IOException If an I/O error occurs
+ * @throws IOException If an I/O error occurs
* @since 1.2
*/
public native void setLength(long newLength) throws IOException;
@@ -634,7 +634,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
*
If this file has an associated channel then the channel is closed
* as well.
*
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*
* @revised 1.4
* @spec JSR-51
@@ -678,8 +678,8 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
* is detected, or an exception is thrown.
*
* @return the {@code boolean} value read.
- * @exception EOFException if this file has reached the end.
- * @exception IOException if an I/O error occurs.
+ * @throws EOFException if this file has reached the end.
+ * @throws IOException if an I/O error occurs.
*/
public final boolean readBoolean() throws IOException {
int ch = this.read();
@@ -703,8 +703,8 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
*
* @return the next byte of this file as a signed eight-bit
* {@code byte}.
- * @exception EOFException if this file has reached the end.
- * @exception IOException if an I/O error occurs.
+ * @throws EOFException if this file has reached the end.
+ * @throws IOException if an I/O error occurs.
*/
public final byte readByte() throws IOException {
int ch = this.read();
@@ -723,8 +723,8 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
*
* @return the next byte of this file, interpreted as an unsigned
* eight-bit number.
- * @exception EOFException if this file has reached the end.
- * @exception IOException if an I/O error occurs.
+ * @throws EOFException if this file has reached the end.
+ * @throws IOException if an I/O error occurs.
*/
public final int readUnsignedByte() throws IOException {
int ch = this.read();
@@ -749,9 +749,9 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
*
* @return the next two bytes of this file, interpreted as a signed
* 16-bit number.
- * @exception EOFException if this file reaches the end before reading
+ * @throws EOFException if this file reaches the end before reading
* two bytes.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
public final short readShort() throws IOException {
int ch1 = this.read();
@@ -777,9 +777,9 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
*
* @return the next two bytes of this file, interpreted as an unsigned
* 16-bit integer.
- * @exception EOFException if this file reaches the end before reading
+ * @throws EOFException if this file reaches the end before reading
* two bytes.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
public final int readUnsignedShort() throws IOException {
int ch1 = this.read();
@@ -805,9 +805,9 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
*
* @return the next two bytes of this file, interpreted as a
* {@code char}.
- * @exception EOFException if this file reaches the end before reading
+ * @throws EOFException if this file reaches the end before reading
* two bytes.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
public final char readChar() throws IOException {
int ch1 = this.read();
@@ -833,9 +833,9 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
*
* @return the next four bytes of this file, interpreted as an
* {@code int}.
- * @exception EOFException if this file reaches the end before reading
+ * @throws EOFException if this file reaches the end before reading
* four bytes.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
public final int readInt() throws IOException {
int ch1 = this.read();
@@ -871,9 +871,9 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
*
* @return the next eight bytes of this file, interpreted as a
* {@code long}.
- * @exception EOFException if this file reaches the end before reading
+ * @throws EOFException if this file reaches the end before reading
* eight bytes.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
public final long readLong() throws IOException {
return ((long)(readInt()) << 32) + (readInt() & 0xFFFFFFFFL);
@@ -892,9 +892,9 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
*
* @return the next four bytes of this file, interpreted as a
* {@code float}.
- * @exception EOFException if this file reaches the end before reading
+ * @throws EOFException if this file reaches the end before reading
* four bytes.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
* @see java.io.RandomAccessFile#readInt()
* @see java.lang.Float#intBitsToFloat(int)
*/
@@ -915,9 +915,9 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
*
* @return the next eight bytes of this file, interpreted as a
* {@code double}.
- * @exception EOFException if this file reaches the end before reading
+ * @throws EOFException if this file reaches the end before reading
* eight bytes.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
* @see java.io.RandomAccessFile#readLong()
* @see java.lang.Double#longBitsToDouble(long)
*/
@@ -946,7 +946,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
*
* @return the next line of text from this file, or null if end
* of file is encountered before even one byte is read.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
public final String readLine() throws IOException {
@@ -997,10 +997,10 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
* stream is detected, or an exception is thrown.
*
* @return a Unicode string.
- * @exception EOFException if this file reaches the end before
+ * @throws EOFException if this file reaches the end before
* reading all the bytes.
- * @exception IOException if an I/O error occurs.
- * @exception UTFDataFormatException if the bytes do not represent
+ * @throws IOException if an I/O error occurs.
+ * @throws UTFDataFormatException if the bytes do not represent
* valid modified UTF-8 encoding of a Unicode string.
* @see java.io.RandomAccessFile#readUnsignedShort()
*/
@@ -1016,7 +1016,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
* the current position of the file pointer.
*
* @param v a {@code boolean} value to be written.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
public final void writeBoolean(boolean v) throws IOException {
write(v ? 1 : 0);
@@ -1028,7 +1028,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
* write starts at the current position of the file pointer.
*
* @param v a {@code byte} value to be written.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
public final void writeByte(int v) throws IOException {
write(v);
@@ -1040,7 +1040,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
* The write starts at the current position of the file pointer.
*
* @param v a {@code short} to be written.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
public final void writeShort(int v) throws IOException {
write((v >>> 8) & 0xFF);
@@ -1054,7 +1054,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
* file pointer.
*
* @param v a {@code char} value to be written.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
public final void writeChar(int v) throws IOException {
write((v >>> 8) & 0xFF);
@@ -1067,7 +1067,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
* The write starts at the current position of the file pointer.
*
* @param v an {@code int} to be written.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
public final void writeInt(int v) throws IOException {
write((v >>> 24) & 0xFF);
@@ -1082,7 +1082,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
* The write starts at the current position of the file pointer.
*
* @param v a {@code long} to be written.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
public final void writeLong(long v) throws IOException {
write((int)(v >>> 56) & 0xFF);
@@ -1104,7 +1104,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
* current position of the file pointer.
*
* @param v a {@code float} value to be written.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
* @see java.lang.Float#floatToIntBits(float)
*/
public final void writeFloat(float v) throws IOException {
@@ -1119,7 +1119,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
* position of the file pointer.
*
* @param v a {@code double} value to be written.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
* @see java.lang.Double#doubleToLongBits(double)
*/
public final void writeDouble(double v) throws IOException {
@@ -1133,7 +1133,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
* the file pointer.
*
* @param s a string of bytes to be written.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
@SuppressWarnings("deprecation")
public final void writeBytes(String s) throws IOException {
@@ -1150,7 +1150,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
* position of the file pointer.
*
* @param s a {@code String} value to be written.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
* @see java.io.RandomAccessFile#writeChar(int)
*/
public final void writeChars(String s) throws IOException {
@@ -1180,7 +1180,7 @@ public class RandomAccessFile implements DataOutput, DataInput, Closeable {
* for each character.
*
* @param str a string to be written.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
public final void writeUTF(String str) throws IOException {
DataOutputStream.writeUTF(str, this);
diff --git a/src/java.base/share/classes/java/io/Reader.java b/src/java.base/share/classes/java/io/Reader.java
index dff691a0e8e..1f6002d7836 100644
--- a/src/java.base/share/classes/java/io/Reader.java
+++ b/src/java.base/share/classes/java/io/Reader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2019, 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
@@ -203,7 +203,7 @@ public abstract class Reader implements Readable, Closeable {
* ({@code 0x00-0xffff}), or -1 if the end of the stream has
* been reached
*
- * @exception IOException If an I/O error occurs
+ * @throws IOException If an I/O error occurs
*/
public int read() throws IOException {
char cb[] = new char[1];
@@ -223,7 +223,7 @@ public abstract class Reader implements Readable, Closeable {
* if the end of the stream
* has been reached
*
- * @exception IOException If an I/O error occurs
+ * @throws IOException If an I/O error occurs
*/
public int read(char cbuf[]) throws IOException {
return read(cbuf, 0, cbuf.length);
@@ -241,8 +241,8 @@ public abstract class Reader implements Readable, Closeable {
* @return The number of characters read, or -1 if the end of the
* stream has been reached
*
- * @exception IOException If an I/O error occurs
- * @exception IndexOutOfBoundsException
+ * @throws IOException If an I/O error occurs
+ * @throws IndexOutOfBoundsException
* If {@code off} is negative, or {@code len} is negative,
* or {@code len} is greater than {@code cbuf.length - off}
*/
@@ -262,8 +262,8 @@ public abstract class Reader implements Readable, Closeable {
*
* @return The number of characters actually skipped
*
- * @exception IllegalArgumentException If n is negative.
- * @exception IOException If an I/O error occurs
+ * @throws IllegalArgumentException If n is negative.
+ * @throws IOException If an I/O error occurs
*/
public long skip(long n) throws IOException {
if (n < 0L)
@@ -290,7 +290,7 @@ public abstract class Reader implements Readable, Closeable {
* false otherwise. Note that returning false does not guarantee that the
* next read will block.
*
- * @exception IOException If an I/O error occurs
+ * @throws IOException If an I/O error occurs
*/
public boolean ready() throws IOException {
return false;
@@ -317,7 +317,7 @@ public abstract class Reader implements Readable, Closeable {
* reading this many characters, attempting to
* reset the stream may fail.
*
- * @exception IOException If the stream does not support mark(),
+ * @throws IOException If the stream does not support mark(),
* or if some other I/O error occurs
*/
public void mark(int readAheadLimit) throws IOException {
@@ -332,7 +332,7 @@ public abstract class Reader implements Readable, Closeable {
* character-input streams support the reset() operation, and some support
* reset() without supporting mark().
*
- * @exception IOException If the stream has not been marked,
+ * @throws IOException If the stream has not been marked,
* or if the mark has been invalidated,
* or if the stream does not support reset(),
* or if some other I/O error occurs
@@ -347,7 +347,7 @@ public abstract class Reader implements Readable, Closeable {
* mark(), reset(), or skip() invocations will throw an IOException.
* Closing a previously closed stream has no effect.
*
- * @exception IOException If an I/O error occurs
+ * @throws IOException If an I/O error occurs
*/
public abstract void close() throws IOException;
diff --git a/src/java.base/share/classes/java/io/SequenceInputStream.java b/src/java.base/share/classes/java/io/SequenceInputStream.java
index a5126f89330..3e4f70c7f42 100644
--- a/src/java.base/share/classes/java/io/SequenceInputStream.java
+++ b/src/java.base/share/classes/java/io/SequenceInputStream.java
@@ -118,13 +118,13 @@ class SequenceInputStream extends InputStream {
* This method simply calls {@code available} of the current underlying
* input stream and returns the result.
*
- * @return an estimate of the number of bytes that can be read (or
- * skipped over) from the current underlying input stream
- * without blocking or {@code 0} if this input stream
- * has been closed by invoking its {@link #close()} method
- * @exception IOException if an I/O error occurs.
+ * @return an estimate of the number of bytes that can be read (or
+ * skipped over) from the current underlying input stream
+ * without blocking or {@code 0} if this input stream
+ * has been closed by invoking its {@link #close()} method
+ * @throw IOException if an I/O error occurs.
*
- * @since 1.1
+ * @since 1.1
*/
public int available() throws IOException {
if (in == null) {
@@ -149,7 +149,7 @@ class SequenceInputStream extends InputStream {
*
* @return the next byte of data, or -1 if the end of the
* stream is reached.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
public int read() throws IOException {
while (in != null) {
@@ -179,11 +179,11 @@ class SequenceInputStream extends InputStream {
* at which the data is written.
* @param len the maximum number of bytes read.
* @return int the number of bytes read.
- * @exception NullPointerException If b is null.
- * @exception IndexOutOfBoundsException If off is negative,
- * len is negative, or len is greater than
- * b.length - off
- * @exception IOException if an I/O error occurs.
+ * @throws NullPointerException If b is null.
+ * @throws IndexOutOfBoundsException If off is negative,
+ * len is negative, or len is
+ * greater than b.length - off
+ * @throws IOException if an I/O error occurs.
*/
public int read(byte b[], int off, int len) throws IOException {
if (in == null) {
@@ -217,7 +217,7 @@ class SequenceInputStream extends InputStream {
* are requested from the enumeration and closed
* before the close method returns.
*
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
*/
public void close() throws IOException {
IOException ioe = null;
diff --git a/src/java.base/share/classes/java/io/StreamTokenizer.java b/src/java.base/share/classes/java/io/StreamTokenizer.java
index 9de14054485..9fbf2b90692 100644
--- a/src/java.base/share/classes/java/io/StreamTokenizer.java
+++ b/src/java.base/share/classes/java/io/StreamTokenizer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2019, 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 @@ public class StreamTokenizer {
* is returned.
*
* @return the value of the {@code ttype} field.
- * @exception IOException if an I/O error occurs.
+ * @throws IOException if an I/O error occurs.
* @see java.io.StreamTokenizer#nval
* @see java.io.StreamTokenizer#sval
* @see java.io.StreamTokenizer#ttype
diff --git a/src/java.base/share/classes/java/io/StringReader.java b/src/java.base/share/classes/java/io/StringReader.java
index 9cfe5412993..fbbe93d09d1 100644
--- a/src/java.base/share/classes/java/io/StringReader.java
+++ b/src/java.base/share/classes/java/io/StringReader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2019, 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
@@ -62,7 +62,7 @@ public class StringReader extends Reader {
* @return The character read, or -1 if the end of the stream has been
* reached
*
- * @exception IOException If an I/O error occurs
+ * @throws IOException If an I/O error occurs
*/
public int read() throws IOException {
synchronized (lock) {
@@ -83,8 +83,8 @@ public class StringReader extends Reader {
* @return The number of characters read, or -1 if the end of the
* stream has been reached
*
- * @exception IOException If an I/O error occurs
- * @exception IndexOutOfBoundsException {@inheritDoc}
+ * @throws IOException If an I/O error occurs
+ * @throws IndexOutOfBoundsException {@inheritDoc}
*/
public int read(char cbuf[], int off, int len) throws IOException {
synchronized (lock) {
@@ -118,7 +118,7 @@ public class StringReader extends Reader {
*
If the entire string has been read or skipped, then this method has
* no effect and always returns 0.
*
- * @exception IOException If an I/O error occurs
+ * @throws IOException If an I/O error occurs
*/
public long skip(long ns) throws IOException {
synchronized (lock) {
@@ -138,7 +138,7 @@ public class StringReader extends Reader {
*
* @return True if the next read() is guaranteed not to block for input
*
- * @exception IOException If the stream is closed
+ * @throws IOException If the stream is closed
*/
public boolean ready() throws IOException {
synchronized (lock) {
@@ -164,8 +164,8 @@ public class StringReader extends Reader {
* is no actual limit, so this argument must not
* be negative, but is otherwise ignored.
*
- * @exception IllegalArgumentException If {@code readAheadLimit < 0}
- * @exception IOException If an I/O error occurs
+ * @throws IllegalArgumentException If {@code readAheadLimit < 0}
+ * @throws IOException If an I/O error occurs
*/
public void mark(int readAheadLimit) throws IOException {
if (readAheadLimit < 0){
@@ -181,7 +181,7 @@ public class StringReader extends Reader {
* Resets the stream to the most recent mark, or to the beginning of the
* string if it has never been marked.
*
- * @exception IOException If an I/O error occurs
+ * @throws IOException If an I/O error occurs
*/
public void reset() throws IOException {
synchronized (lock) {
diff --git a/src/java.base/share/classes/java/lang/Class.java b/src/java.base/share/classes/java/lang/Class.java
index 22e88d358bd..75abd2351f7 100644
--- a/src/java.base/share/classes/java/lang/Class.java
+++ b/src/java.base/share/classes/java/lang/Class.java
@@ -321,10 +321,10 @@ public final class Class The number of dimensions of the new array must not
* exceed 255.
*
- * @param componentType the {@code Class} object representing the
- * component type of the new array
- * @param length the length of the new array
+ * @param componentType the {@code Class} object representing the
+ * component type of the new array
+ * @param length the length of the new array
* @return the new array
- * @exception NullPointerException if the specified
- * {@code componentType} parameter is null
- * @exception IllegalArgumentException if componentType is {@link
- * Void#TYPE} or if the number of dimensions of the requested array
- * instance exceed 255.
- * @exception NegativeArraySizeException if the specified {@code length}
- * is negative
+ * @throws NullPointerException if the specified
+ * {@code componentType} parameter is null
+ * @throws IllegalArgumentException if componentType is {@link
+ * Void#TYPE} or if the number of dimensions of the requested array
+ * instance exceed 255.
+ * @throws NegativeArraySizeException if the specified {@code length}
+ * is negative
*/
public static Object newInstance(Class> componentType, int length)
throws NegativeArraySizeException {
@@ -100,13 +100,13 @@ class Array {
* @param dimensions an array of {@code int} representing the dimensions of
* the new array
* @return the new array
- * @exception NullPointerException if the specified
+ * @throws NullPointerException if the specified
* {@code componentType} argument is null
- * @exception IllegalArgumentException if the specified {@code dimensions}
+ * @throws IllegalArgumentException if the specified {@code dimensions}
* argument is a zero-dimensional array, if componentType is {@link
* Void#TYPE}, or if the number of dimensions of the requested array
* instance exceed 255.
- * @exception NegativeArraySizeException if any of the components in
+ * @throws NegativeArraySizeException if any of the components in
* the specified {@code dimensions} argument is negative.
*/
public static Object newInstance(Class> componentType, int... dimensions)
@@ -119,7 +119,7 @@ class Array {
*
* @param array the array
* @return the length of the array
- * @exception IllegalArgumentException if the object argument is not
+ * @throws IllegalArgumentException if the object argument is not
* an array
*/
@HotSpotIntrinsicCandidate
@@ -135,10 +135,10 @@ class Array {
* @param index the index
* @return the (possibly wrapped) value of the indexed component in
* the specified array
- * @exception NullPointerException If the specified object is null
- * @exception IllegalArgumentException If the specified object is not
+ * @throws NullPointerException If the specified object is null
+ * @throws IllegalArgumentException If the specified object is not
* an array
- * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
+ * @throws ArrayIndexOutOfBoundsException If the specified {@code index}
* argument is negative, or if it is greater than or equal to the
* length of the specified array
*/
@@ -152,11 +152,11 @@ class Array {
* @param array the array
* @param index the index
* @return the value of the indexed component in the specified array
- * @exception NullPointerException If the specified object is null
- * @exception IllegalArgumentException If the specified object is not
+ * @throws NullPointerException If the specified object is null
+ * @throws IllegalArgumentException If the specified object is not
* an array, or if the indexed element cannot be converted to the
* return type by an identity or widening conversion
- * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
+ * @throws ArrayIndexOutOfBoundsException If the specified {@code index}
* argument is negative, or if it is greater than or equal to the
* length of the specified array
* @see Array#get
@@ -171,11 +171,11 @@ class Array {
* @param array the array
* @param index the index
* @return the value of the indexed component in the specified array
- * @exception NullPointerException If the specified object is null
- * @exception IllegalArgumentException If the specified object is not
+ * @throws NullPointerException If the specified object is null
+ * @throws IllegalArgumentException If the specified object is not
* an array, or if the indexed element cannot be converted to the
* return type by an identity or widening conversion
- * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
+ * @throws ArrayIndexOutOfBoundsException If the specified {@code index}
* argument is negative, or if it is greater than or equal to the
* length of the specified array
* @see Array#get
@@ -190,11 +190,11 @@ class Array {
* @param array the array
* @param index the index
* @return the value of the indexed component in the specified array
- * @exception NullPointerException If the specified object is null
- * @exception IllegalArgumentException If the specified object is not
+ * @throws NullPointerException If the specified object is null
+ * @throws IllegalArgumentException If the specified object is not
* an array, or if the indexed element cannot be converted to the
* return type by an identity or widening conversion
- * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
+ * @throws ArrayIndexOutOfBoundsException If the specified {@code index}
* argument is negative, or if it is greater than or equal to the
* length of the specified array
* @see Array#get
@@ -209,11 +209,11 @@ class Array {
* @param array the array
* @param index the index
* @return the value of the indexed component in the specified array
- * @exception NullPointerException If the specified object is null
- * @exception IllegalArgumentException If the specified object is not
+ * @throws NullPointerException If the specified object is null
+ * @throws IllegalArgumentException If the specified object is not
* an array, or if the indexed element cannot be converted to the
* return type by an identity or widening conversion
- * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
+ * @throws ArrayIndexOutOfBoundsException If the specified {@code index}
* argument is negative, or if it is greater than or equal to the
* length of the specified array
* @see Array#get
@@ -228,11 +228,11 @@ class Array {
* @param array the array
* @param index the index
* @return the value of the indexed component in the specified array
- * @exception NullPointerException If the specified object is null
- * @exception IllegalArgumentException If the specified object is not
+ * @throws NullPointerException If the specified object is null
+ * @throws IllegalArgumentException If the specified object is not
* an array, or if the indexed element cannot be converted to the
* return type by an identity or widening conversion
- * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
+ * @throws ArrayIndexOutOfBoundsException If the specified {@code index}
* argument is negative, or if it is greater than or equal to the
* length of the specified array
* @see Array#get
@@ -247,11 +247,11 @@ class Array {
* @param array the array
* @param index the index
* @return the value of the indexed component in the specified array
- * @exception NullPointerException If the specified object is null
- * @exception IllegalArgumentException If the specified object is not
+ * @throws NullPointerException If the specified object is null
+ * @throws IllegalArgumentException If the specified object is not
* an array, or if the indexed element cannot be converted to the
* return type by an identity or widening conversion
- * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
+ * @throws ArrayIndexOutOfBoundsException If the specified {@code index}
* argument is negative, or if it is greater than or equal to the
* length of the specified array
* @see Array#get
@@ -266,11 +266,11 @@ class Array {
* @param array the array
* @param index the index
* @return the value of the indexed component in the specified array
- * @exception NullPointerException If the specified object is null
- * @exception IllegalArgumentException If the specified object is not
+ * @throws NullPointerException If the specified object is null
+ * @throws IllegalArgumentException If the specified object is not
* an array, or if the indexed element cannot be converted to the
* return type by an identity or widening conversion
- * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
+ * @throws ArrayIndexOutOfBoundsException If the specified {@code index}
* argument is negative, or if it is greater than or equal to the
* length of the specified array
* @see Array#get
@@ -285,11 +285,11 @@ class Array {
* @param array the array
* @param index the index
* @return the value of the indexed component in the specified array
- * @exception NullPointerException If the specified object is null
- * @exception IllegalArgumentException If the specified object is not
+ * @throws NullPointerException If the specified object is null
+ * @throws IllegalArgumentException If the specified object is not
* an array, or if the indexed element cannot be converted to the
* return type by an identity or widening conversion
- * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
+ * @throws ArrayIndexOutOfBoundsException If the specified {@code index}
* argument is negative, or if it is greater than or equal to the
* length of the specified array
* @see Array#get
@@ -305,12 +305,12 @@ class Array {
* @param array the array
* @param index the index into the array
* @param value the new value of the indexed component
- * @exception NullPointerException If the specified object argument
+ * @throws NullPointerException If the specified object argument
* is null
- * @exception IllegalArgumentException If the specified object argument
+ * @throws IllegalArgumentException If the specified object argument
* is not an array, or if the array component type is primitive and
* an unwrapping conversion fails
- * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
+ * @throws ArrayIndexOutOfBoundsException If the specified {@code index}
* argument is negative, or if it is greater than or equal to
* the length of the specified array
*/
@@ -323,13 +323,13 @@ class Array {
* @param array the array
* @param index the index into the array
* @param z the new value of the indexed component
- * @exception NullPointerException If the specified object argument
+ * @throws NullPointerException If the specified object argument
* is null
- * @exception IllegalArgumentException If the specified object argument
+ * @throws IllegalArgumentException If the specified object argument
* is not an array, or if the specified value cannot be converted
* to the underlying array's component type by an identity or a
* primitive widening conversion
- * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
+ * @throws ArrayIndexOutOfBoundsException If the specified {@code index}
* argument is negative, or if it is greater than or equal to
* the length of the specified array
* @see Array#set
@@ -343,13 +343,13 @@ class Array {
* @param array the array
* @param index the index into the array
* @param b the new value of the indexed component
- * @exception NullPointerException If the specified object argument
+ * @throws NullPointerException If the specified object argument
* is null
- * @exception IllegalArgumentException If the specified object argument
+ * @throws IllegalArgumentException If the specified object argument
* is not an array, or if the specified value cannot be converted
* to the underlying array's component type by an identity or a
* primitive widening conversion
- * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
+ * @throws ArrayIndexOutOfBoundsException If the specified {@code index}
* argument is negative, or if it is greater than or equal to
* the length of the specified array
* @see Array#set
@@ -363,13 +363,13 @@ class Array {
* @param array the array
* @param index the index into the array
* @param c the new value of the indexed component
- * @exception NullPointerException If the specified object argument
+ * @throws NullPointerException If the specified object argument
* is null
- * @exception IllegalArgumentException If the specified object argument
+ * @throws IllegalArgumentException If the specified object argument
* is not an array, or if the specified value cannot be converted
* to the underlying array's component type by an identity or a
* primitive widening conversion
- * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
+ * @throws ArrayIndexOutOfBoundsException If the specified {@code index}
* argument is negative, or if it is greater than or equal to
* the length of the specified array
* @see Array#set
@@ -383,13 +383,13 @@ class Array {
* @param array the array
* @param index the index into the array
* @param s the new value of the indexed component
- * @exception NullPointerException If the specified object argument
+ * @throws NullPointerException If the specified object argument
* is null
- * @exception IllegalArgumentException If the specified object argument
+ * @throws IllegalArgumentException If the specified object argument
* is not an array, or if the specified value cannot be converted
* to the underlying array's component type by an identity or a
* primitive widening conversion
- * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
+ * @throws ArrayIndexOutOfBoundsException If the specified {@code index}
* argument is negative, or if it is greater than or equal to
* the length of the specified array
* @see Array#set
@@ -403,13 +403,13 @@ class Array {
* @param array the array
* @param index the index into the array
* @param i the new value of the indexed component
- * @exception NullPointerException If the specified object argument
+ * @throws NullPointerException If the specified object argument
* is null
- * @exception IllegalArgumentException If the specified object argument
+ * @throws IllegalArgumentException If the specified object argument
* is not an array, or if the specified value cannot be converted
* to the underlying array's component type by an identity or a
* primitive widening conversion
- * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
+ * @throws ArrayIndexOutOfBoundsException If the specified {@code index}
* argument is negative, or if it is greater than or equal to
* the length of the specified array
* @see Array#set
@@ -423,13 +423,13 @@ class Array {
* @param array the array
* @param index the index into the array
* @param l the new value of the indexed component
- * @exception NullPointerException If the specified object argument
+ * @throws NullPointerException If the specified object argument
* is null
- * @exception IllegalArgumentException If the specified object argument
+ * @throws IllegalArgumentException If the specified object argument
* is not an array, or if the specified value cannot be converted
* to the underlying array's component type by an identity or a
* primitive widening conversion
- * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
+ * @throws ArrayIndexOutOfBoundsException If the specified {@code index}
* argument is negative, or if it is greater than or equal to
* the length of the specified array
* @see Array#set
@@ -443,13 +443,13 @@ class Array {
* @param array the array
* @param index the index into the array
* @param f the new value of the indexed component
- * @exception NullPointerException If the specified object argument
+ * @throws NullPointerException If the specified object argument
* is null
- * @exception IllegalArgumentException If the specified object argument
+ * @throws IllegalArgumentException If the specified object argument
* is not an array, or if the specified value cannot be converted
* to the underlying array's component type by an identity or a
* primitive widening conversion
- * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
+ * @throws ArrayIndexOutOfBoundsException If the specified {@code index}
* argument is negative, or if it is greater than or equal to
* the length of the specified array
* @see Array#set
@@ -463,13 +463,13 @@ class Array {
* @param array the array
* @param index the index into the array
* @param d the new value of the indexed component
- * @exception NullPointerException If the specified object argument
+ * @throws NullPointerException If the specified object argument
* is null
- * @exception IllegalArgumentException If the specified object argument
+ * @throws IllegalArgumentException If the specified object argument
* is not an array, or if the specified value cannot be converted
* to the underlying array's component type by an identity or a
* primitive widening conversion
- * @exception ArrayIndexOutOfBoundsException If the specified {@code index}
+ * @throws ArrayIndexOutOfBoundsException If the specified {@code index}
* argument is negative, or if it is greater than or equal to
* the length of the specified array
* @see Array#set
diff --git a/src/java.base/share/classes/java/lang/reflect/Constructor.java b/src/java.base/share/classes/java/lang/reflect/Constructor.java
index 6852a609bf7..f1d2cf1485f 100644
--- a/src/java.base/share/classes/java/lang/reflect/Constructor.java
+++ b/src/java.base/share/classes/java/lang/reflect/Constructor.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2019, 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
@@ -454,21 +454,21 @@ public final class Constructor The ttl is an unsigned 8-bit quantity, and so must be
* in the range {@code 0 <= ttl <= 0xFF }.
*
- * @param ttl the time-to-live
- * @exception IOException if an I/O exception occurs
- * while setting the default time-to-live value
+ * @param ttl the time-to-live
+ * @throws IOException if an I/O exception occurs
+ * while setting the default time-to-live value
* @deprecated use the setTimeToLive method instead, which uses
- * int instead of byte as the type for ttl.
+ * int instead of byte as the type for ttl.
* @see #getTTL()
*/
@Deprecated
@@ -254,7 +254,7 @@ class MulticastSocket extends DatagramSocket {
* Get the default time-to-live for multicast packets sent out on
* the socket.
*
- * @exception IOException if an I/O exception occurs
+ * @throws IOException if an I/O exception occurs
* while getting the default time-to-live value
* @return the default time-to-live value
* @deprecated use the getTimeToLive method instead, which returns
@@ -271,7 +271,7 @@ class MulticastSocket extends DatagramSocket {
/**
* Get the default time-to-live for multicast packets sent out on
* the socket.
- * @exception IOException if an I/O exception occurs while
+ * @throws IOException if an I/O exception occurs while
* getting the default time-to-live value
* @return the default time-to-live value
* @see #setTimeToLive(int)
@@ -293,10 +293,10 @@ class MulticastSocket extends DatagramSocket {
*
* @param mcastaddr is the multicast address to join
*
- * @exception IOException if there is an error joining, or when the address
+ * @throws IOException if there is an error joining, or when the address
* is not a multicast address, or the platform does not support
* multicasting
- * @exception SecurityException if a security manager exists and its
+ * @throws SecurityException if a security manager exists and its
* {@code checkMulticast} method doesn't allow the join.
*
* @see SecurityManager#checkMulticast(InetAddress)
@@ -339,9 +339,9 @@ class MulticastSocket extends DatagramSocket {
* as its argument.
*
* @param mcastaddr is the multicast address to leave
- * @exception IOException if there is an error leaving
+ * @throws IOException if there is an error leaving
* or when the address is not a multicast address.
- * @exception SecurityException if a security manager exists and its
+ * @throws SecurityException if a security manager exists and its
* {@code checkMulticast} method doesn't allow the operation.
*
* @see SecurityManager#checkMulticast(InetAddress)
@@ -378,10 +378,10 @@ class MulticastSocket extends DatagramSocket {
* {@link MulticastSocket#setInterface(InetAddress)} or
* {@link MulticastSocket#setNetworkInterface(NetworkInterface)}
*
- * @exception IOException if there is an error joining, or when the address
+ * @throws IOException if there is an error joining, or when the address
* is not a multicast address, or the platform does not support
* multicasting
- * @exception SecurityException if a security manager exists and its
+ * @throws SecurityException if a security manager exists and its
* {@code checkMulticast} method doesn't allow the join.
* @throws IllegalArgumentException if mcastaddr is null or is a
* SocketAddress subclass not supported by this socket
@@ -426,9 +426,9 @@ class MulticastSocket extends DatagramSocket {
* to the interface set by
* {@link MulticastSocket#setInterface(InetAddress)} or
* {@link MulticastSocket#setNetworkInterface(NetworkInterface)}
- * @exception IOException if there is an error leaving
+ * @throws IOException if there is an error leaving
* or when the address is not a multicast address.
- * @exception SecurityException if a security manager exists and its
+ * @throws SecurityException if a security manager exists and its
* {@code checkMulticast} method doesn't allow the operation.
* @throws IllegalArgumentException if mcastaddr is null or is a
* SocketAddress subclass not supported by this socket
@@ -465,7 +465,7 @@ class MulticastSocket extends DatagramSocket {
* whose behavior would be affected by the value of the
* network interface. Useful for multihomed hosts.
* @param inf the InetAddress
- * @exception SocketException if there is an error in
+ * @throws SocketException if there is an error in
* the underlying protocol, such as a TCP error.
* @see #getInterface()
*/
@@ -489,7 +489,7 @@ class MulticastSocket extends DatagramSocket {
* the address of the network interface used for
* multicast packets.
*
- * @exception SocketException if there is an error in
+ * @throws SocketException if there is an error in
* the underlying protocol, such as a TCP error.
*
* @see #setInterface(java.net.InetAddress)
@@ -549,7 +549,7 @@ class MulticastSocket extends DatagramSocket {
* sent on this socket.
*
* @param netIf the interface
- * @exception SocketException if there is an error in
+ * @throws SocketException if there is an error in
* the underlying protocol, such as a TCP error.
* @see #getNetworkInterface()
* @since 1.4
@@ -567,7 +567,7 @@ class MulticastSocket extends DatagramSocket {
/**
* Get the multicast network interface set.
*
- * @exception SocketException if there is an error in
+ * @throws SocketException if there is an error in
* the underlying protocol, such as a TCP error.
* @return the multicast {@code NetworkInterface} currently set
* @see #setNetworkInterface(NetworkInterface)
@@ -643,9 +643,9 @@ class MulticastSocket extends DatagramSocket {
* @param ttl optional time to live for multicast packet.
* default ttl is 1.
*
- * @exception IOException is raised if an error occurs i.e
+ * @throws IOException is raised if an error occurs i.e
* error while setting ttl.
- * @exception SecurityException if a security manager exists and its
+ * @throws SecurityException if a security manager exists and its
* {@code checkMulticast} or {@code checkConnect}
* method doesn't allow the send.
*
diff --git a/src/java.base/share/classes/java/net/NetworkInterface.java b/src/java.base/share/classes/java/net/NetworkInterface.java
index 73351db8407..0c20b9f272b 100644
--- a/src/java.base/share/classes/java/net/NetworkInterface.java
+++ b/src/java.base/share/classes/java/net/NetworkInterface.java
@@ -341,7 +341,7 @@ public final class NetworkInterface {
* {@link #getInetAddresses()} to obtain all IP addresses for this node
*
* @return an Enumeration of NetworkInterfaces found on this machine
- * @exception SocketException if an I/O error occurs,
+ * @throws SocketException if an I/O error occurs,
* or if the platform does not have at least one configured
* network interface.
* @see #networkInterfaces()
@@ -371,7 +371,7 @@ public final class NetworkInterface {
* }
*
* @return a Stream of NetworkInterfaces found on this machine
- * @exception SocketException if an I/O error occurs,
+ * @throws SocketException if an I/O error occurs,
* or if the platform does not have at least one configured
* network interface.
* @since 9
@@ -450,7 +450,7 @@ public final class NetworkInterface {
* Returns whether a network interface is up and running.
*
* @return {@code true} if the interface is up and running.
- * @exception SocketException if an I/O error occurs.
+ * @throws SocketException if an I/O error occurs.
* @since 1.6
*/
@@ -462,7 +462,7 @@ public final class NetworkInterface {
* Returns whether a network interface is a loopback interface.
*
* @return {@code true} if the interface is a loopback interface.
- * @exception SocketException if an I/O error occurs.
+ * @throws SocketException if an I/O error occurs.
* @since 1.6
*/
@@ -477,7 +477,7 @@ public final class NetworkInterface {
*
* @return {@code true} if the interface is a point to point
* interface.
- * @exception SocketException if an I/O error occurs.
+ * @throws SocketException if an I/O error occurs.
* @since 1.6
*/
@@ -489,7 +489,7 @@ public final class NetworkInterface {
* Returns whether a network interface supports multicasting or not.
*
* @return {@code true} if the interface supports Multicasting.
- * @exception SocketException if an I/O error occurs.
+ * @throws SocketException if an I/O error occurs.
* @since 1.6
*/
@@ -508,7 +508,7 @@ public final class NetworkInterface {
* manager is set and the caller does not have the permission
* NetPermission("getNetworkInformation")
*
- * @exception SocketException if an I/O error occurs.
+ * @throws SocketException if an I/O error occurs.
* @since 1.6
*/
public byte[] getHardwareAddress() throws SocketException {
@@ -535,7 +535,7 @@ public final class NetworkInterface {
* Returns the Maximum Transmission Unit (MTU) of this interface.
*
* @return the value of the MTU for that interface.
- * @exception SocketException if an I/O error occurs.
+ * @throws SocketException if an I/O error occurs.
* @since 1.6
*/
public int getMTU() throws SocketException {
diff --git a/src/java.base/share/classes/java/net/ProxySelector.java b/src/java.base/share/classes/java/net/ProxySelector.java
index 5aa5baded6e..c1e97ecc981 100644
--- a/src/java.base/share/classes/java/net/ProxySelector.java
+++ b/src/java.base/share/classes/java/net/ProxySelector.java
@@ -85,10 +85,10 @@ public abstract class ProxySelector {
*
* @throws SecurityException
* If a security manager has been installed and it denies
- * {@link NetPermission}{@code ("getProxySelector")}
- * @see #setDefault(ProxySelector)
- * @return the system-wide {@code ProxySelector}
- * @since 1.5
+ * {@link NetPermission}{@code ("getProxySelector")}
+ * @see #setDefault(ProxySelector)
+ * @return the system-wide {@code ProxySelector}
+ * @since 1.5
*/
public static ProxySelector getDefault() {
SecurityManager sm = System.getSecurityManager();
@@ -108,7 +108,7 @@ public abstract class ProxySelector {
*
* @throws SecurityException
* If a security manager has been installed and it denies
- * {@link NetPermission}{@code ("setProxySelector")}
+ * {@link NetPermission}{@code ("setProxySelector")}
*
* @see #getDefault()
* @since 1.5
@@ -163,7 +163,7 @@ public abstract class ProxySelector {
*
* @param ioe
* The I/O exception thrown when the connect failed.
- * @throws IllegalArgumentException if either argument is null
+ * @throws IllegalArgumentException if either argument is null
*/
public abstract void connectFailed(URI uri, SocketAddress sa, IOException ioe);
diff --git a/src/java.base/share/classes/java/net/ServerSocket.java b/src/java.base/share/classes/java/net/ServerSocket.java
index ba2f2c2a6a2..3f4f3ec705b 100644
--- a/src/java.base/share/classes/java/net/ServerSocket.java
+++ b/src/java.base/share/classes/java/net/ServerSocket.java
@@ -83,7 +83,7 @@ class ServerSocket implements java.io.Closeable {
/**
* Creates an unbound server socket.
*
- * @exception IOException IO error when opening the socket.
+ * @throws IOException IO error when opening the socket.
* @revised 1.4
*/
public ServerSocket() throws IOException {
@@ -115,11 +115,11 @@ class ServerSocket implements java.io.Closeable {
* @param port the port number, or {@code 0} to use a port
* number that is automatically allocated.
*
- * @exception IOException if an I/O error occurs when opening the socket.
- * @exception SecurityException
+ * @throws IOException if an I/O error occurs when opening the socket.
+ * @throws SecurityException
* if a security manager exists and its {@code checkListen}
* method doesn't allow the operation.
- * @exception IllegalArgumentException if the port parameter is outside
+ * @throws IllegalArgumentException if the port parameter is outside
* the specified range of valid port values, which is between
* 0 and 65535, inclusive.
*
@@ -168,11 +168,11 @@ class ServerSocket implements java.io.Closeable {
* @param backlog requested maximum length of the queue of incoming
* connections.
*
- * @exception IOException if an I/O error occurs when opening the socket.
- * @exception SecurityException
+ * @throws IOException if an I/O error occurs when opening the socket.
+ * @throws SecurityException
* if a security manager exists and its {@code checkListen}
* method doesn't allow the operation.
- * @exception IllegalArgumentException if the port parameter is outside
+ * @throws IllegalArgumentException if the port parameter is outside
* the specified range of valid port values, which is between
* 0 and 65535, inclusive.
*
@@ -221,7 +221,7 @@ class ServerSocket implements java.io.Closeable {
* its {@code checkListen} method doesn't allow the operation.
*
* @throws IOException if an I/O error occurs when opening the socket.
- * @exception IllegalArgumentException if the port parameter is outside
+ * @throws IllegalArgumentException if the port parameter is outside
* the specified range of valid port values, which is between
* 0 and 65535, inclusive.
*
@@ -474,13 +474,13 @@ class ServerSocket implements java.io.Closeable {
* of the {@linkplain Socket#setSocketImplFactory(SocketImplFactory)
* client socket implementation factory}, if one has been set.
*
- * @exception IOException if an I/O error occurs when waiting for a
+ * @throws IOException if an I/O error occurs when waiting for a
* connection.
- * @exception SecurityException if a security manager exists and its
+ * @throws SecurityException if a security manager exists and its
* {@code checkAccept} method doesn't allow the operation.
- * @exception SocketTimeoutException if a timeout was previously set with setSoTimeout and
+ * @throws SocketTimeoutException if a timeout was previously set with setSoTimeout and
* the timeout has been reached.
- * @exception java.nio.channels.IllegalBlockingModeException
+ * @throws java.nio.channels.IllegalBlockingModeException
* if this socket has an associated channel, the channel is in
* non-blocking mode, and there is no connection ready to be
* accepted
@@ -674,7 +674,7 @@ class ServerSocket implements java.io.Closeable {
* If this socket has an associated channel then the channel is closed
* as well.
*
- * @exception IOException if an I/O error occurs when closing the socket.
+ * @throws IOException if an I/O error occurs when closing the socket.
* @revised 1.4
* @spec JSR-51
*/
@@ -763,7 +763,7 @@ class ServerSocket implements java.io.Closeable {
* Retrieve setting for {@link SocketOptions#SO_TIMEOUT SO_TIMEOUT}.
* 0 returns implies that the option is disabled (i.e., timeout of infinity).
* @return the {@link SocketOptions#SO_TIMEOUT SO_TIMEOUT} value
- * @exception IOException if an I/O error occurs
+ * @throws IOException if an I/O error occurs
* @since 1.1
* @see #setSoTimeout(int)
*/
@@ -806,7 +806,7 @@ class ServerSocket implements java.io.Closeable {
* is not defined.
*
* @param on whether to enable or disable the socket option
- * @exception SocketException if an error occurs enabling or
+ * @throws SocketException if an error occurs enabling or
* disabling the {@link SocketOptions#SO_REUSEADDR SO_REUSEADDR}
* socket option, or the socket is closed.
* @since 1.4
@@ -826,7 +826,7 @@ class ServerSocket implements java.io.Closeable {
*
* @return a {@code boolean} indicating whether or not
* {@link SocketOptions#SO_REUSEADDR SO_REUSEADDR} is enabled.
- * @exception SocketException if there is an error
+ * @throws SocketException if there is an error
* in the underlying protocol, such as a TCP error.
* @since 1.4
* @see #setReuseAddress(boolean)
@@ -885,10 +885,10 @@ class ServerSocket implements java.io.Closeable {
* This could result in a SecurityException.
*
* @param fac the desired factory.
- * @exception IOException if an I/O error occurs when setting the
+ * @throws IOException if an I/O error occurs when setting the
* socket factory.
- * @exception SocketException if the factory has already been defined.
- * @exception SecurityException if a security manager exists and its
+ * @throws SocketException if the factory has already been defined.
+ * @throws SecurityException if a security manager exists and its
* {@code checkSetFactory} method doesn't allow the operation.
* @see java.net.SocketImplFactory#createSocketImpl()
* @see SecurityManager#checkSetFactory
@@ -928,13 +928,13 @@ class ServerSocket implements java.io.Closeable {
* requested value but the TCP receive window in sockets accepted from
* this ServerSocket will be no larger than 64K bytes.
*
- * @exception SocketException if there is an error
+ * @throws SocketException if there is an error
* in the underlying protocol, such as a TCP error.
*
* @param size the size to which to set the receive buffer
* size. This value must be greater than 0.
*
- * @exception IllegalArgumentException if the
+ * @throws IllegalArgumentException if the
* value is 0 or is negative.
*
* @since 1.4
@@ -958,7 +958,7 @@ class ServerSocket implements java.io.Closeable {
* calling {@link Socket#getReceiveBufferSize()}.
* @return the value of the {@link SocketOptions#SO_RCVBUF SO_RCVBUF}
* option for this {@code Socket}.
- * @exception SocketException if there is an error
+ * @throws SocketException if there is an error
* in the underlying protocol, such as a TCP error.
* @see #setReceiveBufferSize(int)
* @since 1.4
diff --git a/src/java.base/share/classes/java/net/Socket.java b/src/java.base/share/classes/java/net/Socket.java
index 2a2989f89f2..bd5a1a60fe5 100644
--- a/src/java.base/share/classes/java/net/Socket.java
+++ b/src/java.base/share/classes/java/net/Socket.java
@@ -180,7 +180,7 @@ class Socket implements java.io.Closeable {
* @param impl an instance of a SocketImpl
* the subclass wishes to use on the Socket.
*
- * @exception SocketException if there is an error in the underlying protocol,
+ * @throws SocketException if there is an error in the underlying protocol,
* such as a TCP error.
* @since 1.1
*/
@@ -211,13 +211,13 @@ class Socket implements java.io.Closeable {
* @param host the host name, or {@code null} for the loopback address.
* @param port the port number.
*
- * @exception UnknownHostException if the IP address of
+ * @throws UnknownHostException if the IP address of
* the host could not be determined.
*
- * @exception IOException if an I/O error occurs when creating the socket.
- * @exception SecurityException if a security manager exists and its
+ * @throws IOException if an I/O error occurs when creating the socket.
+ * @throws SecurityException if a security manager exists and its
* {@code checkConnect} method doesn't allow the operation.
- * @exception IllegalArgumentException if the port parameter is outside
+ * @throws IllegalArgumentException if the port parameter is outside
* the specified range of valid port values, which is between
* 0 and 65535, inclusive.
* @see java.net.Socket#setSocketImplFactory(java.net.SocketImplFactory)
@@ -249,13 +249,13 @@ class Socket implements java.io.Closeable {
*
* @param address the IP address.
* @param port the port number.
- * @exception IOException if an I/O error occurs when creating the socket.
- * @exception SecurityException if a security manager exists and its
+ * @throws IOException if an I/O error occurs when creating the socket.
+ * @throws SecurityException if a security manager exists and its
* {@code checkConnect} method doesn't allow the operation.
- * @exception IllegalArgumentException if the port parameter is outside
+ * @throws IllegalArgumentException if the port parameter is outside
* the specified range of valid port values, which is between
* 0 and 65535, inclusive.
- * @exception NullPointerException if {@code address} is null.
+ * @throws NullPointerException if {@code address} is null.
* @see java.net.Socket#setSocketImplFactory(java.net.SocketImplFactory)
* @see java.net.SocketImpl
* @see java.net.SocketImplFactory#createSocketImpl()
@@ -291,12 +291,12 @@ class Socket implements java.io.Closeable {
* {@code null} for the {@code anyLocal} address.
* @param localPort the local port the socket is bound to, or
* {@code zero} for a system selected free port.
- * @exception IOException if an I/O error occurs when creating the socket.
- * @exception SecurityException if a security manager exists and its
+ * @throws IOException if an I/O error occurs when creating the socket.
+ * @throws SecurityException if a security manager exists and its
* {@code checkConnect} method doesn't allow the connection
* to the destination, or if its {@code checkListen} method
* doesn't allow the bind to the local port.
- * @exception IllegalArgumentException if the port parameter or localPort
+ * @throws IllegalArgumentException if the port parameter or localPort
* parameter is outside the specified range of valid port values,
* which is between 0 and 65535, inclusive.
* @see SecurityManager#checkConnect
@@ -332,15 +332,15 @@ class Socket implements java.io.Closeable {
* {@code null} for the {@code anyLocal} address.
* @param localPort the local port the socket is bound to or
* {@code zero} for a system selected free port.
- * @exception IOException if an I/O error occurs when creating the socket.
- * @exception SecurityException if a security manager exists and its
+ * @throws IOException if an I/O error occurs when creating the socket.
+ * @throws SecurityException if a security manager exists and its
* {@code checkConnect} method doesn't allow the connection
* to the destination, or if its {@code checkListen} method
* doesn't allow the bind to the local port.
- * @exception IllegalArgumentException if the port parameter or localPort
+ * @throws IllegalArgumentException if the port parameter or localPort
* parameter is outside the specified range of valid port values,
* which is between 0 and 65535, inclusive.
- * @exception NullPointerException if {@code address} is null.
+ * @throws NullPointerException if {@code address} is null.
* @see SecurityManager#checkConnect
* @since 1.1
*/
@@ -380,10 +380,10 @@ class Socket implements java.io.Closeable {
* @param port the port number.
* @param stream a {@code boolean} indicating whether this is
* a stream socket or a datagram socket.
- * @exception IOException if an I/O error occurs when creating the socket.
- * @exception SecurityException if a security manager exists and its
+ * @throws IOException if an I/O error occurs when creating the socket.
+ * @throws SecurityException if a security manager exists and its
* {@code checkConnect} method doesn't allow the operation.
- * @exception IllegalArgumentException if the port parameter is outside
+ * @throws IllegalArgumentException if the port parameter is outside
* the specified range of valid port values, which is between
* 0 and 65535, inclusive.
* @see java.net.Socket#setSocketImplFactory(java.net.SocketImplFactory)
@@ -423,13 +423,13 @@ class Socket implements java.io.Closeable {
* @param port the port number.
* @param stream if {@code true}, create a stream socket;
* otherwise, create a datagram socket.
- * @exception IOException if an I/O error occurs when creating the socket.
- * @exception SecurityException if a security manager exists and its
+ * @throws IOException if an I/O error occurs when creating the socket.
+ * @throws SecurityException if a security manager exists and its
* {@code checkConnect} method doesn't allow the operation.
- * @exception IllegalArgumentException if the port parameter is outside
+ * @throws IllegalArgumentException if the port parameter is outside
* the specified range of valid port values, which is between
* 0 and 65535, inclusive.
- * @exception NullPointerException if {@code host} is null.
+ * @throws NullPointerException if {@code host} is null.
* @see java.net.Socket#setSocketImplFactory(java.net.SocketImplFactory)
* @see java.net.SocketImpl
* @see java.net.SocketImplFactory#createSocketImpl()
@@ -867,7 +867,7 @@ class Socket implements java.io.Closeable {
* will close the associated socket.
*
* @return an input stream for reading bytes from this socket.
- * @exception IOException if an I/O error occurs when creating the
+ * @throws IOException if an I/O error occurs when creating the
* input stream, the socket is closed, the socket is
* not connected, or the socket input has been shutdown
* using {@link #shutdownInput()}
@@ -942,7 +942,7 @@ class Socket implements java.io.Closeable {
* will close the associated socket.
*
* @return an output stream for writing bytes to this socket.
- * @exception IOException if an I/O error occurs when creating the
+ * @throws IOException if an I/O error occurs when creating the
* output stream or if the socket is not connected.
* @revised 1.4
* @spec JSR-51
@@ -1002,7 +1002,7 @@ class Socket implements java.io.Closeable {
* @param on {@code true} to enable TCP_NODELAY,
* {@code false} to disable.
*
- * @exception SocketException if there is an error
+ * @throws SocketException if there is an error
* in the underlying protocol, such as a TCP error.
*
* @since 1.1
@@ -1020,7 +1020,7 @@ class Socket implements java.io.Closeable {
*
* @return a {@code boolean} indicating whether or not
* {@link SocketOptions#TCP_NODELAY TCP_NODELAY} is enabled.
- * @exception SocketException if there is an error
+ * @throws SocketException if there is an error
* in the underlying protocol, such as a TCP error.
* @since 1.1
* @see #setTcpNoDelay(boolean)
@@ -1040,9 +1040,9 @@ class Socket implements java.io.Closeable {
*
* @param on whether or not to linger on.
* @param linger how long to linger for, if on is true.
- * @exception SocketException if there is an error
+ * @throws SocketException if there is an error
* in the underlying protocol, such as a TCP error.
- * @exception IllegalArgumentException if the linger value is negative.
+ * @throws IllegalArgumentException if the linger value is negative.
* @since 1.1
* @see #getSoLinger()
*/
@@ -1069,7 +1069,7 @@ class Socket implements java.io.Closeable {
* The setting only affects socket close.
*
* @return the setting for {@link SocketOptions#SO_LINGER SO_LINGER}.
- * @exception SocketException if there is an error
+ * @throws SocketException if there is an error
* in the underlying protocol, such as a TCP error.
* @since 1.1
* @see #setSoLinger(boolean, int)
@@ -1091,7 +1091,7 @@ class Socket implements java.io.Closeable {
* sent after any preceding writes to the socket OutputStream
* and before any future writes to the OutputStream.
* @param data The byte of data to send
- * @exception IOException if there is an error
+ * @throws IOException if there is an error
* sending the data.
* @since 1.4
*/
@@ -1120,7 +1120,7 @@ class Socket implements java.io.Closeable {
* {@link SocketOptions#SO_OOBINLINE SO_OOBINLINE},
* {@code false} to disable.
*
- * @exception SocketException if there is an error
+ * @throws SocketException if there is an error
* in the underlying protocol, such as a TCP error.
*
* @since 1.4
@@ -1139,7 +1139,7 @@ class Socket implements java.io.Closeable {
* @return a {@code boolean} indicating whether or not
* {@link SocketOptions#SO_OOBINLINE SO_OOBINLINE} is enabled.
*
- * @exception SocketException if there is an error
+ * @throws SocketException if there is an error
* in the underlying protocol, such as a TCP error.
* @since 1.4
* @see #setOOBInline(boolean)
@@ -1182,7 +1182,7 @@ class Socket implements java.io.Closeable {
* 0 returns implies that the option is disabled (i.e., timeout of infinity).
*
* @return the setting for {@link SocketOptions#SO_TIMEOUT SO_TIMEOUT}
- * @exception SocketException if there is an error
+ * @throws SocketException if there is an error
* in the underlying protocol, such as a TCP error.
*
* @since 1.1
@@ -1211,13 +1211,13 @@ class Socket implements java.io.Closeable {
* applications that want to verify what size the buffers were set to
* should call {@link #getSendBufferSize()}.
*
- * @exception SocketException if there is an error
+ * @throws SocketException if there is an error
* in the underlying protocol, such as a TCP error.
*
* @param size the size to which to set the send buffer
* size. This value must be greater than 0.
*
- * @exception IllegalArgumentException if the
+ * @throws IllegalArgumentException if the
* value is 0 or is negative.
*
* @see #getSendBufferSize()
@@ -1240,7 +1240,7 @@ class Socket implements java.io.Closeable {
* @return the value of the {@link SocketOptions#SO_SNDBUF SO_SNDBUF}
* option for this {@code Socket}.
*
- * @exception SocketException if there is an error
+ * @throws SocketException if there is an error
* in the underlying protocol, such as a TCP error.
*
* @see #setSendBufferSize(int)
@@ -1287,10 +1287,10 @@ class Socket implements java.io.Closeable {
* @param size the size to which to set the receive buffer
* size. This value must be greater than 0.
*
- * @exception IllegalArgumentException if the value is 0 or is
+ * @throws IllegalArgumentException if the value is 0 or is
* negative.
*
- * @exception SocketException if there is an error
+ * @throws SocketException if there is an error
* in the underlying protocol, such as a TCP error.
*
* @see #getReceiveBufferSize()
@@ -1314,7 +1314,7 @@ class Socket implements java.io.Closeable {
*
* @return the value of the {@link SocketOptions#SO_RCVBUF SO_RCVBUF}
* option for this {@code Socket}.
- * @exception SocketException if there is an error
+ * @throws SocketException if there is an error
* in the underlying protocol, such as a TCP error.
* @see #setReceiveBufferSize(int)
* @since 1.2
@@ -1335,7 +1335,7 @@ class Socket implements java.io.Closeable {
* Enable/disable {@link SocketOptions#SO_KEEPALIVE SO_KEEPALIVE}.
*
* @param on whether or not to have socket keep alive turned on.
- * @exception SocketException if there is an error
+ * @throws SocketException if there is an error
* in the underlying protocol, such as a TCP error.
* @since 1.3
* @see #getKeepAlive()
@@ -1351,7 +1351,7 @@ class Socket implements java.io.Closeable {
*
* @return a {@code boolean} indicating whether or not
* {@link SocketOptions#SO_KEEPALIVE SO_KEEPALIVE} is enabled.
- * @exception SocketException if there is an error
+ * @throws SocketException if there is an error
* in the underlying protocol, such as a TCP error.
* @since 1.3
* @see #setKeepAlive(boolean)
@@ -1470,7 +1470,7 @@ class Socket implements java.io.Closeable {
* is not defined.
*
* @param on whether to enable or disable the socket option
- * @exception SocketException if an error occurs enabling or
+ * @throws SocketException if an error occurs enabling or
* disabling the {@link SocketOptions#SO_REUSEADDR SO_REUSEADDR}
* socket option, or the socket is closed.
* @since 1.4
@@ -1490,7 +1490,7 @@ class Socket implements java.io.Closeable {
*
* @return a {@code boolean} indicating whether or not
* {@link SocketOptions#SO_REUSEADDR SO_REUSEADDR} is enabled.
- * @exception SocketException if there is an error
+ * @throws SocketException if there is an error
* in the underlying protocol, such as a TCP error.
* @since 1.4
* @see #setReuseAddress(boolean)
@@ -1518,7 +1518,7 @@ class Socket implements java.io.Closeable {
* If this socket has an associated channel then the channel is closed
* as well.
*
- * @exception IOException if an I/O error occurs when closing this socket.
+ * @throws IOException if an I/O error occurs when closing this socket.
* @revised 1.4
* @spec JSR-51
* @see #isClosed
@@ -1542,7 +1542,7 @@ class Socket implements java.io.Closeable {
* socket, the stream's {@code available} method will return 0, and its
* {@code read} methods will return {@code -1} (end of stream).
*
- * @exception IOException if an I/O error occurs when shutting down this
+ * @throws IOException if an I/O error occurs when shutting down this
* socket.
*
* @since 1.3
@@ -1572,7 +1572,7 @@ class Socket implements java.io.Closeable {
* shutdownOutput() on the socket, the stream will throw
* an IOException.
*
- * @exception IOException if an I/O error occurs when shutting down this
+ * @throws IOException if an I/O error occurs when shutting down this
* socket.
*
* @since 1.3
@@ -1700,10 +1700,10 @@ class Socket implements java.io.Closeable {
* This could result in a SecurityException.
*
* @param fac the desired factory.
- * @exception IOException if an I/O error occurs when setting the
+ * @throws IOException if an I/O error occurs when setting the
* socket factory.
- * @exception SocketException if the factory is already defined.
- * @exception SecurityException if a security manager exists and its
+ * @throws SocketException if the factory is already defined.
+ * @throws SecurityException if a security manager exists and its
* {@code checkSetFactory} method doesn't allow the operation.
* @see java.net.SocketImplFactory#createSocketImpl()
* @see SecurityManager#checkSetFactory
diff --git a/src/java.base/share/classes/java/net/SocketImpl.java b/src/java.base/share/classes/java/net/SocketImpl.java
index 1f853b7592c..9acafd5c24e 100644
--- a/src/java.base/share/classes/java/net/SocketImpl.java
+++ b/src/java.base/share/classes/java/net/SocketImpl.java
@@ -114,7 +114,7 @@ public abstract class SocketImpl implements SocketOptions {
*
* @param stream if {@code true}, create a stream socket;
* otherwise, create a datagram socket.
- * @exception IOException if an I/O error occurs while creating the
+ * @throws IOException if an I/O error occurs while creating the
* socket.
*/
protected abstract void create(boolean stream) throws IOException;
@@ -124,7 +124,7 @@ public abstract class SocketImpl implements SocketOptions {
*
* @param host the name of the remote host.
* @param port the port number.
- * @exception IOException if an I/O error occurs when connecting to the
+ * @throws IOException if an I/O error occurs when connecting to the
* remote host.
*/
protected abstract void connect(String host, int port) throws IOException;
@@ -134,7 +134,7 @@ public abstract class SocketImpl implements SocketOptions {
*
* @param address the IP address of the remote host.
* @param port the port number.
- * @exception IOException if an I/O error occurs when attempting a
+ * @throws IOException if an I/O error occurs when attempting a
* connection.
*/
protected abstract void connect(InetAddress address, int port) throws IOException;
@@ -146,7 +146,7 @@ public abstract class SocketImpl implements SocketOptions {
*
* @param address the Socket address of the remote host.
* @param timeout the timeout value, in milliseconds, or zero for no timeout.
- * @exception IOException if an I/O error occurs when attempting a
+ * @throws IOException if an I/O error occurs when attempting a
* connection.
* @since 1.4
*/
@@ -157,7 +157,7 @@ public abstract class SocketImpl implements SocketOptions {
*
* @param host an IP address that belongs to a local interface.
* @param port the port number.
- * @exception IOException if an I/O error occurs when binding this socket.
+ * @throws IOException if an I/O error occurs when binding this socket.
*/
protected abstract void bind(InetAddress host, int port) throws IOException;
@@ -168,7 +168,7 @@ public abstract class SocketImpl implements SocketOptions {
* connection is refused.
*
* @param backlog the maximum length of the queue.
- * @exception IOException if an I/O error occurs when creating the queue.
+ * @throws IOException if an I/O error occurs when creating the queue.
*/
protected abstract void listen(int backlog) throws IOException;
@@ -176,7 +176,7 @@ public abstract class SocketImpl implements SocketOptions {
* Accepts a connection.
*
* @param s the accepted connection.
- * @exception IOException if an I/O error occurs when accepting the
+ * @throws IOException if an I/O error occurs when accepting the
* connection.
*/
protected abstract void accept(SocketImpl s) throws IOException;
@@ -185,7 +185,7 @@ public abstract class SocketImpl implements SocketOptions {
* Returns an input stream for this socket.
*
* @return a stream for reading from this socket.
- * @exception IOException if an I/O error occurs when creating the
+ * @throws IOException if an I/O error occurs when creating the
* input stream.
*/
protected abstract InputStream getInputStream() throws IOException;
@@ -194,7 +194,7 @@ public abstract class SocketImpl implements SocketOptions {
* Returns an output stream for this socket.
*
* @return an output stream for writing to this socket.
- * @exception IOException if an I/O error occurs when creating the
+ * @throws IOException if an I/O error occurs when creating the
* output stream.
*/
protected abstract OutputStream getOutputStream() throws IOException;
@@ -205,7 +205,7 @@ public abstract class SocketImpl implements SocketOptions {
*
* @return the number of bytes that can be read from this socket
* without blocking.
- * @exception IOException if an I/O error occurs when determining the
+ * @throws IOException if an I/O error occurs when determining the
* number of bytes available.
*/
protected abstract int available() throws IOException;
@@ -213,7 +213,7 @@ public abstract class SocketImpl implements SocketOptions {
/**
* Closes this socket.
*
- * @exception IOException if an I/O error occurs when closing this socket.
+ * @throws IOException if an I/O error occurs when closing this socket.
*/
protected abstract void close() throws IOException;
@@ -235,7 +235,7 @@ public abstract class SocketImpl implements SocketOptions {
* socket, the stream's {@code available} method will return 0, and its
* {@code read} methods will return {@code -1} (end of stream).
*
- * @exception IOException if an I/O error occurs when shutting down this
+ * @throws IOException if an I/O error occurs when shutting down this
* socket.
* @see java.net.Socket#shutdownOutput()
* @see java.net.Socket#close()
@@ -255,7 +255,7 @@ public abstract class SocketImpl implements SocketOptions {
* shutdownOutput() on the socket, the stream will throw
* an IOException.
*
- * @exception IOException if an I/O error occurs when shutting down this
+ * @throws IOException if an I/O error occurs when shutting down this
* socket.
* @see java.net.Socket#shutdownInput()
* @see java.net.Socket#close()
@@ -313,7 +313,7 @@ public abstract class SocketImpl implements SocketOptions {
* Send one byte of urgent data on the socket.
* The byte to be sent is the low eight bits of the parameter
* @param data The byte of data to send
- * @exception IOException if there is an error
+ * @throws IOException if there is an error
* sending the data.
* @since 1.4
*/
diff --git a/src/java.base/share/classes/java/net/SocketInputStream.java b/src/java.base/share/classes/java/net/SocketInputStream.java
index 878583f7a63..797d8f9d9f4 100644
--- a/src/java.base/share/classes/java/net/SocketInputStream.java
+++ b/src/java.base/share/classes/java/net/SocketInputStream.java
@@ -86,7 +86,7 @@ class SocketInputStream extends FileInputStream {
* @param timeout the read timeout in ms
* @return the actual number of bytes read, -1 is
* returned when the end of the stream is reached.
- * @exception IOException If an I/O error has occurred.
+ * @throws IOException If an I/O error has occurred.
*/
private native int socketRead0(FileDescriptor fd,
byte b[], int off, int len,
@@ -104,7 +104,7 @@ class SocketInputStream extends FileInputStream {
* @param timeout the read timeout in ms
* @return the actual number of bytes read, -1 is
* returned when the end of the stream is reached.
- * @exception IOException If an I/O error has occurred.
+ * @throws IOException If an I/O error has occurred.
*/
private int socketRead(FileDescriptor fd,
byte b[], int off, int len,
@@ -118,7 +118,7 @@ class SocketInputStream extends FileInputStream {
* @param b the buffer into which the data is read
* @return the actual number of bytes read, -1 is
* returned when the end of the stream is reached.
- * @exception IOException If an I/O error has occurred.
+ * @throws IOException If an I/O error has occurred.
*/
public int read(byte b[]) throws IOException {
return read(b, 0, b.length);
@@ -132,7 +132,7 @@ class SocketInputStream extends FileInputStream {
* @param length the maximum number of bytes read
* @return the actual number of bytes read, -1 is
* returned when the end of the stream is reached.
- * @exception IOException If an I/O error has occurred.
+ * @throws IOException If an I/O error has occurred.
*/
public int read(byte b[], int off, int length) throws IOException {
return read(b, off, length, impl.getTimeout());
@@ -206,7 +206,7 @@ class SocketInputStream extends FileInputStream {
* Skips n bytes of input.
* @param numbytes the number of bytes to skip
* @return the actual number of bytes skipped.
- * @exception IOException If an I/O error has occurred.
+ * @throws IOException If an I/O error has occurred.
*/
public long skip(long numbytes) throws IOException {
if (numbytes <= 0) {
diff --git a/src/java.base/share/classes/java/net/SocketOptions.java b/src/java.base/share/classes/java/net/SocketOptions.java
index 2e9d28a3ceb..5dbe88bb1fd 100644
--- a/src/java.base/share/classes/java/net/SocketOptions.java
+++ b/src/java.base/share/classes/java/net/SocketOptions.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2019, 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
@@ -81,11 +81,11 @@ public interface SocketOptions {
* Throws SocketException if the option is unrecognized,
* the socket is closed, or some low-level error occurred
* The ISO 3166-1 codes can be found on-line.
*
* @return A three-letter abbreviation of this locale's country.
- * @exception MissingResourceException Throws MissingResourceException if the
+ * @throws MissingResourceException Throws MissingResourceException if the
* three-letter country abbreviation is not available for this locale.
*/
public String getISO3Country() throws MissingResourceException {
@@ -1834,7 +1834,7 @@ public final class Locale implements Cloneable, Serializable {
*
* @param inLocale The locale for which to retrieve the display language.
* @return The name of the display language appropriate to the given locale.
- * @exception NullPointerException if SecurityException.
*
- * @exception java.lang.SecurityException if a security manager already
+ * @throws java.lang.SecurityException if a security manager already
* exists and its checkPermission method
* doesn't allow creation of a new security manager.
* @see java.lang.System#getSecurityManager()
@@ -398,9 +398,9 @@ public class SecurityManager {
* with the given permission.
*
* @param perm the requested permission.
- * @exception SecurityException if access is not permitted based on
+ * @throws SecurityException if access is not permitted based on
* the current security policy.
- * @exception NullPointerException if the permission argument is
+ * @throws NullPointerException if the permission argument is
* null.
* @since 1.2
*/
@@ -429,11 +429,11 @@ public class SecurityManager {
*
* @param perm the specified permission
* @param context a system-dependent security context.
- * @exception SecurityException if the specified security context
+ * @throws SecurityException if the specified security context
* is not an instance of AccessControlContext
* (e.g., is null), or is denied access to the
* resource specified by the given permission.
- * @exception NullPointerException if the permission argument is
+ * @throws NullPointerException if the permission argument is
* null.
* @see java.lang.SecurityManager#getSecurityContext()
* @see java.security.AccessControlContext#checkPermission(java.security.Permission)
@@ -460,7 +460,7 @@ public class SecurityManager {
* at the point the overridden method would normally throw an
* exception.
*
- * @exception SecurityException if the calling thread does not
+ * @throws SecurityException if the calling thread does not
* have permission
* to create a new class loader.
* @see java.lang.ClassLoader#ClassLoader()
@@ -515,9 +515,9 @@ public class SecurityManager {
* equivalent security check should be placed in the overridden method.
*
* @param t the thread to be checked.
- * @exception SecurityException if the calling thread does not have
+ * @throws SecurityException if the calling thread does not have
* permission to modify the thread.
- * @exception NullPointerException if the thread argument is
+ * @throws NullPointerException if the thread argument is
* null.
* @see java.lang.Thread#resume() resume
* @see java.lang.Thread#setDaemon(boolean) setDaemon
@@ -568,9 +568,9 @@ public class SecurityManager {
* equivalent security check should be placed in the overridden method.
*
* @param g the thread group to be checked.
- * @exception SecurityException if the calling thread does not have
+ * @throws SecurityException if the calling thread does not have
* permission to modify the thread group.
- * @exception NullPointerException if the thread group argument is
+ * @throws NullPointerException if the thread group argument is
* null.
* @see java.lang.ThreadGroup#destroy() destroy
* @see java.lang.ThreadGroup#resume() resume
@@ -610,7 +610,7 @@ public class SecurityManager {
* exception.
*
* @param status the exit status.
- * @exception SecurityException if the calling thread does not have
+ * @throws SecurityException if the calling thread does not have
* permission to halt the Java Virtual Machine with
* the specified status.
* @see java.lang.Runtime#exit(int) exit
@@ -639,9 +639,9 @@ public class SecurityManager {
* exception.
*
* @param cmd the specified system command.
- * @exception SecurityException if the calling thread does not have
+ * @throws SecurityException if the calling thread does not have
* permission to create a subprocess.
- * @exception NullPointerException if the cmd argument is
+ * @throws NullPointerException if the cmd argument is
* null.
* @see java.lang.Runtime#exec(java.lang.String)
* @see java.lang.Runtime#exec(java.lang.String, java.lang.String[])
@@ -679,9 +679,9 @@ public class SecurityManager {
* exception.
*
* @param lib the name of the library.
- * @exception SecurityException if the calling thread does not have
+ * @throws SecurityException if the calling thread does not have
* permission to dynamically link the library.
- * @exception NullPointerException if the lib argument is
+ * @throws NullPointerException if the lib argument is
* null.
* @see java.lang.Runtime#load(java.lang.String)
* @see java.lang.Runtime#loadLibrary(java.lang.String)
@@ -709,9 +709,9 @@ public class SecurityManager {
* exception.
*
* @param fd the system-dependent file descriptor.
- * @exception SecurityException if the calling thread does not have
+ * @throws SecurityException if the calling thread does not have
* permission to access the specified file descriptor.
- * @exception NullPointerException if the file descriptor argument is
+ * @throws NullPointerException if the file descriptor argument is
* null.
* @see java.io.FileDescriptor
* @see #checkPermission(java.security.Permission) checkPermission
@@ -737,9 +737,9 @@ public class SecurityManager {
* exception.
*
* @param file the system-dependent file name.
- * @exception SecurityException if the calling thread does not have
+ * @throws SecurityException if the calling thread does not have
* permission to access the specified file.
- * @exception NullPointerException if the file argument is
+ * @throws NullPointerException if the file argument is
* null.
* @see #checkPermission(java.security.Permission) checkPermission
*/
@@ -769,11 +769,11 @@ public class SecurityManager {
*
* @param file the system-dependent filename.
* @param context a system-dependent security context.
- * @exception SecurityException if the specified security context
+ * @throws SecurityException if the specified security context
* is not an instance of AccessControlContext
* (e.g., is null), or does not have permission
* to read the specified file.
- * @exception NullPointerException if the file argument is
+ * @throws NullPointerException if the file argument is
* null.
* @see java.lang.SecurityManager#getSecurityContext()
* @see java.security.AccessControlContext#checkPermission(java.security.Permission)
@@ -799,9 +799,9 @@ public class SecurityManager {
* exception.
*
* @param fd the system-dependent file descriptor.
- * @exception SecurityException if the calling thread does not have
+ * @throws SecurityException if the calling thread does not have
* permission to access the specified file descriptor.
- * @exception NullPointerException if the file descriptor argument is
+ * @throws NullPointerException if the file descriptor argument is
* null.
* @see java.io.FileDescriptor
* @see #checkPermission(java.security.Permission) checkPermission
@@ -828,9 +828,9 @@ public class SecurityManager {
* exception.
*
* @param file the system-dependent filename.
- * @exception SecurityException if the calling thread does not
+ * @throws SecurityException if the calling thread does not
* have permission to access the specified file.
- * @exception NullPointerException if the file argument is
+ * @throws NullPointerException if the file argument is
* null.
* @see #checkPermission(java.security.Permission) checkPermission
*/
@@ -855,9 +855,9 @@ public class SecurityManager {
* exception.
*
* @param file the system-dependent filename.
- * @exception SecurityException if the calling thread does not
+ * @throws SecurityException if the calling thread does not
* have permission to delete the file.
- * @exception NullPointerException if the file argument is
+ * @throws NullPointerException if the file argument is
* null.
* @see java.io.File#delete()
* @see #checkPermission(java.security.Permission) checkPermission
@@ -889,10 +889,10 @@ public class SecurityManager {
*
* @param host the host name port to connect to.
* @param port the protocol port to connect to.
- * @exception SecurityException if the calling thread does not have
+ * @throws SecurityException if the calling thread does not have
* permission to open a socket connection to the specified
* host and port.
- * @exception NullPointerException if the host argument is
+ * @throws NullPointerException if the host argument is
* null.
* @see #checkPermission(java.security.Permission) checkPermission
*/
@@ -941,12 +941,12 @@ public class SecurityManager {
* @param host the host name port to connect to.
* @param port the protocol port to connect to.
* @param context a system-dependent security context.
- * @exception SecurityException if the specified security context
+ * @throws SecurityException if the specified security context
* is not an instance of AccessControlContext
* (e.g., is null), or does not have permission
* to open a socket connection to the specified
* host and port.
- * @exception NullPointerException if the host argument is
+ * @throws NullPointerException if the host argument is
* null.
* @see java.lang.SecurityManager#getSecurityContext()
* @see java.security.AccessControlContext#checkPermission(java.security.Permission)
@@ -982,7 +982,7 @@ public class SecurityManager {
* exception.
*
* @param port the local port.
- * @exception SecurityException if the calling thread does not have
+ * @throws SecurityException if the calling thread does not have
* permission to listen on the specified port.
* @see #checkPermission(java.security.Permission) checkPermission
*/
@@ -1009,9 +1009,9 @@ public class SecurityManager {
*
* @param host the host name of the socket connection.
* @param port the port number of the socket connection.
- * @exception SecurityException if the calling thread does not have
+ * @throws SecurityException if the calling thread does not have
* permission to accept the connection.
- * @exception NullPointerException if the host argument is
+ * @throws NullPointerException if the host argument is
* null.
* @see java.net.ServerSocket#accept()
* @see #checkPermission(java.security.Permission) checkPermission
@@ -1042,9 +1042,9 @@ public class SecurityManager {
* exception.
*
* @param maddr Internet group address to be used.
- * @exception SecurityException if the calling thread is not allowed to
+ * @throws SecurityException if the calling thread is not allowed to
* use (join/leave/send/receive) IP multicast.
- * @exception NullPointerException if the address argument is
+ * @throws NullPointerException if the address argument is
* null.
* @since 1.1
* @see #checkPermission(java.security.Permission) checkPermission
@@ -1076,9 +1076,9 @@ public class SecurityManager {
* @param ttl value in use, if it is multicast send.
* Note: this particular implementation does not use the ttl
* parameter.
- * @exception SecurityException if the calling thread is not allowed to
+ * @throws SecurityException if the calling thread is not allowed to
* use (join/leave/send/receive) IP multicast.
- * @exception NullPointerException if the address argument is
+ * @throws NullPointerException if the address argument is
* null.
* @since 1.1
* @deprecated Use #checkPermission(java.security.Permission) instead
@@ -1110,7 +1110,7 @@ public class SecurityManager {
* at the point the overridden method would normally throw an
* exception.
*
- * @exception SecurityException if the calling thread does not have
+ * @throws SecurityException if the calling thread does not have
* permission to access or modify the system properties.
* @see java.lang.System#getProperties()
* @see java.lang.System#setProperties(java.util.Properties)
@@ -1139,11 +1139,11 @@ public class SecurityManager {
*
* @param key a system property key.
*
- * @exception SecurityException if the calling thread does not have
+ * @throws SecurityException if the calling thread does not have
* permission to access the specified system property.
- * @exception NullPointerException if the key argument is
+ * @throws NullPointerException if the key argument is
* null.
- * @exception IllegalArgumentException if key is empty.
+ * @throws IllegalArgumentException if key is empty.
*
* @see java.lang.System#getProperty(java.lang.String)
* @see #checkPermission(java.security.Permission) checkPermission
@@ -1166,7 +1166,7 @@ public class SecurityManager {
* at the point the overridden method would normally throw an
* exception.
*
- * @exception SecurityException if the calling thread does not have
+ * @throws SecurityException if the calling thread does not have
* permission to initiate a print job request.
* @since 1.1
* @see #checkPermission(java.security.Permission) checkPermission
@@ -1474,7 +1474,7 @@ public class SecurityManager {
* at the point the overridden method would normally throw an
* exception.
*
- * @exception SecurityException if the calling thread does not have
+ * @throws SecurityException if the calling thread does not have
* permission to specify a socket factory or a stream
* handler factory.
*
@@ -1509,10 +1509,10 @@ public class SecurityManager {
*
* @param target the target name of the SecurityPermission.
*
- * @exception SecurityException if the calling thread does not have
+ * @throws SecurityException if the calling thread does not have
* permission for the requested access.
- * @exception NullPointerException if target is null.
- * @exception IllegalArgumentException if target is empty.
+ * @throws NullPointerException if target is null.
+ * @throws IllegalArgumentException if target is empty.
*
* @since 1.1
* @see #checkPermission(java.security.Permission) checkPermission
diff --git a/src/java.base/share/classes/java/lang/String.java b/src/java.base/share/classes/java/lang/String.java
index 2ad6388a19c..cfbbd4178ba 100644
--- a/src/java.base/share/classes/java/lang/String.java
+++ b/src/java.base/share/classes/java/lang/String.java
@@ -702,7 +702,7 @@ public final class String
* @param index the index of the {@code char} value.
* @return the {@code char} value at the specified index of this string.
* The first {@code char} value is at index {@code 0}.
- * @exception IndexOutOfBoundsException if the {@code index}
+ * @throws IndexOutOfBoundsException if the {@code index}
* argument is negative or not less than the length of this
* string.
*/
@@ -731,7 +731,7 @@ public final class String
* @param index the index to the {@code char} values
* @return the code point value of the character at the
* {@code index}
- * @exception IndexOutOfBoundsException if the {@code index}
+ * @throws IndexOutOfBoundsException if the {@code index}
* argument is negative or not less than the length of this
* string.
* @since 1.5
@@ -763,7 +763,7 @@ public final class String
*
* @param index the index following the code point that should be returned
* @return the Unicode code point value before the given index.
- * @exception IndexOutOfBoundsException if the {@code index}
+ * @throws IndexOutOfBoundsException if the {@code index}
* argument is less than 1 or greater than the length
* of this string.
* @since 1.5
@@ -794,7 +794,7 @@ public final class String
* the text range.
* @return the number of Unicode code points in the specified text
* range
- * @exception IndexOutOfBoundsException if the
+ * @throws IndexOutOfBoundsException if the
* {@code beginIndex} is negative, or {@code endIndex}
* is larger than the length of this {@code String}, or
* {@code beginIndex} is larger than {@code endIndex}.
@@ -821,7 +821,7 @@ public final class String
* @param index the index to be offset
* @param codePointOffset the offset in code points
* @return the index within this {@code String}
- * @exception IndexOutOfBoundsException if {@code index}
+ * @throws IndexOutOfBoundsException if {@code index}
* is negative or larger then the length of this
* {@code String}, or if {@code codePointOffset} is positive
* and the substring starting with {@code index} has fewer
@@ -858,7 +858,7 @@ public final class String
* to copy.
* @param dst the destination array.
* @param dstBegin the start offset in the destination array.
- * @exception IndexOutOfBoundsException If any of the following
+ * @throws IndexOutOfBoundsException If any of the following
* is true:
*
- * @param optID identifies the option
- * @param value the parameter of the socket option
+ * @param optID identifies the option
+ * @param value the parameter of the socket option
* @throws SocketException if the option is unrecognized,
- * the socket is closed, or some low-level error occurred
- * @see #getOption(int)
+ * the socket is closed, or some low-level error occurred
+ * @see #getOption(int)
*/
public void
setOption(int optID, Object value) throws SocketException;
@@ -116,7 +116,7 @@ public interface SocketOptions {
* }
*
*
- * @param optID an {@code int} identifying the option to fetch
+ * @param optID an {@code int} identifying the option to fetch
* @return the value of the option
* @throws SocketException if the socket is closed
* @throws SocketException if optID is unknown along the
diff --git a/src/java.base/share/classes/java/net/SocketOutputStream.java b/src/java.base/share/classes/java/net/SocketOutputStream.java
index f1fa7d376f8..a73329f15d8 100644
--- a/src/java.base/share/classes/java/net/SocketOutputStream.java
+++ b/src/java.base/share/classes/java/net/SocketOutputStream.java
@@ -79,7 +79,7 @@ class SocketOutputStream extends FileOutputStream {
* @param b the data to be written
* @param off the start offset in the data
* @param len the number of bytes that are written
- * @exception IOException If an I/O error has occurred.
+ * @throws IOException If an I/O error has occurred.
*/
private native void socketWrite0(FileDescriptor fd, byte[] b, int off,
int len) throws IOException;
@@ -90,7 +90,7 @@ class SocketOutputStream extends FileOutputStream {
* @param b the data to be written
* @param off the start offset in the data
* @param len the number of bytes that are written
- * @exception IOException If an I/O error has occurred.
+ * @throws IOException If an I/O error has occurred.
*/
private void socketWrite(byte b[], int off, int len) throws IOException {
@@ -120,7 +120,7 @@ class SocketOutputStream extends FileOutputStream {
/**
* Writes a byte to the socket.
* @param b the data to be written
- * @exception IOException If an I/O error has occurred.
+ * @throws IOException If an I/O error has occurred.
*/
public void write(int b) throws IOException {
temp[0] = (byte)b;
@@ -130,7 +130,7 @@ class SocketOutputStream extends FileOutputStream {
/**
* Writes the contents of the buffer b to the socket.
* @param b the data to be written
- * @exception SocketException If an I/O error has occurred.
+ * @throws SocketException If an I/O error has occurred.
*/
public void write(byte b[]) throws IOException {
socketWrite(b, 0, b.length);
@@ -142,7 +142,7 @@ class SocketOutputStream extends FileOutputStream {
* @param b the data to be written
* @param off the start offset in the data
* @param len the number of bytes that are written
- * @exception SocketException If an I/O error has occurred.
+ * @throws SocketException If an I/O error has occurred.
*/
public void write(byte b[], int off, int len) throws IOException {
socketWrite(b, off, len);
diff --git a/src/java.base/share/classes/java/net/SocketPermission.java b/src/java.base/share/classes/java/net/SocketPermission.java
index fafec736bcc..3abf17604e0 100644
--- a/src/java.base/share/classes/java/net/SocketPermission.java
+++ b/src/java.base/share/classes/java/net/SocketPermission.java
@@ -1361,10 +1361,10 @@ final class SocketPermissionCollection extends PermissionCollection
*
* @param permission the Permission object to add.
*
- * @exception IllegalArgumentException - if the permission is not a
+ * @throws IllegalArgumentException - if the permission is not a
* SocketPermission
*
- * @exception SecurityException - if this SocketPermissionCollection object
+ * @throws SecurityException - if this SocketPermissionCollection object
* has been marked readonly
*/
@Override
diff --git a/src/java.base/share/classes/java/net/URL.java b/src/java.base/share/classes/java/net/URL.java
index 4ed2d93f430..2899149a594 100644
--- a/src/java.base/share/classes/java/net/URL.java
+++ b/src/java.base/share/classes/java/net/URL.java
@@ -349,7 +349,7 @@ public final class URL implements java.io.Serializable {
* @param host the name of the host.
* @param port the port number on the host.
* @param file the file on the host
- * @exception MalformedURLException if an unknown protocol or the port
+ * @throws MalformedURLException if an unknown protocol or the port
* is a negative number other than -1
* @see java.lang.System#getProperty(java.lang.String)
* @see java.net.URL#setURLStreamHandlerFactory(
@@ -378,7 +378,7 @@ public final class URL implements java.io.Serializable {
* @param protocol the name of the protocol to use.
* @param host the name of the host.
* @param file the file on the host.
- * @exception MalformedURLException if an unknown protocol is specified.
+ * @throws MalformedURLException if an unknown protocol is specified.
* @see java.net.URL#URL(java.lang.String, java.lang.String,
* int, java.lang.String)
*/
@@ -412,9 +412,9 @@ public final class URL implements java.io.Serializable {
* @param port the port number on the host.
* @param file the file on the host
* @param handler the stream handler for the URL.
- * @exception MalformedURLException if an unknown protocol or the port
+ * @throws MalformedURLException if an unknown protocol or the port
is a negative number other than -1
- * @exception SecurityException
+ * @throws SecurityException
* if a security manager exists and its
* {@code checkPermission} method doesn't allow
* specifying a stream handler explicitly.
@@ -494,7 +494,7 @@ public final class URL implements java.io.Serializable {
* constructor with a {@code null} first argument.
*
* @param spec the {@code String} to parse as a URL.
- * @exception MalformedURLException if no protocol is specified, or an
+ * @throws MalformedURLException if no protocol is specified, or an
* unknown protocol is found, or {@code spec} is {@code null},
* or the parsed URL fails to comply with the specific syntax
* of the associated protocol.
@@ -543,7 +543,7 @@ public final class URL implements java.io.Serializable {
*
* @param context the context in which to parse the specification.
* @param spec the {@code String} to parse as a URL.
- * @exception MalformedURLException if no protocol is specified, or an
+ * @throws MalformedURLException if no protocol is specified, or an
* unknown protocol is found, or {@code spec} is {@code null},
* or the parsed URL fails to comply with the specific syntax
* of the associated protocol.
@@ -565,11 +565,11 @@ public final class URL implements java.io.Serializable {
* @param context the context in which to parse the specification.
* @param spec the {@code String} to parse as a URL.
* @param handler the stream handler for the URL.
- * @exception MalformedURLException if no protocol is specified, or an
+ * @throws MalformedURLException if no protocol is specified, or an
* unknown protocol is found, or {@code spec} is {@code null},
* or the parsed URL fails to comply with the specific syntax
* of the associated protocol.
- * @exception SecurityException
+ * @throws SecurityException
* if a security manager exists and its
* {@code checkPermission} method doesn't allow
* specifying a stream handler.
@@ -1042,7 +1042,7 @@ public final class URL implements java.io.Serializable {
* to a URI. However, some URLs that are not strictly in compliance
* can not be converted to a URI.
*
- * @exception URISyntaxException if this URL is not formatted strictly according to
+ * @throws URISyntaxException if this URL is not formatted strictly according to
* RFC2396 and cannot be converted to a URI.
*
* @return a URI instance equivalent to this URL.
@@ -1082,7 +1082,7 @@ public final class URL implements java.io.Serializable {
*
* @return a {@link java.net.URLConnection URLConnection} linking
* to the URL.
- * @exception IOException if an I/O exception occurs.
+ * @throws IOException if an I/O exception occurs.
* @see java.net.URL#URL(java.lang.String, java.lang.String,
* int, java.lang.String)
*/
@@ -1103,13 +1103,13 @@ public final class URL implements java.io.Serializable {
* will be made. If direct connection is desired,
* Proxy.NO_PROXY should be specified.
* @return a {@code URLConnection} to the URL.
- * @exception IOException if an I/O exception occurs.
- * @exception SecurityException if a security manager is present
+ * @throws IOException if an I/O exception occurs.
+ * @throws SecurityException if a security manager is present
* and the caller doesn't have permission to connect
* to the proxy.
- * @exception IllegalArgumentException will be thrown if proxy is null,
+ * @throws IllegalArgumentException will be thrown if proxy is null,
* or proxy has the wrong type
- * @exception UnsupportedOperationException if the subclass that
+ * @throws UnsupportedOperationException if the subclass that
* implements the protocol handler doesn't support
* this method.
* @see java.net.URL#URL(java.lang.String, java.lang.String,
@@ -1148,7 +1148,7 @@ public final class URL implements java.io.Serializable {
*
*
* @return an input stream for reading from the URL connection.
- * @exception IOException if an I/O exception occurs.
+ * @throws IOException if an I/O exception occurs.
* @see java.net.URL#openConnection()
* @see java.net.URLConnection#getInputStream()
*/
@@ -1163,7 +1163,7 @@ public final class URL implements java.io.Serializable {
*
*
* @return the contents of this URL.
- * @exception IOException if an I/O exception occurs.
+ * @throws IOException if an I/O exception occurs.
* @see java.net.URLConnection#getContent()
*/
public final Object getContent() throws java.io.IOException {
@@ -1180,7 +1180,7 @@ public final class URL implements java.io.Serializable {
* @return the content object of this URL that is the first match of
* the types specified in the classes array.
* null if none of the requested types are supported.
- * @exception IOException if an I/O exception occurs.
+ * @throws IOException if an I/O exception occurs.
* @see java.net.URLConnection#getContent(Class[])
* @since 1.3
*/
@@ -1208,8 +1208,8 @@ public final class URL implements java.io.Serializable {
* This could result in a SecurityException.
*
* @param fac the desired factory.
- * @exception Error if the application has already set a factory.
- * @exception SecurityException if a security manager exists and its
+ * @throws Error if the application has already set a factory.
+ * @throws SecurityException if a security manager exists and its
* {@code checkSetFactory} method doesn't allow
* the operation.
* @see java.net.URL#URL(java.lang.String, java.lang.String,
diff --git a/src/java.base/share/classes/java/net/URLClassLoader.java b/src/java.base/share/classes/java/net/URLClassLoader.java
index 43ea7786a15..88fb4ab5e54 100644
--- a/src/java.base/share/classes/java/net/URLClassLoader.java
+++ b/src/java.base/share/classes/java/net/URLClassLoader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, 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
@@ -99,12 +99,12 @@ public class URLClassLoader extends SecureClassLoader implements Closeable {
* calls the security manager's {@code checkCreateClassLoader} method
* to ensure creation of a class loader is allowed.
*
- * @param urls the URLs from which to load classes and resources
- * @param parent the parent class loader for delegation
- * @exception SecurityException if a security manager exists and its
+ * @param urls the URLs from which to load classes and resources
+ * @param parent the parent class loader for delegation
+ * @throws SecurityException if a security manager exists and its
* {@code checkCreateClassLoader} method doesn't allow
* creation of a class loader.
- * @exception NullPointerException if {@code urls} or any of its
+ * @throws NullPointerException if {@code urls} or any of its
* elements is {@code null}.
* @see SecurityManager#checkCreateClassLoader
*/
@@ -134,12 +134,12 @@ public class URLClassLoader extends SecureClassLoader implements Closeable {
* calls the security manager's {@code checkCreateClassLoader} method
* to ensure creation of a class loader is allowed.
*
- * @param urls the URLs from which to load classes and resources
+ * @param urls the URLs from which to load classes and resources
*
- * @exception SecurityException if a security manager exists and its
+ * @throws SecurityException if a security manager exists and its
* {@code checkCreateClassLoader} method doesn't allow
* creation of a class loader.
- * @exception NullPointerException if {@code urls} or any of its
+ * @throws NullPointerException if {@code urls} or any of its
* elements is {@code null}.
* @see SecurityManager#checkCreateClassLoader
*/
@@ -166,15 +166,15 @@ public class URLClassLoader extends SecureClassLoader implements Closeable {
* calls the security manager's {@code checkCreateClassLoader} method
* to ensure creation of a class loader is allowed.
*
- * @param urls the URLs from which to load classes and resources
- * @param parent the parent class loader for delegation
- * @param factory the URLStreamHandlerFactory to use when creating URLs
+ * @param urls the URLs from which to load classes and resources
+ * @param parent the parent class loader for delegation
+ * @param factory the URLStreamHandlerFactory to use when creating URLs
*
- * @exception SecurityException if a security manager exists and its
- * {@code checkCreateClassLoader} method doesn't allow
- * creation of a class loader.
- * @exception NullPointerException if {@code urls} or any of its
- * elements is {@code null}.
+ * @throws SecurityException if a security manager exists and its
+ * {@code checkCreateClassLoader} method doesn't allow
+ * creation of a class loader.
+ * @throws NullPointerException if {@code urls} or any of its
+ * elements is {@code null}.
* @see SecurityManager#checkCreateClassLoader
*/
public URLClassLoader(URL[] urls, ClassLoader parent,
@@ -326,13 +326,13 @@ public class URLClassLoader extends SecureClassLoader implements Closeable {
* and errors are not caught. Calling close on an already closed
* loader has no effect.
*
- * @exception IOException if closing any file opened by this class loader
+ * @throws IOException if closing any file opened by this class loader
* resulted in an IOException. Any such exceptions are caught internally.
* If only one is caught, then it is re-thrown. If more than one exception
* is caught, then the second and following exceptions are added
* as suppressed exceptions of the first one caught, which is then re-thrown.
*
- * @exception SecurityException if a security manager is set, and it denies
+ * @throws SecurityException if a security manager is set, and it denies
* {@link RuntimePermission}{@code ("closeClassLoader")}
*
* @since 1.7
@@ -401,11 +401,11 @@ public class URLClassLoader extends SecureClassLoader implements Closeable {
* path. Any URLs referring to JAR files are loaded and opened as needed
* until the class is found.
*
- * @param name the name of the class
- * @return the resulting class
- * @exception ClassNotFoundException if the class could not be found,
+ * @param name the name of the class
+ * @return the resulting class
+ * @throws ClassNotFoundException if the class could not be found,
* or if the loader is closed.
- * @exception NullPointerException if {@code name} is {@code null}.
+ * @throws NullPointerException if {@code name} is {@code null}.
*/
protected Class> findClass(final String name)
throws ClassNotFoundException
@@ -628,7 +628,7 @@ public class URLClassLoader extends SecureClassLoader implements Closeable {
* on the URL search path having the specified name.
*
* @param name the resource name
- * @exception IOException if an I/O exception occurs
+ * @throws IOException if an I/O exception occurs
* @return An {@code Enumeration} of {@code URL}s.
* If the loader is closed, the Enumeration contains no elements.
*/
@@ -696,7 +696,7 @@ public class URLClassLoader extends SecureClassLoader implements Closeable {
* If the protocol is not "file", then permission
* to connect to and accept connections from the URL's host is granted.
* @param codesource the codesource
- * @exception NullPointerException if {@code codesource} is {@code null}.
+ * @throws NullPointerException if {@code codesource} is {@code null}.
* @return the permissions granted to the codesource
*/
protected PermissionCollection getPermissions(CodeSource codesource)
@@ -776,7 +776,7 @@ public class URLClassLoader extends SecureClassLoader implements Closeable {
*
* @param urls the URLs to search for classes and resources
* @param parent the parent class loader for delegation
- * @exception NullPointerException if {@code urls} or any of its
+ * @throws NullPointerException if {@code urls} or any of its
* elements is {@code null}.
* @return the resulting class loader
*/
@@ -803,7 +803,7 @@ public class URLClassLoader extends SecureClassLoader implements Closeable {
* loading the class.
*
* @param urls the URLs to search for classes and resources
- * @exception NullPointerException if {@code urls} or any of its
+ * @throws NullPointerException if {@code urls} or any of its
* elements is {@code null}.
* @return the resulting class loader
*/
diff --git a/src/java.base/share/classes/java/net/URLConnection.java b/src/java.base/share/classes/java/net/URLConnection.java
index 74a0c682c33..a26cbc9bf4a 100644
--- a/src/java.base/share/classes/java/net/URLConnection.java
+++ b/src/java.base/share/classes/java/net/URLConnection.java
@@ -327,7 +327,7 @@ public abstract class URLConnection {
* This could result in a SecurityException.
*
* @param map the FileNameMap to be set
- * @exception SecurityException if a security manager exists and its
+ * @throws SecurityException if a security manager exists and its
* {@code checkSetFactory} method doesn't allow the operation.
* @see SecurityManager#checkSetFactory
* @see #getFileNameMap()
@@ -357,7 +357,7 @@ public abstract class URLConnection {
*
* @throws SocketTimeoutException if the timeout expires before
* the connection can be established
- * @exception IOException if an I/O error occurs while opening the
+ * @throws IOException if an I/O error occurs while opening the
* connection.
* @see java.net.URLConnection#connected
* @see #getConnectTimeout()
@@ -734,9 +734,9 @@ public abstract class URLConnection {
* @return the object fetched. The {@code instanceof} operator
* should be used to determine the specific kind of object
* returned.
- * @exception IOException if an I/O error occurs while
+ * @throws IOException if an I/O error occurs while
* getting the content.
- * @exception UnknownServiceException if the protocol does not support
+ * @throws UnknownServiceException if the protocol does not support
* the content type.
* @see java.net.ContentHandlerFactory#createContentHandler(java.lang.String)
* @see java.net.URLConnection#getContentType()
@@ -760,9 +760,9 @@ public abstract class URLConnection {
* the requested types are supported.
* The {@code instanceof} operator should be used to
* determine the specific kind of object returned.
- * @exception IOException if an I/O error occurs while
+ * @throws IOException if an I/O error occurs while
* getting the content.
- * @exception UnknownServiceException if the protocol does not support
+ * @throws UnknownServiceException if the protocol does not support
* the content type.
* @see java.net.URLConnection#getContent()
* @see java.net.ContentHandlerFactory#createContentHandler(java.lang.String)
@@ -813,7 +813,7 @@ public abstract class URLConnection {
* necessary to make the connection represented by this
* URLConnection.
*
- * @exception IOException if the computation of the permission
+ * @throws IOException if the computation of the permission
* requires network or file I/O and an exception occurs while
* computing it.
*/
@@ -829,9 +829,9 @@ public abstract class URLConnection {
* is available for read.
*
* @return an input stream that reads from this open connection.
- * @exception IOException if an I/O error occurs while
+ * @throws IOException if an I/O error occurs while
* creating the input stream.
- * @exception UnknownServiceException if the protocol does not support
+ * @throws UnknownServiceException if the protocol does not support
* input.
* @see #setReadTimeout(int)
* @see #getReadTimeout()
@@ -844,9 +844,9 @@ public abstract class URLConnection {
* Returns an output stream that writes to this connection.
*
* @return an output stream that writes to this connection.
- * @exception IOException if an I/O error occurs while
+ * @throws IOException if an I/O error occurs while
* creating the output stream.
- * @exception UnknownServiceException if the protocol does not support
+ * @throws UnknownServiceException if the protocol does not support
* output.
*/
public OutputStream getOutputStream() throws IOException {
@@ -1250,8 +1250,8 @@ public abstract class URLConnection {
* This could result in a SecurityException.
*
* @param fac the desired factory.
- * @exception Error if the factory has already been defined.
- * @exception SecurityException if a security manager exists and its
+ * @throws Error if the factory has already been defined.
+ * @throws SecurityException if a security manager exists and its
* {@code checkSetFactory} method doesn't allow the operation.
* @see java.net.ContentHandlerFactory
* @see java.net.URLConnection#getContent()
@@ -1479,7 +1479,7 @@ public abstract class URLConnection {
* @param is an input stream that supports marks.
* @return a guess at the content type, or {@code null} if none
* can be determined.
- * @exception IOException if an I/O error occurs while reading the
+ * @throws IOException if an I/O error occurs while reading the
* input stream.
* @see java.io.InputStream#mark(int)
* @see java.io.InputStream#markSupported()
diff --git a/src/java.base/share/classes/java/net/URLPermission.java b/src/java.base/share/classes/java/net/URLPermission.java
index f670cd893fb..98e87e3820f 100644
--- a/src/java.base/share/classes/java/net/URLPermission.java
+++ b/src/java.base/share/classes/java/net/URLPermission.java
@@ -175,7 +175,7 @@ public final class URLPermission extends Permission {
*
* @param actions the actions string
*
- * @exception IllegalArgumentException if url is invalid or if actions contains white-space.
+ * @throws IllegalArgumentException if url is invalid or if actions contains white-space.
*/
public URLPermission(String url, String actions) {
super(normalize(url));
diff --git a/src/java.base/share/classes/java/net/URLStreamHandler.java b/src/java.base/share/classes/java/net/URLStreamHandler.java
index 80e7d8856a4..6bf51ab4d39 100644
--- a/src/java.base/share/classes/java/net/URLStreamHandler.java
+++ b/src/java.base/share/classes/java/net/URLStreamHandler.java
@@ -66,7 +66,7 @@ public abstract class URLStreamHandler {
*
* @param u the URL that this connects to.
* @return a {@code URLConnection} object for the {@code URL}.
- * @exception IOException if an I/O error occurs while opening the
+ * @throws IOException if an I/O error occurs while opening the
* connection.
*/
protected abstract URLConnection openConnection(URL u) throws IOException;
@@ -91,11 +91,11 @@ public abstract class URLStreamHandler {
* If direct connection is desired, Proxy.NO_PROXY
* should be specified.
* @return a {@code URLConnection} object for the {@code URL}.
- * @exception IOException if an I/O error occurs while opening the
+ * @throws IOException if an I/O error occurs while opening the
* connection.
- * @exception IllegalArgumentException if either u or p is null,
+ * @throws IllegalArgumentException if either u or p is null,
* or p has the wrong type.
- * @exception UnsupportedOperationException if the subclass that
+ * @throws UnsupportedOperationException if the subclass that
* implements the protocol doesn't support this method.
* @since 1.5
*/
@@ -510,7 +510,7 @@ public abstract class URLStreamHandler {
* @param path the path component of the URL.
* @param query the query part for the URL.
* @param ref the reference.
- * @exception SecurityException if the protocol handler of the URL is
+ * @throws SecurityException if the protocol handler of the URL is
* different from this one
* @since 1.3
*/
@@ -539,7 +539,7 @@ public abstract class URLStreamHandler {
* @param port the port on the remote machine.
* @param file the file.
* @param ref the reference.
- * @exception SecurityException if the protocol handler of the URL is
+ * @throws SecurityException if the protocol handler of the URL is
* different from this one
* @deprecated Use setURL(URL, String, String, int, String, String, String,
* String);
diff --git a/src/java.base/share/classes/java/nio/Buffer.java b/src/java.base/share/classes/java/nio/Buffer.java
index c5e538554ea..bd903736d9d 100644
--- a/src/java.base/share/classes/java/nio/Buffer.java
+++ b/src/java.base/share/classes/java/nio/Buffer.java
@@ -249,8 +249,8 @@ public abstract class Buffer {
* @param capacity
* The new buffer's capacity, in $type$s
*
- * @throws IllegalArgumentException
- * If the {@code capacity} is a negative integer
+ * @throws IllegalArgumentException
+ * If the {@code capacity} is a negative integer
*/
static IllegalArgumentException createCapacityException(int capacity) {
assert capacity < 0 : "capacity expected to be negative";
diff --git a/src/java.base/share/classes/java/nio/MappedByteBuffer.java b/src/java.base/share/classes/java/nio/MappedByteBuffer.java
index a62709982cc..22e1ad818ed 100644
--- a/src/java.base/share/classes/java/nio/MappedByteBuffer.java
+++ b/src/java.base/share/classes/java/nio/MappedByteBuffer.java
@@ -322,14 +322,14 @@ public abstract class MappedByteBuffer
* mapping modes. This method may or may not have an effect for
* implementation-specific mapping modes. text is null.
+ * @throws NullPointerException if text is null.
*/
public AttributedString(String text) {
if (text == null) {
@@ -130,9 +130,9 @@ public class AttributedString {
* Constructs an AttributedString instance with the given text and attributes.
* @param text The text for this attributed string.
* @param attributes The attributes that apply to the entire string.
- * @exception NullPointerException if text or
+ * @throws NullPointerException if text or
* attributes is null.
- * @exception IllegalArgumentException if the text has length 0
+ * @throws IllegalArgumentException if the text has length 0
* and the attributes parameter is not an empty Map (attributes
* cannot be applied to a 0-length range).
*/
@@ -171,7 +171,7 @@ public class AttributedString {
* Constructs an AttributedString instance with the given attributed
* text represented by AttributedCharacterIterator.
* @param text The text for this attributed string.
- * @exception NullPointerException if text is null.
+ * @throws NullPointerException if text is null.
*/
public AttributedString(AttributedCharacterIterator text) {
// If performance is critical, this constructor should be
@@ -192,8 +192,8 @@ public class AttributedString {
* @param beginIndex Index of the first character of the range.
* @param endIndex Index of the character following the last character
* of the range.
- * @exception NullPointerException if text is null.
- * @exception IllegalArgumentException if the subrange given by
+ * @throws NullPointerException if text is null.
+ * @throws IllegalArgumentException if the subrange given by
* beginIndex and endIndex is out of the text range.
* @see java.text.Annotation
*/
@@ -220,8 +220,8 @@ public class AttributedString {
* @param attributes Specifies attributes to be extracted
* from the text. If null is specified, all available attributes will
* be used.
- * @exception NullPointerException if text is null.
- * @exception IllegalArgumentException if the subrange given by
+ * @throws NullPointerException if text is null.
+ * @throws IllegalArgumentException if the subrange given by
* beginIndex and endIndex is out of the text range.
* @see java.text.Annotation
*/
@@ -307,8 +307,8 @@ public class AttributedString {
* Adds an attribute to the entire string.
* @param attribute the attribute key
* @param value the value of the attribute; may be null
- * @exception NullPointerException if attribute is null.
- * @exception IllegalArgumentException if the AttributedString has length 0
+ * @throws NullPointerException if attribute is null.
+ * @throws IllegalArgumentException if the AttributedString has length 0
* (attributes cannot be applied to a 0-length range).
*/
public void addAttribute(Attribute attribute, Object value) {
@@ -331,8 +331,8 @@ public class AttributedString {
* @param value The value of the attribute. May be null.
* @param beginIndex Index of the first character of the range.
* @param endIndex Index of the character following the last character of the range.
- * @exception NullPointerException if attribute is null.
- * @exception IllegalArgumentException if beginIndex is less than 0, endIndex is
+ * @throws NullPointerException if attribute is null.
+ * @throws IllegalArgumentException if beginIndex is less than 0, endIndex is
* greater than the length of the string, or beginIndex and endIndex together don't
* define a non-empty subrange of the string.
*/
@@ -356,8 +356,8 @@ public class AttributedString {
* @param beginIndex Index of the first character of the range.
* @param endIndex Index of the character following the last
* character of the range.
- * @exception NullPointerException if attributes is null.
- * @exception IllegalArgumentException if beginIndex is less than
+ * @throws NullPointerException if attributes is null.
+ * @throws IllegalArgumentException if beginIndex is less than
* 0, endIndex is greater than the length of the string, or
* beginIndex and endIndex together don't define a non-empty
* subrange of the string and the attributes parameter is not an
@@ -580,7 +580,7 @@ public class AttributedString {
* @param beginIndex the index of the first character
* @param endIndex the index of the character following the last character
* @return an iterator providing access to the text and its attributes
- * @exception IllegalArgumentException if beginIndex is less than 0,
+ * @throws IllegalArgumentException if beginIndex is less than 0,
* endIndex is greater than the length of the string, or beginIndex is
* greater than endIndex.
*/
diff --git a/src/java.base/share/classes/java/text/BreakIterator.java b/src/java.base/share/classes/java/text/BreakIterator.java
index ffb5d5938e5..1bc930c852e 100644
--- a/src/java.base/share/classes/java/text/BreakIterator.java
+++ b/src/java.base/share/classes/java/text/BreakIterator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2019, 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
@@ -327,7 +327,7 @@ public abstract class BreakIterator implements Cloneable
* @return The first boundary after the specified offset or
* BreakIterator.DONE if the last text boundary is passed in
* as the offset.
- * @exception IllegalArgumentException if the specified offset is less than
+ * @throws IllegalArgumentException if the specified offset is less than
* the first text boundary or greater than the last text boundary.
*/
public abstract int following(int offset);
@@ -343,7 +343,7 @@ public abstract class BreakIterator implements Cloneable
* @return The last boundary before the specified offset or
* BreakIterator.DONE if the first text boundary is passed in
* as the offset.
- * @exception IllegalArgumentException if the specified offset is less than
+ * @throws IllegalArgumentException if the specified offset is less than
* the first text boundary or greater than the last text boundary.
* @since 1.2
*/
@@ -363,7 +363,7 @@ public abstract class BreakIterator implements Cloneable
* @param offset the character offset to check.
* @return true if "offset" is a boundary position,
* false otherwise.
- * @exception IllegalArgumentException if the specified offset is less than
+ * @throws IllegalArgumentException if the specified offset is less than
* the first text boundary or greater than the last text boundary.
* @since 1.2
*/
@@ -453,7 +453,7 @@ public abstract class BreakIterator implements Cloneable
* for the given locale.
* @param locale the desired locale
* @return A break iterator for word breaks
- * @exception NullPointerException if locale is null
+ * @throws NullPointerException if locale is null
*/
public static BreakIterator getWordInstance(Locale locale)
{
@@ -477,7 +477,7 @@ public abstract class BreakIterator implements Cloneable
* for the given locale.
* @param locale the desired locale
* @return A break iterator for line breaks
- * @exception NullPointerException if locale is null
+ * @throws NullPointerException if locale is null
*/
public static BreakIterator getLineInstance(Locale locale)
{
@@ -501,7 +501,7 @@ public abstract class BreakIterator implements Cloneable
* for the given locale.
* @param locale the desired locale
* @return A break iterator for character breaks
- * @exception NullPointerException if locale is null
+ * @throws NullPointerException if locale is null
*/
public static BreakIterator getCharacterInstance(Locale locale)
{
@@ -525,7 +525,7 @@ public abstract class BreakIterator implements Cloneable
* for the given locale.
* @param locale the desired locale
* @return A break iterator for sentence breaks
- * @exception NullPointerException if locale is null
+ * @throws NullPointerException if locale is null
*/
public static BreakIterator getSentenceInstance(Locale locale)
{
diff --git a/src/java.base/share/classes/java/text/ChoiceFormat.java b/src/java.base/share/classes/java/text/ChoiceFormat.java
index 5d7f2bc48ff..0254e4e5ea2 100644
--- a/src/java.base/share/classes/java/text/ChoiceFormat.java
+++ b/src/java.base/share/classes/java/text/ChoiceFormat.java
@@ -174,7 +174,7 @@ public class ChoiceFormat extends NumberFormat {
/**
* Sets the pattern.
* @param newPattern See the class description.
- * @exception NullPointerException if {@code newPattern}
+ * @throws NullPointerException if {@code newPattern}
* is {@code null}
*/
public void applyPattern(String newPattern) {
@@ -313,7 +313,7 @@ public class ChoiceFormat extends NumberFormat {
* Constructs with limits and corresponding formats based on the pattern.
*
* @param newPattern the new pattern string
- * @exception NullPointerException if {@code newPattern} is
+ * @throws NullPointerException if {@code newPattern} is
* {@code null}
* @see #applyPattern
*/
@@ -326,7 +326,7 @@ public class ChoiceFormat extends NumberFormat {
*
* @param limits limits in ascending order
* @param formats corresponding format strings
- * @exception NullPointerException if {@code limits} or {@code formats}
+ * @throws NullPointerException if {@code limits} or {@code formats}
* is {@code null}
* @see #setChoices
*/
@@ -347,7 +347,7 @@ public class ChoiceFormat extends NumberFormat {
* When formatting with object Y,
* if the object is a NumberFormat, then ((NumberFormat) Y).format(X)
* is called. Otherwise Y.toString() is called.
- * @exception NullPointerException if {@code limits} or
+ * @throws NullPointerException if {@code limits} or
* {@code formats} is {@code null}
*/
public void setChoices(double[] limits, String formats[]) {
@@ -396,7 +396,7 @@ public class ChoiceFormat extends NumberFormat {
* @param number number to be formatted and substituted.
* @param toAppendTo where text is appended.
* @param status ignore no useful status is returned.
- * @exception NullPointerException if {@code toAppendTo}
+ * @throws NullPointerException if {@code toAppendTo}
* is {@code null}
*/
public StringBuffer format(double number, StringBuffer toAppendTo,
@@ -426,7 +426,7 @@ public class ChoiceFormat extends NumberFormat {
* status.index is unchanged and status.errorIndex is set to the
* first index of the character that caused the parse to fail.
* @return A Number representing the value of the number parsed.
- * @exception NullPointerException if {@code status} is {@code null}
+ * @throws NullPointerException if {@code status} is {@code null}
* or if {@code text} is {@code null} and the list of
* choice strings is not empty.
*/
diff --git a/src/java.base/share/classes/java/text/CollationKey.java b/src/java.base/share/classes/java/text/CollationKey.java
index 318f3c4d26b..f88a66f6e5c 100644
--- a/src/java.base/share/classes/java/text/CollationKey.java
+++ b/src/java.base/share/classes/java/text/CollationKey.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, 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
@@ -136,7 +136,7 @@ public abstract class CollationKey implements ComparableString whose beginning should be parsed.
* @return A Date parsed from the string.
- * @exception ParseException if the beginning of the specified string
+ * @throws ParseException if the beginning of the specified string
* cannot be parsed.
*/
public Date parse(String source) throws ParseException
diff --git a/src/java.base/share/classes/java/text/DateFormatSymbols.java b/src/java.base/share/classes/java/text/DateFormatSymbols.java
index dc925bc33f4..3be9f008e6b 100644
--- a/src/java.base/share/classes/java/text/DateFormatSymbols.java
+++ b/src/java.base/share/classes/java/text/DateFormatSymbols.java
@@ -122,7 +122,7 @@ public class DateFormatSymbols implements Serializable, Cloneable {
* @see #getInstance()
* @see java.util.Locale#getDefault(java.util.Locale.Category)
* @see java.util.Locale.Category#FORMAT
- * @exception java.util.MissingResourceException
+ * @throws java.util.MissingResourceException
* if the resources for the default locale cannot be
* found or cannot be loaded.
*/
@@ -142,7 +142,7 @@ public class DateFormatSymbols implements Serializable, Cloneable {
*
* @param locale the desired locale
* @see #getInstance(Locale)
- * @exception java.util.MissingResourceException
+ * @throws java.util.MissingResourceException
* if the resources for the specified locale cannot be
* found or cannot be loaded.
*/
@@ -340,7 +340,7 @@ public class DateFormatSymbols implements Serializable, Cloneable {
* implementations.
* @param locale the given locale.
* @return a DateFormatSymbols instance.
- * @exception NullPointerException if locale is null
+ * @throws NullPointerException if locale is null
* @since 1.6
*/
public static final DateFormatSymbols getInstance(Locale locale) {
@@ -596,9 +596,9 @@ public class DateFormatSymbols implements Serializable, Cloneable {
* All other entries are localized names.
*
* @param newZoneStrings the new time zone strings.
- * @exception IllegalArgumentException if the length of any row in
+ * @throws IllegalArgumentException if the length of any row in
* newZoneStrings is less than 5
- * @exception NullPointerException if newZoneStrings is null
+ * @throws NullPointerException if newZoneStrings is null
* @see #getZoneStrings()
*/
public void setZoneStrings(String[][] newZoneStrings) {
diff --git a/src/java.base/share/classes/java/text/DecimalFormat.java b/src/java.base/share/classes/java/text/DecimalFormat.java
index ab9ed947e5e..af6bde79431 100644
--- a/src/java.base/share/classes/java/text/DecimalFormat.java
+++ b/src/java.base/share/classes/java/text/DecimalFormat.java
@@ -425,8 +425,8 @@ public class DecimalFormat extends NumberFormat {
* locale.
*
* @param pattern a non-localized pattern string.
- * @exception NullPointerException if {@code pattern} is null
- * @exception IllegalArgumentException if the given pattern is invalid.
+ * @throws NullPointerException if {@code pattern} is null
+ * @throws IllegalArgumentException if the given pattern is invalid.
* @see java.text.NumberFormat#getInstance
* @see java.text.NumberFormat#getNumberInstance
* @see java.text.NumberFormat#getCurrencyInstance
@@ -452,8 +452,8 @@ public class DecimalFormat extends NumberFormat {
*
* @param pattern a non-localized pattern string
* @param symbols the set of symbols to be used
- * @exception NullPointerException if any of the given arguments is null
- * @exception IllegalArgumentException if the given pattern is invalid
+ * @throws NullPointerException if any of the given arguments is null
+ * @throws IllegalArgumentException if the given pattern is invalid
* @see java.text.NumberFormat#getInstance
* @see java.text.NumberFormat#getNumberInstance
* @see java.text.NumberFormat#getCurrencyInstance
@@ -486,11 +486,11 @@ public class DecimalFormat extends NumberFormat {
* to 0 and 9, respectively for the output string
* {@code 1,234,567.89}.
* @return the value passed in as {@code toAppendTo}
- * @exception IllegalArgumentException if {@code number} is
+ * @throws IllegalArgumentException if {@code number} is
* null or not an instance of {@code Number}.
- * @exception NullPointerException if {@code toAppendTo} or
+ * @throws NullPointerException if {@code toAppendTo} or
* {@code pos} is null
- * @exception ArithmeticException if rounding is needed with rounding
+ * @throws ArithmeticException if rounding is needed with rounding
* mode being set to RoundingMode.UNNECESSARY
* @see java.text.FieldPosition
*/
@@ -528,9 +528,9 @@ public class DecimalFormat extends NumberFormat {
* and end index of {@code fieldPosition} will be set
* to 0 and 9, respectively for the output string
* {@code 1,234,567.89}.
- * @exception NullPointerException if {@code result} or
+ * @throws NullPointerException if {@code result} or
* {@code fieldPosition} is {@code null}
- * @exception ArithmeticException if rounding is needed with rounding
+ * @throws ArithmeticException if rounding is needed with rounding
* mode being set to RoundingMode.UNNECESSARY
* @return The formatted number string
* @see java.text.FieldPosition
@@ -565,7 +565,7 @@ public class DecimalFormat extends NumberFormat {
* @param number The double to format
* @param result where the text is to be appended
* @param delegate notified of locations of sub fields
- * @exception ArithmeticException if rounding is needed with rounding
+ * @throws ArithmeticException if rounding is needed with rounding
* mode being set to RoundingMode.UNNECESSARY
* @return The formatted number string
*/
@@ -698,9 +698,9 @@ public class DecimalFormat extends NumberFormat {
* and end index of {@code fieldPosition} will be set
* to 0 and 11, respectively for the output string
* {@code 123,456,789}.
- * @exception NullPointerException if {@code result} or
+ * @throws NullPointerException if {@code result} or
* {@code fieldPosition} is {@code null}
- * @exception ArithmeticException if rounding is needed with rounding
+ * @throws ArithmeticException if rounding is needed with rounding
* mode being set to RoundingMode.UNNECESSARY
* @return The formatted number string
* @see java.text.FieldPosition
@@ -720,7 +720,7 @@ public class DecimalFormat extends NumberFormat {
* @param result where the text is to be appended
* @param delegate notified of locations of sub fields
* @return The formatted number string
- * @exception ArithmeticException if rounding is needed with rounding
+ * @throws ArithmeticException if rounding is needed with rounding
* mode being set to RoundingMode.UNNECESSARY
* @see java.text.FieldPosition
*/
@@ -795,7 +795,7 @@ public class DecimalFormat extends NumberFormat {
* to 0 and 9, respectively for the output string
* {@code 1,234,567.89}.
* @return The formatted number string
- * @exception ArithmeticException if rounding is needed with rounding
+ * @throws ArithmeticException if rounding is needed with rounding
* mode being set to RoundingMode.UNNECESSARY
* @see java.text.FieldPosition
*/
@@ -811,7 +811,7 @@ public class DecimalFormat extends NumberFormat {
* @param number The BigDecimal to format
* @param result where the text is to be appended
* @param delegate notified of locations of sub fields
- * @exception ArithmeticException if rounding is needed with rounding
+ * @throws ArithmeticException if rounding is needed with rounding
* mode being set to RoundingMode.UNNECESSARY
* @return The formatted number string
*/
@@ -854,7 +854,7 @@ public class DecimalFormat extends NumberFormat {
* to 0 and 11, respectively for the output string
* {@code 123,456,789}.
* @return The formatted number string
- * @exception ArithmeticException if rounding is needed with rounding
+ * @throws ArithmeticException if rounding is needed with rounding
* mode being set to RoundingMode.UNNECESSARY
* @see java.text.FieldPosition
*/
@@ -872,7 +872,7 @@ public class DecimalFormat extends NumberFormat {
* @param result where the text is to be appended
* @param delegate notified of locations of sub fields
* @return The formatted number string
- * @exception ArithmeticException if rounding is needed with rounding
+ * @throws ArithmeticException if rounding is needed with rounding
* mode being set to RoundingMode.UNNECESSARY
* @see java.text.FieldPosition
*/
@@ -923,10 +923,10 @@ public class DecimalFormat extends NumberFormat {
* {@code NumberFormat.Field}, with the attribute value being the
* same as the attribute key.
*
- * @exception NullPointerException if obj is null.
- * @exception IllegalArgumentException when the Format cannot format the
+ * @throws NullPointerException if obj is null.
+ * @throws IllegalArgumentException when the Format cannot format the
* given object.
- * @exception ArithmeticException if rounding is needed with rounding
+ * @throws ArithmeticException if rounding is needed with rounding
* mode being set to RoundingMode.UNNECESSARY
* @param obj The object to format
* @return AttributedCharacterIterator describing the formatted value.
@@ -2130,7 +2130,7 @@ public class DecimalFormat extends NumberFormat {
* @param pos A {@code ParsePosition} object with index and error
* index information as described above.
* @return the parsed value, or {@code null} if the parse fails
- * @exception NullPointerException if {@code text} or
+ * @throws NullPointerException if {@code text} or
* {@code pos} is null.
*/
@Override
@@ -3254,8 +3254,8 @@ public class DecimalFormat extends NumberFormat {
* these are presumed to be set in the positive pattern.
*
* @param pattern a new pattern
- * @exception NullPointerException if {@code pattern} is null
- * @exception IllegalArgumentException if the given pattern is invalid.
+ * @throws NullPointerException if {@code pattern} is null
+ * @throws IllegalArgumentException if the given pattern is invalid.
*/
public void applyPattern(String pattern) {
applyPattern(pattern, false);
@@ -3281,8 +3281,8 @@ public class DecimalFormat extends NumberFormat {
* these are presumed to be set in the positive pattern.
*
* @param pattern a new pattern
- * @exception NullPointerException if {@code pattern} is null
- * @exception IllegalArgumentException if the given pattern is invalid.
+ * @throws NullPointerException if {@code pattern} is null
+ * @throws IllegalArgumentException if the given pattern is invalid.
*/
public void applyLocalizedPattern(String pattern) {
applyPattern(pattern, true);
@@ -3782,7 +3782,7 @@ public class DecimalFormat extends NumberFormat {
* on this number format's symbols.
*
* @param currency the new currency to be used by this decimal format
- * @exception NullPointerException if {@code currency} is null
+ * @throws NullPointerException if {@code currency} is null
* @since 1.4
*/
@Override
@@ -3813,7 +3813,7 @@ public class DecimalFormat extends NumberFormat {
*
* @param roundingMode The {@code RoundingMode} to be used
* @see #getRoundingMode()
- * @exception NullPointerException if {@code roundingMode} is null.
+ * @throws NullPointerException if {@code roundingMode} is null.
* @since 1.6
*/
@Override
diff --git a/src/java.base/share/classes/java/text/DecimalFormatSymbols.java b/src/java.base/share/classes/java/text/DecimalFormatSymbols.java
index 6f2aa46897d..4d33852aada 100644
--- a/src/java.base/share/classes/java/text/DecimalFormatSymbols.java
+++ b/src/java.base/share/classes/java/text/DecimalFormatSymbols.java
@@ -109,7 +109,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable {
* instead of the Latin numbering system.
*
* @param locale the desired locale
- * @exception NullPointerException if {@code locale} is null
+ * @throws NullPointerException if {@code locale} is null
*/
public DecimalFormatSymbols( Locale locale ) {
initialize( locale );
@@ -172,7 +172,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable {
*
* @param locale the desired locale.
* @return a {@code DecimalFormatSymbols} instance.
- * @exception NullPointerException if {@code locale} is null
+ * @throws NullPointerException if {@code locale} is null
* @since 1.6
*/
public static final DecimalFormatSymbols getInstance(Locale locale) {
@@ -576,7 +576,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable {
* symbol attribute to the currency's ISO 4217 currency code.
*
* @param currency the new currency to be used
- * @exception NullPointerException if {@code currency} is null
+ * @throws NullPointerException if {@code currency} is null
* @since 1.4
* @see #setCurrencySymbol
* @see #setInternationalCurrencySymbol
@@ -652,7 +652,7 @@ public class DecimalFormatSymbols implements Cloneable, Serializable {
* Examples: "x10^" for 1.23x10^4, "E" for 1.23E4.
*
* @param exp the exponent separator string
- * @exception NullPointerException if {@code exp} is null
+ * @throws NullPointerException if {@code exp} is null
* @see #getExponentSeparator()
* @since 1.6
*/
diff --git a/src/java.base/share/classes/java/text/DigitList.java b/src/java.base/share/classes/java/text/DigitList.java
index 708e3e64575..a40c151b84b 100644
--- a/src/java.base/share/classes/java/text/DigitList.java
+++ b/src/java.base/share/classes/java/text/DigitList.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2019, 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
@@ -445,7 +445,7 @@ final class DigitList implements Cloneable {
* @param alreadyRounded whether or not rounding up has already happened.
* @param valueExactAsDecimal whether or not collected digits provide
* an exact decimal representation of the value.
- * @exception ArithmeticException if rounding is needed with rounding
+ * @throws ArithmeticException if rounding is needed with rounding
* mode being set to RoundingMode.UNNECESSARY
* @return true if digit maximumDigits-1 should be
* incremented
diff --git a/src/java.base/share/classes/java/text/Format.java b/src/java.base/share/classes/java/text/Format.java
index e10aab9d001..b71bb18d64a 100644
--- a/src/java.base/share/classes/java/text/Format.java
+++ b/src/java.base/share/classes/java/text/Format.java
@@ -152,7 +152,7 @@ public abstract class Format implements Serializable, Cloneable {
*
* @param obj The object to format
* @return Formatted string.
- * @exception IllegalArgumentException if the Format cannot format the given
+ * @throws IllegalArgumentException if the Format cannot format the given
* object
*/
public final String format (Object obj) {
@@ -172,9 +172,9 @@ public abstract class Format implements Serializable, Cloneable {
* in the formatted text
* @return the string buffer passed in as toAppendTo,
* with formatted text appended
- * @exception NullPointerException if toAppendTo or
+ * @throws NullPointerException if toAppendTo or
* pos is null
- * @exception IllegalArgumentException if the Format cannot format the given
+ * @throws IllegalArgumentException if the Format cannot format the given
* object
*/
public abstract StringBuffer format(Object obj,
@@ -197,8 +197,8 @@ public abstract class Format implements Serializable, Cloneable {
* that support fields should override this and create an
* AttributedCharacterIterator with meaningful attributes.
*
- * @exception NullPointerException if obj is null.
- * @exception IllegalArgumentException when the Format cannot format the
+ * @throws NullPointerException if obj is null.
+ * @throws IllegalArgumentException when the Format cannot format the
* given object.
* @param obj The object to format
* @return AttributedCharacterIterator describing the formatted value.
@@ -237,7 +237,7 @@ public abstract class Format implements Serializable, Cloneable {
*
* @param source A String whose beginning should be parsed.
* @return An Object parsed from the string.
- * @exception ParseException if the beginning of the specified string
+ * @throws ParseException if the beginning of the specified string
* cannot be parsed.
* @throws NullPointerException if {@code source} is null.
*/
diff --git a/src/java.base/share/classes/java/text/MergeCollation.java b/src/java.base/share/classes/java/text/MergeCollation.java
index 1bfcbf018ac..1b092ed207a 100644
--- a/src/java.base/share/classes/java/text/MergeCollation.java
+++ b/src/java.base/share/classes/java/text/MergeCollation.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2019, 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
@@ -64,7 +64,7 @@ final class MergeCollation {
/**
* Creates from a pattern
- * @exception ParseException If the input pattern is incorrect.
+ * @throws ParseException If the input pattern is incorrect.
*/
public MergeCollation(String pattern) throws ParseException
{
diff --git a/src/java.base/share/classes/java/text/MessageFormat.java b/src/java.base/share/classes/java/text/MessageFormat.java
index 7697280161f..37c623f445e 100644
--- a/src/java.base/share/classes/java/text/MessageFormat.java
+++ b/src/java.base/share/classes/java/text/MessageFormat.java
@@ -362,8 +362,8 @@ public class MessageFormat extends Format {
* class description.
*
* @param pattern the pattern for this message format
- * @exception IllegalArgumentException if the pattern is invalid
- * @exception NullPointerException if {@code pattern} is
+ * @throws IllegalArgumentException if the pattern is invalid
+ * @throws NullPointerException if {@code pattern} is
* {@code null}
*/
public MessageFormat(String pattern) {
@@ -381,8 +381,8 @@ public class MessageFormat extends Format {
*
* @param pattern the pattern for this message format
* @param locale the locale for this message format
- * @exception IllegalArgumentException if the pattern is invalid
- * @exception NullPointerException if {@code pattern} is
+ * @throws IllegalArgumentException if the pattern is invalid
+ * @throws NullPointerException if {@code pattern} is
* {@code null}
* @since 1.4
*/
@@ -430,8 +430,8 @@ public class MessageFormat extends Format {
* class description.
*
* @param pattern the pattern for this message format
- * @exception IllegalArgumentException if the pattern is invalid
- * @exception NullPointerException if {@code pattern} is
+ * @throws IllegalArgumentException if the pattern is invalid
+ * @throws NullPointerException if {@code pattern} is
* {@code null}
*/
@SuppressWarnings("fallthrough") // fallthrough in switch is expected, suppress it
@@ -614,7 +614,7 @@ public class MessageFormat extends Format {
* than newFormats.length are replaced.
*
* @param newFormats the new formats to use
- * @exception NullPointerException if newFormats is null
+ * @throws NullPointerException if newFormats is null
* @since 1.4
*/
public void setFormatsByArgumentIndex(Format[] newFormats) {
@@ -646,7 +646,7 @@ public class MessageFormat extends Format {
* the parse methods.
*
* @param newFormats the new formats to use
- * @exception NullPointerException if newFormats is null
+ * @throws NullPointerException if newFormats is null
*/
public void setFormats(Format[] newFormats) {
int runsToCopy = newFormats.length;
@@ -698,7 +698,7 @@ public class MessageFormat extends Format {
*
* @param formatElementIndex the index of a format element within the pattern
* @param newFormat the format to use for the specified format element
- * @exception ArrayIndexOutOfBoundsException if {@code formatElementIndex} is equal to or
+ * @throws ArrayIndexOutOfBoundsException if {@code formatElementIndex} is equal to or
* larger than the number of format elements in the pattern string
*/
public void setFormat(int formatElementIndex, Format newFormat) {
@@ -829,10 +829,10 @@ public class MessageFormat extends Format {
in the output string.
* @return the string buffer passed in as {@code result}, with formatted
* text appended
- * @exception IllegalArgumentException if an argument in the
+ * @throws IllegalArgumentException if an argument in the
* arguments array is not of the type
* expected by the format element(s) that use it.
- * @exception NullPointerException if {@code result} is {@code null}
+ * @throws NullPointerException if {@code result} is {@code null}
*/
public final StringBuffer format(Object[] arguments, StringBuffer result,
FieldPosition pos)
@@ -850,11 +850,11 @@ public class MessageFormat extends Format {
* @param pattern the pattern string
* @param arguments object(s) to format
* @return the formatted string
- * @exception IllegalArgumentException if the pattern is invalid,
+ * @throws IllegalArgumentException if the pattern is invalid,
* or if an argument in the arguments array
* is not of the type expected by the format element(s)
* that use it.
- * @exception NullPointerException if {@code pattern} is {@code null}
+ * @throws NullPointerException if {@code pattern} is {@code null}
*/
public static String format(String pattern, Object ... arguments) {
MessageFormat temp = new MessageFormat(pattern);
@@ -875,10 +875,10 @@ public class MessageFormat extends Format {
* @param result where text is appended.
* @param pos keeps track on the position of the first replaced argument
* in the output string.
- * @exception IllegalArgumentException if an argument in the
+ * @throws IllegalArgumentException if an argument in the
* arguments array is not of the type
* expected by the format element(s) that use it.
- * @exception NullPointerException if {@code result} is {@code null}
+ * @throws NullPointerException if {@code result} is {@code null}
*/
public final StringBuffer format(Object arguments, StringBuffer result,
FieldPosition pos)
@@ -915,8 +915,8 @@ public class MessageFormat extends Format {
*
* @param arguments an array of objects to be formatted and substituted.
* @return AttributedCharacterIterator describing the formatted value.
- * @exception NullPointerException if arguments is null.
- * @exception IllegalArgumentException if an argument in the
+ * @throws NullPointerException if arguments is null.
+ * @throws IllegalArgumentException if an argument in the
* arguments array is not of the type
* expected by the format element(s) that use it.
* @since 1.4
@@ -968,7 +968,7 @@ public class MessageFormat extends Format {
* @param source the string to parse
* @param pos the parse position
* @return an array of parsed objects
- * @exception NullPointerException if {@code pos} is {@code null}
+ * @throws NullPointerException if {@code pos} is {@code null}
* for a non-null {@code source} string.
*/
public Object[] parse(String source, ParsePosition pos) {
@@ -1057,7 +1057,7 @@ public class MessageFormat extends Format {
*
* @param source A String whose beginning should be parsed.
* @return An Object array parsed from the string.
- * @exception ParseException if the beginning of the specified string
+ * @throws ParseException if the beginning of the specified string
* cannot be parsed.
*/
public Object[] parse(String source) throws ParseException {
@@ -1253,7 +1253,7 @@ public class MessageFormat extends Format {
* {@code Field.ARGUMENT} as the field attribute, the location of
* the first replaced argument will be set in it.
*
- * @exception IllegalArgumentException if an argument in the
+ * @throws IllegalArgumentException if an argument in the
* arguments array is not of the type
* expected by the format element(s) that use it.
*/
diff --git a/src/java.base/share/classes/java/text/NumberFormat.java b/src/java.base/share/classes/java/text/NumberFormat.java
index e7b5792a42d..8eb4ca3985a 100644
--- a/src/java.base/share/classes/java/text/NumberFormat.java
+++ b/src/java.base/share/classes/java/text/NumberFormat.java
@@ -259,11 +259,11 @@ public abstract class NumberFormat extends Format {
* to 0 and 9, respectively for the output string
* {@code 1,234,567.89}.
* @return the value passed in as toAppendTo
- * @exception IllegalArgumentException if number is
+ * @throws IllegalArgumentException if number is
* null or not an instance of Number.
- * @exception NullPointerException if toAppendTo or
+ * @throws NullPointerException if toAppendTo or
* pos is null
- * @exception ArithmeticException if rounding is needed with rounding
+ * @throws ArithmeticException if rounding is needed with rounding
* mode being set to RoundingMode.UNNECESSARY
* @see java.text.FieldPosition
*/
@@ -318,7 +318,7 @@ public abstract class NumberFormat extends Format {
*
* @param number the double number to format
* @return the formatted String
- * @exception ArithmeticException if rounding is needed with rounding
+ * @throws ArithmeticException if rounding is needed with rounding
* mode being set to RoundingMode.UNNECESSARY
* @see java.text.Format#format
*/
@@ -343,7 +343,7 @@ public abstract class NumberFormat extends Format {
*
* @param number the long number to format
* @return the formatted String
- * @exception ArithmeticException if rounding is needed with rounding
+ * @throws ArithmeticException if rounding is needed with rounding
* mode being set to RoundingMode.UNNECESSARY
* @see java.text.Format#format
*/
@@ -367,7 +367,7 @@ public abstract class NumberFormat extends Format {
* to 0 and 9, respectively for the output string
* {@code 1,234,567.89}.
* @return the formatted StringBuffer
- * @exception ArithmeticException if rounding is needed with rounding
+ * @throws ArithmeticException if rounding is needed with rounding
* mode being set to RoundingMode.UNNECESSARY
* @see java.text.Format#format
*/
@@ -390,7 +390,7 @@ public abstract class NumberFormat extends Format {
* to 0 and 11, respectively for the output string
* {@code 123,456,789}.
* @return the formatted StringBuffer
- * @exception ArithmeticException if rounding is needed with rounding
+ * @throws ArithmeticException if rounding is needed with rounding
* mode being set to RoundingMode.UNNECESSARY
* @see java.text.Format#format
*/
@@ -424,7 +424,7 @@ public abstract class NumberFormat extends Format {
*
* @param source A String whose beginning should be parsed.
* @return A Number parsed from the string.
- * @exception ParseException if the beginning of the specified string
+ * @throws ParseException if the beginning of the specified string
* cannot be parsed.
*/
public Number parse(String source) throws ParseException {
@@ -891,7 +891,7 @@ public abstract class NumberFormat extends Format {
* UnsupportedOperationException.
*
* @return the currency used by this number format, or null
- * @exception UnsupportedOperationException if the number format class
+ * @throws UnsupportedOperationException if the number format class
* doesn't implement currency formatting
* @since 1.4
*/
@@ -908,9 +908,9 @@ public abstract class NumberFormat extends Format {
* UnsupportedOperationException.
*
* @param currency the new currency to be used by this number format
- * @exception UnsupportedOperationException if the number format class
+ * @throws UnsupportedOperationException if the number format class
* doesn't implement currency formatting
- * @exception NullPointerException if currency is null
+ * @throws NullPointerException if currency is null
* @since 1.4
*/
public void setCurrency(Currency currency) {
@@ -924,7 +924,7 @@ public abstract class NumberFormat extends Format {
* Subclasses which handle different rounding modes should override
* this method.
*
- * @exception UnsupportedOperationException The default implementation
+ * @throws UnsupportedOperationException The default implementation
* always throws this exception
* @return The RoundingMode used for this NumberFormat.
* @see #setRoundingMode(RoundingMode)
@@ -941,9 +941,9 @@ public abstract class NumberFormat extends Format {
* Subclasses which handle different rounding modes should override
* this method.
*
- * @exception UnsupportedOperationException The default implementation
+ * @throws UnsupportedOperationException The default implementation
* always throws this exception
- * @exception NullPointerException if roundingMode is null
+ * @throws NullPointerException if roundingMode is null
* @param roundingMode The RoundingMode to be used
* @see #getRoundingMode()
* @since 1.6
diff --git a/src/java.base/share/classes/java/text/RBTableBuilder.java b/src/java.base/share/classes/java/text/RBTableBuilder.java
index 0210112f289..4706dfb817e 100644
--- a/src/java.base/share/classes/java/text/RBTableBuilder.java
+++ b/src/java.base/share/classes/java/text/RBTableBuilder.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2019, 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
@@ -72,7 +72,7 @@ final class RBTableBuilder {
* stores them back in the RBCollationTables object. It is called
* ONLY by the RBCollationTables constructor.
* @see RuleBasedCollator#RuleBasedCollator
- * @exception ParseException If the rules format is incorrect.
+ * @throws ParseException If the rules format is incorrect.
*/
public void build(String pattern, int decmp) throws ParseException {
diff --git a/src/java.base/share/classes/java/text/RuleBasedCollator.java b/src/java.base/share/classes/java/text/RuleBasedCollator.java
index c0bad4d5816..c4abc4bb16a 100644
--- 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, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, 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
@@ -273,7 +273,7 @@ public class RuleBasedCollator extends Collator{
* description for more details on the collation rule syntax.
* @see java.util.Locale
* @param rules the collation rules to build the collation table from.
- * @exception ParseException A format exception
+ * @throws ParseException A format exception
* will be thrown if the build process of the rules fails. For
* example, build rule "a < ? < d" will cause the constructor to
* throw the ParseException because the '?' is not quoted.
@@ -290,7 +290,7 @@ public class RuleBasedCollator extends Collator{
* @param rules the collation rules to build the collation table from.
* @param decomp the decomposition strength used to build the
* collation table and to perform comparisons.
- * @exception ParseException A format exception
+ * @throws ParseException A format exception
* will be thrown if the build process of the rules fails. For
* example, build rule "a < ? < d" will cause the constructor to
* throw the ParseException because the '?' is not quoted.
@@ -350,7 +350,7 @@ public class RuleBasedCollator extends Collator{
* than, greater than or equal to another string in a language.
* This can be overridden in a subclass.
*
- * @exception NullPointerException if source or target is null.
+ * @throws NullPointerException if source or target is null.
*/
public synchronized int compare(String source, String target)
{
diff --git a/src/java.base/share/classes/java/text/SimpleDateFormat.java b/src/java.base/share/classes/java/text/SimpleDateFormat.java
index d2650657661..b7412480f54 100644
--- a/src/java.base/share/classes/java/text/SimpleDateFormat.java
+++ b/src/java.base/share/classes/java/text/SimpleDateFormat.java
@@ -592,8 +592,8 @@ public class SimpleDateFormat extends DateFormat {
* @see java.util.Locale#getDefault(java.util.Locale.Category)
* @see java.util.Locale.Category#FORMAT
* @param pattern the pattern describing the date and time format
- * @exception NullPointerException if the given pattern is null
- * @exception IllegalArgumentException if the given pattern is invalid
+ * @throws NullPointerException if the given pattern is null
+ * @throws IllegalArgumentException if the given pattern is invalid
*/
public SimpleDateFormat(String pattern)
{
@@ -609,8 +609,8 @@ public class SimpleDateFormat extends DateFormat {
*
* @param pattern the pattern describing the date and time format
* @param locale the locale whose date format symbols should be used
- * @exception NullPointerException if the given pattern or locale is null
- * @exception IllegalArgumentException if the given pattern is invalid
+ * @throws NullPointerException if the given pattern or locale is null
+ * @throws IllegalArgumentException if the given pattern is invalid
*/
public SimpleDateFormat(String pattern, Locale locale)
{
@@ -631,8 +631,8 @@ public class SimpleDateFormat extends DateFormat {
*
* @param pattern the pattern describing the date and time format
* @param formatSymbols the date format symbols to be used for formatting
- * @exception NullPointerException if the given pattern or formatSymbols is null
- * @exception IllegalArgumentException if the given pattern is invalid
+ * @throws NullPointerException if the given pattern or formatSymbols is null
+ * @throws IllegalArgumentException if the given pattern is invalid
*/
public SimpleDateFormat(String pattern, DateFormatSymbols formatSymbols)
{
@@ -739,8 +739,8 @@ public class SimpleDateFormat extends DateFormat {
* is "'o'", the TaggedData entry is
* ((TAG_QUOTE_ASCII_CHAR&nbs;<<&nbs;8)&nbs;|&nbs;'o').
*
- * @exception NullPointerException if the given pattern is null
- * @exception IllegalArgumentException if the given pattern is invalid
+ * @throws NullPointerException if the given pattern is null
+ * @throws IllegalArgumentException if the given pattern is invalid
*/
private char[] compile(String pattern) {
int length = pattern.length();
@@ -958,7 +958,7 @@ public class SimpleDateFormat extends DateFormat {
* {@code fieldPosition} will be set to 5 and 8, respectively, for the
* first occurrence of the timezone pattern character {@code 'z'}.
* @return the formatted date-time string.
- * @exception NullPointerException if any of the parameters is {@code null}.
+ * @throws NullPointerException if any of the parameters is {@code null}.
*/
@Override
public StringBuffer format(Date date, StringBuffer toAppendTo,
@@ -1012,8 +1012,8 @@ public class SimpleDateFormat extends DateFormat {
* DateFormat.Field, with the corresponding attribute value
* being the same as the attribute key.
*
- * @exception NullPointerException if obj is null.
- * @exception IllegalArgumentException if the Format cannot format the
+ * @throws NullPointerException if obj is null.
+ * @throws IllegalArgumentException if the Format cannot format the
* given object, or if the Format's pattern string is invalid.
* @param obj The object to format
* @return AttributedCharacterIterator describing the formatted value.
@@ -1459,7 +1459,7 @@ public class SimpleDateFormat extends DateFormat {
* index information as described above.
* @return A Date parsed from the string. In case of
* error, returns null.
- * @exception NullPointerException if text or pos is null.
+ * @throws NullPointerException if text or pos is null.
*/
@Override
public Date parse(String text, ParsePosition pos)
@@ -2276,7 +2276,7 @@ public class SimpleDateFormat extends DateFormat {
* Translates a pattern, mapping each character in the from string to the
* corresponding character in the to string.
*
- * @exception IllegalArgumentException if the given pattern is invalid
+ * @throws IllegalArgumentException if the given pattern is invalid
*/
private String translatePattern(String pattern, String from, String to) {
StringBuilder result = new StringBuilder();
@@ -2339,8 +2339,8 @@ public class SimpleDateFormat extends DateFormat {
* Applies the given pattern string to this date format.
*
* @param pattern the new date and time pattern for this date format
- * @exception NullPointerException if the given pattern is null
- * @exception IllegalArgumentException if the given pattern is invalid
+ * @throws NullPointerException if the given pattern is null
+ * @throws IllegalArgumentException if the given pattern is invalid
*/
public void applyPattern(String pattern)
{
@@ -2357,8 +2357,8 @@ public class SimpleDateFormat extends DateFormat {
*
* @param pattern a String to be mapped to the new date and time format
* pattern for this format
- * @exception NullPointerException if the given pattern is null
- * @exception IllegalArgumentException if the given pattern is invalid
+ * @throws NullPointerException if the given pattern is null
+ * @throws IllegalArgumentException if the given pattern is invalid
*/
public void applyLocalizedPattern(String pattern) {
String p = translatePattern(pattern,
@@ -2383,7 +2383,7 @@ public class SimpleDateFormat extends DateFormat {
* Sets the date and time format symbols of this date format.
*
* @param newFormatSymbols the new date and time format symbols
- * @exception NullPointerException if the given newFormatSymbols is null
+ * @throws NullPointerException if the given newFormatSymbols is null
* @see #getDateFormatSymbols
*/
public void setDateFormatSymbols(DateFormatSymbols newFormatSymbols)
@@ -2470,7 +2470,7 @@ public class SimpleDateFormat extends DateFormat {
* After reading an object from the input stream, the format
* pattern in the object is verified.
*
- * @exception InvalidObjectException if the pattern is invalid
+ * @throws InvalidObjectException if the pattern is invalid
*/
@java.io.Serial
private void readObject(ObjectInputStream stream)
diff --git a/src/java.base/share/classes/java/text/spi/BreakIteratorProvider.java b/src/java.base/share/classes/java/text/spi/BreakIteratorProvider.java
index dd4a1a2ecd5..e9831eb2176 100644
--- a/src/java.base/share/classes/java/text/spi/BreakIteratorProvider.java
+++ b/src/java.base/share/classes/java/text/spi/BreakIteratorProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, 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
@@ -51,8 +51,8 @@ public abstract class BreakIteratorProvider extends LocaleServiceProvider {
* for the given locale.
* @param locale the desired locale
* @return A break iterator for word breaks
- * @exception NullPointerException if locale is null
- * @exception IllegalArgumentException if locale isn't
+ * @throws NullPointerException if locale is null
+ * @throws IllegalArgumentException if locale isn't
* one of the locales returned from
* {@link java.util.spi.LocaleServiceProvider#getAvailableLocales()
* getAvailableLocales()}.
@@ -66,8 +66,8 @@ public abstract class BreakIteratorProvider extends LocaleServiceProvider {
* for the given locale.
* @param locale the desired locale
* @return A break iterator for line breaks
- * @exception NullPointerException if locale is null
- * @exception IllegalArgumentException if locale isn't
+ * @throws NullPointerException if locale is null
+ * @throws IllegalArgumentException if locale isn't
* one of the locales returned from
* {@link java.util.spi.LocaleServiceProvider#getAvailableLocales()
* getAvailableLocales()}.
@@ -81,8 +81,8 @@ public abstract class BreakIteratorProvider extends LocaleServiceProvider {
* for the given locale.
* @param locale the desired locale
* @return A break iterator for character breaks
- * @exception NullPointerException if locale is null
- * @exception IllegalArgumentException if locale isn't
+ * @throws NullPointerException if locale is null
+ * @throws IllegalArgumentException if locale isn't
* one of the locales returned from
* {@link java.util.spi.LocaleServiceProvider#getAvailableLocales()
* getAvailableLocales()}.
@@ -96,8 +96,8 @@ public abstract class BreakIteratorProvider extends LocaleServiceProvider {
* for the given locale.
* @param locale the desired locale
* @return A break iterator for sentence breaks
- * @exception NullPointerException if locale is null
- * @exception IllegalArgumentException if locale isn't
+ * @throws NullPointerException if locale is null
+ * @throws IllegalArgumentException if locale isn't
* one of the locales returned from
* {@link java.util.spi.LocaleServiceProvider#getAvailableLocales()
* getAvailableLocales()}.
diff --git a/src/java.base/share/classes/java/text/spi/CollatorProvider.java b/src/java.base/share/classes/java/text/spi/CollatorProvider.java
index 14809087bfb..925ca6cfaa9 100644
--- a/src/java.base/share/classes/java/text/spi/CollatorProvider.java
+++ b/src/java.base/share/classes/java/text/spi/CollatorProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, 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,9 +49,9 @@ public abstract class CollatorProvider extends LocaleServiceProvider {
* Returns a new Collator instance for the specified locale.
* @param locale the desired locale.
* @return the Collator for the desired locale.
- * @exception NullPointerException if
+ * @throws NullPointerException if
* locale is null
- * @exception IllegalArgumentException if locale isn't
+ * @throws IllegalArgumentException if locale isn't
* one of the locales returned from
* {@link java.util.spi.LocaleServiceProvider#getAvailableLocales()
* getAvailableLocales()}.
diff --git a/src/java.base/share/classes/java/text/spi/DateFormatProvider.java b/src/java.base/share/classes/java/text/spi/DateFormatProvider.java
index e12effdb88b..8e19376f884 100644
--- a/src/java.base/share/classes/java/text/spi/DateFormatProvider.java
+++ b/src/java.base/share/classes/java/text/spi/DateFormatProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, 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,12 +54,12 @@ public abstract class DateFormatProvider extends LocaleServiceProvider {
* {@link java.text.DateFormat#LONG DateFormat.LONG}, or
* {@link java.text.DateFormat#FULL DateFormat.FULL}.
* @param locale the desired locale.
- * @exception IllegalArgumentException if style is invalid,
+ * @throws IllegalArgumentException if style is invalid,
* or if locale isn't
* one of the locales returned from
* {@link java.util.spi.LocaleServiceProvider#getAvailableLocales()
* getAvailableLocales()}.
- * @exception NullPointerException if locale is null
+ * @throws NullPointerException if locale is null
* @return a time formatter.
* @see java.text.DateFormat#getTimeInstance(int, java.util.Locale)
*/
@@ -74,12 +74,12 @@ public abstract class DateFormatProvider extends LocaleServiceProvider {
* {@link java.text.DateFormat#LONG DateFormat.LONG}, or
* {@link java.text.DateFormat#FULL DateFormat.FULL}.
* @param locale the desired locale.
- * @exception IllegalArgumentException if style is invalid,
+ * @throws IllegalArgumentException if style is invalid,
* or if locale isn't
* one of the locales returned from
* {@link java.util.spi.LocaleServiceProvider#getAvailableLocales()
* getAvailableLocales()}.
- * @exception NullPointerException if locale is null
+ * @throws NullPointerException if locale is null
* @return a date formatter.
* @see java.text.DateFormat#getDateInstance(int, java.util.Locale)
*/
@@ -99,13 +99,13 @@ public abstract class DateFormatProvider extends LocaleServiceProvider {
* {@link java.text.DateFormat#LONG DateFormat.LONG}, or
* {@link java.text.DateFormat#FULL DateFormat.FULL}.
* @param locale the desired locale.
- * @exception IllegalArgumentException if dateStyle or
+ * @throws IllegalArgumentException if dateStyle or
* timeStyle is invalid,
* or if locale isn't
* one of the locales returned from
* {@link java.util.spi.LocaleServiceProvider#getAvailableLocales()
* getAvailableLocales()}.
- * @exception NullPointerException if locale is null
+ * @throws NullPointerException if locale is null
* @return a date/time formatter.
* @see java.text.DateFormat#getDateTimeInstance(int, int, java.util.Locale)
*/
diff --git a/src/java.base/share/classes/java/text/spi/DateFormatSymbolsProvider.java b/src/java.base/share/classes/java/text/spi/DateFormatSymbolsProvider.java
index bc3a8fb042c..19415946a38 100644
--- a/src/java.base/share/classes/java/text/spi/DateFormatSymbolsProvider.java
+++ b/src/java.base/share/classes/java/text/spi/DateFormatSymbolsProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, 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
@@ -50,8 +50,8 @@ public abstract class DateFormatSymbolsProvider extends LocaleServiceProvider {
* specified locale.
*
* @param locale the desired locale
- * @exception NullPointerException if locale is null
- * @exception IllegalArgumentException if locale isn't
+ * @throws NullPointerException if locale is null
+ * @throws IllegalArgumentException if locale isn't
* one of the locales returned from
* {@link java.util.spi.LocaleServiceProvider#getAvailableLocales()
* getAvailableLocales()}.
diff --git a/src/java.base/share/classes/java/text/spi/DecimalFormatSymbolsProvider.java b/src/java.base/share/classes/java/text/spi/DecimalFormatSymbolsProvider.java
index d1d078c8fb3..aad5ac8d167 100644
--- a/src/java.base/share/classes/java/text/spi/DecimalFormatSymbolsProvider.java
+++ b/src/java.base/share/classes/java/text/spi/DecimalFormatSymbolsProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, 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
@@ -60,8 +60,8 @@ public abstract class DecimalFormatSymbolsProvider extends LocaleServiceProvider
* specified locale.
*
* @param locale the desired locale
- * @exception NullPointerException if locale is null
- * @exception IllegalArgumentException if locale isn't
+ * @throws NullPointerException if locale is null
+ * @throws IllegalArgumentException if locale isn't
* one of the locales returned from
* {@link java.util.spi.LocaleServiceProvider#getAvailableLocales()
* getAvailableLocales()}.
diff --git a/src/java.base/share/classes/java/text/spi/NumberFormatProvider.java b/src/java.base/share/classes/java/text/spi/NumberFormatProvider.java
index 9698bd22206..64d8ff34a92 100644
--- a/src/java.base/share/classes/java/text/spi/NumberFormatProvider.java
+++ b/src/java.base/share/classes/java/text/spi/NumberFormatProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, 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
@@ -50,8 +50,8 @@ public abstract class NumberFormatProvider extends LocaleServiceProvider {
* monetary values for the specified locale.
*
* @param locale the desired locale.
- * @exception NullPointerException if locale is null
- * @exception IllegalArgumentException if locale isn't
+ * @throws NullPointerException if locale is null
+ * @throws IllegalArgumentException if locale isn't
* one of the locales returned from
* {@link java.util.spi.LocaleServiceProvider#getAvailableLocales()
* getAvailableLocales()}.
@@ -71,8 +71,8 @@ public abstract class NumberFormatProvider extends LocaleServiceProvider {
* java.text.NumberFormat#isParseIntegerOnly isParseIntegerOnly}).
*
* @param locale the desired locale
- * @exception NullPointerException if locale is null
- * @exception IllegalArgumentException if locale isn't
+ * @throws NullPointerException if locale is null
+ * @throws IllegalArgumentException if locale isn't
* one of the locales returned from
* {@link java.util.spi.LocaleServiceProvider#getAvailableLocales()
* getAvailableLocales()}.
@@ -86,8 +86,8 @@ public abstract class NumberFormatProvider extends LocaleServiceProvider {
* the specified locale.
*
* @param locale the desired locale
- * @exception NullPointerException if locale is null
- * @exception IllegalArgumentException if locale isn't
+ * @throws NullPointerException if locale is null
+ * @throws IllegalArgumentException if locale isn't
* one of the locales returned from
* {@link java.util.spi.LocaleServiceProvider#getAvailableLocales()
* getAvailableLocales()}.
@@ -101,8 +101,8 @@ public abstract class NumberFormatProvider extends LocaleServiceProvider {
* percentage values for the specified locale.
*
* @param locale the desired locale
- * @exception NullPointerException if locale is null
- * @exception IllegalArgumentException if locale isn't
+ * @throws NullPointerException if locale is null
+ * @throws IllegalArgumentException if locale isn't
* one of the locales returned from
* {@link java.util.spi.LocaleServiceProvider#getAvailableLocales()
* getAvailableLocales()}.
diff --git a/src/java.base/share/classes/java/util/Calendar.java b/src/java.base/share/classes/java/util/Calendar.java
index 86a77d2b456..42dcd4d619d 100644
--- a/src/java.base/share/classes/java/util/Calendar.java
+++ b/src/java.base/share/classes/java/util/Calendar.java
@@ -2100,11 +2100,11 @@ public abstract class Calendar implements Serializable, Cloneable, Comparablefalse otherwise.
- * @exception IndexOutOfBoundsException if the specified
+ * @throws IndexOutOfBoundsException if the specified
* field is out of range
* (field < 0 || field >= FIELD_COUNT).
* @see #selectFields()
@@ -2344,7 +2344,7 @@ public abstract class Calendar implements Serializable, Cloneable, Comparablefield < 0 || field >= FIELD_COUNT).
* @see #isExternallySet(int)
@@ -2381,7 +2381,7 @@ public abstract class Calendar implements Serializable, Cloneable, Comparablefield < 0 || field >= FIELD_COUNT).
* @see #isExternallySet(int)
@@ -2806,9 +2806,9 @@ public abstract class Calendar implements Serializable, Cloneable, ComparableCalendar is after the
* time represented by the argument.
- * @exception NullPointerException if the specified Calendar is
+ * @throws NullPointerException if the specified Calendar is
* null.
- * @exception IllegalArgumentException if the time value of the
+ * @throws IllegalArgumentException if the time value of the
* specified Calendar object can't be obtained due to
* any invalid calendar values.
* @since 1.5
@@ -3054,7 +3054,7 @@ public abstract class Calendar implements Serializable, Cloneable, Comparablefield is negative,
* equal to or greater than {@code FIELD_COUNT}.
*/
static String getFieldName(int field) {
diff --git a/src/java.base/share/classes/java/util/Currency.java b/src/java.base/share/classes/java/util/Currency.java
index a5ef89241b1..b46e6437e43 100644
--- a/src/java.base/share/classes/java/util/Currency.java
+++ b/src/java.base/share/classes/java/util/Currency.java
@@ -289,8 +289,8 @@ public final class Currency implements Serializable {
*
* @param currencyCode the ISO 4217 code of the currency
* @return the Currency instance for the given currency code
- * @exception NullPointerException if currencyCode is null
- * @exception IllegalArgumentException if currencyCode is not
+ * @throws NullPointerException if currencyCode is null
+ * @throws IllegalArgumentException if currencyCode is not
* a supported ISO 4217 code.
*/
public static Currency getInstance(String currencyCode) {
@@ -372,9 +372,9 @@ public final class Currency implements Serializable {
* instance is needed
* @return the Currency instance for the country of the given
* locale, or {@code null}
- * @exception NullPointerException if locale
+ * @throws NullPointerException if locale
* is {@code null}
- * @exception IllegalArgumentException if the country of the given {@code locale}
+ * @throws IllegalArgumentException if the country of the given {@code locale}
* is not a supported ISO 3166 country code.
*/
public static Currency getInstance(Locale locale) {
@@ -537,7 +537,7 @@ public final class Currency implements Serializable {
* @param locale the locale for which a display name for this currency is
* needed
* @return the symbol of this currency for the specified locale
- * @exception NullPointerException if locale is null
+ * @throws NullPointerException if locale is null
*/
public String getSymbol(Locale locale) {
LocaleServiceProviderPool pool =
@@ -632,7 +632,7 @@ public final class Currency implements Serializable {
* @param locale the locale for which a display name for this currency is
* needed
* @return the display name of this currency for the specified locale
- * @exception NullPointerException if locale is null
+ * @throws NullPointerException if locale is null
* @since 1.7
*/
public String getDisplayName(Locale locale) {
@@ -1197,5 +1197,3 @@ public final class Currency implements Serializable {
}
}
-
-
diff --git a/src/java.base/share/classes/java/util/Date.java b/src/java.base/share/classes/java/util/Date.java
index 671d710c671..d0b31a40268 100644
--- a/src/java.base/share/classes/java/util/Date.java
+++ b/src/java.base/share/classes/java/util/Date.java
@@ -910,7 +910,7 @@ public class Date
* represented by this {@code Date} object is strictly
* earlier than the instant represented by {@code when};
* {@code false} otherwise.
- * @exception NullPointerException if {@code when} is null.
+ * @throws NullPointerException if {@code when} is null.
*/
public boolean before(Date when) {
return getMillisOf(this) < getMillisOf(when);
@@ -924,7 +924,7 @@ public class Date
* by this {@code Date} object is strictly later than the
* instant represented by {@code when};
* {@code false} otherwise.
- * @exception NullPointerException if {@code when} is null.
+ * @throws NullPointerException if {@code when} is null.
*/
public boolean after(Date when) {
return getMillisOf(this) > getMillisOf(when);
@@ -973,7 +973,7 @@ public class Date
* is before the Date argument; and a value greater than
* {@code 0} if this Date is after the Date argument.
* @since 1.2
- * @exception NullPointerException if {@code anotherDate} is null.
+ * @throws NullPointerException if {@code anotherDate} is null.
*/
public int compareTo(Date anotherDate) {
long thisTime = getMillisOf(this);
@@ -1353,8 +1353,8 @@ public class Date
* @param instant the instant to convert
* @return a {@code Date} representing the same point on the time-line as
* the provided instant
- * @exception NullPointerException if {@code instant} is null.
- * @exception IllegalArgumentException if the instant is too large to
+ * @throws NullPointerException if {@code instant} is null.
+ * @throws IllegalArgumentException if the instant is too large to
* represent as a {@code Date}
* @since 1.8
*/
diff --git a/src/java.base/share/classes/java/util/Dictionary.java b/src/java.base/share/classes/java/util/Dictionary.java
index c9825b4cc6b..162de2b5d62 100644
--- a/src/java.base/share/classes/java/util/Dictionary.java
+++ b/src/java.base/share/classes/java/util/Dictionary.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2019, 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
@@ -106,7 +106,7 @@ class Dictionaryfield is
+ * @throws IllegalArgumentException if field is
* ZONE_OFFSET, DST_OFFSET, or unknown,
* or if any calendar fields have out-of-range values in
* non-lenient mode.
@@ -1101,7 +1101,7 @@ public class GregorianCalendar extends Calendar {
*
* @param up indicates if the value of the specified calendar field is to be
* rolled up or rolled down. Use true if rolling up, false otherwise.
- * @exception IllegalArgumentException if field is
+ * @throws IllegalArgumentException if field is
* ZONE_OFFSET, DST_OFFSET, or unknown,
* or if any calendar fields have out-of-range values in
* non-lenient mode.
@@ -1148,7 +1148,7 @@ public class GregorianCalendar extends Calendar {
*
* @param field the calendar field.
* @param amount the signed amount to add to field.
- * @exception IllegalArgumentException if field is
+ * @throws IllegalArgumentException if field is
* ZONE_OFFSET, DST_OFFSET, or unknown,
* or if any calendar fields have out-of-range values in
* non-lenient mode.
@@ -2183,7 +2183,7 @@ public class GregorianCalendar extends Calendar {
* for the {@link #DAY_OF_WEEK DAY_OF_WEEK} field:
* {@link Calendar#SUNDAY SUNDAY}, ...,
* {@link Calendar#SATURDAY SATURDAY}.
- * @exception IllegalArgumentException
+ * @throws IllegalArgumentException
* if any of the given date specifiers is invalid,
* or if any of the calendar fields are inconsistent
* with the given date specifiers in non-lenient mode
@@ -2626,7 +2626,7 @@ public class GregorianCalendar extends Calendar {
* Converts calendar field values to the time value (millisecond
* offset from the Epoch).
*
- * @exception IllegalArgumentException if any calendar fields are invalid.
+ * @throws IllegalArgumentException if any calendar fields are invalid.
*/
@Override
protected void computeTime() {
@@ -3279,8 +3279,8 @@ public class GregorianCalendar extends Calendar {
* @param zdt the zoned date-time object to convert
* @return the gregorian calendar representing the same point on the
* time-line as the zoned date-time provided
- * @exception NullPointerException if {@code zdt} is null
- * @exception IllegalArgumentException if the zoned date-time is too
+ * @throws NullPointerException if {@code zdt} is null
+ * @throws IllegalArgumentException if the zoned date-time is too
* large to represent as a {@code GregorianCalendar}
* @since 1.8
*/
diff --git a/src/java.base/share/classes/java/util/Hashtable.java b/src/java.base/share/classes/java/util/Hashtable.java
index 2f1e9dfa409..54ee3461670 100644
--- a/src/java.base/share/classes/java/util/Hashtable.java
+++ b/src/java.base/share/classes/java/util/Hashtable.java
@@ -180,7 +180,7 @@ public class HashtableLocale class description about valid country values.
* @param variant Any arbitrary value used to indicate a variation of a Locale.
* See the Locale class description for the details.
- * @exception NullPointerException thrown if any argument is null.
+ * @throws NullPointerException thrown if any argument is null.
*/
public Locale(String language, String country, String variant) {
if (language == null || country == null || variant == null) {
@@ -770,7 +770,7 @@ public final class Locale implements Cloneable, Serializable {
* valid language values.
* @param country An ISO 3166 alpha-2 country code or a UN M.49 numeric-3 area code.
* See the Locale class description about valid country values.
- * @exception NullPointerException thrown if either argument is null.
+ * @throws NullPointerException thrown if either argument is null.
*/
public Locale(String language, String country) {
this(language, country, "");
@@ -793,7 +793,7 @@ public final class Locale implements Cloneable, Serializable {
* @param language An ISO 639 alpha-2 or alpha-3 language code, or a language subtag
* up to 8 characters in length. See the Locale class description about
* valid language values.
- * @exception NullPointerException thrown if argument is null.
+ * @throws NullPointerException thrown if argument is null.
* @since 1.4
*/
public Locale(String language) {
@@ -812,7 +812,7 @@ public final class Locale implements Cloneable, Serializable {
* @param country uppercase two-letter ISO-3166 code and numeric-3 UN M.49 area code.
* @param variant vendor and browser specific code. See class description.
* @return the Locale instance requested
- * @exception NullPointerException if any argument is null.
+ * @throws NullPointerException if any argument is null.
*/
static Locale getInstance(String language, String country, String variant) {
return getInstance(language, "", country, variant, null);
@@ -1737,7 +1737,7 @@ public final class Locale implements Cloneable, Serializable {
* not specify a language the empty string is returned.
*
* @return A three-letter abbreviation of this locale's language.
- * @exception MissingResourceException Throws MissingResourceException if
+ * @throws MissingResourceException Throws MissingResourceException if
* three-letter language abbreviation is not available for this locale.
*/
public String getISO3Language() throws MissingResourceException {
@@ -1764,7 +1764,7 @@ public final class Locale implements Cloneable, Serializable {
* inLocale is null
+ * @throws NullPointerException if inLocale is null
*/
public String getDisplayLanguage(Locale inLocale) {
return getDisplayString(baseLocale.getLanguage(), null, inLocale, DISPLAY_LANGUAGE);
@@ -1907,7 +1907,7 @@ public final class Locale implements Cloneable, Serializable {
*
* @param inLocale The locale for which to retrieve the display country.
* @return The name of the country appropriate to the given locale.
- * @exception NullPointerException if inLocale is null
+ * @throws NullPointerException if inLocale is null
*/
public String getDisplayCountry(Locale inLocale) {
return getDisplayString(baseLocale.getRegion(), null, inLocale, DISPLAY_COUNTRY);
@@ -1949,7 +1949,7 @@ public final class Locale implements Cloneable, Serializable {
*
* @param inLocale The locale for which to retrieve the display variant code.
* @return The name of the display variant code appropriate to the given locale.
- * @exception NullPointerException if inLocale is null
+ * @throws NullPointerException if inLocale is null
*/
public String getDisplayVariant(Locale inLocale) {
if (baseLocale.getVariant().isEmpty())
diff --git a/src/java.base/share/classes/java/util/Properties.java b/src/java.base/share/classes/java/util/Properties.java
index e5a7b399e23..c5885e3ff4f 100644
--- a/src/java.base/share/classes/java/util/Properties.java
+++ b/src/java.base/share/classes/java/util/Properties.java
@@ -394,7 +394,7 @@ class Properties extends Hashtable