All compilers are expected to be able to compile to the C99 language standard, as some C99 features are used in the source code. Microsoft Visual Studio doesn't fully support C99 so in practice shared code is limited to using C99 features that it does support.
The minimum accepted version of gcc is 5.0. Older versions will generate a warning by configure and are unlikely to work.
The JDK is currently known to be able to compile with at least version 10.2 of gcc.
+The JDK is currently known to be able to compile with at least version 11.2 of gcc.
In general, any version between these two should be usable.
The minimum accepted version of clang is 3.5. Older versions will not be accepted by configure.
Do not use the standard global allocation and deallocation functions (operator new and related functions). Use of these functions by HotSpot code is disabled for some platforms.
-Rationale: HotSpot often uses "resource" or "arena" allocation. Even where heap allocation is used, the standard global functions are avoided in favor of wrappers around malloc and free that support the VM's Native Memory Tracking (NMT) feature.
+Rationale: HotSpot often uses "resource" or "arena" allocation. Even where heap allocation is used, the standard global functions are avoided in favor of wrappers around malloc and free that support the VM's Native Memory Tracking (NMT) feature. Typically, uses of the global operator new are inadvertent and therefore often associated with memory leaks.
Native memory allocation failures are often treated as non-recoverable. The place where "out of memory" is (first) detected may be an innocent bystander, unrelated to the actual culprit.
Use public single inheritance.
@@ -270,8 +270,8 @@ while ( test_foo(args...) ) { // No, excess spaces around controlThe underlying type of a scoped-enum should also be specified explicitly if conversions may be applied to values of that type.Due to bugs in certain (very old) compilers, there is widespread use of enums and avoidance of in-class initialization of static integral constant members. Compilers having such bugs are no longer supported. Except where an enum is semantically appropriate, new code should use integral constants.
Do not use thread_local (n2659); instead, use the HotSpot macro THREAD_LOCAL. The initializer must be a constant expression.
As was discussed in the review for JDK-8230877, thread_local allows dynamic initialization and destruction semantics. However, that support requires a run-time penalty for references to non-function-local thread_local variables defined in a different translation unit, even if they don't need dynamic initialization. Dynamic initialization and destruction of namespace-scoped thread local variables also has the same ordering problems as for ordinary namespace-scoped variables.
Avoid use of thread_local (n2659); and instead, use the HotSpot macro THREAD_LOCAL, for which the initializer must be a constant expression. When thread_local must be used, use the Hotspot macro APPROVED_CPP_THREAD_LOCAL to indicate that the use has been given appropriate consideration.
As was discussed in the review for JDK-8230877, thread_local allows dynamic initialization and destruction semantics. However, that support requires a run-time penalty for references to non-function-local thread_local variables defined in a different translation unit, even if they don't need dynamic initialization. Dynamic initialization and destruction of non-local thread_local variables also has the same ordering problems as for ordinary non-local variables. So we avoid use of thread_local in general, limiting its use to only those cases where dynamic initialization or destruction are essential. See JDK-8282469 for further discussion.
Prefer nullptr (n2431) to NULL. Don't use (constexpr or literal) 0 for pointers.
For historical reasons there are widespread uses of both NULL and of integer 0 as a pointer value.
Warning: Deserialization of untrusted data is inherently dangerous
* and should be avoided. Untrusted data should be carefully validated according to the
diff --git a/make/data/characterdata/CharacterData00.java.template b/src/java.base/share/classes/java/lang/CharacterData00.java.template
similarity index 100%
rename from make/data/characterdata/CharacterData00.java.template
rename to src/java.base/share/classes/java/lang/CharacterData00.java.template
diff --git a/make/data/characterdata/CharacterData01.java.template b/src/java.base/share/classes/java/lang/CharacterData01.java.template
similarity index 100%
rename from make/data/characterdata/CharacterData01.java.template
rename to src/java.base/share/classes/java/lang/CharacterData01.java.template
diff --git a/make/data/characterdata/CharacterData02.java.template b/src/java.base/share/classes/java/lang/CharacterData02.java.template
similarity index 100%
rename from make/data/characterdata/CharacterData02.java.template
rename to src/java.base/share/classes/java/lang/CharacterData02.java.template
diff --git a/make/data/characterdata/CharacterData03.java.template b/src/java.base/share/classes/java/lang/CharacterData03.java.template
similarity index 100%
rename from make/data/characterdata/CharacterData03.java.template
rename to src/java.base/share/classes/java/lang/CharacterData03.java.template
diff --git a/make/data/characterdata/CharacterData0E.java.template b/src/java.base/share/classes/java/lang/CharacterData0E.java.template
similarity index 100%
rename from make/data/characterdata/CharacterData0E.java.template
rename to src/java.base/share/classes/java/lang/CharacterData0E.java.template
diff --git a/make/data/characterdata/CharacterDataLatin1.java.template b/src/java.base/share/classes/java/lang/CharacterDataLatin1.java.template
similarity index 100%
rename from make/data/characterdata/CharacterDataLatin1.java.template
rename to src/java.base/share/classes/java/lang/CharacterDataLatin1.java.template
diff --git a/src/java.base/share/classes/java/lang/Math.java b/src/java.base/share/classes/java/lang/Math.java
index 7341aa56a6ac870f6d05dfbac3adca52675f58c5..6d8fa48c9764e6207e2aa0dac074abad72b15ef4 100644
--- a/src/java.base/share/classes/java/lang/Math.java
+++ b/src/java.base/share/classes/java/lang/Math.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1994, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2022, 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
@@ -131,14 +131,27 @@ public final class Math {
* The {@code double} value that is closer than any other to
* e, the base of the natural logarithms.
*/
- public static final double E = 2.7182818284590452354;
+ public static final double E = 2.718281828459045;
/**
* The {@code double} value that is closer than any other to
- * pi, the ratio of the circumference of a circle to its
- * diameter.
+ * pi (π), the ratio of the circumference of a circle to
+ * its diameter.
*/
- public static final double PI = 3.14159265358979323846;
+ public static final double PI = 3.141592653589793;
+
+ /**
+ * The {@code double} value that is closer than any other to
+ * tau (τ), the ratio of the circumference of a circle
+ * to its radius.
+ *
+ * @apiNote
+ * The value of pi is one half that of tau; in other
+ * words, tau is double pi .
+ *
+ * @since 19
+ */
+ public static final double TAU = 2.0 * PI;
/**
* Constant by which to multiply an angular value in degrees to obtain an
diff --git a/src/java.base/share/classes/java/lang/StrictMath.java b/src/java.base/share/classes/java/lang/StrictMath.java
index 53b25fedebbff2170d53c65ae8bb8e1015f7ab40..b551288a38f0194579d7ac0ab5621f42789b9d32 100644
--- a/src/java.base/share/classes/java/lang/StrictMath.java
+++ b/src/java.base/share/classes/java/lang/StrictMath.java
@@ -92,14 +92,27 @@ public final class StrictMath {
* The {@code double} value that is closer than any other to
* e, the base of the natural logarithms.
*/
- public static final double E = 2.7182818284590452354;
+ public static final double E = 2.718281828459045;
/**
* The {@code double} value that is closer than any other to
- * pi, the ratio of the circumference of a circle to its
+ * pi (π), the ratio of the circumference of a circle to its
* diameter.
*/
- public static final double PI = 3.14159265358979323846;
+ public static final double PI = 3.141592653589793;
+
+ /**
+ * The {@code double} value that is closer than any other to
+ * tau (τ), the ratio of the circumference of a circle
+ * to its radius.
+ *
+ * @apiNote
+ * The value of pi is one half that of tau; in other
+ * words, tau is double pi .
+ *
+ * @since 19
+ */
+ public static final double TAU = 2.0 * PI;
/**
* Returns the trigonometric sine of an angle. Special cases:
diff --git a/src/java.base/share/classes/java/lang/String.java b/src/java.base/share/classes/java/lang/String.java
index e79884bd4cc62d1d98d43bc05f7b074a18d4519b..009a61a9ba39518832cec7545f1965a417c5e26a 100644
--- a/src/java.base/share/classes/java/lang/String.java
+++ b/src/java.base/share/classes/java/lang/String.java
@@ -525,56 +525,63 @@ public final class String
this.value = "".value;
this.coder = "".coder;
} else if (charset == UTF_8.INSTANCE) {
- if (COMPACT_STRINGS && !StringCoding.hasNegatives(bytes, offset, length)) {
- this.value = Arrays.copyOfRange(bytes, offset, offset + length);
- this.coder = LATIN1;
- } else {
+ if (COMPACT_STRINGS) {
+ int dp = StringCoding.countPositives(bytes, offset, length);
+ if (dp == length) {
+ this.value = Arrays.copyOfRange(bytes, offset, offset + length);
+ this.coder = LATIN1;
+ return;
+ }
int sl = offset + length;
- int dp = 0;
- byte[] dst = null;
- if (COMPACT_STRINGS) {
- dst = new byte[length];
- while (offset < sl) {
- int b1 = bytes[offset];
- if (b1 >= 0) {
- dst[dp++] = (byte)b1;
+ byte[] dst = new byte[length];
+ if (dp > 0) {
+ System.arraycopy(bytes, offset, dst, 0, dp);
+ offset += dp;
+ }
+ while (offset < sl) {
+ int b1 = bytes[offset++];
+ if (b1 >= 0) {
+ dst[dp++] = (byte)b1;
+ continue;
+ }
+ if ((b1 & 0xfe) == 0xc2 && offset < sl) { // b1 either 0xc2 or 0xc3
+ int b2 = bytes[offset];
+ if (b2 < -64) { // continuation bytes are always negative values in the range -128 to -65
+ dst[dp++] = (byte)decode2(b1, b2);
offset++;
continue;
}
- if ((b1 & 0xfe) == 0xc2 && offset + 1 < sl) { // b1 either 0xc2 or 0xc3
- int b2 = bytes[offset + 1];
- if (!isNotContinuation(b2)) {
- dst[dp++] = (byte)decode2(b1, b2);
- offset += 2;
- continue;
- }
- }
- // anything not a latin1, including the repl
- // we have to go with the utf16
- break;
- }
- if (offset == sl) {
- if (dp != dst.length) {
- dst = Arrays.copyOf(dst, dp);
- }
- this.value = dst;
- this.coder = LATIN1;
- return;
}
+ // anything not a latin1, including the REPL
+ // we have to go with the utf16
+ offset--;
+ break;
}
- if (dp == 0 || dst == null) {
- dst = new byte[length << 1];
- } else {
- byte[] buf = new byte[length << 1];
- StringLatin1.inflate(dst, 0, buf, 0, dp);
- dst = buf;
+ if (offset == sl) {
+ if (dp != dst.length) {
+ dst = Arrays.copyOf(dst, dp);
+ }
+ this.value = dst;
+ this.coder = LATIN1;
+ return;
}
+ byte[] buf = new byte[length << 1];
+ StringLatin1.inflate(dst, 0, buf, 0, dp);
+ dst = buf;
dp = decodeUTF8_UTF16(bytes, offset, sl, dst, dp, true);
if (dp != length) {
dst = Arrays.copyOf(dst, dp << 1);
}
this.value = dst;
this.coder = UTF16;
+ } else { // !COMPACT_STRINGS
+ byte[] dst = new byte[length << 1];
+ int dp = decodeUTF8_UTF16(bytes, offset, offset + length, dst, 0, true);
+ if (dp != length) {
+ dst = Arrays.copyOf(dst, dp << 1);
+ }
+ this.value = dst;
+ this.coder = UTF16;
}
} else if (charset == ISO_8859_1.INSTANCE) {
if (COMPACT_STRINGS) {
@@ -682,41 +689,43 @@ public final class String
if (length == 0) {
return "";
}
- if (COMPACT_STRINGS && !StringCoding.hasNegatives(bytes, offset, length)) {
- return new String(Arrays.copyOfRange(bytes, offset, offset + length), LATIN1);
- } else {
+ int dp;
+ byte[] dst;
+ if (COMPACT_STRINGS) {
+ dp = StringCoding.countPositives(bytes, offset, length);
int sl = offset + length;
- int dp = 0;
- byte[] dst = null;
- if (COMPACT_STRINGS) {
- dst = new byte[length];
- while (offset < sl) {
- int b1 = bytes[offset];
- if (b1 >= 0) {
- dst[dp++] = (byte) b1;
+ if (dp == length) {
+ return new String(Arrays.copyOfRange(bytes, offset, offset + length), LATIN1);
+ }
+ dst = new byte[length];
+ System.arraycopy(bytes, offset, dst, 0, dp);
+ offset += dp;
+ while (offset < sl) {
+ int b1 = bytes[offset++];
+ if (b1 >= 0) {
+ dst[dp++] = (byte)b1;
+ continue;
+ }
+ if ((b1 & 0xfe) == 0xc2 && offset < sl) { // b1 either 0xc2 or 0xc3
+ int b2 = bytes[offset];
+ if (b2 < -64) { // continuation bytes are always negative values in the range -128 to -65
+ dst[dp++] = (byte)decode2(b1, b2);
offset++;
continue;
}
- if ((b1 & 0xfe) == 0xc2 && offset + 1 < sl) { // b1 either 0xc2 or 0xc3
- int b2 = bytes[offset + 1];
- if (!isNotContinuation(b2)) {
- dst[dp++] = (byte) decode2(b1, b2);
- offset += 2;
- continue;
- }
- }
- // anything not a latin1, including the REPL
- // we have to go with the utf16
- break;
}
- if (offset == sl) {
- if (dp != dst.length) {
- dst = Arrays.copyOf(dst, dp);
- }
- return new String(dst, LATIN1);
+ // anything not a latin1, including the REPL
+ // we have to go with the utf16
+ offset--;
+ break;
+ }
+ if (offset == sl) {
+ if (dp != dst.length) {
+ dst = Arrays.copyOf(dst, dp);
}
+ return new String(dst, LATIN1);
}
- if (dp == 0 || dst == null) {
+ if (dp == 0) {
dst = new byte[length << 1];
} else {
byte[] buf = new byte[length << 1];
@@ -724,11 +733,14 @@ public final class String
dst = buf;
}
dp = decodeUTF8_UTF16(bytes, offset, sl, dst, dp, false);
- if (dp != length) {
- dst = Arrays.copyOf(dst, dp << 1);
- }
- return new String(dst, UTF16);
+ } else { // !COMPACT_STRINGS
+ dst = new byte[length << 1];
+ dp = decodeUTF8_UTF16(bytes, offset, offset + length, dst, 0, false);
+ }
+ if (dp != length) {
+ dst = Arrays.copyOf(dst, dp << 1);
}
+ return new String(dst, UTF16);
}
static String newStringNoRepl(byte[] src, Charset cs) throws CharacterCodingException {
@@ -1019,17 +1031,15 @@ public final class String
*/
/* package-private */
static int decodeASCII(byte[] sa, int sp, char[] da, int dp, int len) {
- if (!StringCoding.hasNegatives(sa, sp, len)) {
- StringLatin1.inflate(sa, sp, da, dp, len);
- return len;
- } else {
- int start = sp;
- int end = sp + len;
- while (sp < end && sa[sp] >= 0) {
- da[dp++] = (char) sa[sp++];
+ int count = StringCoding.countPositives(sa, sp, len);
+ while (count < len) {
+ if (sa[sp + count] < 0) {
+ break;
}
- return sp - start;
+ count++;
}
+ StringLatin1.inflate(sa, sp, da, dp, count);
+ return count;
}
private static boolean isNotContinuation(int b) {
diff --git a/src/java.base/share/classes/java/lang/StringCoding.java b/src/java.base/share/classes/java/lang/StringCoding.java
index ec81c3795799f1f91a41d3c373053007e8b565cc..293fbdb78dc85c6a272c4ffef9340944b83b41fb 100644
--- a/src/java.base/share/classes/java/lang/StringCoding.java
+++ b/src/java.base/share/classes/java/lang/StringCoding.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2022, 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
@@ -34,14 +34,27 @@ class StringCoding {
private StringCoding() { }
- @IntrinsicCandidate
public static boolean hasNegatives(byte[] ba, int off, int len) {
- for (int i = off; i < off + len; i++) {
+ return countPositives(ba, off, len) != len;
+ }
+
+ /**
+ * Count the number of leading positive bytes in the range.
+ *
+ * @implSpec the implementation must return len if there are no negative
+ * bytes in the range. If there are negative bytes, the implementation must return
+ * a value that is less than or equal to the index of the first negative byte
+ * in the range.
+ */
+ @IntrinsicCandidate
+ public static int countPositives(byte[] ba, int off, int len) {
+ int limit = off + len;
+ for (int i = off; i < limit; i++) {
if (ba[i] < 0) {
- return true;
+ return i - off;
}
}
- return false;
+ return len;
}
@IntrinsicCandidate
diff --git a/src/java.base/share/classes/java/lang/StringConcatHelper.java b/src/java.base/share/classes/java/lang/StringConcatHelper.java
index f267fd9e1d6d9eb4e81b30b4cecaf295ba648f04..3867c10e8d6fcdead85bdc9b4f6d81dd31bd8177 100644
--- a/src/java.base/share/classes/java/lang/StringConcatHelper.java
+++ b/src/java.base/share/classes/java/lang/StringConcatHelper.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, 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
@@ -430,7 +430,7 @@ final class StringConcatHelper {
* Produce a String from a concatenation of single argument, which we
* end up using for trivial concatenations like {@code "" + arg}.
*
- * This will always create a new Object to comply with JLS 15.18.1:
+ * This will always create a new Object to comply with JLS {@jls 15.18.1}:
* "The String object is newly created unless the expression is a
* compile-time constant expression".
*
diff --git a/src/java.base/share/classes/java/lang/annotation/ElementType.java b/src/java.base/share/classes/java/lang/annotation/ElementType.java
index c046272b12c7b12d1ef75bd3b305b7269b4c1695..97275fb97ec8b6fe31d1293727f169075f106045 100644
--- a/src/java.base/share/classes/java/lang/annotation/ElementType.java
+++ b/src/java.base/share/classes/java/lang/annotation/ElementType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, 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
@@ -40,14 +40,14 @@ package java.lang.annotation;
* The constants {@link #ANNOTATION_TYPE}, {@link #CONSTRUCTOR}, {@link
* #FIELD}, {@link #LOCAL_VARIABLE}, {@link #METHOD}, {@link #PACKAGE}, {@link
* #MODULE}, {@link #PARAMETER}, {@link #TYPE}, and {@link #TYPE_PARAMETER}
- * correspond to the declaration contexts in JLS 9.6.4.1.
+ * correspond to the declaration contexts in JLS {@jls 9.6.4.1}.
*
* For example, an annotation whose interface is meta-annotated with
* {@code @Target(ElementType.FIELD)} may only be written as a modifier for a
* field declaration.
*
* The constant {@link #TYPE_USE} corresponds to the type contexts in JLS
- * 4.11, as well as to two declaration contexts: class and interface
+ * {@jls 4.11}, as well as to two declaration contexts: class and interface
* declarations (including annotation declarations) and type parameter
* declarations.
*
diff --git a/src/java.base/share/classes/java/lang/constant/ClassDesc.java b/src/java.base/share/classes/java/lang/constant/ClassDesc.java
index 14923594c0e1bc24cbfbce13bc91596dcd0495ac..6742b622a40c998a38ee52228622b95befb18205 100644
--- a/src/java.base/share/classes/java/lang/constant/ClassDesc.java
+++ b/src/java.base/share/classes/java/lang/constant/ClassDesc.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -116,7 +116,7 @@ public sealed interface ClassDesc
* followed by the field descriptor for the component type. Examples of
* valid type descriptor strings include {@code "Ljava/lang/String;"}, {@code "I"},
* {@code "[I"}, {@code "V"}, {@code "[Ljava/lang/String;"}, etc.
- * See JVMS 4.3.2 ("Field Descriptors") for more detail.
+ * See JVMS {@jvms 4.3.2 }("Field Descriptors") for more detail.
*
* @param descriptor a field descriptor string
* @return a {@linkplain ClassDesc} describing the desired class
@@ -148,7 +148,8 @@ public sealed interface ClassDesc
* is described by this {@linkplain ClassDesc}.
*
* @return a {@linkplain ClassDesc} describing the array type
- * @throws IllegalStateException if the resulting {@linkplain ClassDesc} would have an array rank of greater than 255
+ * @throws IllegalStateException if the resulting {@linkplain
+ * ClassDesc} would have an array rank of greater than 255
* @jvms 4.4.1 The CONSTANT_Class_info Structure
*/
default ClassDesc arrayType() {
@@ -167,14 +168,27 @@ public sealed interface ClassDesc
*
* @param rank the rank of the array
* @return a {@linkplain ClassDesc} describing the array type
- * @throws IllegalArgumentException if the rank is less than or equal to zero or if the rank of the resulting array type is
+ * @throws IllegalArgumentException if the rank is less than or
+ * equal to zero or if the rank of the resulting array type is
* greater than 255
* @jvms 4.4.1 The CONSTANT_Class_info Structure
*/
default ClassDesc arrayType(int rank) {
- int currentDepth = ConstantUtils.arrayDepth(descriptorString());
- if (rank <= 0 || currentDepth + rank > ConstantUtils.MAX_ARRAY_TYPE_DESC_DIMENSIONS)
- throw new IllegalArgumentException("rank: " + currentDepth + rank);
+ int netRank;
+ if (rank <= 0) {
+ throw new IllegalArgumentException("rank " + rank + " is not a positive value");
+ }
+ try {
+ int currentDepth = ConstantUtils.arrayDepth(descriptorString());
+ netRank = Math.addExact(currentDepth, rank);
+ if (netRank > ConstantUtils.MAX_ARRAY_TYPE_DESC_DIMENSIONS) {
+ throw new IllegalArgumentException("rank: " + netRank +
+ " exceeds maximum supported dimension of " +
+ ConstantUtils.MAX_ARRAY_TYPE_DESC_DIMENSIONS);
+ }
+ } catch (ArithmeticException ae) {
+ throw new IllegalArgumentException("Integer overflow in rank computation");
+ }
return ClassDesc.ofDescriptor("[".repeat(rank) + descriptorString());
}
diff --git a/src/java.base/share/classes/java/lang/constant/Constable.java b/src/java.base/share/classes/java/lang/constant/Constable.java
index 33875654c05404d7e1fb8eeb96844626b9d235d7..e404dff6e4ba8a89ad035f89f1e88a71b816f8fb 100644
--- a/src/java.base/share/classes/java/lang/constant/Constable.java
+++ b/src/java.base/share/classes/java/lang/constant/Constable.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,7 @@ import java.util.Optional;
/**
* Represents a type which is constable. A constable type is one whose
* values are constants that can be represented in the constant pool of a Java
- * classfile as described in JVMS 4.4, and whose instances can describe themselves
+ * classfile as described in JVMS {@jvms 4.4}, and whose instances can describe themselves
* nominally as a {@link ConstantDesc}.
*
* Some constable types have a native representation in the constant pool:
@@ -48,7 +48,7 @@ import java.util.Optional;
* Platform API are types that support Java language features such as {@link Enum},
* and runtime support classes such as {@link VarHandle}. These are typically
* described with a {@link DynamicConstantDesc}, which describes dynamically
- * generated constants (JVMS 4.4.10).
+ * generated constants (JVMS {@jvms 4.4.10}).
*
* The nominal form of an instance of a constable type is obtained via
* {@link #describeConstable()}. A {@linkplain Constable} need
diff --git a/src/java.base/share/classes/java/lang/constant/ConstantDesc.java b/src/java.base/share/classes/java/lang/constant/ConstantDesc.java
index 70c5f8fcb558be811518d5c5b0b94249e2501ad4..401119989a9527b2a49542157d831ad79377b4bc 100644
--- a/src/java.base/share/classes/java/lang/constant/ConstantDesc.java
+++ b/src/java.base/share/classes/java/lang/constant/ConstantDesc.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,7 @@ import java.lang.invoke.VarHandle.VarHandleDesc;
/**
* A nominal descriptor for a loadable
- * constant value, as defined in JVMS 4.4. Such a descriptor can be resolved via
+ * constant value, as defined in JVMS {@jvms 4.4}. Such a descriptor can be resolved via
* {@link ConstantDesc#resolveConstantDesc(MethodHandles.Lookup)} to yield the
* constant value itself.
*
@@ -87,7 +87,7 @@ public sealed interface ConstantDesc
String {
/**
* Resolves this descriptor reflectively, emulating the resolution behavior
- * of JVMS 5.4.3 and the access control behavior of JVMS 5.4.4. The resolution
+ * of JVMS {@jvms 5.4.3} and the access control behavior of JVMS {@jvms 5.4.4}. The resolution
* and access control context is provided by the {@link MethodHandles.Lookup}
* parameter. No caching of the resulting value is performed.
*
diff --git a/src/java.base/share/classes/java/lang/constant/package-info.java b/src/java.base/share/classes/java/lang/constant/package-info.java
index 9bc978e44a192e0415d550f16d1a50cf7acfe565..fd85dfb93d74290ceb126d730856b5111d00bb46 100644
--- a/src/java.base/share/classes/java/lang/constant/package-info.java
+++ b/src/java.base/share/classes/java/lang/constant/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, 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
@@ -55,7 +55,7 @@
* referenced in their nominal description are present and accessible.
*
* The subtypes of {@link java.lang.constant.ConstantDesc} describe various kinds
- * of constant values. For each type of loadable constant pool entry defined in JVMS 4.4,
+ * of constant values. For each type of loadable constant pool entry defined in JVMS {@jvms 4.4},
* there is a corresponding subtype of {@link java.lang.constant.ConstantDesc}:
* {@link java.lang.constant.ClassDesc}, {@link java.lang.constant.MethodTypeDesc},
* {@link java.lang.constant.DirectMethodHandleDesc}, {@link java.lang.String},
diff --git a/src/java.base/share/classes/java/lang/invoke/ConstantBootstraps.java b/src/java.base/share/classes/java/lang/invoke/ConstantBootstraps.java
index 27d74284dc6d4361fd0f27a452332fa2d569a41b..b3858104e21e4cac947671dd26ff90c0dfd84114 100644
--- a/src/java.base/share/classes/java/lang/invoke/ConstantBootstraps.java
+++ b/src/java.base/share/classes/java/lang/invoke/ConstantBootstraps.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2017, 2022, 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
@@ -96,7 +96,7 @@ public final class ConstantBootstraps {
* descriptor is specified by {@code name}.
*
* @param lookup unused
- * @param name the descriptor (JVMS 4.3) of the desired primitive type
+ * @param name the descriptor (JVMS {@jvms 4.3}) of the desired primitive type
* @param type the required result type (must be {@code Class.class})
* @return the {@link Class} mirror
* @throws IllegalArgumentException if the name is not a descriptor for a
diff --git a/src/java.base/share/classes/java/lang/invoke/MethodHandle.java b/src/java.base/share/classes/java/lang/invoke/MethodHandle.java
index ec910dbf8fe34598c1ba9ec0b9eebf7bab2daabb..fb7ef0afbac3f9be8d74e24880bc6ea621cc7368 100644
--- a/src/java.base/share/classes/java/lang/invoke/MethodHandle.java
+++ b/src/java.base/share/classes/java/lang/invoke/MethodHandle.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2022, 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
@@ -807,15 +807,15 @@ public abstract class MethodHandle implements Constable {
* (The types do not need to be related in any particular way.
* This is because a dynamic value of null can convert to any reference type.)
* By default, a hidden class or interface may be unloaded
* even if the class loader that is marked as its defining loader is
@@ -2024,7 +2024,7 @@ public class MethodHandles {
* that {@linkplain Class#getClassLoader() defined it}.
* This means that a class created by a class loader may be unloaded if and
* only if its defining loader is not reachable and thus may be reclaimed
- * by a garbage collector (JLS 12.7).
+ * by a garbage collector (JLS {@jls 12.7}).
*
* By default, however, a hidden class or interface may be unloaded even if
* the class loader that is marked as its defining loader is
@@ -2759,7 +2759,7 @@ assertEquals("[x, y, z]", pb.command().toString());
/**
* Looks up a class by name from the lookup context defined by this {@code Lookup} object,
* as if resolved by an {@code ldc} instruction.
- * Such a resolution, as specified in JVMS 5.4.3.1 section, attempts to locate and load the class,
+ * Such a resolution, as specified in JVMS {@jvms 5.4.3.1}, attempts to locate and load the class,
* and then determines whether the class is accessible to this lookup object.
*
* The lookup context here is determined by the {@linkplain #lookupClass() lookup class},
@@ -4757,15 +4757,15 @@ return invoker;
* the boolean is converted to a byte value, 1 for true, 0 for false.
* (This treatment follows the usage of the bytecode verifier.)
* Note that in some cases, closing the input stream may depend on the
+ * peer's output stream being closed first. If the connection is not closed
+ * in an orderly manner (for example {@link Socket#shutdownInput()} is called
+ * before the peer's write closure notification has been received), exceptions
+ * may be raised to indicate that an error has occurred.
+ *
+ * Once an {@code SSLSocket} is closed, it is not reusable: a new
+ * {@code SSLSocket} must be created.
*
* @see java.net.Socket
* @see SSLServerSocket
diff --git a/src/java.base/share/classes/jdk/internal/logger/LoggerFinderLoader.java b/src/java.base/share/classes/jdk/internal/logger/LoggerFinderLoader.java
index dbf4ccca128e4c292231f66fd1e3f33f11296cd3..4f009973e2742a2468aa2437353f23bcd178a99a 100644
--- a/src/java.base/share/classes/jdk/internal/logger/LoggerFinderLoader.java
+++ b/src/java.base/share/classes/jdk/internal/logger/LoggerFinderLoader.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, 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
@@ -129,7 +129,7 @@ public final class LoggerFinderLoader {
result = iterator.next();
if (iterator.hasNext() && ensureSingletonProvider()) {
throw new ServiceConfigurationError(
- "More than on LoggerFinder implementation");
+ "More than one LoggerFinder implementation");
}
} else {
result = loadDefaultImplementation();
diff --git a/src/java.base/share/classes/sun/security/ssl/Alert.java b/src/java.base/share/classes/sun/security/ssl/Alert.java
index bc034dc8c3bcfbc0eae58c61e75d7017a5b4e3eb..922937887aaaceb25a202578dda1eecc191e6fc9 100644
--- a/src/java.base/share/classes/sun/security/ssl/Alert.java
+++ b/src/java.base/share/classes/sun/security/ssl/Alert.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, 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
@@ -122,22 +122,15 @@ enum Alert {
reason = (cause != null) ? cause.getMessage() : "";
}
- SSLException ssle;
if (cause instanceof IOException) {
- ssle = new SSLException(reason);
+ return new SSLException(reason, cause);
} else if ((this == UNEXPECTED_MESSAGE)) {
- ssle = new SSLProtocolException(reason);
+ return new SSLProtocolException(reason, cause);
} else if (handshakeOnly) {
- ssle = new SSLHandshakeException(reason);
+ return new SSLHandshakeException(reason, cause);
} else {
- ssle = new SSLException(reason);
+ return new SSLException(reason, cause);
}
-
- if (cause != null) {
- ssle.initCause(cause);
- }
-
- return ssle;
}
/**
diff --git a/src/java.base/share/classes/sun/security/ssl/DHClientKeyExchange.java b/src/java.base/share/classes/sun/security/ssl/DHClientKeyExchange.java
index f9753ffe078b6c13f813e23500aa9556c75e27b0..996e3f78ec162b97f95b3abbe150f7a8d942f120 100644
--- a/src/java.base/share/classes/sun/security/ssl/DHClientKeyExchange.java
+++ b/src/java.base/share/classes/sun/security/ssl/DHClientKeyExchange.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, 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
@@ -295,8 +295,8 @@ final class DHClientKeyExchange {
shc.handshakeCredentials.add(
new DHECredentials(peerPublicKey, namedGroup));
} catch (GeneralSecurityException | java.io.IOException e) {
- throw (SSLHandshakeException)(new SSLHandshakeException(
- "Could not generate DHPublicKey").initCause(e));
+ throw new SSLHandshakeException(
+ "Could not generate DHPublicKey", e);
}
// update the states
diff --git a/src/java.base/share/classes/sun/security/ssl/ECDHKeyExchange.java b/src/java.base/share/classes/sun/security/ssl/ECDHKeyExchange.java
index 59bc40411ce86580ebfefd2a6daf62d985aa4cc9..9833ea94e8d48ec3aa80f87226fbf16515c275da 100644
--- a/src/java.base/share/classes/sun/security/ssl/ECDHKeyExchange.java
+++ b/src/java.base/share/classes/sun/security/ssl/ECDHKeyExchange.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, 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
@@ -160,8 +160,7 @@ final class ECDHKeyExchange {
ka.doPhase(peerPublicKey, true);
return ka.generateSecret("TlsPremasterSecret");
} catch (GeneralSecurityException e) {
- throw (SSLHandshakeException) new SSLHandshakeException(
- "Could not generate secret").initCause(e);
+ throw new SSLHandshakeException("Could not generate secret", e);
}
}
@@ -177,8 +176,7 @@ final class ECDHKeyExchange {
PublicKey peerPublicKey = kf.generatePublic(spec);
return getAgreedSecret(peerPublicKey);
} catch (GeneralSecurityException | java.io.IOException e) {
- throw (SSLHandshakeException) new SSLHandshakeException(
- "Could not generate secret").initCause(e);
+ throw new SSLHandshakeException("Could not generate secret", e);
}
}
@@ -202,8 +200,8 @@ final class ECDHKeyExchange {
"ECPublicKey does not comply to algorithm constraints");
}
} catch (GeneralSecurityException | java.io.IOException e) {
- throw (SSLHandshakeException) new SSLHandshakeException(
- "Could not generate ECPublicKey").initCause(e);
+ throw new SSLHandshakeException(
+ "Could not generate ECPublicKey", e);
}
}
diff --git a/src/java.base/share/classes/sun/security/ssl/KAKeyDerivation.java b/src/java.base/share/classes/sun/security/ssl/KAKeyDerivation.java
index 7c791e85f773481a632d3313fc62bde60637c353..b76da75c763cca16cb8933af724c3ac86a371e6c 100644
--- a/src/java.base/share/classes/sun/security/ssl/KAKeyDerivation.java
+++ b/src/java.base/share/classes/sun/security/ssl/KAKeyDerivation.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2022, 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,8 +88,7 @@ public class KAKeyDerivation implements SSLKeyDerivation {
context, preMasterSecret);
return kd.deriveKey("MasterSecret", params);
} catch (GeneralSecurityException gse) {
- throw (SSLHandshakeException) new SSLHandshakeException(
- "Could not generate secret").initCause(gse);
+ throw new SSLHandshakeException("Could not generate secret", gse);
}
}
@@ -125,8 +124,7 @@ public class KAKeyDerivation implements SSLKeyDerivation {
// derive handshake secret
return hkdf.extract(saltSecret, sharedSecret, algorithm);
} catch (GeneralSecurityException gse) {
- throw (SSLHandshakeException) new SSLHandshakeException(
- "Could not generate secret").initCause(gse);
+ throw new SSLHandshakeException("Could not generate secret", gse);
}
}
}
diff --git a/src/java.base/share/classes/sun/security/ssl/NewSessionTicket.java b/src/java.base/share/classes/sun/security/ssl/NewSessionTicket.java
index 50f19dbf715c1e101a92923f098b54edb0b68eff..337c83849915be30a3e27e862ef571cc3dc0406b 100644
--- a/src/java.base/share/classes/sun/security/ssl/NewSessionTicket.java
+++ b/src/java.base/share/classes/sun/security/ssl/NewSessionTicket.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, 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
@@ -302,8 +302,7 @@ final class NewSessionTicket {
return hkdf.expand(resumptionMasterSecret, hkdfInfo,
hashAlg.hashLength, "TlsPreSharedKey");
} catch (GeneralSecurityException gse) {
- throw (SSLHandshakeException) new SSLHandshakeException(
- "Could not derive PSK").initCause(gse);
+ throw new SSLHandshakeException("Could not derive PSK", gse);
}
}
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLBasicKeyDerivation.java b/src/java.base/share/classes/sun/security/ssl/SSLBasicKeyDerivation.java
index 7f6934006379551ad9c1fc220f71e67d78c284be..20fc711259379d262fcf866c30d425a23487b6bc 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLBasicKeyDerivation.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLBasicKeyDerivation.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -52,8 +52,7 @@ final class SSLBasicKeyDerivation implements SSLKeyDerivation {
return hkdf.expand(secret, hkdfInfo,
((SecretSizeSpec)keySpec).length, algorithm);
} catch (GeneralSecurityException gse) {
- throw (SSLHandshakeException) new SSLHandshakeException(
- "Could not generate secret").initCause(gse);
+ throw new SSLHandshakeException("Could not generate secret", gse);
}
}
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLEngineImpl.java b/src/java.base/share/classes/sun/security/ssl/SSLEngineImpl.java
index ca4a80c5a5c550706ab85692df6c7e5170f3a62e..1db9ba8d86bad0a3db0a96b80a8b59f48f425dba 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLEngineImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLEngineImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2022, 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
@@ -1167,17 +1167,13 @@ final class SSLEngineImpl extends SSLEngine implements SSLTransport {
if (taskThrown instanceof RuntimeException) {
throw new RuntimeException(msg, taskThrown);
} else if (taskThrown instanceof SSLHandshakeException) {
- return (SSLHandshakeException)
- new SSLHandshakeException(msg).initCause(taskThrown);
+ return new SSLHandshakeException(msg, taskThrown);
} else if (taskThrown instanceof SSLKeyException) {
- return (SSLKeyException)
- new SSLKeyException(msg).initCause(taskThrown);
+ return new SSLKeyException(msg, taskThrown);
} else if (taskThrown instanceof SSLPeerUnverifiedException) {
- return (SSLPeerUnverifiedException)
- new SSLPeerUnverifiedException(msg).initCause(taskThrown);
+ return new SSLPeerUnverifiedException(msg, taskThrown);
} else if (taskThrown instanceof SSLProtocolException) {
- return (SSLProtocolException)
- new SSLProtocolException(msg).initCause(taskThrown);
+ return new SSLProtocolException(msg, taskThrown);
} else if (taskThrown instanceof SSLException) {
return (SSLException)taskThrown;
} else {
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLEngineInputRecord.java b/src/java.base/share/classes/sun/security/ssl/SSLEngineInputRecord.java
index 938768aaf76bb26fd53b9342e9c5f5497b87bcb4..dc957ca141949a99d2c155cd445895091724f4cb 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLEngineInputRecord.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLEngineInputRecord.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -242,8 +242,7 @@ final class SSLEngineInputRecord extends InputRecord implements SSLRecord {
} catch (BadPaddingException bpe) {
throw bpe;
} catch (GeneralSecurityException gse) {
- throw (SSLProtocolException)(new SSLProtocolException(
- "Unexpected exception")).initCause(gse);
+ throw new SSLProtocolException("Unexpected exception", gse);
} finally {
// consume a complete record
packet.limit(srcLim);
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLSecretDerivation.java b/src/java.base/share/classes/sun/security/ssl/SSLSecretDerivation.java
index a7ba9a5e566a5aeabfae7e0083d63ec4d42e4807..ff13948a67c20b65b4b5c2e48112ff17b3fd2b6e 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLSecretDerivation.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLSecretDerivation.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, 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
@@ -113,8 +113,7 @@ final class SSLSecretDerivation implements SSLKeyDerivation {
HKDF hkdf = new HKDF(hashAlg.name);
return hkdf.expand(secret, hkdfInfo, hashAlg.hashLength, algorithm);
} catch (GeneralSecurityException gse) {
- throw (SSLHandshakeException) new SSLHandshakeException(
- "Could not generate secret").initCause(gse);
+ throw new SSLHandshakeException("Could not generate secret", gse);
}
}
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java b/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java
index 842cef119113d02abe9fa9c6196b5dc8942cf633..68fb386020339c39e6d9d608223714659b59552a 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2022, 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
@@ -1709,19 +1709,13 @@ public final class SSLSocketImpl
private Plaintext handleEOF(EOFException eofe) throws IOException {
if (requireCloseNotify || conContext.handshakeContext != null) {
- SSLException ssle;
if (conContext.handshakeContext != null) {
- ssle = new SSLHandshakeException(
- "Remote host terminated the handshake");
+ throw new SSLHandshakeException(
+ "Remote host terminated the handshake", eofe);
} else {
- ssle = new SSLProtocolException(
- "Remote host terminated the connection");
- }
-
- if (eofe != null) {
- ssle.initCause(eofe);
+ throw new SSLProtocolException(
+ "Remote host terminated the connection", eofe);
}
- throw ssle;
} else {
// treat as if we had received a close_notify
conContext.isInputCloseNotified = true;
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLSocketInputRecord.java b/src/java.base/share/classes/sun/security/ssl/SSLSocketInputRecord.java
index da189f4f3fff342abd2e53a47f642d25c22507b7..7afacb0f3d77c96e7d233428a54d1b0f086e1a93 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLSocketInputRecord.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLSocketInputRecord.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2020, Azul Systems, Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -263,8 +263,7 @@ final class SSLSocketInputRecord extends InputRecord implements SSLRecord {
} catch (BadPaddingException bpe) {
throw bpe;
} catch (GeneralSecurityException gse) {
- throw (SSLProtocolException)(new SSLProtocolException(
- "Unexpected exception")).initCause(gse);
+ throw new SSLProtocolException("Unexpected exception", gse);
}
if (contentType != ContentType.HANDSHAKE.id &&
diff --git a/src/java.base/share/classes/sun/security/ssl/SSLTrafficKeyDerivation.java b/src/java.base/share/classes/sun/security/ssl/SSLTrafficKeyDerivation.java
index ac39cbb16fbd930d0befc33522127fbd2f6dc11e..6e890c8818dc05228f50052cc5284fb707283b7b 100644
--- a/src/java.base/share/classes/sun/security/ssl/SSLTrafficKeyDerivation.java
+++ b/src/java.base/share/classes/sun/security/ssl/SSLTrafficKeyDerivation.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, 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
@@ -154,8 +154,8 @@ enum SSLTrafficKeyDerivation implements SSLKeyDerivationGenerator {
ks.getKeyLength(cs),
ks.getAlgorithm(cs, algorithm));
} catch (GeneralSecurityException gse) {
- throw (SSLHandshakeException)(new SSLHandshakeException(
- "Could not generate secret").initCause(gse));
+ throw new SSLHandshakeException(
+ "Could not generate secret", gse);
}
}
diff --git a/src/java.base/share/classes/sun/security/ssl/ServerHello.java b/src/java.base/share/classes/sun/security/ssl/ServerHello.java
index 193a71cde861ebaac056b74caa2650051ce33a39..efbe860bfd6be6fc64dfe73a31c19e95039ad6c2 100644
--- a/src/java.base/share/classes/sun/security/ssl/ServerHello.java
+++ b/src/java.base/share/classes/sun/security/ssl/ServerHello.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, 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
@@ -1205,8 +1205,7 @@ final class ServerHello {
hc.handshakeKeyDerivation =
new SSLSecretDerivation(hc, earlySecret);
} catch (GeneralSecurityException gse) {
- throw (SSLHandshakeException) new SSLHandshakeException(
- "Could not generate secret").initCause(gse);
+ throw new SSLHandshakeException("Could not generate secret", gse);
}
}
diff --git a/src/java.base/share/classes/sun/security/ssl/ServerNameExtension.java b/src/java.base/share/classes/sun/security/ssl/ServerNameExtension.java
index 74f38bf5b56c448f84d0ca3bef6143c8e17b6404..eaf154af3bb4c989df54cc609d7d14f0f570039e 100644
--- a/src/java.base/share/classes/sun/security/ssl/ServerNameExtension.java
+++ b/src/java.base/share/classes/sun/security/ssl/ServerNameExtension.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -135,9 +135,8 @@ final class ServerNameExtension {
nameType + "), name=" +
(new String(encoded, StandardCharsets.UTF_8)) +
", value={" +
- Utilities.toHexString(encoded) + "}");
- throw hc.conContext.fatal(Alert.ILLEGAL_PARAMETER,
- (SSLProtocolException)spe.initCause(iae));
+ Utilities.toHexString(encoded) + "}", iae);
+ throw hc.conContext.fatal(Alert.ILLEGAL_PARAMETER, spe);
}
} else {
try {
@@ -146,9 +145,8 @@ final class ServerNameExtension {
SSLProtocolException spe = new SSLProtocolException(
"Illegal server name, type=(" + nameType +
"), value={" +
- Utilities.toHexString(encoded) + "}");
- throw hc.conContext.fatal(Alert.ILLEGAL_PARAMETER,
- (SSLProtocolException)spe.initCause(iae));
+ Utilities.toHexString(encoded) + "}", iae);
+ throw hc.conContext.fatal(Alert.ILLEGAL_PARAMETER, spe);
}
}
diff --git a/src/java.base/share/classes/sun/security/tools/keytool/Main.java b/src/java.base/share/classes/sun/security/tools/keytool/Main.java
index 032fcd768ea0900d5b3a710edf79cc75402afc76..462606c7f84c28176c44a0f549b6c410c85f677a 100644
--- a/src/java.base/share/classes/sun/security/tools/keytool/Main.java
+++ b/src/java.base/share/classes/sun/security/tools/keytool/Main.java
@@ -42,8 +42,6 @@ import java.security.cert.TrustAnchor;
import java.security.cert.URICertStoreParameters;
-import java.security.interfaces.ECKey;
-import java.security.interfaces.EdECKey;
import java.security.spec.ECParameterSpec;
import java.text.Collator;
import java.text.MessageFormat;
@@ -2018,7 +2016,7 @@ public final class Main {
("Generating.keysize.bit.keyAlgName.key.pair.and.a.certificate.sigAlgName.issued.by.signerAlias.with.a.validity.of.validality.days.for"));
Object[] source = {
groupName == null ? keysize : KeyUtil.getKeySize(privKey),
- fullDisplayAlgName(privKey),
+ KeyUtil.fullDisplayAlgName(privKey),
newCert.getSigAlgName(),
signerAlias,
validity,
@@ -2029,7 +2027,7 @@ public final class Main {
("Generating.keysize.bit.keyAlgName.key.pair.and.self.signed.certificate.sigAlgName.with.a.validity.of.validality.days.for"));
Object[] source = {
groupName == null ? keysize : KeyUtil.getKeySize(privKey),
- fullDisplayAlgName(privKey),
+ KeyUtil.fullDisplayAlgName(privKey),
newCert.getSigAlgName(),
validity,
x500Name};
@@ -3560,24 +3558,10 @@ public final class Main {
}
}
- private String fullDisplayAlgName(Key key) {
- String result = key.getAlgorithm();
- if (key instanceof ECKey) {
- ECParameterSpec paramSpec = ((ECKey) key).getParams();
- if (paramSpec instanceof NamedCurve) {
- NamedCurve nc = (NamedCurve)paramSpec;
- result += " (" + nc.getNameAndAliases()[0] + ")";
- }
- } else if (key instanceof EdECKey) {
- result = ((EdECKey) key).getParams().getName();
- }
- return result;
- }
-
private String withWeakConstraint(Key key,
CertPathConstraintsParameters cpcp) {
int kLen = KeyUtil.getKeySize(key);
- String displayAlg = fullDisplayAlgName(key);
+ String displayAlg = KeyUtil.fullDisplayAlgName(key);
try {
DISABLED_CHECK.permits(key.getAlgorithm(), cpcp, true);
} catch (CertPathValidatorException e) {
@@ -4946,13 +4930,13 @@ public final class Main {
weakWarnings.add(String.format(
rb.getString("whose.key.weak"), label,
String.format(rb.getString("key.bit"),
- KeyUtil.getKeySize(key), fullDisplayAlgName(key))));
+ KeyUtil.getKeySize(key), KeyUtil.fullDisplayAlgName(key))));
}
} catch (CertPathValidatorException e) {
weakWarnings.add(String.format(
rb.getString("whose.key.disabled"), label,
String.format(rb.getString("key.bit"),
- KeyUtil.getKeySize(key), fullDisplayAlgName(key))));
+ KeyUtil.getKeySize(key), KeyUtil.fullDisplayAlgName(key))));
}
}
}
@@ -4973,12 +4957,12 @@ public final class Main {
weakWarnings.add(String.format(
rb.getString("whose.key.disabled"), label,
String.format(rb.getString("key.bit"),
- KeyUtil.getKeySize(key), fullDisplayAlgName(key))));
+ KeyUtil.getKeySize(key), KeyUtil.fullDisplayAlgName(key))));
} else if (!LEGACY_CHECK.permits(SIG_PRIMITIVE_SET, key)) {
weakWarnings.add(String.format(
rb.getString("whose.key.weak"), label,
String.format(rb.getString("key.bit"),
- KeyUtil.getKeySize(key), fullDisplayAlgName(key))));
+ KeyUtil.getKeySize(key), KeyUtil.fullDisplayAlgName(key))));
}
}
}
diff --git a/src/java.base/share/classes/sun/security/util/KeyUtil.java b/src/java.base/share/classes/sun/security/util/KeyUtil.java
index a20ebffa5ff53a72ffd38633307cf588150990b6..3648447e10e138616d30c086781d2bb83b8e8547 100644
--- a/src/java.base/share/classes/sun/security/util/KeyUtil.java
+++ b/src/java.base/share/classes/sun/security/util/KeyUtil.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2022, 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
@@ -190,6 +190,28 @@ public final class KeyUtil {
return -1;
}
+ /**
+ * Returns the algorithm name of the given key object. If an EC key is
+ * specified, returns the algorithm name and its named curve.
+ *
+ * @param key the key object, cannot be null
+ * @return the algorithm name of the given key object, or return in the
+ * form of "EC (named curve)" if the given key object is an EC key
+ */
+ public static final String fullDisplayAlgName(Key key) {
+ String result = key.getAlgorithm();
+ if (key instanceof ECKey) {
+ ECParameterSpec paramSpec = ((ECKey) key).getParams();
+ if (paramSpec instanceof NamedCurve) {
+ NamedCurve nc = (NamedCurve)paramSpec;
+ result += " (" + nc.getNameAndAliases()[0] + ")";
+ }
+ } else if (key instanceof EdECKey) {
+ result = ((EdECKey) key).getParams().getName();
+ }
+ return result;
+ }
+
/**
* Returns whether the key is valid or not.
*
diff --git a/src/java.base/share/classes/sun/util/resources/CurrencyNames.properties b/src/java.base/share/classes/sun/util/resources/CurrencyNames.properties
index 9f1867d2cd1ed3fbb41c2294354746815c3a3b1d..53bf1d837ff60416255503277dba683c6c4c249a 100644
--- a/src/java.base/share/classes/sun/util/resources/CurrencyNames.properties
+++ b/src/java.base/share/classes/sun/util/resources/CurrencyNames.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2005, 2022, 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
@@ -221,6 +221,7 @@ SGD=SGD
SHP=SHP
SIT=SIT
SKK=SKK
+SLE=SLE
SLL=SLL
SOS=SOS
SRD=SRD
@@ -445,6 +446,7 @@ sgd=Singapore Dollar
shp=Saint Helena Pound
sit=Slovenian Tolar
skk=Slovak Koruna
+sle=Sierra Leonean Leone
sll=Sierra Leonean Leone
sos=Somali Shilling
srd=Surinamese Dollar
diff --git a/make/data/blockedcertsconverter/blocked.certs.pem b/src/java.base/share/data/blockedcertsconverter/blocked.certs.pem
similarity index 100%
rename from make/data/blockedcertsconverter/blocked.certs.pem
rename to src/java.base/share/data/blockedcertsconverter/blocked.certs.pem
diff --git a/make/data/cacerts/README b/src/java.base/share/data/cacerts/README
similarity index 100%
rename from make/data/cacerts/README
rename to src/java.base/share/data/cacerts/README
diff --git a/make/data/cacerts/actalisauthenticationrootca b/src/java.base/share/data/cacerts/actalisauthenticationrootca
similarity index 100%
rename from make/data/cacerts/actalisauthenticationrootca
rename to src/java.base/share/data/cacerts/actalisauthenticationrootca
diff --git a/make/data/cacerts/addtrustexternalca b/src/java.base/share/data/cacerts/addtrustexternalca
similarity index 100%
rename from make/data/cacerts/addtrustexternalca
rename to src/java.base/share/data/cacerts/addtrustexternalca
diff --git a/make/data/cacerts/addtrustqualifiedca b/src/java.base/share/data/cacerts/addtrustqualifiedca
similarity index 100%
rename from make/data/cacerts/addtrustqualifiedca
rename to src/java.base/share/data/cacerts/addtrustqualifiedca
diff --git a/make/data/cacerts/affirmtrustcommercialca b/src/java.base/share/data/cacerts/affirmtrustcommercialca
similarity index 100%
rename from make/data/cacerts/affirmtrustcommercialca
rename to src/java.base/share/data/cacerts/affirmtrustcommercialca
diff --git a/make/data/cacerts/affirmtrustnetworkingca b/src/java.base/share/data/cacerts/affirmtrustnetworkingca
similarity index 100%
rename from make/data/cacerts/affirmtrustnetworkingca
rename to src/java.base/share/data/cacerts/affirmtrustnetworkingca
diff --git a/make/data/cacerts/affirmtrustpremiumca b/src/java.base/share/data/cacerts/affirmtrustpremiumca
similarity index 100%
rename from make/data/cacerts/affirmtrustpremiumca
rename to src/java.base/share/data/cacerts/affirmtrustpremiumca
diff --git a/make/data/cacerts/affirmtrustpremiumeccca b/src/java.base/share/data/cacerts/affirmtrustpremiumeccca
similarity index 100%
rename from make/data/cacerts/affirmtrustpremiumeccca
rename to src/java.base/share/data/cacerts/affirmtrustpremiumeccca
diff --git a/make/data/cacerts/amazonrootca1 b/src/java.base/share/data/cacerts/amazonrootca1
similarity index 100%
rename from make/data/cacerts/amazonrootca1
rename to src/java.base/share/data/cacerts/amazonrootca1
diff --git a/make/data/cacerts/amazonrootca2 b/src/java.base/share/data/cacerts/amazonrootca2
similarity index 100%
rename from make/data/cacerts/amazonrootca2
rename to src/java.base/share/data/cacerts/amazonrootca2
diff --git a/make/data/cacerts/amazonrootca3 b/src/java.base/share/data/cacerts/amazonrootca3
similarity index 100%
rename from make/data/cacerts/amazonrootca3
rename to src/java.base/share/data/cacerts/amazonrootca3
diff --git a/make/data/cacerts/amazonrootca4 b/src/java.base/share/data/cacerts/amazonrootca4
similarity index 100%
rename from make/data/cacerts/amazonrootca4
rename to src/java.base/share/data/cacerts/amazonrootca4
diff --git a/make/data/cacerts/baltimorecybertrustca b/src/java.base/share/data/cacerts/baltimorecybertrustca
similarity index 100%
rename from make/data/cacerts/baltimorecybertrustca
rename to src/java.base/share/data/cacerts/baltimorecybertrustca
diff --git a/make/data/cacerts/buypassclass2ca b/src/java.base/share/data/cacerts/buypassclass2ca
similarity index 100%
rename from make/data/cacerts/buypassclass2ca
rename to src/java.base/share/data/cacerts/buypassclass2ca
diff --git a/make/data/cacerts/buypassclass3ca b/src/java.base/share/data/cacerts/buypassclass3ca
similarity index 100%
rename from make/data/cacerts/buypassclass3ca
rename to src/java.base/share/data/cacerts/buypassclass3ca
diff --git a/make/data/cacerts/camerfirmachambersca b/src/java.base/share/data/cacerts/camerfirmachambersca
similarity index 100%
rename from make/data/cacerts/camerfirmachambersca
rename to src/java.base/share/data/cacerts/camerfirmachambersca
diff --git a/make/data/cacerts/camerfirmachamberscommerceca b/src/java.base/share/data/cacerts/camerfirmachamberscommerceca
similarity index 100%
rename from make/data/cacerts/camerfirmachamberscommerceca
rename to src/java.base/share/data/cacerts/camerfirmachamberscommerceca
diff --git a/make/data/cacerts/camerfirmachambersignca b/src/java.base/share/data/cacerts/camerfirmachambersignca
similarity index 100%
rename from make/data/cacerts/camerfirmachambersignca
rename to src/java.base/share/data/cacerts/camerfirmachambersignca
diff --git a/make/data/cacerts/certumca b/src/java.base/share/data/cacerts/certumca
similarity index 100%
rename from make/data/cacerts/certumca
rename to src/java.base/share/data/cacerts/certumca
diff --git a/make/data/cacerts/certumtrustednetworkca b/src/java.base/share/data/cacerts/certumtrustednetworkca
similarity index 100%
rename from make/data/cacerts/certumtrustednetworkca
rename to src/java.base/share/data/cacerts/certumtrustednetworkca
diff --git a/make/data/cacerts/chunghwaepkirootca b/src/java.base/share/data/cacerts/chunghwaepkirootca
similarity index 100%
rename from make/data/cacerts/chunghwaepkirootca
rename to src/java.base/share/data/cacerts/chunghwaepkirootca
diff --git a/make/data/cacerts/comodoaaaca b/src/java.base/share/data/cacerts/comodoaaaca
similarity index 100%
rename from make/data/cacerts/comodoaaaca
rename to src/java.base/share/data/cacerts/comodoaaaca
diff --git a/make/data/cacerts/comodoeccca b/src/java.base/share/data/cacerts/comodoeccca
similarity index 100%
rename from make/data/cacerts/comodoeccca
rename to src/java.base/share/data/cacerts/comodoeccca
diff --git a/make/data/cacerts/comodorsaca b/src/java.base/share/data/cacerts/comodorsaca
similarity index 100%
rename from make/data/cacerts/comodorsaca
rename to src/java.base/share/data/cacerts/comodorsaca
diff --git a/make/data/cacerts/digicertassuredidg2 b/src/java.base/share/data/cacerts/digicertassuredidg2
similarity index 100%
rename from make/data/cacerts/digicertassuredidg2
rename to src/java.base/share/data/cacerts/digicertassuredidg2
diff --git a/make/data/cacerts/digicertassuredidg3 b/src/java.base/share/data/cacerts/digicertassuredidg3
similarity index 100%
rename from make/data/cacerts/digicertassuredidg3
rename to src/java.base/share/data/cacerts/digicertassuredidg3
diff --git a/make/data/cacerts/digicertassuredidrootca b/src/java.base/share/data/cacerts/digicertassuredidrootca
similarity index 100%
rename from make/data/cacerts/digicertassuredidrootca
rename to src/java.base/share/data/cacerts/digicertassuredidrootca
diff --git a/make/data/cacerts/digicertglobalrootca b/src/java.base/share/data/cacerts/digicertglobalrootca
similarity index 100%
rename from make/data/cacerts/digicertglobalrootca
rename to src/java.base/share/data/cacerts/digicertglobalrootca
diff --git a/make/data/cacerts/digicertglobalrootg2 b/src/java.base/share/data/cacerts/digicertglobalrootg2
similarity index 100%
rename from make/data/cacerts/digicertglobalrootg2
rename to src/java.base/share/data/cacerts/digicertglobalrootg2
diff --git a/make/data/cacerts/digicertglobalrootg3 b/src/java.base/share/data/cacerts/digicertglobalrootg3
similarity index 100%
rename from make/data/cacerts/digicertglobalrootg3
rename to src/java.base/share/data/cacerts/digicertglobalrootg3
diff --git a/make/data/cacerts/digicerthighassuranceevrootca b/src/java.base/share/data/cacerts/digicerthighassuranceevrootca
similarity index 100%
rename from make/data/cacerts/digicerthighassuranceevrootca
rename to src/java.base/share/data/cacerts/digicerthighassuranceevrootca
diff --git a/make/data/cacerts/digicerttrustedrootg4 b/src/java.base/share/data/cacerts/digicerttrustedrootg4
similarity index 100%
rename from make/data/cacerts/digicerttrustedrootg4
rename to src/java.base/share/data/cacerts/digicerttrustedrootg4
diff --git a/make/data/cacerts/dtrustclass3ca2 b/src/java.base/share/data/cacerts/dtrustclass3ca2
similarity index 100%
rename from make/data/cacerts/dtrustclass3ca2
rename to src/java.base/share/data/cacerts/dtrustclass3ca2
diff --git a/make/data/cacerts/dtrustclass3ca2ev b/src/java.base/share/data/cacerts/dtrustclass3ca2ev
similarity index 100%
rename from make/data/cacerts/dtrustclass3ca2ev
rename to src/java.base/share/data/cacerts/dtrustclass3ca2ev
diff --git a/make/data/cacerts/entrust2048ca b/src/java.base/share/data/cacerts/entrust2048ca
similarity index 100%
rename from make/data/cacerts/entrust2048ca
rename to src/java.base/share/data/cacerts/entrust2048ca
diff --git a/make/data/cacerts/entrustevca b/src/java.base/share/data/cacerts/entrustevca
similarity index 100%
rename from make/data/cacerts/entrustevca
rename to src/java.base/share/data/cacerts/entrustevca
diff --git a/make/data/cacerts/entrustrootcaec1 b/src/java.base/share/data/cacerts/entrustrootcaec1
similarity index 100%
rename from make/data/cacerts/entrustrootcaec1
rename to src/java.base/share/data/cacerts/entrustrootcaec1
diff --git a/make/data/cacerts/entrustrootcag2 b/src/java.base/share/data/cacerts/entrustrootcag2
similarity index 100%
rename from make/data/cacerts/entrustrootcag2
rename to src/java.base/share/data/cacerts/entrustrootcag2
diff --git a/make/data/cacerts/entrustrootcag4 b/src/java.base/share/data/cacerts/entrustrootcag4
similarity index 100%
rename from make/data/cacerts/entrustrootcag4
rename to src/java.base/share/data/cacerts/entrustrootcag4
diff --git a/make/data/cacerts/geotrustglobalca b/src/java.base/share/data/cacerts/geotrustglobalca
similarity index 100%
rename from make/data/cacerts/geotrustglobalca
rename to src/java.base/share/data/cacerts/geotrustglobalca
diff --git a/make/data/cacerts/geotrustprimaryca b/src/java.base/share/data/cacerts/geotrustprimaryca
similarity index 100%
rename from make/data/cacerts/geotrustprimaryca
rename to src/java.base/share/data/cacerts/geotrustprimaryca
diff --git a/make/data/cacerts/geotrustprimarycag2 b/src/java.base/share/data/cacerts/geotrustprimarycag2
similarity index 100%
rename from make/data/cacerts/geotrustprimarycag2
rename to src/java.base/share/data/cacerts/geotrustprimarycag2
diff --git a/make/data/cacerts/geotrustprimarycag3 b/src/java.base/share/data/cacerts/geotrustprimarycag3
similarity index 100%
rename from make/data/cacerts/geotrustprimarycag3
rename to src/java.base/share/data/cacerts/geotrustprimarycag3
diff --git a/make/data/cacerts/geotrustuniversalca b/src/java.base/share/data/cacerts/geotrustuniversalca
similarity index 100%
rename from make/data/cacerts/geotrustuniversalca
rename to src/java.base/share/data/cacerts/geotrustuniversalca
diff --git a/make/data/cacerts/globalsignca b/src/java.base/share/data/cacerts/globalsignca
similarity index 100%
rename from make/data/cacerts/globalsignca
rename to src/java.base/share/data/cacerts/globalsignca
diff --git a/make/data/cacerts/globalsigneccrootcar4 b/src/java.base/share/data/cacerts/globalsigneccrootcar4
similarity index 100%
rename from make/data/cacerts/globalsigneccrootcar4
rename to src/java.base/share/data/cacerts/globalsigneccrootcar4
diff --git a/make/data/cacerts/globalsigneccrootcar5 b/src/java.base/share/data/cacerts/globalsigneccrootcar5
similarity index 100%
rename from make/data/cacerts/globalsigneccrootcar5
rename to src/java.base/share/data/cacerts/globalsigneccrootcar5
diff --git a/make/data/cacerts/globalsignr3ca b/src/java.base/share/data/cacerts/globalsignr3ca
similarity index 100%
rename from make/data/cacerts/globalsignr3ca
rename to src/java.base/share/data/cacerts/globalsignr3ca
diff --git a/make/data/cacerts/globalsignrootcar6 b/src/java.base/share/data/cacerts/globalsignrootcar6
similarity index 100%
rename from make/data/cacerts/globalsignrootcar6
rename to src/java.base/share/data/cacerts/globalsignrootcar6
diff --git a/make/data/cacerts/godaddyclass2ca b/src/java.base/share/data/cacerts/godaddyclass2ca
similarity index 100%
rename from make/data/cacerts/godaddyclass2ca
rename to src/java.base/share/data/cacerts/godaddyclass2ca
diff --git a/make/data/cacerts/godaddyrootg2ca b/src/java.base/share/data/cacerts/godaddyrootg2ca
similarity index 100%
rename from make/data/cacerts/godaddyrootg2ca
rename to src/java.base/share/data/cacerts/godaddyrootg2ca
diff --git a/make/data/cacerts/haricaeccrootca2015 b/src/java.base/share/data/cacerts/haricaeccrootca2015
similarity index 100%
rename from make/data/cacerts/haricaeccrootca2015
rename to src/java.base/share/data/cacerts/haricaeccrootca2015
diff --git a/make/data/cacerts/haricarootca2015 b/src/java.base/share/data/cacerts/haricarootca2015
similarity index 100%
rename from make/data/cacerts/haricarootca2015
rename to src/java.base/share/data/cacerts/haricarootca2015
diff --git a/make/data/cacerts/identrustcommercial b/src/java.base/share/data/cacerts/identrustcommercial
similarity index 100%
rename from make/data/cacerts/identrustcommercial
rename to src/java.base/share/data/cacerts/identrustcommercial
diff --git a/make/data/cacerts/identrustpublicca b/src/java.base/share/data/cacerts/identrustpublicca
similarity index 100%
rename from make/data/cacerts/identrustpublicca
rename to src/java.base/share/data/cacerts/identrustpublicca
diff --git a/make/data/cacerts/letsencryptisrgx1 b/src/java.base/share/data/cacerts/letsencryptisrgx1
similarity index 100%
rename from make/data/cacerts/letsencryptisrgx1
rename to src/java.base/share/data/cacerts/letsencryptisrgx1
diff --git a/make/data/cacerts/luxtrustglobalroot2ca b/src/java.base/share/data/cacerts/luxtrustglobalroot2ca
similarity index 100%
rename from make/data/cacerts/luxtrustglobalroot2ca
rename to src/java.base/share/data/cacerts/luxtrustglobalroot2ca
diff --git a/make/data/cacerts/luxtrustglobalrootca b/src/java.base/share/data/cacerts/luxtrustglobalrootca
similarity index 100%
rename from make/data/cacerts/luxtrustglobalrootca
rename to src/java.base/share/data/cacerts/luxtrustglobalrootca
diff --git a/make/data/cacerts/quovadisrootca b/src/java.base/share/data/cacerts/quovadisrootca
similarity index 100%
rename from make/data/cacerts/quovadisrootca
rename to src/java.base/share/data/cacerts/quovadisrootca
diff --git a/make/data/cacerts/quovadisrootca1g3 b/src/java.base/share/data/cacerts/quovadisrootca1g3
similarity index 100%
rename from make/data/cacerts/quovadisrootca1g3
rename to src/java.base/share/data/cacerts/quovadisrootca1g3
diff --git a/make/data/cacerts/quovadisrootca2 b/src/java.base/share/data/cacerts/quovadisrootca2
similarity index 100%
rename from make/data/cacerts/quovadisrootca2
rename to src/java.base/share/data/cacerts/quovadisrootca2
diff --git a/make/data/cacerts/quovadisrootca2g3 b/src/java.base/share/data/cacerts/quovadisrootca2g3
similarity index 100%
rename from make/data/cacerts/quovadisrootca2g3
rename to src/java.base/share/data/cacerts/quovadisrootca2g3
diff --git a/make/data/cacerts/quovadisrootca3 b/src/java.base/share/data/cacerts/quovadisrootca3
similarity index 100%
rename from make/data/cacerts/quovadisrootca3
rename to src/java.base/share/data/cacerts/quovadisrootca3
diff --git a/make/data/cacerts/quovadisrootca3g3 b/src/java.base/share/data/cacerts/quovadisrootca3g3
similarity index 100%
rename from make/data/cacerts/quovadisrootca3g3
rename to src/java.base/share/data/cacerts/quovadisrootca3g3
diff --git a/make/data/cacerts/secomscrootca1 b/src/java.base/share/data/cacerts/secomscrootca1
similarity index 100%
rename from make/data/cacerts/secomscrootca1
rename to src/java.base/share/data/cacerts/secomscrootca1
diff --git a/make/data/cacerts/secomscrootca2 b/src/java.base/share/data/cacerts/secomscrootca2
similarity index 100%
rename from make/data/cacerts/secomscrootca2
rename to src/java.base/share/data/cacerts/secomscrootca2
diff --git a/make/data/cacerts/securetrustca b/src/java.base/share/data/cacerts/securetrustca
similarity index 100%
rename from make/data/cacerts/securetrustca
rename to src/java.base/share/data/cacerts/securetrustca
diff --git a/make/data/cacerts/sslrooteccca b/src/java.base/share/data/cacerts/sslrooteccca
similarity index 100%
rename from make/data/cacerts/sslrooteccca
rename to src/java.base/share/data/cacerts/sslrooteccca
diff --git a/make/data/cacerts/sslrootevrsaca b/src/java.base/share/data/cacerts/sslrootevrsaca
similarity index 100%
rename from make/data/cacerts/sslrootevrsaca
rename to src/java.base/share/data/cacerts/sslrootevrsaca
diff --git a/make/data/cacerts/sslrootrsaca b/src/java.base/share/data/cacerts/sslrootrsaca
similarity index 100%
rename from make/data/cacerts/sslrootrsaca
rename to src/java.base/share/data/cacerts/sslrootrsaca
diff --git a/make/data/cacerts/starfieldclass2ca b/src/java.base/share/data/cacerts/starfieldclass2ca
similarity index 100%
rename from make/data/cacerts/starfieldclass2ca
rename to src/java.base/share/data/cacerts/starfieldclass2ca
diff --git a/make/data/cacerts/starfieldrootg2ca b/src/java.base/share/data/cacerts/starfieldrootg2ca
similarity index 100%
rename from make/data/cacerts/starfieldrootg2ca
rename to src/java.base/share/data/cacerts/starfieldrootg2ca
diff --git a/make/data/cacerts/starfieldservicesrootg2ca b/src/java.base/share/data/cacerts/starfieldservicesrootg2ca
similarity index 100%
rename from make/data/cacerts/starfieldservicesrootg2ca
rename to src/java.base/share/data/cacerts/starfieldservicesrootg2ca
diff --git a/make/data/cacerts/swisssigngoldg2ca b/src/java.base/share/data/cacerts/swisssigngoldg2ca
similarity index 100%
rename from make/data/cacerts/swisssigngoldg2ca
rename to src/java.base/share/data/cacerts/swisssigngoldg2ca
diff --git a/make/data/cacerts/swisssignplatinumg2ca b/src/java.base/share/data/cacerts/swisssignplatinumg2ca
similarity index 100%
rename from make/data/cacerts/swisssignplatinumg2ca
rename to src/java.base/share/data/cacerts/swisssignplatinumg2ca
diff --git a/make/data/cacerts/swisssignsilverg2ca b/src/java.base/share/data/cacerts/swisssignsilverg2ca
similarity index 100%
rename from make/data/cacerts/swisssignsilverg2ca
rename to src/java.base/share/data/cacerts/swisssignsilverg2ca
diff --git a/make/data/cacerts/teliasonerarootcav1 b/src/java.base/share/data/cacerts/teliasonerarootcav1
similarity index 100%
rename from make/data/cacerts/teliasonerarootcav1
rename to src/java.base/share/data/cacerts/teliasonerarootcav1
diff --git a/make/data/cacerts/thawteprimaryrootca b/src/java.base/share/data/cacerts/thawteprimaryrootca
similarity index 100%
rename from make/data/cacerts/thawteprimaryrootca
rename to src/java.base/share/data/cacerts/thawteprimaryrootca
diff --git a/make/data/cacerts/thawteprimaryrootcag2 b/src/java.base/share/data/cacerts/thawteprimaryrootcag2
similarity index 100%
rename from make/data/cacerts/thawteprimaryrootcag2
rename to src/java.base/share/data/cacerts/thawteprimaryrootcag2
diff --git a/make/data/cacerts/thawteprimaryrootcag3 b/src/java.base/share/data/cacerts/thawteprimaryrootcag3
similarity index 100%
rename from make/data/cacerts/thawteprimaryrootcag3
rename to src/java.base/share/data/cacerts/thawteprimaryrootcag3
diff --git a/make/data/cacerts/ttelesecglobalrootclass2ca b/src/java.base/share/data/cacerts/ttelesecglobalrootclass2ca
similarity index 100%
rename from make/data/cacerts/ttelesecglobalrootclass2ca
rename to src/java.base/share/data/cacerts/ttelesecglobalrootclass2ca
diff --git a/make/data/cacerts/ttelesecglobalrootclass3ca b/src/java.base/share/data/cacerts/ttelesecglobalrootclass3ca
similarity index 100%
rename from make/data/cacerts/ttelesecglobalrootclass3ca
rename to src/java.base/share/data/cacerts/ttelesecglobalrootclass3ca
diff --git a/make/data/cacerts/usertrusteccca b/src/java.base/share/data/cacerts/usertrusteccca
similarity index 100%
rename from make/data/cacerts/usertrusteccca
rename to src/java.base/share/data/cacerts/usertrusteccca
diff --git a/make/data/cacerts/usertrustrsaca b/src/java.base/share/data/cacerts/usertrustrsaca
similarity index 100%
rename from make/data/cacerts/usertrustrsaca
rename to src/java.base/share/data/cacerts/usertrustrsaca
diff --git a/make/data/cacerts/utnuserfirstobjectca b/src/java.base/share/data/cacerts/utnuserfirstobjectca
similarity index 100%
rename from make/data/cacerts/utnuserfirstobjectca
rename to src/java.base/share/data/cacerts/utnuserfirstobjectca
diff --git a/make/data/cacerts/verisignclass3g3ca b/src/java.base/share/data/cacerts/verisignclass3g3ca
similarity index 100%
rename from make/data/cacerts/verisignclass3g3ca
rename to src/java.base/share/data/cacerts/verisignclass3g3ca
diff --git a/make/data/cacerts/verisignclass3g4ca b/src/java.base/share/data/cacerts/verisignclass3g4ca
similarity index 100%
rename from make/data/cacerts/verisignclass3g4ca
rename to src/java.base/share/data/cacerts/verisignclass3g4ca
diff --git a/make/data/cacerts/verisignclass3g5ca b/src/java.base/share/data/cacerts/verisignclass3g5ca
similarity index 100%
rename from make/data/cacerts/verisignclass3g5ca
rename to src/java.base/share/data/cacerts/verisignclass3g5ca
diff --git a/make/data/cacerts/verisignuniversalrootca b/src/java.base/share/data/cacerts/verisignuniversalrootca
similarity index 100%
rename from make/data/cacerts/verisignuniversalrootca
rename to src/java.base/share/data/cacerts/verisignuniversalrootca
diff --git a/make/data/cacerts/xrampglobalca b/src/java.base/share/data/cacerts/xrampglobalca
similarity index 100%
rename from make/data/cacerts/xrampglobalca
rename to src/java.base/share/data/cacerts/xrampglobalca
diff --git a/make/data/currency/CurrencyData.properties b/src/java.base/share/data/currency/CurrencyData.properties
similarity index 98%
rename from make/data/currency/CurrencyData.properties
rename to src/java.base/share/data/currency/CurrencyData.properties
index 236e544feaf65543bac0ca05d69e55946dd31996..d86fc6ddfd41b08989e5f3cd5c2805abb76bfa68 100644
--- a/make/data/currency/CurrencyData.properties
+++ b/src/java.base/share/data/currency/CurrencyData.properties
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2022, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -32,7 +32,7 @@ formatVersion=3
# Version of the currency code information in this class.
# It is a serial number that accompanies with each amendment.
-dataVersion=170
+dataVersion=171
# List of all valid ISO 4217 currency codes.
# To ensure compatibility, do not remove codes.
@@ -51,7 +51,7 @@ all=ADP020-AED784-AFA004-AFN971-ALL008-AMD051-ANG532-AOA973-ARS032-ATS040-AUD036
MTL470-MUR480-MVR462-MWK454-MXN484-MXV979-MYR458-MZM508-MZN943-NAD516-NGN566-\
NIO558-NLG528-NOK578-NPR524-NZD554-OMR512-PAB590-PEN604-PGK598-PHP608-\
PKR586-PLN985-PTE620-PYG600-QAR634-ROL642-RON946-RSD941-RUB643-RUR810-RWF646-SAR682-\
- SBD090-SCR690-SDD736-SDG938-SEK752-SGD702-SHP654-SIT705-SKK703-SLL694-SOS706-\
+ SBD090-SCR690-SDD736-SDG938-SEK752-SGD702-SHP654-SIT705-SKK703-SLE925-SLL694-SOS706-\
SRD968-SRG740-SSP728-STD678-STN930-SVC222-SYP760-SZL748-THB764-TJS972-TMM795-TMT934-TND788-TOP776-\
TPE626-TRL792-TRY949-TTD780-TWD901-TZS834-UAH980-UGX800-USD840-USN997-USS998-UYI940-\
UYU858-UZS860-VEB862-VED926-VEF937-VES928-VND704-VUV548-WST882-XAF950-XAG961-XAU959-XBA955-\
@@ -484,7 +484,7 @@ CS=CSD
# SEYCHELLES
SC=SCR
# SIERRA LEONE
-SL=SLL
+SL=SLE
# SINGAPORE
SG=SGD
# SLOVAKIA
diff --git a/make/data/lsrdata/language-subtag-registry.txt b/src/java.base/share/data/lsrdata/language-subtag-registry.txt
similarity index 100%
rename from make/data/lsrdata/language-subtag-registry.txt
rename to src/java.base/share/data/lsrdata/language-subtag-registry.txt
diff --git a/make/data/publicsuffixlist/VERSION b/src/java.base/share/data/publicsuffixlist/VERSION
similarity index 100%
rename from make/data/publicsuffixlist/VERSION
rename to src/java.base/share/data/publicsuffixlist/VERSION
diff --git a/make/data/publicsuffixlist/public_suffix_list.dat b/src/java.base/share/data/publicsuffixlist/public_suffix_list.dat
similarity index 100%
rename from make/data/publicsuffixlist/public_suffix_list.dat
rename to src/java.base/share/data/publicsuffixlist/public_suffix_list.dat
diff --git a/make/data/tzdata/VERSION b/src/java.base/share/data/tzdata/VERSION
similarity index 100%
rename from make/data/tzdata/VERSION
rename to src/java.base/share/data/tzdata/VERSION
diff --git a/make/data/tzdata/africa b/src/java.base/share/data/tzdata/africa
similarity index 100%
rename from make/data/tzdata/africa
rename to src/java.base/share/data/tzdata/africa
diff --git a/make/data/tzdata/antarctica b/src/java.base/share/data/tzdata/antarctica
similarity index 100%
rename from make/data/tzdata/antarctica
rename to src/java.base/share/data/tzdata/antarctica
diff --git a/make/data/tzdata/asia b/src/java.base/share/data/tzdata/asia
similarity index 100%
rename from make/data/tzdata/asia
rename to src/java.base/share/data/tzdata/asia
diff --git a/make/data/tzdata/australasia b/src/java.base/share/data/tzdata/australasia
similarity index 100%
rename from make/data/tzdata/australasia
rename to src/java.base/share/data/tzdata/australasia
diff --git a/make/data/tzdata/backward b/src/java.base/share/data/tzdata/backward
similarity index 100%
rename from make/data/tzdata/backward
rename to src/java.base/share/data/tzdata/backward
diff --git a/make/data/tzdata/etcetera b/src/java.base/share/data/tzdata/etcetera
similarity index 100%
rename from make/data/tzdata/etcetera
rename to src/java.base/share/data/tzdata/etcetera
diff --git a/make/data/tzdata/europe b/src/java.base/share/data/tzdata/europe
similarity index 100%
rename from make/data/tzdata/europe
rename to src/java.base/share/data/tzdata/europe
diff --git a/make/data/tzdata/factory b/src/java.base/share/data/tzdata/factory
similarity index 100%
rename from make/data/tzdata/factory
rename to src/java.base/share/data/tzdata/factory
diff --git a/make/data/tzdata/gmt b/src/java.base/share/data/tzdata/gmt
similarity index 100%
rename from make/data/tzdata/gmt
rename to src/java.base/share/data/tzdata/gmt
diff --git a/make/data/tzdata/iso3166.tab b/src/java.base/share/data/tzdata/iso3166.tab
similarity index 100%
rename from make/data/tzdata/iso3166.tab
rename to src/java.base/share/data/tzdata/iso3166.tab
diff --git a/make/data/tzdata/jdk11_backward b/src/java.base/share/data/tzdata/jdk11_backward
similarity index 100%
rename from make/data/tzdata/jdk11_backward
rename to src/java.base/share/data/tzdata/jdk11_backward
diff --git a/make/data/tzdata/leapseconds b/src/java.base/share/data/tzdata/leapseconds
similarity index 100%
rename from make/data/tzdata/leapseconds
rename to src/java.base/share/data/tzdata/leapseconds
diff --git a/make/data/tzdata/northamerica b/src/java.base/share/data/tzdata/northamerica
similarity index 100%
rename from make/data/tzdata/northamerica
rename to src/java.base/share/data/tzdata/northamerica
diff --git a/make/data/tzdata/solar87 b/src/java.base/share/data/tzdata/solar87
similarity index 100%
rename from make/data/tzdata/solar87
rename to src/java.base/share/data/tzdata/solar87
diff --git a/make/data/tzdata/solar88 b/src/java.base/share/data/tzdata/solar88
similarity index 100%
rename from make/data/tzdata/solar88
rename to src/java.base/share/data/tzdata/solar88
diff --git a/make/data/tzdata/solar89 b/src/java.base/share/data/tzdata/solar89
similarity index 100%
rename from make/data/tzdata/solar89
rename to src/java.base/share/data/tzdata/solar89
diff --git a/make/data/tzdata/southamerica b/src/java.base/share/data/tzdata/southamerica
similarity index 100%
rename from make/data/tzdata/southamerica
rename to src/java.base/share/data/tzdata/southamerica
diff --git a/make/data/tzdata/zone.tab b/src/java.base/share/data/tzdata/zone.tab
similarity index 100%
rename from make/data/tzdata/zone.tab
rename to src/java.base/share/data/tzdata/zone.tab
diff --git a/make/data/unicodedata/Blocks.txt b/src/java.base/share/data/unicodedata/Blocks.txt
similarity index 100%
rename from make/data/unicodedata/Blocks.txt
rename to src/java.base/share/data/unicodedata/Blocks.txt
diff --git a/make/data/unicodedata/DerivedCoreProperties.txt b/src/java.base/share/data/unicodedata/DerivedCoreProperties.txt
similarity index 100%
rename from make/data/unicodedata/DerivedCoreProperties.txt
rename to src/java.base/share/data/unicodedata/DerivedCoreProperties.txt
diff --git a/make/data/unicodedata/NormalizationTest.txt b/src/java.base/share/data/unicodedata/NormalizationTest.txt
similarity index 100%
rename from make/data/unicodedata/NormalizationTest.txt
rename to src/java.base/share/data/unicodedata/NormalizationTest.txt
diff --git a/make/data/unicodedata/PropList.txt b/src/java.base/share/data/unicodedata/PropList.txt
similarity index 100%
rename from make/data/unicodedata/PropList.txt
rename to src/java.base/share/data/unicodedata/PropList.txt
diff --git a/make/data/unicodedata/PropertyValueAliases.txt b/src/java.base/share/data/unicodedata/PropertyValueAliases.txt
similarity index 100%
rename from make/data/unicodedata/PropertyValueAliases.txt
rename to src/java.base/share/data/unicodedata/PropertyValueAliases.txt
diff --git a/make/data/unicodedata/ReadMe.txt b/src/java.base/share/data/unicodedata/ReadMe.txt
similarity index 100%
rename from make/data/unicodedata/ReadMe.txt
rename to src/java.base/share/data/unicodedata/ReadMe.txt
diff --git a/make/data/unicodedata/Scripts.txt b/src/java.base/share/data/unicodedata/Scripts.txt
similarity index 100%
rename from make/data/unicodedata/Scripts.txt
rename to src/java.base/share/data/unicodedata/Scripts.txt
diff --git a/make/data/unicodedata/SpecialCasing.txt b/src/java.base/share/data/unicodedata/SpecialCasing.txt
similarity index 100%
rename from make/data/unicodedata/SpecialCasing.txt
rename to src/java.base/share/data/unicodedata/SpecialCasing.txt
diff --git a/make/data/unicodedata/UnicodeData.txt b/src/java.base/share/data/unicodedata/UnicodeData.txt
similarity index 100%
rename from make/data/unicodedata/UnicodeData.txt
rename to src/java.base/share/data/unicodedata/UnicodeData.txt
diff --git a/make/data/unicodedata/auxiliary/GraphemeBreakProperty.txt b/src/java.base/share/data/unicodedata/auxiliary/GraphemeBreakProperty.txt
similarity index 100%
rename from make/data/unicodedata/auxiliary/GraphemeBreakProperty.txt
rename to src/java.base/share/data/unicodedata/auxiliary/GraphemeBreakProperty.txt
diff --git a/make/data/unicodedata/auxiliary/GraphemeBreakTest.txt b/src/java.base/share/data/unicodedata/auxiliary/GraphemeBreakTest.txt
similarity index 100%
rename from make/data/unicodedata/auxiliary/GraphemeBreakTest.txt
rename to src/java.base/share/data/unicodedata/auxiliary/GraphemeBreakTest.txt
diff --git a/make/data/unicodedata/emoji/emoji-data.txt b/src/java.base/share/data/unicodedata/emoji/emoji-data.txt
similarity index 100%
rename from make/data/unicodedata/emoji/emoji-data.txt
rename to src/java.base/share/data/unicodedata/emoji/emoji-data.txt
diff --git a/src/java.base/share/native/libjava/ClassLoader.c b/src/java.base/share/native/libjava/ClassLoader.c
index bbdff87b0b312ff549d1456cf88859ff33387b85..301f068070b36cf0cd948718de148570d9b51d46 100644
--- a/src/java.base/share/native/libjava/ClassLoader.c
+++ b/src/java.base/share/native/libjava/ClassLoader.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2021, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2022, 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
@@ -23,16 +23,16 @@
* questions.
*/
-#include
* Adds an item to this {@code Choice} menu.
* @param item the item to be added
- * @exception NullPointerException if the item's value is equal to
+ * @throws NullPointerException if the item's value is equal to
* {@code null}
*/
public void addItem(String item) {
@@ -238,7 +238,7 @@ public class Choice extends Component implements ItemSelectable, Accessible {
* invoking this method.
* @param item the item to be added
* @param index the new item position
- * @exception NullPointerException if the item's value is equal to
+ * @throws NullPointerException if the item's value is equal to
* {@code null}
*/
private void insertNoInvalidate(String item, int index) {
@@ -274,7 +274,7 @@ public class Choice extends Component implements ItemSelectable, Accessible {
* the selected item.
* @param item the non-{@code null} item to be inserted
* @param index the position at which the item should be inserted
- * @exception IllegalArgumentException if index is less than 0
+ * @throws IllegalArgumentException if index is less than 0
*/
public void insert(String item, int index) {
synchronized (this) {
@@ -300,7 +300,7 @@ public class Choice extends Component implements ItemSelectable, Accessible {
* item remains selected (and the selected index is
* updated accordingly).
* @param item the item to remove from this {@code Choice} menu
- * @exception IllegalArgumentException if the item doesn't
+ * @throws IllegalArgumentException if the item doesn't
* exist in the choice menu
* @since 1.1
*/
@@ -430,7 +430,7 @@ public class Choice extends Component implements ItemSelectable, Accessible {
* {@code ItemEvent} is by user interaction.
*
* @param pos the position of the selected item
- * @exception IllegalArgumentException if the specified
+ * @throws IllegalArgumentException if the specified
* position is greater than the
* number of items or less than zero
* @see #getSelectedItem
@@ -561,7 +561,7 @@ public class Choice extends Component implements ItemSelectable, Accessible {
*
*
*
*
diff --git a/src/java.base/share/classes/java/lang/ref/FinalReference.java b/src/java.base/share/classes/java/lang/ref/FinalReference.java
index 9175516d4d0cec03562b36299f4941f4a8d9f583..06af37df67c94e062022a727f4841dd9c9579ef4 100644
--- a/src/java.base/share/classes/java/lang/ref/FinalReference.java
+++ b/src/java.base/share/classes/java/lang/ref/FinalReference.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2022, 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
@@ -28,7 +28,7 @@ package java.lang.ref;
/**
* Final references, used to implement finalization
*/
-class FinalReferenceFooListeners by the specified multicast
* listener, or an empty array if no such listeners have been
* chained by the specified multicast listener
- * @exception NullPointerException if the specified
+ * @throws NullPointerException if the specified
* {@code listenertype} parameter is {@code null}
- * @exception ClassCastException if {@code listenerType}
+ * @throws ClassCastException if {@code listenerType}
* doesn't specify a class or interface that implements
* {@code java.util.EventListener}
*
diff --git a/src/java.desktop/share/classes/java/awt/BorderLayout.java b/src/java.desktop/share/classes/java/awt/BorderLayout.java
index 88edc23dec4fae6f6c959d0a02a4af686162ffe5..e3b92a7996ae75e4e5ec4be21dd8ee3b3ecfd92a 100644
--- a/src/java.desktop/share/classes/java/awt/BorderLayout.java
+++ b/src/java.desktop/share/classes/java/awt/BorderLayout.java
@@ -419,7 +419,7 @@ public class BorderLayout implements LayoutManager2,
* @param constraints an object that specifies how and where
* the component is added to the layout.
* @see java.awt.Container#add(java.awt.Component, java.lang.Object)
- * @exception IllegalArgumentException if the constraint object is not
+ * @throws IllegalArgumentException if the constraint object is not
* a string, or if it not one of the five specified constants.
* @since 1.1
*/
@@ -514,7 +514,7 @@ public class BorderLayout implements LayoutManager2,
* {@code LINE_START}, {@code LINE_END}
* @return the component at the given location, or {@code null} if
* the location is empty
- * @exception IllegalArgumentException if the constraint object is
+ * @throws IllegalArgumentException if the constraint object is
* not one of the nine specified constants
* @see #addLayoutComponent(java.awt.Component, java.lang.Object)
* @since 1.5
@@ -562,9 +562,9 @@ public class BorderLayout implements LayoutManager2,
* {@code Container}'s component orientation.
* @return the component at the given location, or {@code null} if
* the location is empty
- * @exception IllegalArgumentException if the constraint object is
+ * @throws IllegalArgumentException if the constraint object is
* not one of the five specified constants
- * @exception NullPointerException if the target parameter is null
+ * @throws NullPointerException if the target parameter is null
* @see #addLayoutComponent(java.awt.Component, java.lang.Object)
* @since 1.5
*/
diff --git a/src/java.desktop/share/classes/java/awt/BufferCapabilities.java b/src/java.desktop/share/classes/java/awt/BufferCapabilities.java
index 22df13cfb5072998e55129e0343ef4838f9f7ff1..6edeae843aa45f50186c1e9a48ce6d5d10fd4fa7 100644
--- a/src/java.desktop/share/classes/java/awt/BufferCapabilities.java
+++ b/src/java.desktop/share/classes/java/awt/BufferCapabilities.java
@@ -47,7 +47,7 @@ public class BufferCapabilities implements Cloneable {
* cannot be {@code null}
* @param flipContents the contents of the back buffer after page-flipping,
* {@code null} if page flipping is not used (implies blitting)
- * @exception IllegalArgumentException if frontCaps or backCaps are
+ * @throws IllegalArgumentException if frontCaps or backCaps are
* {@code null}
*/
public BufferCapabilities(ImageCapabilities frontCaps,
diff --git a/src/java.desktop/share/classes/java/awt/Button.java b/src/java.desktop/share/classes/java/awt/Button.java
index 35acb8d292882f2dc5ba7229de975da7b9751aef..524008e401a6273dfab4fd582508419d21d7b2c8 100644
--- a/src/java.desktop/share/classes/java/awt/Button.java
+++ b/src/java.desktop/share/classes/java/awt/Button.java
@@ -140,7 +140,7 @@ public class Button extends Component implements Accessible {
/**
* Constructs a button with an empty string for its label.
*
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true
* @see java.awt.GraphicsEnvironment#isHeadless
*/
@@ -153,7 +153,7 @@ public class Button extends Component implements Accessible {
*
* @param label a string label for the button, or
* {@code null} for no label
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true
* @see java.awt.GraphicsEnvironment#isHeadless
*/
@@ -339,7 +339,7 @@ public class Button extends Component implements Accessible {
* FooListeners on this button,
* or an empty array if no such
* listeners have been added
- * @exception ClassCastException if {@code listenerType}
+ * @throws ClassCastException if {@code listenerType}
* doesn't specify a class or interface that implements
* {@code java.util.EventListener}
*
diff --git a/src/java.desktop/share/classes/java/awt/Canvas.java b/src/java.desktop/share/classes/java/awt/Canvas.java
index 1ee5380c6df08be44d8fea8ff81cb8568ef26310..7d90e148b6c313a9be2d917f9075031e1284a171 100644
--- a/src/java.desktop/share/classes/java/awt/Canvas.java
+++ b/src/java.desktop/share/classes/java/awt/Canvas.java
@@ -166,8 +166,8 @@ public class Canvas extends Component implements Accessible {
* Each time this method is called,
* the existing buffer strategy for this component is discarded.
* @param numBuffers number of buffers to create, including the front buffer
- * @exception IllegalArgumentException if numBuffers is less than 1.
- * @exception IllegalStateException if the component is not displayable
+ * @throws IllegalArgumentException if numBuffers is less than 1.
+ * @throws IllegalStateException if the component is not displayable
* @see #isDisplayable
* @see #getBufferStrategy
* @since 1.4
@@ -187,11 +187,11 @@ public class Canvas extends Component implements Accessible {
* @param numBuffers number of buffers to create
* @param caps the required capabilities for creating the buffer strategy;
* cannot be {@code null}
- * @exception AWTException if the capabilities supplied could not be
+ * @throws AWTException if the capabilities supplied could not be
* supported or met; this may happen, for example, if there is not enough
* accelerated memory currently available, or if page flipping is specified
* but not possible.
- * @exception IllegalArgumentException if numBuffers is less than 1, or if
+ * @throws IllegalArgumentException if numBuffers is less than 1, or if
* caps is {@code null}
* @see #getBufferStrategy
* @since 1.4
diff --git a/src/java.desktop/share/classes/java/awt/CardLayout.java b/src/java.desktop/share/classes/java/awt/CardLayout.java
index d53c86a9d454ab14e9a85849256d40373c8bf335..915376d032095727f5ff440706fdbd81b4152201 100644
--- a/src/java.desktop/share/classes/java/awt/CardLayout.java
+++ b/src/java.desktop/share/classes/java/awt/CardLayout.java
@@ -206,7 +206,7 @@ public class CardLayout implements LayoutManager2,
* @param constraints a tag that identifies a particular
* card in the layout.
* @see java.awt.CardLayout#show(java.awt.Container, java.lang.String)
- * @exception IllegalArgumentException if the constraint is not a string.
+ * @throws IllegalArgumentException if the constraint is not a string.
*/
public void addLayoutComponent(Component comp, Object constraints) {
synchronized (comp.getTreeLock()) {
diff --git a/src/java.desktop/share/classes/java/awt/Checkbox.java b/src/java.desktop/share/classes/java/awt/Checkbox.java
index e72d249f8e31139b0903b5bb2aa1e99907600d7f..f4a642cb3297c13cd13a157058dc9f6c8bb8648b 100644
--- a/src/java.desktop/share/classes/java/awt/Checkbox.java
+++ b/src/java.desktop/share/classes/java/awt/Checkbox.java
@@ -146,7 +146,7 @@ public class Checkbox extends Component implements ItemSelectable, Accessible {
* Creates a check box with an empty string for its label.
* The state of this check box is set to "off," and it is not
* part of any check box group.
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true
* @see java.awt.GraphicsEnvironment#isHeadless
*/
@@ -161,7 +161,7 @@ public class Checkbox extends Component implements ItemSelectable, Accessible {
*
* @param label a string label for this check box,
* or {@code null} for no label.
- * @exception HeadlessException if
+ * @throws HeadlessException if
* {@code GraphicsEnvironment.isHeadless}
* returns {@code true}
* @see java.awt.GraphicsEnvironment#isHeadless
@@ -178,7 +178,7 @@ public class Checkbox extends Component implements ItemSelectable, Accessible {
* @param label a string label for this check box,
* or {@code null} for no label
* @param state the initial state of this check box
- * @exception HeadlessException if
+ * @throws HeadlessException if
* {@code GraphicsEnvironment.isHeadless}
* returns {@code true}
* @see java.awt.GraphicsEnvironment#isHeadless
@@ -196,7 +196,7 @@ public class Checkbox extends Component implements ItemSelectable, Accessible {
* @param state the initial state of this check box.
* @param group a check box group for this check box,
* or {@code null} for no group.
- * @exception HeadlessException if
+ * @throws HeadlessException if
* {@code GraphicsEnvironment.isHeadless}
* returns {@code true}
* @see java.awt.GraphicsEnvironment#isHeadless
@@ -222,7 +222,7 @@ public class Checkbox extends Component implements ItemSelectable, Accessible {
* @param group a check box group for this check box,
* or {@code null} for no group.
* @param state the initial state of this check box.
- * @exception HeadlessException if
+ * @throws HeadlessException if
* {@code GraphicsEnvironment.isHeadless}
* returns {@code true}
* @see java.awt.GraphicsEnvironment#isHeadless
@@ -508,7 +508,7 @@ public class Checkbox extends Component implements ItemSelectable, Accessible {
* FooListeners on this checkbox,
* or an empty array if no such
* listeners have been added
- * @exception ClassCastException if {@code listenerType}
+ * @throws ClassCastException if {@code listenerType}
* doesn't specify a class or interface that implements
* {@code java.util.EventListener}
*
diff --git a/src/java.desktop/share/classes/java/awt/CheckboxMenuItem.java b/src/java.desktop/share/classes/java/awt/CheckboxMenuItem.java
index 4df4ddbef856a39e7d23566383f4ce2322b4edbe..f95d1d39424a7894b528aa3868b655df84e43871 100644
--- a/src/java.desktop/share/classes/java/awt/CheckboxMenuItem.java
+++ b/src/java.desktop/share/classes/java/awt/CheckboxMenuItem.java
@@ -110,7 +110,7 @@ public class CheckboxMenuItem extends MenuItem implements ItemSelectable, Access
/**
* Create a check box menu item with an empty label.
* The item's state is initially set to "off."
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true
* @see java.awt.GraphicsEnvironment#isHeadless
* @since 1.1
@@ -125,7 +125,7 @@ public class CheckboxMenuItem extends MenuItem implements ItemSelectable, Access
* @param label a string label for the check box menu item,
* or {@code null} for an unlabeled menu item.
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true
* @see java.awt.GraphicsEnvironment#isHeadless
*/
@@ -140,7 +140,7 @@ public class CheckboxMenuItem extends MenuItem implements ItemSelectable, Access
* @param state the initial state of the menu item, where
* {@code true} indicates "on" and
* {@code false} indicates "off."
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true
* @see java.awt.GraphicsEnvironment#isHeadless
* @since 1.1
@@ -316,7 +316,7 @@ public class CheckboxMenuItem extends MenuItem implements ItemSelectable, Access
* FooListeners on this checkbox menuitem,
* or an empty array if no such
* listeners have been added
- * @exception ClassCastException if {@code listenerType}
+ * @throws ClassCastException if {@code listenerType}
* doesn't specify a class or interface that implements
* {@code java.util.EventListener}
*
diff --git a/src/java.desktop/share/classes/java/awt/Choice.java b/src/java.desktop/share/classes/java/awt/Choice.java
index d8e8ab4c0267a44a96d98f0d7e4af6ddd3866e67..2b04239fd314c89a682d98675417b7efb3bdfa01 100644
--- a/src/java.desktop/share/classes/java/awt/Choice.java
+++ b/src/java.desktop/share/classes/java/awt/Choice.java
@@ -124,7 +124,7 @@ public class Choice extends Component implements ItemSelectable, Accessible {
* By default, the first item added to the choice menu becomes the
* selected item, until a different selection is made by the user
* by calling one of the {@code select} methods.
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true
* @see java.awt.GraphicsEnvironment#isHeadless
* @see #select(int)
@@ -205,7 +205,7 @@ public class Choice extends Component implements ItemSelectable, Accessible {
/**
* Adds an item to this {@code Choice} menu.
* @param item the item to be added
- * @exception NullPointerException if the item's value is
+ * @throws NullPointerException if the item's value is
* {@code null}
* @since 1.1
*/
@@ -219,7 +219,7 @@ public class Choice extends Component implements ItemSelectable, Accessible {
* FooListeners on this choice,
* or an empty array if no such
* listeners have been added
- * @exception ClassCastException if {@code listenerType}
+ * @throws ClassCastException if {@code listenerType}
* doesn't specify a class or interface that implements
* {@code java.util.EventListener}
*
diff --git a/src/java.desktop/share/classes/java/awt/Color.java b/src/java.desktop/share/classes/java/awt/Color.java
index aae90be8616dd0de749497032ef51dad7a4253ab..6bb4befd8e83c5eed52d4f98736c86d74c2b2109 100644
--- a/src/java.desktop/share/classes/java/awt/Color.java
+++ b/src/java.desktop/share/classes/java/awt/Color.java
@@ -722,7 +722,7 @@ public class Color implements Paint, java.io.Serializable {
* an opaque color as a 24-bit integer
* @return the new {@code Color} object.
* @see java.lang.Integer#decode
- * @exception NumberFormatException if the specified string cannot
+ * @throws NumberFormatException if the specified string cannot
* be interpreted as a decimal,
* octal, or hexadecimal integer.
* @since 1.1
diff --git a/src/java.desktop/share/classes/java/awt/Component.java b/src/java.desktop/share/classes/java/awt/Component.java
index 813f9bd0c796eea6b84f543004b91f85b48a52fc..cfd4cbe025a25632f2c17b8fa318a8c2bb542ec3 100644
--- a/src/java.desktop/share/classes/java/awt/Component.java
+++ b/src/java.desktop/share/classes/java/awt/Component.java
@@ -1420,7 +1420,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
* pointer. If the return value of this method is {@code null}, mouse
* pointer is not directly above the {@code Component}.
*
- * @exception HeadlessException if GraphicsEnvironment.isHeadless() returns true
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless() returns true
* @see #isShowing
* @see Container#getMousePosition
* @return mouse coordinates relative to this {@code Component}, or null
@@ -1984,7 +1984,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
* @return this component's locale; if this component does not
* have a locale, the locale of its parent is returned
* @see #setLocale
- * @exception IllegalComponentStateException if the {@code Component}
+ * @throws IllegalComponentStateException if the {@code Component}
* does not have its own locale and has not yet been added to
* a containment hierarchy such that the locale can be determined
* from the containing parent
@@ -3827,8 +3827,8 @@ public abstract class Component implements ImageObserver, MenuContainer,
* Each time this method is called,
* the existing buffer strategy for this component is discarded.
* @param numBuffers number of buffers to create, including the front buffer
- * @exception IllegalArgumentException if numBuffers is less than 1.
- * @exception IllegalStateException if the component is not displayable
+ * @throws IllegalArgumentException if numBuffers is less than 1.
+ * @throws IllegalStateException if the component is not displayable
* @see #isDisplayable
* @see Window#getBufferStrategy()
* @see Canvas#getBufferStrategy()
@@ -3884,11 +3884,11 @@ public abstract class Component implements ImageObserver, MenuContainer,
* @param numBuffers number of buffers to create
* @param caps the required capabilities for creating the buffer strategy;
* cannot be {@code null}
- * @exception AWTException if the capabilities supplied could not be
+ * @throws AWTException if the capabilities supplied could not be
* supported or met; this may happen, for example, if there is not enough
* accelerated memory currently available, or if page flipping is specified
* but not possible.
- * @exception IllegalArgumentException if numBuffers is less than 1, or if
+ * @throws IllegalArgumentException if numBuffers is less than 1, or if
* caps is {@code null}
* @see Window#getBufferStrategy()
* @see Canvas#getBufferStrategy()
@@ -4032,12 +4032,12 @@ public abstract class Component implements ImageObserver, MenuContainer,
* @see Applet
* @param numBuffers the number of buffers
* @param caps the capabilities of the buffers
- * @exception AWTException if the capabilities supplied could not be
+ * @throws AWTException if the capabilities supplied could not be
* supported or met
- * @exception ClassCastException if the component is not a canvas or
+ * @throws ClassCastException if the component is not a canvas or
* window.
- * @exception IllegalStateException if the component has no peer
- * @exception IllegalArgumentException if {@code numBuffers} is less than two,
+ * @throws IllegalStateException if the component has no peer
+ * @throws IllegalArgumentException if {@code numBuffers} is less than two,
* or if {@code BufferCapabilities.isPageFlipping} is not
* {@code true}.
* @see #createBuffers(int, BufferCapabilities)
@@ -4066,10 +4066,10 @@ public abstract class Component implements ImageObserver, MenuContainer,
* @param caps the capabilities of the buffers.
* {@code BufferCapabilities.isPageFlipping} must be
* {@code true}.
- * @exception AWTException if the capabilities supplied could not be
+ * @throws AWTException if the capabilities supplied could not be
* supported or met
- * @exception IllegalStateException if the component has no peer
- * @exception IllegalArgumentException if numBuffers is less than two,
+ * @throws IllegalStateException if the component has no peer
+ * @throws IllegalArgumentException if numBuffers is less than two,
* or if {@code BufferCapabilities.isPageFlipping} is not
* {@code true}.
* @see java.awt.BufferCapabilities#isPageFlipping()
@@ -4135,7 +4135,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
* Provides direct access to the back buffer as an image.
*
* @return the back buffer as an image
- * @exception IllegalStateException if the buffers have not yet
+ * @throws IllegalStateException if the buffers have not yet
* been created
*/
protected Image getBackBuffer() {
@@ -4154,7 +4154,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
* for the contents of the back buffer. This should be one of the
* values of the {@code BufferCapabilities.FlipContents}
* property.
- * @exception IllegalStateException if the buffers have not yet
+ * @throws IllegalStateException if the buffers have not yet
* been created
* @see java.awt.BufferCapabilities#getFlipContents()
*/
@@ -6060,7 +6060,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
* @return an array of all objects registered as
* FooListeners on this component,
* or an empty array if no such listeners have been added
- * @exception ClassCastException if {@code listenerType}
+ * @throws ClassCastException if {@code listenerType}
* doesn't specify a class or interface that implements
* {@code java.util.EventListener}
* @throws NullPointerException if {@code listenerType} is {@code null}
@@ -8352,7 +8352,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
* Adds the specified popup menu to the component.
* @param popup the popup menu to be added to the component.
* @see #remove(MenuComponent)
- * @exception NullPointerException if {@code popup} is {@code null}
+ * @throws NullPointerException if {@code popup} is {@code null}
* @since 1.1
*/
public void add(PopupMenu popup) {
@@ -9192,7 +9192,7 @@ public abstract class Component implements ImageObserver, MenuContainer,
*
* @param orientation the new component orientation of this component and
* the components contained within it.
- * @exception NullPointerException if {@code orientation} is null.
+ * @throws NullPointerException if {@code orientation} is null.
* @see #setComponentOrientation
* @see #getComponentOrientation
* @see #invalidate
diff --git a/src/java.desktop/share/classes/java/awt/Container.java b/src/java.desktop/share/classes/java/awt/Container.java
index 5b4489f3cac037367281592b11af7f29702c7b2c..f63c507a829abdcf04069e02d6bb9e4bba3de2c6 100644
--- a/src/java.desktop/share/classes/java/awt/Container.java
+++ b/src/java.desktop/share/classes/java/awt/Container.java
@@ -340,7 +340,7 @@ public class Container extends Component {
*
* @param n the index of the component to get.
* @return the nth component in this container.
- * @exception ArrayIndexOutOfBoundsException
+ * @throws ArrayIndexOutOfBoundsException
* if the nth value does not exist.
* @see Component#getTreeLock()
*/
@@ -429,7 +429,7 @@ public class Container extends Component {
* display the added component.
*
* @param comp the component to be added
- * @exception NullPointerException if {@code comp} is {@code null}
+ * @throws NullPointerException if {@code comp} is {@code null}
* @see #addImpl
* @see #invalidate
* @see #validate
@@ -456,7 +456,7 @@ public class Container extends Component {
* @param name the name of the component to be added
* @param comp the component to be added
* @return the component added
- * @exception NullPointerException if {@code comp} is {@code null}
+ * @throws NullPointerException if {@code comp} is {@code null}
* @see #add(Component, Object)
* @see #invalidate
*/
@@ -479,8 +479,8 @@ public class Container extends Component {
* @param comp the component to be added
* @param index the position at which to insert the component,
* or {@code -1} to append the component to the end
- * @exception NullPointerException if {@code comp} is {@code null}
- * @exception IllegalArgumentException if {@code index} is invalid (see
+ * @throws NullPointerException if {@code comp} is {@code null}
+ * @throws IllegalArgumentException if {@code index} is invalid (see
* {@link #addImpl} for details)
* @return the component {@code comp}
* @see #addImpl
@@ -764,17 +764,17 @@ public class Container extends Component {
* @param index the position in the container's list to
* insert the component, where {@code getComponentCount()}
* appends to the end
- * @exception NullPointerException if {@code comp} is
+ * @throws NullPointerException if {@code comp} is
* {@code null}
- * @exception IllegalArgumentException if {@code comp} is one of the
+ * @throws IllegalArgumentException if {@code comp} is one of the
* container's parents
- * @exception IllegalArgumentException if {@code index} is not in
+ * @throws IllegalArgumentException if {@code index} is not in
* the range {@code [0, getComponentCount()]} for moving
* between containers, or not in the range
* {@code [0, getComponentCount()-1]} for moving inside
* a container
- * @exception IllegalArgumentException if adding a container to itself
- * @exception IllegalArgumentException if adding a {@code Window}
+ * @throws IllegalArgumentException if adding a container to itself
+ * @throws IllegalArgumentException if adding a {@code Window}
* to a container
* @see #getComponentZOrder(java.awt.Component)
* @see #invalidate
@@ -989,7 +989,7 @@ public class Container extends Component {
* @param comp the component to be added
* @param constraints an object expressing
* layout constraints for this component
- * @exception NullPointerException if {@code comp} is {@code null}
+ * @throws NullPointerException if {@code comp} is {@code null}
* @see #addImpl
* @see #invalidate
* @see #validate
@@ -1019,8 +1019,8 @@ public class Container extends Component {
* @param index the position in the container's list at which to insert
* the component; {@code -1} means insert at the end
* component
- * @exception NullPointerException if {@code comp} is {@code null}
- * @exception IllegalArgumentException if {@code index} is invalid (see
+ * @throws NullPointerException if {@code comp} is {@code null}
+ * @throws IllegalArgumentException if {@code index} is invalid (see
* {@link #addImpl} for details)
* @see #addImpl
* @see #invalidate
@@ -1082,16 +1082,16 @@ public class Container extends Component {
* @param index the position in the container's list at which to
* insert the component, where {@code -1}
* means append to the end
- * @exception IllegalArgumentException if {@code index} is invalid;
+ * @throws IllegalArgumentException if {@code index} is invalid;
* if {@code comp} is a child of this container, the valid
* range is {@code [-1, getComponentCount()-1]}; if component is
* not a child of this container, the valid range is
* {@code [-1, getComponentCount()]}
*
- * @exception IllegalArgumentException if {@code comp} is an ancestor of
+ * @throws IllegalArgumentException if {@code comp} is an ancestor of
* this container
- * @exception IllegalArgumentException if adding a window to a container
- * @exception NullPointerException if {@code comp} is {@code null}
+ * @throws IllegalArgumentException if adding a window to a container
+ * @throws NullPointerException if {@code comp} is {@code null}
* @see #add(Component)
* @see #add(Component, int)
* @see #add(Component, java.lang.Object)
@@ -2213,10 +2213,10 @@ public class Container extends Component {
* @return an array of all objects registered as
* FooListeners on this container,
* or an empty array if no such listeners have been added
- * @exception ClassCastException if {@code listenerType}
+ * @throws ClassCastException if {@code listenerType}
* doesn't specify a class or interface that implements
* {@code java.util.EventListener}
- * @exception NullPointerException if {@code listenerType} is {@code null}
+ * @throws NullPointerException if {@code listenerType} is {@code null}
*
* @see #getContainerListeners
*
@@ -2622,7 +2622,7 @@ public class Container extends Component {
* a non-null value if the mouse pointer is above {@code Container} or any
* of its descendants.
*
- * @exception HeadlessException if GraphicsEnvironment.isHeadless() returns true
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless() returns true
* @param allowChildren true if children should be taken into account
* @see Component#getMousePosition
* @return mouse coordinates relative to this {@code Component}, or null
@@ -3556,7 +3556,7 @@ public class Container extends Component {
*
* @param o the new component orientation of this container and
* the components contained within it.
- * @exception NullPointerException if {@code orientation} is null.
+ * @throws NullPointerException if {@code orientation} is null.
* @see Component#setComponentOrientation
* @see Component#getComponentOrientation
* @see #invalidate
diff --git a/src/java.desktop/share/classes/java/awt/Cursor.java b/src/java.desktop/share/classes/java/awt/Cursor.java
index 936d17da46f6e2f8dc4f53485ddacbf51133f53c..cfccf06723becd6a24be72fb99cde1a7142ee1b8 100644
--- a/src/java.desktop/share/classes/java/awt/Cursor.java
+++ b/src/java.desktop/share/classes/java/awt/Cursor.java
@@ -285,9 +285,9 @@ public class Cursor implements java.io.Serializable {
*
* @param name a string describing the desired system-specific custom cursor
* @return the system specific custom cursor named
- * @exception HeadlessException if
+ * @throws HeadlessException if
* {@code GraphicsEnvironment.isHeadless} returns true
- * @exception AWTException in case of erroneous retrieving of the cursor
+ * @throws AWTException in case of erroneous retrieving of the cursor
*/
public static Cursor getSystemCustomCursor(final String name)
throws AWTException, HeadlessException {
diff --git a/src/java.desktop/share/classes/java/awt/Dialog.java b/src/java.desktop/share/classes/java/awt/Dialog.java
index 1a54d70730697ca0aeff76ff75ea0f8c37ad9c1c..2c126e74ffc80b22fe657dbdac1c8b91b52af483 100644
--- a/src/java.desktop/share/classes/java/awt/Dialog.java
+++ b/src/java.desktop/share/classes/java/awt/Dialog.java
@@ -329,9 +329,9 @@ public class Dialog extends Window {
*
* @param owner the owner of the dialog or {@code null} if
* this dialog has no owner
- * @exception java.lang.IllegalArgumentException if the {@code owner}'s
+ * @throws java.lang.IllegalArgumentException if the {@code owner}'s
* {@code GraphicsConfiguration} is not from a screen device
- * @exception HeadlessException when
+ * @throws HeadlessException when
* {@code GraphicsEnvironment.isHeadless()} returns {@code true}
*
* @see java.awt.GraphicsEnvironment#isHeadless
@@ -352,9 +352,9 @@ public class Dialog extends Window {
* windows when shown. If {@code false}, the dialog is {@code MODELESS};
* if {@code true}, the modality type property is set to
* {@code DEFAULT_MODALITY_TYPE}
- * @exception java.lang.IllegalArgumentException if the {@code owner}'s
+ * @throws java.lang.IllegalArgumentException if the {@code owner}'s
* {@code GraphicsConfiguration} is not from a screen device
- * @exception HeadlessException when
+ * @throws HeadlessException when
* {@code GraphicsEnvironment.isHeadless()} returns {@code true}
*
* @see java.awt.Dialog.ModalityType
@@ -376,9 +376,9 @@ public class Dialog extends Window {
* this dialog has no owner
* @param title the title of the dialog or {@code null} if this dialog
* has no title
- * @exception IllegalArgumentException if the {@code owner}'s
+ * @throws IllegalArgumentException if the {@code owner}'s
* {@code GraphicsConfiguration} is not from a screen device
- * @exception HeadlessException when
+ * @throws HeadlessException when
* {@code GraphicsEnvironment.isHeadless()} returns {@code true}
*
* @see java.awt.GraphicsEnvironment#isHeadless
@@ -401,9 +401,9 @@ public class Dialog extends Window {
* windows when shown. If {@code false}, the dialog is {@code MODELESS};
* if {@code true}, the modality type property is set to
* {@code DEFAULT_MODALITY_TYPE}
- * @exception java.lang.IllegalArgumentException if the {@code owner}'s
+ * @throws java.lang.IllegalArgumentException if the {@code owner}'s
* {@code GraphicsConfiguration} is not from a screen device
- * @exception HeadlessException when
+ * @throws HeadlessException when
* {@code GraphicsEnvironment.isHeadless()} returns {@code true}
*
* @see java.awt.Dialog.ModalityType
@@ -433,9 +433,9 @@ public class Dialog extends Window {
* @param gc the {@code GraphicsConfiguration} of the target screen device;
* if {@code null}, the default system {@code GraphicsConfiguration}
* is assumed
- * @exception java.lang.IllegalArgumentException if {@code gc}
+ * @throws java.lang.IllegalArgumentException if {@code gc}
* is not from a screen device
- * @exception HeadlessException when
+ * @throws HeadlessException when
* {@code GraphicsEnvironment.isHeadless()} returns {@code true}
*
* @see java.awt.Dialog.ModalityType
@@ -459,9 +459,9 @@ public class Dialog extends Window {
*
* @param owner the owner of the dialog or {@code null} if this
* dialog has no owner
- * @exception java.lang.IllegalArgumentException if the {@code owner}'s
+ * @throws java.lang.IllegalArgumentException if the {@code owner}'s
* {@code GraphicsConfiguration} is not from a screen device
- * @exception HeadlessException when
+ * @throws HeadlessException when
* {@code GraphicsEnvironment.isHeadless()} returns {@code true}
* @see java.awt.GraphicsEnvironment#isHeadless
* @since 1.2
@@ -478,9 +478,9 @@ public class Dialog extends Window {
* has no owner
* @param title the title of the dialog or {@code null} if this dialog
* has no title
- * @exception java.lang.IllegalArgumentException if the {@code owner}'s
+ * @throws java.lang.IllegalArgumentException if the {@code owner}'s
* {@code GraphicsConfiguration} is not from a screen device
- * @exception HeadlessException when
+ * @throws HeadlessException when
* {@code GraphicsEnvironment.isHeadless()} returns {@code true}
*
* @see java.awt.GraphicsEnvironment#isHeadless
@@ -502,9 +502,9 @@ public class Dialog extends Window {
* windows when shown. If {@code false}, the dialog is {@code MODELESS};
* if {@code true}, the modality type property is set to
* {@code DEFAULT_MODALITY_TYPE}
- * @exception IllegalArgumentException if the {@code owner}'s
+ * @throws IllegalArgumentException if the {@code owner}'s
* {@code GraphicsConfiguration} is not from a screen device
- * @exception HeadlessException when
+ * @throws HeadlessException when
* {@code GraphicsEnvironment.isHeadless()} returns {@code true}
*
* @see java.awt.Dialog.ModalityType
@@ -536,9 +536,9 @@ public class Dialog extends Window {
* @param gc the {@code GraphicsConfiguration} of the target screen device;
* if {@code null}, the default system {@code GraphicsConfiguration}
* is assumed
- * @exception java.lang.IllegalArgumentException if {@code gc}
+ * @throws java.lang.IllegalArgumentException if {@code gc}
* is not from a screen device
- * @exception HeadlessException when
+ * @throws HeadlessException when
* {@code GraphicsEnvironment.isHeadless()} returns {@code true}
*
* @see java.awt.Dialog.ModalityType
@@ -565,12 +565,12 @@ public class Dialog extends Window {
* {@link java.awt.Dialog Dialog}, {@link java.awt.Frame Frame}, any
* of their descendants or {@code null}
*
- * @exception java.lang.IllegalArgumentException if the {@code owner}
+ * @throws java.lang.IllegalArgumentException if the {@code owner}
* is not an instance of {@link java.awt.Dialog Dialog} or {@link
* java.awt.Frame Frame}
- * @exception java.lang.IllegalArgumentException if the {@code owner}'s
+ * @throws java.lang.IllegalArgumentException if the {@code owner}'s
* {@code GraphicsConfiguration} is not from a screen device
- * @exception HeadlessException when
+ * @throws HeadlessException when
* {@code GraphicsEnvironment.isHeadless()} returns {@code true}
*
* @see java.awt.GraphicsEnvironment#isHeadless
@@ -591,12 +591,12 @@ public class Dialog extends Window {
* @param title the title of the dialog or {@code null} if this dialog
* has no title
*
- * @exception java.lang.IllegalArgumentException if the {@code owner}
+ * @throws java.lang.IllegalArgumentException if the {@code owner}
* is not an instance of {@link java.awt.Dialog Dialog} or {@link
* java.awt.Frame Frame}
- * @exception java.lang.IllegalArgumentException if the {@code owner}'s
+ * @throws java.lang.IllegalArgumentException if the {@code owner}'s
* {@code GraphicsConfiguration} is not from a screen device
- * @exception HeadlessException when
+ * @throws HeadlessException when
* {@code GraphicsEnvironment.isHeadless()} returns {@code true}
*
* @see java.awt.GraphicsEnvironment#isHeadless
@@ -618,14 +618,14 @@ public class Dialog extends Window {
* windows when shown. {@code null} value and unsupported modality
* types are equivalent to {@code MODELESS}
*
- * @exception java.lang.IllegalArgumentException if the {@code owner}
+ * @throws java.lang.IllegalArgumentException if the {@code owner}
* is not an instance of {@link java.awt.Dialog Dialog} or {@link
* java.awt.Frame Frame}
- * @exception java.lang.IllegalArgumentException if the {@code owner}'s
+ * @throws java.lang.IllegalArgumentException if the {@code owner}'s
* {@code GraphicsConfiguration} is not from a screen device
- * @exception HeadlessException when
+ * @throws HeadlessException when
* {@code GraphicsEnvironment.isHeadless()} returns {@code true}
- * @exception SecurityException if the calling thread does not have permission
+ * @throws SecurityException if the calling thread does not have permission
* to create modal dialogs with the given {@code modalityType}
*
* @see java.awt.Dialog.ModalityType
@@ -653,14 +653,14 @@ public class Dialog extends Window {
* windows when shown. {@code null} value and unsupported modality
* types are equivalent to {@code MODELESS}
*
- * @exception java.lang.IllegalArgumentException if the {@code owner}
+ * @throws java.lang.IllegalArgumentException if the {@code owner}
* is not an instance of {@link java.awt.Dialog Dialog} or {@link
* java.awt.Frame Frame}
- * @exception java.lang.IllegalArgumentException if the {@code owner}'s
+ * @throws java.lang.IllegalArgumentException if the {@code owner}'s
* {@code GraphicsConfiguration} is not from a screen device
- * @exception HeadlessException when
+ * @throws HeadlessException when
* {@code GraphicsEnvironment.isHeadless()} returns {@code true}
- * @exception SecurityException if the calling thread does not have permission
+ * @throws SecurityException if the calling thread does not have permission
* to create modal dialogs with the given {@code modalityType}
*
* @see java.awt.Dialog.ModalityType
@@ -704,14 +704,14 @@ public class Dialog extends Window {
* if {@code null}, the default system {@code GraphicsConfiguration}
* is assumed
*
- * @exception java.lang.IllegalArgumentException if the {@code owner}
+ * @throws java.lang.IllegalArgumentException if the {@code owner}
* is not an instance of {@link java.awt.Dialog Dialog} or {@link
* java.awt.Frame Frame}
- * @exception java.lang.IllegalArgumentException if {@code gc}
+ * @throws java.lang.IllegalArgumentException if {@code gc}
* is not from a screen device
- * @exception HeadlessException when
+ * @throws HeadlessException when
* {@code GraphicsEnvironment.isHeadless()} returns {@code true}
- * @exception SecurityException if the calling thread does not have permission
+ * @throws SecurityException if the calling thread does not have permission
* to create modal dialogs with the given {@code modalityType}
*
* @see java.awt.Dialog.ModalityType
@@ -848,7 +848,7 @@ public class Dialog extends Window {
* @param type specifies whether dialog blocks input to other
* windows when shown. {@code null} value and unsupported modality
* types are equivalent to {@code MODELESS}
- * @exception SecurityException if the calling thread does not have permission
+ * @throws SecurityException if the calling thread does not have permission
* to create modal dialogs with the given {@code modalityType}
*
* @see java.awt.Dialog#getModalityType
diff --git a/src/java.desktop/share/classes/java/awt/EventQueue.java b/src/java.desktop/share/classes/java/awt/EventQueue.java
index e7d1dcc82863c1c536ee3c5679f9486c73eefaec..4dce257f7278f47a563748d12dc14ab683457a74 100644
--- a/src/java.desktop/share/classes/java/awt/EventQueue.java
+++ b/src/java.desktop/share/classes/java/awt/EventQueue.java
@@ -544,7 +544,7 @@ public class EventQueue {
* returns it. This method will block until an event has
* been posted by another thread.
* @return the next {@code AWTEvent}
- * @exception InterruptedException
+ * @throws InterruptedException
* if any thread has interrupted this thread
*/
public AWTEvent getNextEvent() throws InterruptedException {
@@ -946,7 +946,7 @@ public class EventQueue {
* Warning: To avoid deadlock, do not declare this method
* synchronized in a subclass.
*
- * @exception EmptyStackException if no previous push was made
+ * @throws EmptyStackException if no previous push was made
* on this {@code EventQueue}
* @see java.awt.EventQueue#push
* @since 1.2
@@ -1331,9 +1331,9 @@ public class EventQueue {
* synchronously in the
* {@link #isDispatchThread event dispatch thread}
* of {@link Toolkit#getSystemEventQueue the system EventQueue}
- * @exception InterruptedException if any thread has
+ * @throws InterruptedException if any thread has
* interrupted this thread
- * @exception InvocationTargetException if an throwable is thrown
+ * @throws InvocationTargetException if an throwable is thrown
* when running {@code runnable}
* @see #invokeLater
* @see Toolkit#getSystemEventQueue
diff --git a/src/java.desktop/share/classes/java/awt/FileDialog.java b/src/java.desktop/share/classes/java/awt/FileDialog.java
index b6a501b44e96b7c73f690c063989b590b64a1d9a..399544b954789ccb0100be92e08542a177c51c6b 100644
--- a/src/java.desktop/share/classes/java/awt/FileDialog.java
+++ b/src/java.desktop/share/classes/java/awt/FileDialog.java
@@ -232,7 +232,7 @@ public class FileDialog extends Dialog {
* @param title the title of the dialog
* @param mode the mode of the dialog; either
* {@code FileDialog.LOAD} or {@code FileDialog.SAVE}
- * @exception IllegalArgumentException if an illegal file
+ * @throws IllegalArgumentException if an illegal file
* dialog mode is supplied
* @see java.awt.FileDialog#LOAD
* @see java.awt.FileDialog#SAVE
@@ -255,10 +255,10 @@ public class FileDialog extends Dialog {
* displayed.
*
* @param parent the owner of the dialog
- * @exception java.lang.IllegalArgumentException if the {@code parent}'s
+ * @throws java.lang.IllegalArgumentException if the {@code parent}'s
* {@code GraphicsConfiguration}
* is not from a screen device;
- * @exception java.lang.IllegalArgumentException if {@code parent}
+ * @throws java.lang.IllegalArgumentException if {@code parent}
* is {@code null}; this exception is always thrown when
* {@code GraphicsEnvironment.isHeadless}
* returns {@code true}
@@ -285,10 +285,10 @@ public class FileDialog extends Dialog {
* @param title the title of the dialog; a {@code null} value
* will be accepted without causing a
* {@code NullPointerException} to be thrown
- * @exception java.lang.IllegalArgumentException if the {@code parent}'s
+ * @throws java.lang.IllegalArgumentException if the {@code parent}'s
* {@code GraphicsConfiguration}
* is not from a screen device;
- * @exception java.lang.IllegalArgumentException if {@code parent}
+ * @throws java.lang.IllegalArgumentException if {@code parent}
* is {@code null}; this exception is always thrown when
* {@code GraphicsEnvironment.isHeadless}
* returns {@code true}
@@ -321,12 +321,12 @@ public class FileDialog extends Dialog {
* {@code NullPointerException} to be thrown
* @param mode the mode of the dialog; either
* {@code FileDialog.LOAD} or {@code FileDialog.SAVE}
- * @exception java.lang.IllegalArgumentException if an illegal
+ * @throws java.lang.IllegalArgumentException if an illegal
* file dialog mode is supplied;
- * @exception java.lang.IllegalArgumentException if the {@code parent}'s
+ * @throws java.lang.IllegalArgumentException if the {@code parent}'s
* {@code GraphicsConfiguration}
* is not from a screen device;
- * @exception java.lang.IllegalArgumentException if {@code parent}
+ * @throws java.lang.IllegalArgumentException if {@code parent}
* is {@code null}; this exception is always thrown when
* {@code GraphicsEnvironment.isHeadless}
* returns {@code true}
@@ -408,7 +408,7 @@ public class FileDialog extends Dialog {
* @see java.awt.FileDialog#LOAD
* @see java.awt.FileDialog#SAVE
* @see java.awt.FileDialog#getMode
- * @exception IllegalArgumentException if an illegal file
+ * @throws IllegalArgumentException if an illegal file
* dialog mode is supplied
* @since 1.1
*/
diff --git a/src/java.desktop/share/classes/java/awt/Frame.java b/src/java.desktop/share/classes/java/awt/Frame.java
index 6dde9373c38714974047be58de9212643f82961f..e01ef082d4229865c0c964723719621ceb99f1cc 100644
--- a/src/java.desktop/share/classes/java/awt/Frame.java
+++ b/src/java.desktop/share/classes/java/awt/Frame.java
@@ -383,7 +383,7 @@ public class Frame extends Window implements MenuContainer {
* Constructs a new instance of {@code Frame} that is
* initially invisible. The title of the {@code Frame}
* is empty.
- * @exception HeadlessException when
+ * @throws HeadlessException when
* {@code GraphicsEnvironment.isHeadless()} returns {@code true}
* @see java.awt.GraphicsEnvironment#isHeadless()
* @see Component#setSize
@@ -401,9 +401,9 @@ public class Frame extends Window implements MenuContainer {
* of the target screen device. If {@code gc}
* is {@code null}, the system default
* {@code GraphicsConfiguration} is assumed.
- * @exception IllegalArgumentException if
+ * @throws IllegalArgumentException if
* {@code gc} is not from a screen device.
- * @exception HeadlessException when
+ * @throws HeadlessException when
* {@code GraphicsEnvironment.isHeadless()} returns {@code true}
* @see java.awt.GraphicsEnvironment#isHeadless()
* @since 1.3
@@ -418,7 +418,7 @@ public class Frame extends Window implements MenuContainer {
* @param title the title to be displayed in the frame's border.
* A {@code null} value
* is treated as an empty string, "".
- * @exception HeadlessException when
+ * @throws HeadlessException when
* {@code GraphicsEnvironment.isHeadless()} returns {@code true}
* @see java.awt.GraphicsEnvironment#isHeadless()
* @see java.awt.Component#setSize
@@ -440,9 +440,9 @@ public class Frame extends Window implements MenuContainer {
* of the target screen device. If {@code gc} is
* {@code null}, the system default
* {@code GraphicsConfiguration} is assumed.
- * @exception IllegalArgumentException if {@code gc}
+ * @throws IllegalArgumentException if {@code gc}
* is not from a screen device.
- * @exception HeadlessException when
+ * @throws HeadlessException when
* {@code GraphicsEnvironment.isHeadless()} returns {@code true}
* @see java.awt.GraphicsEnvironment#isHeadless()
* @see java.awt.Component#setSize
diff --git a/src/java.desktop/share/classes/java/awt/GraphicsConfiguration.java b/src/java.desktop/share/classes/java/awt/GraphicsConfiguration.java
index b698f0f3706d1e08fd328073e4b7ced0f1c3a57f..58d502ac03f47f57a06db6eab39a36ae4c06d706 100644
--- a/src/java.desktop/share/classes/java/awt/GraphicsConfiguration.java
+++ b/src/java.desktop/share/classes/java/awt/GraphicsConfiguration.java
@@ -261,7 +261,7 @@ public abstract class GraphicsConfiguration {
* @param width the width of the returned {@code VolatileImage}
* @param height the height of the returned {@code VolatileImage}
* @param caps the image capabilities
- * @exception AWTException if the supplied image capabilities could not
+ * @throws AWTException if the supplied image capabilities could not
* be met by this graphics configuration
* @since 1.4
*/
@@ -294,7 +294,7 @@ public abstract class GraphicsConfiguration {
* @see Transparency#BITMASK
* @see Transparency#TRANSLUCENT
* @throws IllegalArgumentException if the transparency is not a valid value
- * @exception AWTException if the supplied image capabilities could not
+ * @throws AWTException if the supplied image capabilities could not
* be met by this graphics configuration
* @see Component#createVolatileImage(int, int)
* @since 1.5
diff --git a/src/java.desktop/share/classes/java/awt/GraphicsDevice.java b/src/java.desktop/share/classes/java/awt/GraphicsDevice.java
index d878f610fca9a9d8bc1bcd9e29a81c21ea84254f..c08c5580ae73fc388bc8d67f8e90a697e37b3d86 100644
--- a/src/java.desktop/share/classes/java/awt/GraphicsDevice.java
+++ b/src/java.desktop/share/classes/java/awt/GraphicsDevice.java
@@ -418,10 +418,10 @@ public abstract class GraphicsDevice {
*
*
* @param dm The new display mode of this graphics device.
- * @exception IllegalArgumentException if the {@code DisplayMode}
+ * @throws IllegalArgumentException if the {@code DisplayMode}
* supplied is {@code null}, or is not available in the array returned
* by {@code getDisplayModes}
- * @exception UnsupportedOperationException if
+ * @throws UnsupportedOperationException if
* {@code isDisplayChangeSupported} returns {@code false}
* @see #getDisplayMode
* @see #getDisplayModes
diff --git a/src/java.desktop/share/classes/java/awt/GraphicsEnvironment.java b/src/java.desktop/share/classes/java/awt/GraphicsEnvironment.java
index 438f9f399a0471c2c57d4b11090d212fcf943ad7..79102059b0ef782bf30290a7be8d3af8c25a9593 100644
--- a/src/java.desktop/share/classes/java/awt/GraphicsEnvironment.java
+++ b/src/java.desktop/share/classes/java/awt/GraphicsEnvironment.java
@@ -191,7 +191,7 @@ public abstract class GraphicsEnvironment {
* objects.
* @return an array containing all the {@code GraphicsDevice}
* objects that represent screen devices
- * @exception HeadlessException if isHeadless() returns true
+ * @throws HeadlessException if isHeadless() returns true
* @see #isHeadless()
*/
public abstract GraphicsDevice[] getScreenDevices()
@@ -201,7 +201,7 @@ public abstract class GraphicsEnvironment {
* Returns the default screen {@code GraphicsDevice}.
* @return the {@code GraphicsDevice} that represents the
* default screen device
- * @exception HeadlessException if isHeadless() returns true
+ * @throws HeadlessException if isHeadless() returns true
* @see #isHeadless()
*/
public abstract GraphicsDevice getDefaultScreenDevice()
@@ -383,7 +383,7 @@ public abstract class GraphicsEnvironment {
* within the available display area using getMaximumWindowBounds().
* @return the point where Windows should be centered
*
- * @exception HeadlessException if isHeadless() returns true
+ * @throws HeadlessException if isHeadless() returns true
* @see #getMaximumWindowBounds
* @since 1.4
*/
@@ -409,7 +409,7 @@ public abstract class GraphicsEnvironment {
* {@code Toolkit.getScreenInsets()}.
* @return the maximum bounds for centered Windows
*
- * @exception HeadlessException if isHeadless() returns true
+ * @throws HeadlessException if isHeadless() returns true
* @see #getCenterPoint
* @see GraphicsConfiguration#getBounds
* @see Toolkit#getScreenInsets
diff --git a/src/java.desktop/share/classes/java/awt/GridBagLayout.java b/src/java.desktop/share/classes/java/awt/GridBagLayout.java
index ff3bec8b1153e36fe2db7d0021452ce0354f3c17..e0692ac0624bb5990201b4fd8745f0973b24c101 100644
--- a/src/java.desktop/share/classes/java/awt/GridBagLayout.java
+++ b/src/java.desktop/share/classes/java/awt/GridBagLayout.java
@@ -688,7 +688,7 @@ java.io.Serializable {
* @param comp the component to be added
* @param constraints an object that determines how
* the component is added to the layout
- * @exception IllegalArgumentException if {@code constraints}
+ * @throws IllegalArgumentException if {@code constraints}
* is not a {@code GridBagConstraint}
*/
public void addLayoutComponent(Component comp, Object constraints) {
diff --git a/src/java.desktop/share/classes/java/awt/GridLayout.java b/src/java.desktop/share/classes/java/awt/GridLayout.java
index 4a3b66f4332e86c243260761106a083200453d5e..5c9265bc91214d8d0ca2fa3b977741985dcc3cac 100644
--- a/src/java.desktop/share/classes/java/awt/GridLayout.java
+++ b/src/java.desktop/share/classes/java/awt/GridLayout.java
@@ -186,7 +186,7 @@ public class GridLayout implements LayoutManager, java.io.Serializable {
* any number of columns
* @param hgap the horizontal gap
* @param vgap the vertical gap
- * @exception IllegalArgumentException if the value of both
+ * @throws IllegalArgumentException if the value of both
* {@code rows} and {@code cols} is
* set to zero
*/
@@ -212,7 +212,7 @@ public class GridLayout implements LayoutManager, java.io.Serializable {
/**
* Sets the number of rows in this layout to the specified value.
* @param rows the number of rows in this layout
- * @exception IllegalArgumentException if the value of both
+ * @throws IllegalArgumentException if the value of both
* {@code rows} and {@code cols} is set to zero
* @since 1.1
*/
@@ -240,7 +240,7 @@ public class GridLayout implements LayoutManager, java.io.Serializable {
* of columns displayed in the layout is determined by the total
* number of components and the number of rows specified.
* @param cols the number of columns in this layout
- * @exception IllegalArgumentException if the value of both
+ * @throws IllegalArgumentException if the value of both
* {@code rows} and {@code cols} is set to zero
* @since 1.1
*/
diff --git a/src/java.desktop/share/classes/java/awt/Image.java b/src/java.desktop/share/classes/java/awt/Image.java
index 7e6273232694a0a3e6f5ecb14b6956316a81329d..1ad4ec9226f07c4549ea001fde8e02f4a31cf96f 100644
--- a/src/java.desktop/share/classes/java/awt/Image.java
+++ b/src/java.desktop/share/classes/java/awt/Image.java
@@ -105,7 +105,7 @@ public abstract class Image {
* Creates a graphics context for drawing to an off-screen image.
* This method can only be called for off-screen images.
* @return a graphics context to draw to the off-screen image.
- * @exception UnsupportedOperationException if called for a
+ * @throws UnsupportedOperationException if called for a
* non-off-screen image.
* @see java.awt.Graphics
* @see java.awt.Component#createImage(int, int)
@@ -162,7 +162,7 @@ public abstract class Image {
* @param hints flags to indicate the type of algorithm to use
* for image resampling.
* @return a scaled version of the image.
- * @exception IllegalArgumentException if {@code width}
+ * @throws IllegalArgumentException if {@code width}
* or {@code height} is zero.
* @see java.awt.Image#SCALE_DEFAULT
* @see java.awt.Image#SCALE_FAST
diff --git a/src/java.desktop/share/classes/java/awt/Label.java b/src/java.desktop/share/classes/java/awt/Label.java
index b061efb51700631abef5c58954a7234bcbb1609d..ad8ff4c2b828c17c8bf93ec041ca5fd2a8ed7c28 100644
--- a/src/java.desktop/share/classes/java/awt/Label.java
+++ b/src/java.desktop/share/classes/java/awt/Label.java
@@ -114,7 +114,7 @@ public class Label extends Component implements Accessible {
/**
* Constructs an empty label.
* The text of the label is the empty string {@code ""}.
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true.
* @see java.awt.GraphicsEnvironment#isHeadless
*/
@@ -129,7 +129,7 @@ public class Label extends Component implements Accessible {
* A {@code null} value
* will be accepted without causing a NullPointerException
* to be thrown.
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true.
* @see java.awt.GraphicsEnvironment#isHeadless
*/
@@ -147,7 +147,7 @@ public class Label extends Component implements Accessible {
* will be accepted without causing a NullPointerException
* to be thrown.
* @param alignment the alignment value.
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true.
* @see java.awt.GraphicsEnvironment#isHeadless
*/
@@ -216,7 +216,7 @@ public class Label extends Component implements Accessible {
* Possible values are {@code Label.LEFT},
* {@code Label.RIGHT}, and {@code Label.CENTER}.
* @param alignment the alignment to be set.
- * @exception IllegalArgumentException if an improper value for
+ * @throws IllegalArgumentException if an improper value for
* {@code alignment} is given.
* @see java.awt.Label#getAlignment
*/
diff --git a/src/java.desktop/share/classes/java/awt/List.java b/src/java.desktop/share/classes/java/awt/List.java
index f29374ab6bc062101dd13632dd42eeccaa246a82..fe1a5dc5530434058afe64baa62341928b30b851 100644
--- a/src/java.desktop/share/classes/java/awt/List.java
+++ b/src/java.desktop/share/classes/java/awt/List.java
@@ -193,7 +193,7 @@ public class List extends Component implements ItemSelectable, Accessible {
* not allowed. Note that this is a convenience method for
* {@code List(0, false)}. Also note that the number of visible
* lines in the list cannot be changed after it has been created.
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true.
* @see java.awt.GraphicsEnvironment#isHeadless
*/
@@ -209,7 +209,7 @@ public class List extends Component implements ItemSelectable, Accessible {
* of visible rows in the list cannot be changed after it has
* been created.
* @param rows the number of items to show.
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true.
* @see java.awt.GraphicsEnvironment#isHeadless
* @since 1.1
@@ -238,7 +238,7 @@ public class List extends Component implements ItemSelectable, Accessible {
* @param multipleMode if {@code true},
* then multiple selections are allowed;
* otherwise, only one item can be selected at a time.
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true.
* @see java.awt.GraphicsEnvironment#isHeadless
*/
@@ -411,7 +411,7 @@ public class List extends Component implements ItemSelectable, Accessible {
* with the new string.
* @param newValue a new string to replace an existing item
* @param index the position of the item to replace
- * @exception ArrayIndexOutOfBoundsException if {@code index}
+ * @throws ArrayIndexOutOfBoundsException if {@code index}
* is out of range
*/
public synchronized void replaceItem(String newValue, int index) {
@@ -448,7 +448,7 @@ public class List extends Component implements ItemSelectable, Accessible {
* If the specified item is selected, and is the only selected
* item in the list, the list is set to have no selection.
* @param item the item to remove from the list
- * @exception IllegalArgumentException
+ * @throws IllegalArgumentException
* if the item doesn't exist in the list
* @since 1.1
*/
@@ -470,7 +470,7 @@ public class List extends Component implements ItemSelectable, Accessible {
* @param position the index of the item to delete
* @see #add(String, int)
* @since 1.1
- * @exception ArrayIndexOutOfBoundsException
+ * @throws ArrayIndexOutOfBoundsException
* if the {@code position} is less than 0 or
* greater than {@code getItemCount()-1}
*/
@@ -1053,7 +1053,7 @@ public class List extends Component implements ItemSelectable, Accessible {
* FooListeners on this list,
* or an empty array if no such
* listeners have been added
- * @exception ClassCastException if {@code listenerType}
+ * @throws ClassCastException if {@code listenerType}
* doesn't specify a class or interface that implements
* {@code java.util.EventListener}
*
@@ -1631,7 +1631,7 @@ public class List extends Component implements ItemSelectable, Accessible {
* @return This component's locale. If this component does not have
* a locale, the locale of its parent is returned.
*
- * @exception IllegalComponentStateException
+ * @throws IllegalComponentStateException
* If the Component does not have its own locale and has not yet
* been added to a containment hierarchy such that the locale can
* be determined from the containing parent.
diff --git a/src/java.desktop/share/classes/java/awt/MediaTracker.java b/src/java.desktop/share/classes/java/awt/MediaTracker.java
index e2b754c40afd3b2c55469b7a8d6be8e74739ded3..37e372d0d1f6b521031f1090ff4e5ade3e8dbbc6 100644
--- a/src/java.desktop/share/classes/java/awt/MediaTracker.java
+++ b/src/java.desktop/share/classes/java/awt/MediaTracker.java
@@ -396,7 +396,7 @@ public class MediaTracker implements java.io.Serializable {
* @see java.awt.MediaTracker#waitForAll(long)
* @see java.awt.MediaTracker#isErrorAny
* @see java.awt.MediaTracker#isErrorID
- * @exception InterruptedException if any thread has
+ * @throws InterruptedException if any thread has
* interrupted this thread
*/
public void waitForAll() throws InterruptedException {
@@ -421,7 +421,7 @@ public class MediaTracker implements java.io.Serializable {
* @see java.awt.MediaTracker#waitForAll(long)
* @see java.awt.MediaTracker#isErrorAny
* @see java.awt.MediaTracker#isErrorID
- * @exception InterruptedException if any thread has
+ * @throws InterruptedException if any thread has
* interrupted this thread.
*/
public synchronized boolean waitForAll(long ms)
@@ -627,7 +627,7 @@ public class MediaTracker implements java.io.Serializable {
* @see java.awt.MediaTracker#waitForAll
* @see java.awt.MediaTracker#isErrorAny()
* @see java.awt.MediaTracker#isErrorID(int)
- * @exception InterruptedException if any thread has
+ * @throws InterruptedException if any thread has
* interrupted this thread.
*/
public void waitForID(int id) throws InterruptedException {
@@ -655,7 +655,7 @@ public class MediaTracker implements java.io.Serializable {
* @see java.awt.MediaTracker#statusID
* @see java.awt.MediaTracker#isErrorAny()
* @see java.awt.MediaTracker#isErrorID(int)
- * @exception InterruptedException if any thread has
+ * @throws InterruptedException if any thread has
* interrupted this thread.
*/
public synchronized boolean waitForID(int id, long ms)
diff --git a/src/java.desktop/share/classes/java/awt/Menu.java b/src/java.desktop/share/classes/java/awt/Menu.java
index 5f24c7cb8bdd8e72965b41d1b1c0c0660e79b279..79c3dfe0d82dd6c417d76d76ae9aac0c9c9cad50 100644
--- a/src/java.desktop/share/classes/java/awt/Menu.java
+++ b/src/java.desktop/share/classes/java/awt/Menu.java
@@ -125,7 +125,7 @@ public class Menu extends MenuItem implements MenuContainer, Accessible {
/**
* Constructs a new menu with an empty label. This menu is not
* a tear-off menu.
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true.
* @see java.awt.GraphicsEnvironment#isHeadless
* @since 1.1
@@ -139,7 +139,7 @@ public class Menu extends MenuItem implements MenuContainer, Accessible {
* a tear-off menu.
* @param label the menu's label in the menu bar, or in
* another menu of which this menu is a submenu.
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true.
* @see java.awt.GraphicsEnvironment#isHeadless
*/
@@ -158,7 +158,7 @@ public class Menu extends MenuItem implements MenuContainer, Accessible {
* another menu of which this menu is a submenu.
* @param tearOff if {@code true}, the menu
* is a tear-off menu.
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true.
* @see java.awt.GraphicsEnvironment#isHeadless
*/
@@ -313,7 +313,7 @@ public class Menu extends MenuItem implements MenuContainer, Accessible {
* item should be inserted.
* @see java.awt.Menu#add(java.lang.String)
* @see java.awt.Menu#add(java.awt.MenuItem)
- * @exception IllegalArgumentException if the value of
+ * @throws IllegalArgumentException if the value of
* {@code index} is less than zero
* @since 1.1
*/
@@ -357,7 +357,7 @@ public class Menu extends MenuItem implements MenuContainer, Accessible {
* should be inserted
* @see java.awt.Menu#add(java.lang.String)
* @see java.awt.Menu#add(java.awt.MenuItem)
- * @exception IllegalArgumentException if the value of
+ * @throws IllegalArgumentException if the value of
* {@code index} is less than zero
* @since 1.1
*/
@@ -378,7 +378,7 @@ public class Menu extends MenuItem implements MenuContainer, Accessible {
* Inserts a separator at the specified position.
* @param index the position at which the
* menu separator should be inserted.
- * @exception IllegalArgumentException if the value of
+ * @throws IllegalArgumentException if the value of
* {@code index} is less than 0.
* @see java.awt.Menu#addSeparator
* @since 1.1
diff --git a/src/java.desktop/share/classes/java/awt/MenuBar.java b/src/java.desktop/share/classes/java/awt/MenuBar.java
index 2f78371407aa67869ba076feef67d778b8daa374..c1016f5bd0b2f15236438dcefcf05c24ea129046 100644
--- a/src/java.desktop/share/classes/java/awt/MenuBar.java
+++ b/src/java.desktop/share/classes/java/awt/MenuBar.java
@@ -127,7 +127,7 @@ public class MenuBar extends MenuComponent implements MenuContainer, Accessible
/**
* Creates a new menu bar.
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true.
* @see java.awt.GraphicsEnvironment#isHeadless
*/
diff --git a/src/java.desktop/share/classes/java/awt/MenuComponent.java b/src/java.desktop/share/classes/java/awt/MenuComponent.java
index 2550eea7f520f3f4eab189678a4e594d248cf47b..a2d28fb9e3e3d606eeb306586d2b117616b42bdf 100644
--- a/src/java.desktop/share/classes/java/awt/MenuComponent.java
+++ b/src/java.desktop/share/classes/java/awt/MenuComponent.java
@@ -176,7 +176,7 @@ public abstract class MenuComponent implements java.io.Serializable {
/**
* Creates a {@code MenuComponent}.
- * @exception HeadlessException if
+ * @throws HeadlessException if
* {@code GraphicsEnvironment.isHeadless}
* returns {@code true}
* @see java.awt.GraphicsEnvironment#isHeadless
diff --git a/src/java.desktop/share/classes/java/awt/MenuItem.java b/src/java.desktop/share/classes/java/awt/MenuItem.java
index d1f6f59aa156bb4b8e8dd91af3ab53db11011fd6..adc37db7111a4c76fc0591ccccebe62677f5a84e 100644
--- a/src/java.desktop/share/classes/java/awt/MenuItem.java
+++ b/src/java.desktop/share/classes/java/awt/MenuItem.java
@@ -185,7 +185,7 @@ public class MenuItem extends MenuComponent implements Accessible {
/**
* Constructs a new MenuItem with an empty label and no keyboard
* shortcut.
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true.
* @see java.awt.GraphicsEnvironment#isHeadless
* @since 1.1
@@ -201,7 +201,7 @@ public class MenuItem extends MenuComponent implements Accessible {
* menu items. By default, all menu items except for
* separators are enabled.
* @param label the label for this menu item.
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true.
* @see java.awt.GraphicsEnvironment#isHeadless
* @since 1.0
@@ -218,7 +218,7 @@ public class MenuItem extends MenuComponent implements Accessible {
* @param label the label for this menu item.
* @param s the instance of {@code MenuShortcut}
* associated with this menu item.
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true.
* @see java.awt.GraphicsEnvironment#isHeadless
* @since 1.1
@@ -616,7 +616,7 @@ public class MenuItem extends MenuComponent implements Accessible {
* FooListeners on this menu item,
* or an empty array if no such
* listeners have been added
- * @exception ClassCastException if {@code listenerType}
+ * @throws ClassCastException if {@code listenerType}
* doesn't specify a class or interface that implements
* {@code java.util.EventListener}
*
diff --git a/src/java.desktop/share/classes/java/awt/MouseInfo.java b/src/java.desktop/share/classes/java/awt/MouseInfo.java
index 76b5ed6e39747b28de073524f6fa325f359dcaf3..3dd115e0724f98719e910cfa96df52efb0fd0794 100644
--- a/src/java.desktop/share/classes/java/awt/MouseInfo.java
+++ b/src/java.desktop/share/classes/java/awt/MouseInfo.java
@@ -62,8 +62,8 @@ public class MouseInfo {
* permission before creating and returning a {@code PointerInfo}
* object. This may result in a {@code SecurityException}.
*
- * @exception HeadlessException if GraphicsEnvironment.isHeadless() returns true
- * @exception SecurityException if a security manager exists and its
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless() returns true
+ * @throws SecurityException if a security manager exists and its
* {@code checkPermission} method doesn't allow the operation
* @see GraphicsConfiguration
* @see SecurityManager#checkPermission
@@ -124,7 +124,7 @@ public class MouseInfo {
* by requesting the {@code "awt.mouse.numButtons"} desktop property
* which is set by the underlying native platform.
*
- * @exception HeadlessException if GraphicsEnvironment.isHeadless() returns true
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless() returns true
* @return number of buttons on the mouse
* @see Toolkit#getDesktopProperty
* @since 1.5
diff --git a/src/java.desktop/share/classes/java/awt/Polygon.java b/src/java.desktop/share/classes/java/awt/Polygon.java
index 64f049cd1c7f7a95362c8c38c5bba02ea1dff420..e74ce5cb10faae4c97860a9495d15eb761e0fb1d 100644
--- a/src/java.desktop/share/classes/java/awt/Polygon.java
+++ b/src/java.desktop/share/classes/java/awt/Polygon.java
@@ -139,12 +139,12 @@ public class Polygon implements Shape, java.io.Serializable {
* @param ypoints an array of Y coordinates
* @param npoints the total number of points in the
* {@code Polygon}
- * @exception NegativeArraySizeException if the value of
+ * @throws NegativeArraySizeException if the value of
* {@code npoints} is negative.
- * @exception IndexOutOfBoundsException if {@code npoints} is
+ * @throws IndexOutOfBoundsException if {@code npoints} is
* greater than the length of {@code xpoints}
* or the length of {@code ypoints}.
- * @exception NullPointerException if {@code xpoints} or
+ * @throws NullPointerException if {@code xpoints} or
* {@code ypoints} is {@code null}.
* @since 1.0
*/
diff --git a/src/java.desktop/share/classes/java/awt/PopupMenu.java b/src/java.desktop/share/classes/java/awt/PopupMenu.java
index fd56461df555ce617b7bfbea82c1cae85afe33d5..e9b88d2a12f4b2c4cf64b34b3cc0cd70243fa7d2 100644
--- a/src/java.desktop/share/classes/java/awt/PopupMenu.java
+++ b/src/java.desktop/share/classes/java/awt/PopupMenu.java
@@ -69,7 +69,7 @@ public class PopupMenu extends Menu {
/**
* Creates a new popup menu with an empty name.
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true.
* @see java.awt.GraphicsEnvironment#isHeadless
*/
@@ -82,7 +82,7 @@ public class PopupMenu extends Menu {
*
* @param label a non-{@code null} string specifying
* the popup menu's label
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true.
* @see java.awt.GraphicsEnvironment#isHeadless
*/
@@ -149,12 +149,12 @@ public class PopupMenu extends Menu {
* @param origin the component which defines the coordinate space
* @param x the x coordinate position to popup the menu
* @param y the y coordinate position to popup the menu
- * @exception NullPointerException if the parent is {@code null}
- * @exception IllegalArgumentException if this {@code PopupMenu}
+ * @throws NullPointerException if the parent is {@code null}
+ * @throws IllegalArgumentException if this {@code PopupMenu}
* has a non-{@code Component} parent
- * @exception IllegalArgumentException if the origin is not in the
+ * @throws IllegalArgumentException if the origin is not in the
* parent's hierarchy
- * @exception RuntimeException if the parent is not showing on screen
+ * @throws RuntimeException if the parent is not showing on screen
*/
@SuppressWarnings("deprecation")
public void show(Component origin, int x, int y) {
diff --git a/src/java.desktop/share/classes/java/awt/RenderingHints.java b/src/java.desktop/share/classes/java/awt/RenderingHints.java
index d69ed339eee1cd108cca05bc2b3b589aeb33712b..46d2fda103198c9bac6138a6d4c1470f006078d1 100644
--- a/src/java.desktop/share/classes/java/awt/RenderingHints.java
+++ b/src/java.desktop/share/classes/java/awt/RenderingHints.java
@@ -1064,7 +1064,7 @@ public class RenderingHints
* {@code RenderingHints} is to be tested.
* @return {@code true} if this {@code RenderingHints}
* contains a mapping for the specified key.
- * @exception ClassCastException if the key can not
+ * @throws ClassCastException if the key can not
* be cast to {@code RenderingHints.Key}
*/
public boolean containsKey(Object key) {
@@ -1099,7 +1099,7 @@ public class RenderingHints
* @return the value to which the key is mapped in this object or
* {@code null} if the key is not mapped to any value in
* this object.
- * @exception ClassCastException if the key can not
+ * @throws ClassCastException if the key can not
* be cast to {@code RenderingHints.Key}
* @see #put(Object, Object)
*/
@@ -1117,11 +1117,11 @@ public class RenderingHints
* @param value the rendering hint value.
* @return the previous value of the specified key in this object
* or {@code null} if it did not have one.
- * @exception NullPointerException if the key is
+ * @throws NullPointerException if the key is
* {@code null}.
- * @exception ClassCastException if the key can not
+ * @throws ClassCastException if the key can not
* be cast to {@code RenderingHints.Key}
- * @exception IllegalArgumentException if the
+ * @throws IllegalArgumentException if the
* {@link Key#isCompatibleValue(java.lang.Object)
* Key.isCompatibleValue()}
* method of the specified key returns false for the
@@ -1163,7 +1163,7 @@ public class RenderingHints
* {@code RenderingHints} object. This method does nothing if the
* key is not in this {@code RenderingHints} object.
* @param key the rendering hints key that needs to be removed
- * @exception ClassCastException if the key can not
+ * @throws ClassCastException if the key can not
* be cast to {@code RenderingHints.Key}
* @return the value to which the key had previously been mapped in this
* {@code RenderingHints} object, or {@code null}
@@ -1179,10 +1179,10 @@ public class RenderingHints
* any mappings that this {@code RenderingHints} had for any
* of the keys currently in the specified {@code Map}.
* @param m the specified {@code Map}
- * @exception ClassCastException class of a key or value
+ * @throws ClassCastException class of a key or value
* in the specified {@code Map} prevents it from being
* stored in this {@code RenderingHints}.
- * @exception IllegalArgumentException some aspect
+ * @throws IllegalArgumentException some aspect
* of a key or value in the specified {@code Map}
* prevents it from being stored in
* this {@code RenderingHints}.
diff --git a/src/java.desktop/share/classes/java/awt/Scrollbar.java b/src/java.desktop/share/classes/java/awt/Scrollbar.java
index 34cd3ecc79934186f15fa998ac8895e2fa9352ad..c8f100cc1c28f35e4ffbe1d6898e754bf3a9db99 100644
--- a/src/java.desktop/share/classes/java/awt/Scrollbar.java
+++ b/src/java.desktop/share/classes/java/awt/Scrollbar.java
@@ -349,7 +349,7 @@ public class Scrollbar extends Component implements Adjustable, Accessible {
*
FooListeners on this component,
* or an empty array if no such listeners have been added
- * @exception ClassCastException if {@code listenerType}
+ * @throws ClassCastException if {@code listenerType}
* doesn't specify a class or interface that implements
* {@code java.util.EventListener}
*
diff --git a/src/java.desktop/share/classes/java/awt/TextArea.java b/src/java.desktop/share/classes/java/awt/TextArea.java
index 5e3e5ca6b331ae3ead354742bb8d7112cbd98aee..4c7baa52e4e767bdae7e7c681bd920329b8a74e7 100644
--- a/src/java.desktop/share/classes/java/awt/TextArea.java
+++ b/src/java.desktop/share/classes/java/awt/TextArea.java
@@ -157,7 +157,7 @@ public class TextArea extends TextComponent {
* This text area is created with scrollbar visibility equal to
* {@link #SCROLLBARS_BOTH}, so both vertical and horizontal
* scrollbars will be visible for this text area.
- * @exception HeadlessException if
+ * @throws HeadlessException if
* {@code GraphicsEnvironment.isHeadless} returns true
* @see java.awt.GraphicsEnvironment#isHeadless()
*/
@@ -173,7 +173,7 @@ public class TextArea extends TextComponent {
* @param text the text to be displayed; if
* {@code text} is {@code null}, the empty
* string {@code ""} will be displayed
- * @exception HeadlessException if
+ * @throws HeadlessException if
* {@code GraphicsEnvironment.isHeadless} returns true
* @see java.awt.GraphicsEnvironment#isHeadless()
*/
@@ -191,7 +191,7 @@ public class TextArea extends TextComponent {
* text area.
* @param rows the number of rows
* @param columns the number of columns
- * @exception HeadlessException if
+ * @throws HeadlessException if
* {@code GraphicsEnvironment.isHeadless} returns true
* @see java.awt.GraphicsEnvironment#isHeadless()
*/
@@ -212,7 +212,7 @@ public class TextArea extends TextComponent {
* string {@code ""} will be displayed
* @param rows the number of rows
* @param columns the number of columns
- * @exception HeadlessException if
+ * @throws HeadlessException if
* {@code GraphicsEnvironment.isHeadless} returns true
* @see java.awt.GraphicsEnvironment#isHeadless()
*/
@@ -252,7 +252,7 @@ public class TextArea extends TextComponent {
* @param scrollbars a constant that determines what
* scrollbars are created to view the text area
* @since 1.1
- * @exception HeadlessException if
+ * @throws HeadlessException if
* {@code GraphicsEnvironment.isHeadless} returns true
* @see java.awt.GraphicsEnvironment#isHeadless()
*/
@@ -421,7 +421,7 @@ public class TextArea extends TextComponent {
* @param rows the number of rows
* @see #getRows()
* @see #setColumns(int)
- * @exception IllegalArgumentException if the value
+ * @throws IllegalArgumentException if the value
* supplied for {@code rows}
* is less than {@code 0}
* @since 1.1
@@ -452,7 +452,7 @@ public class TextArea extends TextComponent {
* @param columns the number of columns
* @see #getColumns()
* @see #setRows(int)
- * @exception IllegalArgumentException if the value
+ * @throws IllegalArgumentException if the value
* supplied for {@code columns}
* is less than {@code 0}
* @since 1.1
diff --git a/src/java.desktop/share/classes/java/awt/TextComponent.java b/src/java.desktop/share/classes/java/awt/TextComponent.java
index 5dc8d4068cc7bfa0007fd7b0249abe0cf9c59240..b471b4e5ec6e8544b5a1296315a7b8485ccc5243 100644
--- a/src/java.desktop/share/classes/java/awt/TextComponent.java
+++ b/src/java.desktop/share/classes/java/awt/TextComponent.java
@@ -137,7 +137,7 @@ public class TextComponent extends Component implements Accessible {
* @param text the text to be displayed; if
* {@code text} is {@code null}, the empty
* string {@code ""} will be displayed
- * @exception HeadlessException if
+ * @throws HeadlessException if
* {@code GraphicsEnvironment.isHeadless}
* returns true
* @see java.awt.GraphicsEnvironment#isHeadless
@@ -511,7 +511,7 @@ public class TextComponent extends Component implements Accessible {
* is thrown.
*
* @param position the position of the text insertion caret
- * @exception IllegalArgumentException if {@code position}
+ * @throws IllegalArgumentException if {@code position}
* is less than zero
* @since 1.1
*/
@@ -645,7 +645,7 @@ public class TextComponent extends Component implements Accessible {
* FooListeners on this text component,
* or an empty array if no such
* listeners have been added
- * @exception ClassCastException if {@code listenerType}
+ * @throws ClassCastException if {@code listenerType}
* doesn't specify a class or interface that implements
* {@code java.util.EventListener}
*
diff --git a/src/java.desktop/share/classes/java/awt/TextField.java b/src/java.desktop/share/classes/java/awt/TextField.java
index 5ca720ee80ef95ecaf7826e06899da202f0eeee3..d2bfa0360b9bc80fb4a2531df3ef0f4ac553b302 100644
--- a/src/java.desktop/share/classes/java/awt/TextField.java
+++ b/src/java.desktop/share/classes/java/awt/TextField.java
@@ -152,7 +152,7 @@ public class TextField extends TextComponent {
/**
* Constructs a new text field.
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true.
* @see java.awt.GraphicsEnvironment#isHeadless
*/
@@ -167,7 +167,7 @@ public class TextField extends TextComponent {
* string {@code ""} will be displayed.
* If {@code text} contains EOL and/or LF characters, then
* each will be replaced by space character.
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true.
* @see java.awt.GraphicsEnvironment#isHeadless
*/
@@ -182,7 +182,7 @@ public class TextField extends TextComponent {
* @param columns the number of columns. If
* {@code columns} is less than {@code 0},
* {@code columns} is set to {@code 0}.
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true.
* @see java.awt.GraphicsEnvironment#isHeadless
*/
@@ -203,7 +203,7 @@ public class TextField extends TextComponent {
* @param columns the number of columns. If
* {@code columns} is less than {@code 0},
* {@code columns} is set to {@code 0}.
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true.
* @see java.awt.GraphicsEnvironment#isHeadless
*/
@@ -369,7 +369,7 @@ public class TextField extends TextComponent {
* approximate average character width that is platform-dependent.
* @param columns the number of columns.
* @see java.awt.TextField#getColumns
- * @exception IllegalArgumentException if the value
+ * @throws IllegalArgumentException if the value
* supplied for {@code columns}
* is less than {@code 0}.
* @since 1.1
@@ -585,7 +585,7 @@ public class TextField extends TextComponent {
* FooListeners on this textfield,
* or an empty array if no such
* listeners have been added
- * @exception ClassCastException if {@code listenerType}
+ * @throws ClassCastException if {@code listenerType}
* doesn't specify a class or interface that implements
* {@code java.util.EventListener}
*
diff --git a/src/java.desktop/share/classes/java/awt/Toolkit.java b/src/java.desktop/share/classes/java/awt/Toolkit.java
index f3f4bcbb5c83041723e4d10ae329ab77dbcd2362..7399ced02bb463ebe410e5acbaa5dde65e98cc46 100644
--- a/src/java.desktop/share/classes/java/awt/Toolkit.java
+++ b/src/java.desktop/share/classes/java/awt/Toolkit.java
@@ -149,7 +149,7 @@ public abstract class Toolkit {
* with the current system color values.
*
* @param systemColors an integer array.
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true
* @see java.awt.GraphicsEnvironment#isHeadless
* @since 1.1
@@ -181,7 +181,7 @@ public abstract class Toolkit {
* @param dynamic If true, Containers should re-layout their
* components as the Container is being resized. If false,
* the layout will be validated after resizing is completed.
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true
* @see #isDynamicLayoutSet()
* @see #isDynamicLayoutActive()
@@ -208,7 +208,7 @@ public abstract class Toolkit {
*
* @return true if validation of Containers is done dynamically,
* false if validation is done after resizing is finished.
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true
* @see #setDynamicLayout(boolean dynamic)
* @see #isDynamicLayoutActive()
@@ -274,7 +274,7 @@ public abstract class Toolkit {
* available from {@code GraphicsConfiguration} and
* {@code GraphicsDevice}.
* @return the size of this toolkit's screen, in pixels.
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true
* @see java.awt.GraphicsConfiguration#getBounds
* @see java.awt.GraphicsDevice#getDisplayMode
@@ -286,7 +286,7 @@ public abstract class Toolkit {
/**
* Returns the screen resolution in dots-per-inch.
* @return this toolkit's screen resolution, in dots-per-inch.
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true
* @see java.awt.GraphicsEnvironment#isHeadless
*/
@@ -297,7 +297,7 @@ public abstract class Toolkit {
* Gets the insets of the screen.
* @param gc a {@code GraphicsConfiguration}
* @return the insets of this toolkit's screen, in pixels.
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true
* @see java.awt.GraphicsEnvironment#isHeadless
* @since 1.4
@@ -324,7 +324,7 @@ public abstract class Toolkit {
* {@code getColorModel} method
* of the {@code Component} class.
* @return the color model of this toolkit's screen.
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true
* @see java.awt.GraphicsEnvironment#isHeadless
* @see java.awt.image.ColorModel
@@ -973,7 +973,7 @@ public abstract class Toolkit {
* checkPermission} method to check {@code AWTPermission("accessClipboard")}.
*
* @return the system Clipboard
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true
* @see java.awt.GraphicsEnvironment#isHeadless
* @see java.awt.datatransfer.Clipboard
@@ -1020,7 +1020,7 @@ public abstract class Toolkit {
* @return the system selection as a {@code Clipboard}, or
* {@code null} if the native platform does not support a
* system selection {@code Clipboard}
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true
*
* @see java.awt.datatransfer.Clipboard
@@ -1057,7 +1057,7 @@ public abstract class Toolkit {
* Control key isn't the correct key for accelerators.
* @return the modifier mask on the {@code Event} class
* that is used for menu shortcuts on this toolkit.
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true
* @see java.awt.GraphicsEnvironment#isHeadless
* @see java.awt.MenuBar
@@ -1111,12 +1111,12 @@ public abstract class Toolkit {
* @param keyCode the key code
* @return {@code true} if the given key is currently in its "on" state;
* otherwise {@code false}
- * @exception java.lang.IllegalArgumentException if {@code keyCode}
+ * @throws java.lang.IllegalArgumentException if {@code keyCode}
* is not one of the valid key codes
- * @exception java.lang.UnsupportedOperationException if the host system doesn't
+ * @throws java.lang.UnsupportedOperationException if the host system doesn't
* allow getting the state of this key programmatically, or if the keyboard
* doesn't have this key
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true
* @see java.awt.GraphicsEnvironment#isHeadless
* @since 1.3
@@ -1147,12 +1147,12 @@ public abstract class Toolkit {
*
* @param keyCode the key code
* @param on the state of the key
- * @exception java.lang.IllegalArgumentException if {@code keyCode}
+ * @throws java.lang.IllegalArgumentException if {@code keyCode}
* is not one of the valid key codes
- * @exception java.lang.UnsupportedOperationException if the host system doesn't
+ * @throws java.lang.UnsupportedOperationException if the host system doesn't
* allow setting the state of this key programmatically, or if the keyboard
* doesn't have this key
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true
* @see java.awt.GraphicsEnvironment#isHeadless
* @since 1.3
@@ -1193,10 +1193,10 @@ public abstract class Toolkit {
* hotSpot values must be less than the Dimension returned by
* {@code getBestCursorSize}
* @param name a localized description of the cursor, for Java Accessibility use
- * @exception IndexOutOfBoundsException if the hotSpot values are outside
+ * @throws IndexOutOfBoundsException if the hotSpot values are outside
* the bounds of the cursor
* @return the cursor created
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true
* @see java.awt.GraphicsEnvironment#isHeadless
* @since 1.2
@@ -1232,7 +1232,7 @@ public abstract class Toolkit {
* to use.
* @return the closest matching supported cursor size, or a dimension of 0,0 if
* the Toolkit implementation doesn't support custom cursors.
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true
* @see java.awt.GraphicsEnvironment#isHeadless
* @since 1.2
@@ -1262,7 +1262,7 @@ public abstract class Toolkit {
*
* @return the maximum number of colors, or zero if custom cursors are not
* supported by this Toolkit implementation.
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true
* @see java.awt.GraphicsEnvironment#isHeadless
* @since 1.2
@@ -1310,7 +1310,7 @@ public abstract class Toolkit {
* @param state one of named frame state constants.
* @return {@code true} is this frame state is supported by
* this Toolkit implementation, {@code false} otherwise.
- * @exception HeadlessException
+ * @throws HeadlessException
* if {@code GraphicsEnvironment.isHeadless()}
* returns {@code true}.
* @see java.awt.Window#addWindowStateListener
@@ -2203,7 +2203,7 @@ public abstract class Toolkit {
* returned is unmodifiable.
* @param highlight input method highlight
* @return style attribute map, or {@code null}
- * @exception HeadlessException if
+ * @throws HeadlessException if
* {@code GraphicsEnvironment.isHeadless} returns true
* @see java.awt.GraphicsEnvironment#isHeadless
* @since 1.3
@@ -2360,7 +2360,7 @@ public abstract class Toolkit {
* initialized with {@code true}.
* Changing this value after the {@code Toolkit} class initialization will have no effect.
*
- * @exception HeadlessException if GraphicsEnvironment.isHeadless() returns true
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless() returns true
* @return {@code true} if events from extra mouse buttons are allowed to be processed and posted;
* {@code false} otherwise
* @see System#getProperty(String propertyName)
diff --git a/src/java.desktop/share/classes/java/awt/Window.java b/src/java.desktop/share/classes/java/awt/Window.java
index 59e63abbb3ca4d958027e0931ba4f9348858ec84..c58b2a5e94a3d0211a0e179bb56a72d3a40935e5 100644
--- a/src/java.desktop/share/classes/java/awt/Window.java
+++ b/src/java.desktop/share/classes/java/awt/Window.java
@@ -442,9 +442,9 @@ public class Window extends Container implements Accessible {
* @param gc the {@code GraphicsConfiguration} of the target screen
* device. If {@code gc} is {@code null}, the system default
* {@code GraphicsConfiguration} is assumed
- * @exception IllegalArgumentException if {@code gc}
+ * @throws IllegalArgumentException if {@code gc}
* is not from a screen device
- * @exception HeadlessException when
+ * @throws HeadlessException when
* {@code GraphicsEnvironment.isHeadless()} returns {@code true}
*
* @see java.awt.GraphicsEnvironment#isHeadless
@@ -544,7 +544,7 @@ public class Window extends Container implements Accessible {
* If that check fails with a {@code SecurityException} then a warning
* banner is created.
*
- * @exception HeadlessException when
+ * @throws HeadlessException when
* {@code GraphicsEnvironment.isHeadless()} returns {@code true}
*
* @see java.awt.GraphicsEnvironment#isHeadless
@@ -566,9 +566,9 @@ public class Window extends Container implements Accessible {
*
* @param owner the {@code Frame} to act as owner or {@code null}
* if this window has no owner
- * @exception IllegalArgumentException if the {@code owner}'s
+ * @throws IllegalArgumentException if the {@code owner}'s
* {@code GraphicsConfiguration} is not from a screen device
- * @exception HeadlessException when
+ * @throws HeadlessException when
* {@code GraphicsEnvironment.isHeadless} returns {@code true}
*
* @see java.awt.GraphicsEnvironment#isHeadless
@@ -593,9 +593,9 @@ public class Window extends Container implements Accessible {
*
* @param owner the {@code Window} to act as owner or
* {@code null} if this window has no owner
- * @exception IllegalArgumentException if the {@code owner}'s
+ * @throws IllegalArgumentException if the {@code owner}'s
* {@code GraphicsConfiguration} is not from a screen device
- * @exception HeadlessException when
+ * @throws HeadlessException when
* {@code GraphicsEnvironment.isHeadless()} returns
* {@code true}
*
@@ -627,9 +627,9 @@ public class Window extends Container implements Accessible {
* @param gc the {@code GraphicsConfiguration} of the target
* screen device; if {@code gc} is {@code null},
* the system default {@code GraphicsConfiguration} is assumed
- * @exception IllegalArgumentException if {@code gc}
+ * @throws IllegalArgumentException if {@code gc}
* is not from a screen device
- * @exception HeadlessException when
+ * @throws HeadlessException when
* {@code GraphicsEnvironment.isHeadless()} returns
* {@code true}
*
@@ -1964,10 +1964,10 @@ public class Window extends Container implements Accessible {
* FooListeners on this window,
* or an empty array if no such
* listeners have been added
- * @exception ClassCastException if {@code listenerType}
+ * @throws ClassCastException if {@code listenerType}
* doesn't specify a class or interface that implements
* {@code java.util.EventListener}
- * @exception NullPointerException if {@code listenerType} is {@code null}
+ * @throws NullPointerException if {@code listenerType} is {@code null}
*
* @see #getWindowListeners
* @since 1.3
@@ -3372,8 +3372,8 @@ public class Window extends Container implements Accessible {
* Each time this method is called,
* the existing buffer strategy for this component is discarded.
* @param numBuffers number of buffers to create
- * @exception IllegalArgumentException if numBuffers is less than 1.
- * @exception IllegalStateException if the component is not displayable
+ * @throws IllegalArgumentException if numBuffers is less than 1.
+ * @throws IllegalStateException if the component is not displayable
* @see #isDisplayable
* @see #getBufferStrategy
* @since 1.4
@@ -3393,11 +3393,11 @@ public class Window extends Container implements Accessible {
* @param numBuffers number of buffers to create, including the front buffer
* @param caps the required capabilities for creating the buffer strategy;
* cannot be {@code null}
- * @exception AWTException if the capabilities supplied could not be
+ * @throws AWTException if the capabilities supplied could not be
* supported or met; this may happen, for example, if there is not enough
* accelerated memory currently available, or if page flipping is specified
* but not possible.
- * @exception IllegalArgumentException if numBuffers is less than 1, or if
+ * @throws IllegalArgumentException if numBuffers is less than 1, or if
* caps is {@code null}
* @see #getBufferStrategy
* @since 1.4
diff --git a/src/java.desktop/share/classes/java/awt/dnd/DragSource.java b/src/java.desktop/share/classes/java/awt/dnd/DragSource.java
index 8bbdfc24c06bf8cbc2ed114895ca3086dfaf946c..71bf6d27c8341b6974aa1e1f1bc9b438b91ebeb5 100644
--- a/src/java.desktop/share/classes/java/awt/dnd/DragSource.java
+++ b/src/java.desktop/share/classes/java/awt/dnd/DragSource.java
@@ -217,7 +217,7 @@ public class DragSource implements Serializable {
* the underlying platform.
*
* @return the platform DragSource
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true
* @see java.awt.GraphicsEnvironment#isHeadless
*/
@@ -255,7 +255,7 @@ public class DragSource implements Serializable {
/**
* Creates a new {@code DragSource}.
*
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true
* @see java.awt.GraphicsEnvironment#isHeadless
*/
@@ -682,7 +682,7 @@ public class DragSource implements Serializable {
* FooListeners on this
* {@code DragSource}, or an empty array if no such listeners
* have been added
- * @exception ClassCastException if {@code listenerType}
+ * @throws ClassCastException if {@code listenerType}
* doesn't specify a class or interface that implements
* {@code java.util.EventListener}
*
diff --git a/src/java.desktop/share/classes/java/awt/dnd/DropTarget.java b/src/java.desktop/share/classes/java/awt/dnd/DropTarget.java
index 7ba9c9711da065fa8a1950c3663d0fd71bdfa921..fbd086792a5bff6d04010cabf08a4782d0b586c6 100644
--- a/src/java.desktop/share/classes/java/awt/dnd/DropTarget.java
+++ b/src/java.desktop/share/classes/java/awt/dnd/DropTarget.java
@@ -89,7 +89,7 @@ public class DropTarget implements DropTargetListener, Serializable {
* @param dtl The {@code DropTargetListener} for this {@code DropTarget}
* @param act Is the {@code DropTarget} accepting drops.
* @param fm The {@code FlavorMap} to use, or null for the default {@code FlavorMap}
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true
* @see java.awt.GraphicsEnvironment#isHeadless
*/
@@ -136,7 +136,7 @@ public class DropTarget implements DropTargetListener, Serializable {
* @param ops The default acceptable actions for this {@code DropTarget}
* @param dtl The {@code DropTargetListener} for this {@code DropTarget}
* @param act Is the {@code DropTarget} accepting drops.
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true
* @see java.awt.GraphicsEnvironment#isHeadless
*/
@@ -149,7 +149,7 @@ public class DropTarget implements DropTargetListener, Serializable {
/**
* Creates a {@code DropTarget}.
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true
* @see java.awt.GraphicsEnvironment#isHeadless
*/
@@ -165,7 +165,7 @@ public class DropTarget implements DropTargetListener, Serializable {
* The Component will receive drops only if it is enabled.
* @param c The {@code Component} with which this {@code DropTarget} is associated
* @param dtl The {@code DropTargetListener} for this {@code DropTarget}
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true
* @see java.awt.GraphicsEnvironment#isHeadless
*/
@@ -185,7 +185,7 @@ public class DropTarget implements DropTargetListener, Serializable {
* @param c The {@code Component} with which this {@code DropTarget} is associated
* @param ops The default acceptable actions for this {@code DropTarget}
* @param dtl The {@code DropTargetListener} for this {@code DropTarget}
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true
* @see java.awt.GraphicsEnvironment#isHeadless
*/
diff --git a/src/java.desktop/share/classes/java/awt/event/InputMethodEvent.java b/src/java.desktop/share/classes/java/awt/event/InputMethodEvent.java
index 94cfcc0bf402bde52ba8d21a46033b471197192c..12ad1a0317130ed2c13916089442167a062adad1 100644
--- a/src/java.desktop/share/classes/java/awt/event/InputMethodEvent.java
+++ b/src/java.desktop/share/classes/java/awt/event/InputMethodEvent.java
@@ -436,7 +436,7 @@ public class InputMethodEvent extends AWTEvent {
* belongs to.
*
* @param source the source of the event
- * @exception IllegalArgumentException if source is null.
+ * @throws IllegalArgumentException if source is null.
* @return most recent event time in the {@code EventQueue}
*/
private static long getMostRecentEventTimeForSource(Object source) {
diff --git a/src/java.desktop/share/classes/java/awt/font/TextLayout.java b/src/java.desktop/share/classes/java/awt/font/TextLayout.java
index ddc5199b8432196a97ad7454e98ed56baf34fbbd..352d3c81df247f84dcb711f1a7fa71eaf62e7671 100644
--- a/src/java.desktop/share/classes/java/awt/font/TextLayout.java
+++ b/src/java.desktop/share/classes/java/awt/font/TextLayout.java
@@ -789,7 +789,7 @@ public final class TextLayout implements Cloneable {
* For best results, it should not be too different from the current
* advance of the line.
* @return a {@code TextLayout} justified to the specified width.
- * @exception Error if this layout has already been justified, an Error is
+ * @throws Error if this layout has already been justified, an Error is
* thrown.
*/
public TextLayout getJustifiedLayout(float justificationWidth) {
diff --git a/src/java.desktop/share/classes/java/awt/geom/AffineTransform.java b/src/java.desktop/share/classes/java/awt/geom/AffineTransform.java
index 44324e2d3b9a2f1a731788a140943732f5e14940..7f6fc7c34f986880d3cb2112076c43211cd33848 100644
--- a/src/java.desktop/share/classes/java/awt/geom/AffineTransform.java
+++ b/src/java.desktop/share/classes/java/awt/geom/AffineTransform.java
@@ -2667,7 +2667,7 @@ public class AffineTransform implements Cloneable, java.io.Serializable {
* @return a new {@code AffineTransform} object representing the
* inverse transformation.
* @see #getDeterminant
- * @exception NoninvertibleTransformException
+ * @throws NoninvertibleTransformException
* if the matrix cannot be inverted.
* @since 1.2
*/
@@ -2762,7 +2762,7 @@ public class AffineTransform implements Cloneable, java.io.Serializable {
* transform has no inverse, in which case an exception will be
* thrown if the {@code invert} method is called.
* @see #getDeterminant
- * @exception NoninvertibleTransformException
+ * @throws NoninvertibleTransformException
* if the matrix cannot be inverted.
* @since 1.6
*/
@@ -3464,7 +3464,7 @@ public class AffineTransform implements Cloneable, java.io.Serializable {
* @param ptDst the resulting transformed point
* @return {@code ptDst}, which contains the result of the
* inverse transform.
- * @exception NoninvertibleTransformException if the matrix cannot be
+ * @throws NoninvertibleTransformException if the matrix cannot be
* inverted.
* @since 1.2
*/
@@ -3550,7 +3550,7 @@ public class AffineTransform implements Cloneable, java.io.Serializable {
* @param dstOff the offset to the location of the first
* transformed point that is stored in the destination array
* @param numPts the number of point objects to be transformed
- * @exception NoninvertibleTransformException if the matrix cannot be
+ * @throws NoninvertibleTransformException if the matrix cannot be
* inverted.
* @since 1.2
*/
diff --git a/src/java.desktop/share/classes/java/awt/geom/CubicCurve2D.java b/src/java.desktop/share/classes/java/awt/geom/CubicCurve2D.java
index 76d366c0ec66e6eb0c102f22ffb0a805e62dc72e..cf33fb30438a8367ef5b41d75f7b5b18c97cc522 100644
--- a/src/java.desktop/share/classes/java/awt/geom/CubicCurve2D.java
+++ b/src/java.desktop/share/classes/java/awt/geom/CubicCurve2D.java
@@ -1564,7 +1564,7 @@ public abstract class CubicCurve2D implements Shape, Cloneable {
* Creates a new object of the same class as this object.
*
* @return a clone of this instance.
- * @exception OutOfMemoryError if there is not enough memory.
+ * @throws OutOfMemoryError if there is not enough memory.
* @see java.lang.Cloneable
* @since 1.2
*/
diff --git a/src/java.desktop/share/classes/java/awt/geom/Dimension2D.java b/src/java.desktop/share/classes/java/awt/geom/Dimension2D.java
index 180d96a3840ff976f1211cbba91c033d6bdf99b9..0a2015b15a999a15127ca689d263d9b57231aece 100644
--- a/src/java.desktop/share/classes/java/awt/geom/Dimension2D.java
+++ b/src/java.desktop/share/classes/java/awt/geom/Dimension2D.java
@@ -99,7 +99,7 @@ public abstract class Dimension2D implements Cloneable {
* Creates a new object of the same class as this object.
*
* @return a clone of this instance.
- * @exception OutOfMemoryError if there is not enough memory.
+ * @throws OutOfMemoryError if there is not enough memory.
* @see java.lang.Cloneable
* @since 1.2
*/
diff --git a/src/java.desktop/share/classes/java/awt/geom/FlatteningPathIterator.java b/src/java.desktop/share/classes/java/awt/geom/FlatteningPathIterator.java
index 40159f2db5ff4aee33cdceefc1304c3713480a67..123e6d60b928f7067d4d2d9870a29549f210ac00 100644
--- a/src/java.desktop/share/classes/java/awt/geom/FlatteningPathIterator.java
+++ b/src/java.desktop/share/classes/java/awt/geom/FlatteningPathIterator.java
@@ -109,7 +109,7 @@ public class FlatteningPathIterator implements PathIterator {
* control points and the flattened curve
* @param limit the maximum number of recursive subdivisions
* allowed for any curved segment
- * @exception IllegalArgumentException if
+ * @throws IllegalArgumentException if
* {@code flatness} or {@code limit}
* is less than zero
*/
@@ -336,7 +336,7 @@ public class FlatteningPathIterator implements PathIterator {
* @param coords an array that holds the data returned from
* this method
* @return the path segment type of the current path segment.
- * @exception NoSuchElementException if there
+ * @throws NoSuchElementException if there
* are no more elements in the flattening path to be
* returned.
* @see PathIterator#SEG_MOVETO
@@ -371,7 +371,7 @@ public class FlatteningPathIterator implements PathIterator {
* @param coords an array that holds the data returned from
* this method
* @return the path segment type of the current path segment.
- * @exception NoSuchElementException if there
+ * @throws NoSuchElementException if there
* are no more elements in the flattening path to be
* returned.
* @see PathIterator#SEG_MOVETO
diff --git a/src/java.desktop/share/classes/java/awt/geom/Line2D.java b/src/java.desktop/share/classes/java/awt/geom/Line2D.java
index 3d79e44dfee1caf027f3a0c615b3ef7a7a5a0117..305b51942d9949cacc245b79c46d71fa0b49a72e 100644
--- a/src/java.desktop/share/classes/java/awt/geom/Line2D.java
+++ b/src/java.desktop/share/classes/java/awt/geom/Line2D.java
@@ -1111,7 +1111,7 @@ public abstract class Line2D implements Shape, Cloneable {
* Creates a new object of the same class as this object.
*
* @return a clone of this instance.
- * @exception OutOfMemoryError if there is not enough memory.
+ * @throws OutOfMemoryError if there is not enough memory.
* @see java.lang.Cloneable
* @since 1.2
*/
diff --git a/src/java.desktop/share/classes/java/awt/geom/Path2D.java b/src/java.desktop/share/classes/java/awt/geom/Path2D.java
index 6168664452baf40d773e78898ec13a75576f7647..e777f276602b3b280488fd0afd37adffc10ade07 100644
--- a/src/java.desktop/share/classes/java/awt/geom/Path2D.java
+++ b/src/java.desktop/share/classes/java/awt/geom/Path2D.java
@@ -842,7 +842,7 @@ public abstract class Path2D implements Shape, Cloneable {
* Creates a new object of the same class as this object.
*
* @return a clone of this instance.
- * @exception OutOfMemoryError if there is not enough memory.
+ * @throws OutOfMemoryError if there is not enough memory.
* @see java.lang.Cloneable
* @since 1.6
*/
@@ -1638,7 +1638,7 @@ public abstract class Path2D implements Shape, Cloneable {
* Creates a new object of the same class as this object.
*
* @return a clone of this instance.
- * @exception OutOfMemoryError if there is not enough memory.
+ * @throws OutOfMemoryError if there is not enough memory.
* @see java.lang.Cloneable
* @since 1.6
*/
@@ -2018,7 +2018,7 @@ public abstract class Path2D implements Shape, Cloneable {
*
* @param rule an integer representing the specified
* winding rule
- * @exception IllegalArgumentException if
+ * @throws IllegalArgumentException if
* {@code rule} is not either
* {@link #WIND_EVEN_ODD} or
* {@link #WIND_NON_ZERO}
@@ -2530,7 +2530,7 @@ public abstract class Path2D implements Shape, Cloneable {
* Creates a new object of the same class as this object.
*
* @return a clone of this instance.
- * @exception OutOfMemoryError if there is not enough memory.
+ * @throws OutOfMemoryError if there is not enough memory.
* @see java.lang.Cloneable
* @since 1.6
*/
diff --git a/src/java.desktop/share/classes/java/awt/geom/Point2D.java b/src/java.desktop/share/classes/java/awt/geom/Point2D.java
index bffb5594cfa0fe94d237150fecf291746ece1807..2b0a2aabef1002003b9dc0772d7a564186263819 100644
--- a/src/java.desktop/share/classes/java/awt/geom/Point2D.java
+++ b/src/java.desktop/share/classes/java/awt/geom/Point2D.java
@@ -387,7 +387,7 @@ public abstract class Point2D implements Cloneable {
* Creates a new object of the same class and with the
* same contents as this object.
* @return a clone of this instance.
- * @exception OutOfMemoryError if there is not enough memory.
+ * @throws OutOfMemoryError if there is not enough memory.
* @see java.lang.Cloneable
* @since 1.2
*/
diff --git a/src/java.desktop/share/classes/java/awt/geom/QuadCurve2D.java b/src/java.desktop/share/classes/java/awt/geom/QuadCurve2D.java
index f7dce7ea8e3c9eab88ecd3bf76bf500aba1e43cd..6f4990df49c122a8faeb3ed9f8b5d8a3bb2aee3e 100644
--- a/src/java.desktop/share/classes/java/awt/geom/QuadCurve2D.java
+++ b/src/java.desktop/share/classes/java/awt/geom/QuadCurve2D.java
@@ -1388,7 +1388,7 @@ public abstract class QuadCurve2D implements Shape, Cloneable {
* as this object.
*
* @return a clone of this instance.
- * @exception OutOfMemoryError if there is not enough memory.
+ * @throws OutOfMemoryError if there is not enough memory.
* @see java.lang.Cloneable
* @since 1.2
*/
diff --git a/src/java.desktop/share/classes/java/awt/geom/RectangularShape.java b/src/java.desktop/share/classes/java/awt/geom/RectangularShape.java
index 892eb634559af6a9bee48b7d2fbbd139535760ef..d0b0792792e69cee55b596035c0fa5512a063d4b 100644
--- a/src/java.desktop/share/classes/java/awt/geom/RectangularShape.java
+++ b/src/java.desktop/share/classes/java/awt/geom/RectangularShape.java
@@ -382,7 +382,7 @@ public abstract class RectangularShape implements Shape, Cloneable {
* Creates a new object of the same class and with the same
* contents as this object.
* @return a clone of this instance.
- * @exception OutOfMemoryError if there is not enough memory.
+ * @throws OutOfMemoryError if there is not enough memory.
* @see java.lang.Cloneable
* @since 1.2
*/
diff --git a/src/java.desktop/share/classes/java/awt/im/InputContext.java b/src/java.desktop/share/classes/java/awt/im/InputContext.java
index 2a73793df2b7c79af656e10d538a80f6278ab94a..5476d9e2518294c8a95502d6a658c48a027bbf62 100644
--- a/src/java.desktop/share/classes/java/awt/im/InputContext.java
+++ b/src/java.desktop/share/classes/java/awt/im/InputContext.java
@@ -140,7 +140,7 @@ public class InputContext {
* @param locale The desired new locale.
* @return true if the input method or keyboard layout that's active after
* this call supports the desired locale.
- * @exception NullPointerException if {@code locale} is null
+ * @throws NullPointerException if {@code locale} is null
*/
public boolean selectInputMethod(Locale locale) {
// real implementation is in sun.awt.im.InputContext
@@ -268,7 +268,7 @@ public class InputContext {
* If no input method is available, then the event will never be consumed.
*
* @param event The event
- * @exception NullPointerException if {@code event} is null
+ * @throws NullPointerException if {@code event} is null
*/
public void dispatchEvent(AWTEvent event) {
// real implementation is in sun.awt.im.InputContext
@@ -286,7 +286,7 @@ public class InputContext {
* If no input methods are available, then this method has no effect.
*
* @param client Client component
- * @exception NullPointerException if {@code client} is null
+ * @throws NullPointerException if {@code client} is null
*/
public void removeNotify(Component client) {
// real implementation is in sun.awt.im.InputContext
diff --git a/src/java.desktop/share/classes/java/awt/im/InputMethodHighlight.java b/src/java.desktop/share/classes/java/awt/im/InputMethodHighlight.java
index 7fcf3c9549bdf8fdb54f6ed69bb9fa41734ef519..4b8d4d5c9ea9e94be2496d53adfb46db66628232 100644
--- a/src/java.desktop/share/classes/java/awt/im/InputMethodHighlight.java
+++ b/src/java.desktop/share/classes/java/awt/im/InputMethodHighlight.java
@@ -111,7 +111,7 @@ public class InputMethodHighlight {
* @param state The conversion state for the text range - RAW_TEXT or CONVERTED_TEXT
* @see InputMethodHighlight#RAW_TEXT
* @see InputMethodHighlight#CONVERTED_TEXT
- * @exception IllegalArgumentException if a state other than RAW_TEXT or CONVERTED_TEXT is given
+ * @throws IllegalArgumentException if a state other than RAW_TEXT or CONVERTED_TEXT is given
*/
public InputMethodHighlight(boolean selected, int state) {
this(selected, state, 0, null);
@@ -125,7 +125,7 @@ public class InputMethodHighlight {
* @param variation The style variation for the text range
* @see InputMethodHighlight#RAW_TEXT
* @see InputMethodHighlight#CONVERTED_TEXT
- * @exception IllegalArgumentException if a state other than RAW_TEXT or CONVERTED_TEXT is given
+ * @throws IllegalArgumentException if a state other than RAW_TEXT or CONVERTED_TEXT is given
*/
public InputMethodHighlight(boolean selected, int state, int variation) {
this(selected, state, variation, null);
@@ -140,7 +140,7 @@ public class InputMethodHighlight {
* @param style the rendering style attributes for the text range, or null
* @see InputMethodHighlight#RAW_TEXT
* @see InputMethodHighlight#CONVERTED_TEXT
- * @exception IllegalArgumentException if a state other than RAW_TEXT or CONVERTED_TEXT is given
+ * @throws IllegalArgumentException if a state other than RAW_TEXT or CONVERTED_TEXT is given
* @since 1.3
*/
public InputMethodHighlight(boolean selected, int state, int variation,
diff --git a/src/java.desktop/share/classes/java/awt/im/spi/InputMethod.java b/src/java.desktop/share/classes/java/awt/im/spi/InputMethod.java
index 1174493cc580a83228bead35e75af1958664c7fc..c01987bbfeda39a419a5e3a3e8ea21efda6e2738 100644
--- a/src/java.desktop/share/classes/java/awt/im/spi/InputMethod.java
+++ b/src/java.desktop/share/classes/java/awt/im/spi/InputMethod.java
@@ -59,7 +59,7 @@ public interface InputMethod {
* method.
*
* @param context the input method context for this input method
- * @exception NullPointerException if {@code context} is null
+ * @throws NullPointerException if {@code context} is null
*/
public void setInputMethodContext(InputMethodContext context);
@@ -80,7 +80,7 @@ public interface InputMethod {
*
* @param locale locale to input
* @return whether the specified locale is supported
- * @exception NullPointerException if {@code locale} is null
+ * @throws NullPointerException if {@code locale} is null
*/
public boolean setLocale(Locale locale);
@@ -211,7 +211,7 @@ public interface InputMethod {
* This method is called by {@link java.awt.im.InputContext#dispatchEvent InputContext.dispatchEvent}.
*
* @param event the event being dispatched to the input method
- * @exception NullPointerException if {@code event} is null
+ * @throws NullPointerException if {@code event} is null
*/
public void dispatchEvent(AWTEvent event);
diff --git a/src/java.desktop/share/classes/java/awt/im/spi/InputMethodContext.java b/src/java.desktop/share/classes/java/awt/im/spi/InputMethodContext.java
index 09d44a5eda4053754b1d0afb65fedd697289c684..c17c4e4afef18a4fc006e7abaf74fd3d87df7526 100644
--- a/src/java.desktop/share/classes/java/awt/im/spi/InputMethodContext.java
+++ b/src/java.desktop/share/classes/java/awt/im/spi/InputMethodContext.java
@@ -92,7 +92,7 @@ public interface InputMethodContext extends InputMethodRequests {
* @param attachToInputContext whether this window should share the input context
* that corresponds to this input method context
* @return a window with special characteristics for use by input methods
- * @exception HeadlessException if {@code GraphicsEnvironment.isHeadless}
+ * @throws HeadlessException if {@code GraphicsEnvironment.isHeadless}
* returns {@code true}
*/
public Window createInputMethodWindow(String title, boolean attachToInputContext);
@@ -124,7 +124,7 @@ public interface InputMethodContext extends InputMethodRequests {
* @param attachToInputContext whether this window should share the input context
* that corresponds to this input method context
* @return a JFrame with special characteristics for use by input methods
- * @exception HeadlessException if {@code GraphicsEnvironment.isHeadless}
+ * @throws HeadlessException if {@code GraphicsEnvironment.isHeadless}
* returns {@code true}
*
* @since 1.4
diff --git a/src/java.desktop/share/classes/java/awt/im/spi/InputMethodDescriptor.java b/src/java.desktop/share/classes/java/awt/im/spi/InputMethodDescriptor.java
index 885e7ad4e0981368292785acda66349c8444413a..6e3d8f89706b6007af7d7fd56232eca2087f8ad4 100644
--- a/src/java.desktop/share/classes/java/awt/im/spi/InputMethodDescriptor.java
+++ b/src/java.desktop/share/classes/java/awt/im/spi/InputMethodDescriptor.java
@@ -63,7 +63,7 @@ public interface InputMethodDescriptor {
* unavailable.
*
* @return the locales supported by the input method
- * @exception AWTException if it can be determined that the input method
+ * @throws AWTException if it can be determined that the input method
* is inoperable, for example, because of incomplete installation.
*/
Locale[] getAvailableLocales() throws AWTException;
@@ -122,7 +122,7 @@ public interface InputMethodDescriptor {
* Creates a new instance of the corresponding input method.
*
* @return a new instance of the corresponding input method
- * @exception Exception any exception that may occur while creating the
+ * @throws Exception any exception that may occur while creating the
* input method instance
*/
InputMethod createInputMethod() throws Exception;
diff --git a/src/java.desktop/share/classes/java/awt/image/BufferedImage.java b/src/java.desktop/share/classes/java/awt/image/BufferedImage.java
index 3c937dd38669bac18051badf4215e31b44813914..770fec6e8ab59c1d5b0d03232d78c54a6643dc3d 100644
--- a/src/java.desktop/share/classes/java/awt/image/BufferedImage.java
+++ b/src/java.desktop/share/classes/java/awt/image/BufferedImage.java
@@ -594,12 +594,12 @@ public class BufferedImage extends java.awt.Image
* the raster has been premultiplied with alpha.
* @param properties {@code Hashtable} of
* {@code String}/{@code Object} pairs.
- * @exception RasterFormatException if the number and
+ * @throws RasterFormatException if the number and
* types of bands in the {@code SampleModel} of the
* {@code Raster} do not match the number and types required by
* the {@code ColorModel} to represent its color and alpha
* components.
- * @exception IllegalArgumentException if
+ * @throws IllegalArgumentException if
* {@code raster} is incompatible with {@code cm}
* @see ColorModel
* @see Raster
@@ -1195,7 +1195,7 @@ public class BufferedImage extends java.awt.Image
* @param h the height of the specified rectangular region
* @return a {@code BufferedImage} that is the subimage of this
* {@code BufferedImage}.
- * @exception RasterFormatException if the specified
+ * @throws RasterFormatException if the specified
* area is not contained within this {@code BufferedImage}.
*/
public BufferedImage getSubimage (int x, int y, int w, int h) {
@@ -1391,7 +1391,7 @@ public class BufferedImage extends java.awt.Image
* @param tileY the y index of the requested tile in the tile array
* @return a {@code Raster} that is the tile defined by the
* arguments {@code tileX} and {@code tileY}.
- * @exception ArrayIndexOutOfBoundsException if both
+ * @throws ArrayIndexOutOfBoundsException if both
* {@code tileX} and {@code tileY} are not
* equal to 0
*/
@@ -1561,7 +1561,7 @@ public class BufferedImage extends java.awt.Image
* @return {@code true} if the tile specified by the specified
* indices is checked out for writing; {@code false}
* otherwise.
- * @exception ArrayIndexOutOfBoundsException if both
+ * @throws ArrayIndexOutOfBoundsException if both
* {@code tileX} and {@code tileY} are not equal
* to 0
*/
diff --git a/src/java.desktop/share/classes/java/awt/image/ByteLookupTable.java b/src/java.desktop/share/classes/java/awt/image/ByteLookupTable.java
index 01bebc12ee23f66ecd69c699cd9162afef0443d8..2bb5a1219ef3971d3ebf2c481e2c6512fe9e3d74 100644
--- a/src/java.desktop/share/classes/java/awt/image/ByteLookupTable.java
+++ b/src/java.desktop/share/classes/java/awt/image/ByteLookupTable.java
@@ -117,7 +117,7 @@ public class ByteLookupTable extends LookupTable {
* same length as {@code src}.
* @return the array {@code dst}, an {@code int} array of
* samples.
- * @exception ArrayIndexOutOfBoundsException if {@code src} is
+ * @throws ArrayIndexOutOfBoundsException if {@code src} is
* longer than {@code dst} or if for any element
* {@code i} of {@code src},
* {@code src[i]-offset} is either less than zero or
@@ -168,7 +168,7 @@ public class ByteLookupTable extends LookupTable {
* same length as {@code src}.
* @return the array {@code dst}, an {@code int} array of
* samples.
- * @exception ArrayIndexOutOfBoundsException if {@code src} is
+ * @throws ArrayIndexOutOfBoundsException if {@code src} is
* longer than {@code dst} or if for any element
* {@code i} of {@code src},
* {@code (src[i]&0xff)-offset} is either less than
diff --git a/src/java.desktop/share/classes/java/awt/image/ColorConvertOp.java b/src/java.desktop/share/classes/java/awt/image/ColorConvertOp.java
index 023b376d73d80e74440a86c7b9767edfb0e9124b..f5ec86a151a018f0ab91c8b675def97a73ee365b 100644
--- a/src/java.desktop/share/classes/java/awt/image/ColorConvertOp.java
+++ b/src/java.desktop/share/classes/java/awt/image/ColorConvertOp.java
@@ -194,9 +194,9 @@ public class ColorConvertOp implements BufferedImageOp, RasterOp {
* @param profiles the array of {@code ICC_Profile} objects
* @param hints the {@code RenderingHints} object used to control
* the color conversion, or {@code null}
- * @exception IllegalArgumentException when the profile sequence does not
+ * @throws IllegalArgumentException when the profile sequence does not
* specify a well-defined color conversion
- * @exception NullPointerException if profiles is null
+ * @throws NullPointerException if profiles is null
*/
public ColorConvertOp (ICC_Profile[] profiles, RenderingHints hints)
{
@@ -242,7 +242,7 @@ public class ColorConvertOp implements BufferedImageOp, RasterOp {
* @return {@code dest} color converted from {@code src}
* or a new, converted {@code BufferedImage}
* if {@code dest} is {@code null}
- * @exception IllegalArgumentException if dest is null and this op was
+ * @throws IllegalArgumentException if dest is null and this op was
* constructed using the constructor which takes only a
* RenderingHints argument, since the operation is ill defined.
*/
@@ -456,7 +456,7 @@ public class ColorConvertOp implements BufferedImageOp, RasterOp {
* @return {@code dest} color converted from {@code src}
* or a new, converted {@code WritableRaster}
* if {@code dest} is {@code null}
- * @exception IllegalArgumentException if the number of source or
+ * @throws IllegalArgumentException if the number of source or
* destination bands is incorrect, the source or destination
* color spaces are undefined, or this op was constructed
* with one of the constructors that applies only to
diff --git a/src/java.desktop/share/classes/java/awt/image/DirectColorModel.java b/src/java.desktop/share/classes/java/awt/image/DirectColorModel.java
index bf7ad07a22e710fd18ddbd4c98b5f86d470ac269..5853f3802a4a07a85f32f637afd2645a3c7f9b50 100644
--- a/src/java.desktop/share/classes/java/awt/image/DirectColorModel.java
+++ b/src/java.desktop/share/classes/java/awt/image/DirectColorModel.java
@@ -642,12 +642,12 @@ public class DirectColorModel extends PackedColorModel {
* @param inData the specified pixel
* @return the alpha component of the specified pixel, scaled from
* 0 to 255.
- * @exception ClassCastException if {@code inData}
+ * @throws ClassCastException if {@code inData}
* is not a primitive array of type {@code transferType}
- * @exception ArrayIndexOutOfBoundsException if
+ * @throws ArrayIndexOutOfBoundsException if
* {@code inData} is not large enough to hold a pixel value
* for this {@code ColorModel}
- * @exception UnsupportedOperationException if this
+ * @throws UnsupportedOperationException if this
* {@code tranferType} is not supported by this
* {@code ColorModel}
*/
@@ -694,7 +694,7 @@ public class DirectColorModel extends PackedColorModel {
*
* @param inData the specified pixel
* @return the color and alpha components of the specified pixel.
- * @exception UnsupportedOperationException if this
+ * @throws UnsupportedOperationException if this
* {@code transferType} is not supported by this
* {@code ColorModel}
* @see ColorModel#getRGBdefault
@@ -744,12 +744,12 @@ public class DirectColorModel extends PackedColorModel {
* @param pixel the specified pixel
* @return an array representation of the specified pixel in this
* {@code ColorModel}
- * @exception ClassCastException if {@code pixel}
+ * @throws ClassCastException if {@code pixel}
* is not a primitive array of type {@code transferType}
- * @exception ArrayIndexOutOfBoundsException if
+ * @throws ArrayIndexOutOfBoundsException if
* {@code pixel} is not large enough to hold a pixel value
* for this {@code ColorModel}
- * @exception UnsupportedOperationException if this
+ * @throws UnsupportedOperationException if this
* {@code transferType} is not supported by this
* {@code ColorModel}
* @see WritableRaster#setDataElements
@@ -963,14 +963,14 @@ public class DirectColorModel extends PackedColorModel {
* which to start storing the color and alpha components
* @return an array containing the color and alpha components of the
* specified pixel starting at the specified offset.
- * @exception ClassCastException if {@code pixel}
+ * @throws ClassCastException if {@code pixel}
* is not a primitive array of type {@code transferType}
- * @exception ArrayIndexOutOfBoundsException if
+ * @throws ArrayIndexOutOfBoundsException if
* {@code pixel} is not large enough to hold a pixel value
* for this {@code ColorModel}, or if {@code components}
* is not {@code null} and is not large enough to hold all the
* color and alpha components, starting at {@code offset}
- * @exception UnsupportedOperationException if this
+ * @throws UnsupportedOperationException if this
* {@code transferType} is not supported by this
* color model
*/
@@ -1055,7 +1055,7 @@ public class DirectColorModel extends PackedColorModel {
* begin retrieving the color and alpha components
* @return an {@code int} pixel value in this
* {@code ColorModel} corresponding to the specified components.
- * @exception ArrayIndexOutOfBoundsException if
+ * @throws ArrayIndexOutOfBoundsException if
* the {@code components} array is not large enough to
* hold all of the color and alpha components starting at
* {@code offset}
@@ -1097,14 +1097,14 @@ public class DirectColorModel extends PackedColorModel {
* and alpha components
* @return an {@code Object} representing an array of color and
* alpha components.
- * @exception ClassCastException if {@code obj}
+ * @throws ClassCastException if {@code obj}
* is not a primitive array of type {@code transferType}
- * @exception ArrayIndexOutOfBoundsException if
+ * @throws ArrayIndexOutOfBoundsException if
* {@code obj} is not large enough to hold a pixel value
* for this {@code ColorModel} or the {@code components}
* array is not large enough to hold all of the color and alpha
* components starting at {@code offset}
- * @exception UnsupportedOperationException if this
+ * @throws UnsupportedOperationException if this
* {@code transferType} is not supported by this
* color model
* @see WritableRaster#setDataElements
@@ -1169,7 +1169,7 @@ public class DirectColorModel extends PackedColorModel {
* premultiplied; {@code false} otherwise
* @return a {@code ColorModel} object that represents the
* coerced data.
- * @exception UnsupportedOperationException if this
+ * @throws UnsupportedOperationException if this
* {@code transferType} is not supported by this
* color model
*/
diff --git a/src/java.desktop/share/classes/java/awt/image/ImageFilter.java b/src/java.desktop/share/classes/java/awt/image/ImageFilter.java
index d136e16fc6b8c3e6fd18f7c101fcf17f24e1df43..94586b851ae71b22e5295dcb70c70be57bd7c7f0 100644
--- a/src/java.desktop/share/classes/java/awt/image/ImageFilter.java
+++ b/src/java.desktop/share/classes/java/awt/image/ImageFilter.java
@@ -107,7 +107,7 @@ public class ImageFilter implements ImageConsumer, Cloneable {
* with the filtering operation.
*
* @param props the properties from the source object
- * @exception NullPointerException if {@code props} is null
+ * @throws NullPointerException if {@code props} is null
*/
public void setProperties(Hashtable props) {
@SuppressWarnings("unchecked")
@@ -245,7 +245,7 @@ public class ImageFilter implements ImageConsumer, Cloneable {
* @param ip the ImageProducer that is feeding this instance of
* the filter - also the ImageProducer that the request should be
* forwarded to if necessary
- * @exception NullPointerException if {@code ip} is null
+ * @throws NullPointerException if {@code ip} is null
*/
public void resendTopDownLeftRight(ImageProducer ip) {
ip.requestTopDownLeftRightResend(this);
diff --git a/src/java.desktop/share/classes/java/awt/image/MultiPixelPackedSampleModel.java b/src/java.desktop/share/classes/java/awt/image/MultiPixelPackedSampleModel.java
index dcec78fb34833e0ff4c308c6c1487922ebf58227..9254d9fa71717edfbc055e88f382786d8a3b0830 100644
--- a/src/java.desktop/share/classes/java/awt/image/MultiPixelPackedSampleModel.java
+++ b/src/java.desktop/share/classes/java/awt/image/MultiPixelPackedSampleModel.java
@@ -130,7 +130,7 @@ public class MultiPixelPackedSampleModel extends SampleModel
* @param scanlineStride the line stride of the image data
* @param dataBitOffset the data bit offset for the region of image
* data described
- * @exception RasterFormatException if the number of bits per pixel
+ * @throws RasterFormatException if the number of bits per pixel
* is not a power of 2 or if a power of 2 number of
* pixels do not fit in one data element.
* @throws IllegalArgumentException if {@code w} or
@@ -321,7 +321,7 @@ public class MultiPixelPackedSampleModel extends SampleModel
* @param bands the specified bands
* @return a new {@code SampleModel} with a subset of bands of
* this {@code MultiPixelPackedSampleModel}.
- * @exception RasterFormatException if the number of bands requested
+ * @throws RasterFormatException if the number of bands requested
* is not one.
* @throws IllegalArgumentException if {@code w} or
* {@code h} is not greater than 0
@@ -348,7 +348,7 @@ public class MultiPixelPackedSampleModel extends SampleModel
* data
* @return the specified band containing the sample of the specified
* pixel.
- * @exception ArrayIndexOutOfBoundsException if the specified
+ * @throws ArrayIndexOutOfBoundsException if the specified
* coordinates are not in bounds.
* @see #setSample(int, int, int, int, DataBuffer)
*/
@@ -377,7 +377,7 @@ public class MultiPixelPackedSampleModel extends SampleModel
* @param b the band to return, which is assumed to be 0
* @param s the input sample as an {@code int}
* @param data the {@code DataBuffer} where image data is stored
- * @exception ArrayIndexOutOfBoundsException if the coordinates are
+ * @throws ArrayIndexOutOfBoundsException if the coordinates are
* not in bounds.
* @see #getSample(int, int, int, DataBuffer)
*/
@@ -442,9 +442,9 @@ public class MultiPixelPackedSampleModel extends SampleModel
* @param data the {@code DataBuffer} containing the image data.
* @return an {@code Object} containing data for the specified
* pixel.
- * @exception ClassCastException if {@code obj} is not a
+ * @throws ClassCastException if {@code obj} is not a
* primitive array of type TransferType or is not {@code null}
- * @exception ArrayIndexOutOfBoundsException if the coordinates are
+ * @throws ArrayIndexOutOfBoundsException if the coordinates are
* not in bounds, or if {@code obj} is not {@code null} or
* not large enough to hold the pixel data
* @see #setDataElements(int, int, Object, DataBuffer)
@@ -526,7 +526,7 @@ public class MultiPixelPackedSampleModel extends SampleModel
* {@code null}
* @param data the {@code DataBuffer} where image data is stored
* @return an array containing the specified pixel.
- * @exception ArrayIndexOutOfBoundsException if the coordinates
+ * @throws ArrayIndexOutOfBoundsException if the coordinates
* are not in bounds
* @see #setPixel(int, int, int[], DataBuffer)
*/
diff --git a/src/java.desktop/share/classes/java/awt/image/PixelGrabber.java b/src/java.desktop/share/classes/java/awt/image/PixelGrabber.java
index 3855316d986d5e7babb8b1eb80160e628cfc9457..fb66a95f5398f9035d0952eca33c094a6b4183f0 100644
--- a/src/java.desktop/share/classes/java/awt/image/PixelGrabber.java
+++ b/src/java.desktop/share/classes/java/awt/image/PixelGrabber.java
@@ -219,7 +219,7 @@ public class PixelGrabber implements ImageConsumer {
* delivered.
* @return true if the pixels were successfully grabbed, false on
* abort, error or timeout
- * @exception InterruptedException
+ * @throws InterruptedException
* Another thread has interrupted this thread.
*/
public boolean grabPixels() throws InterruptedException {
@@ -243,7 +243,7 @@ public class PixelGrabber implements ImageConsumer {
* to arrive before timing out
* @return true if the pixels were successfully grabbed, false on
* abort, error or timeout
- * @exception InterruptedException
+ * @throws InterruptedException
* Another thread has interrupted this thread.
*/
public synchronized boolean grabPixels(long ms)
diff --git a/src/java.desktop/share/classes/java/awt/image/RGBImageFilter.java b/src/java.desktop/share/classes/java/awt/image/RGBImageFilter.java
index 44302923d1779f0b971918f8f8d36445baa592f0..9838fdfe8b6c3ec60924e62a6ca59e10ab6e7d54 100644
--- a/src/java.desktop/share/classes/java/awt/image/RGBImageFilter.java
+++ b/src/java.desktop/share/classes/java/awt/image/RGBImageFilter.java
@@ -146,7 +146,7 @@ public abstract class RGBImageFilter extends ImageFilter {
* a color table entry is being filtered rather than an actual
* pixel value.
* @param icm the IndexColorModel object to be filtered
- * @exception NullPointerException if {@code icm} is null
+ * @throws NullPointerException if {@code icm} is null
* @return a new IndexColorModel representing the filtered colors
*/
public IndexColorModel filterIndexColorModel(IndexColorModel icm) {
diff --git a/src/java.desktop/share/classes/java/awt/image/Raster.java b/src/java.desktop/share/classes/java/awt/image/Raster.java
index 32d45078b3800796f45631cca0c197a5002421a1..d388aa1f79cf4b2d4333a4c605f37686b2f6e262 100644
--- a/src/java.desktop/share/classes/java/awt/image/Raster.java
+++ b/src/java.desktop/share/classes/java/awt/image/Raster.java
@@ -1375,7 +1375,7 @@ public class Raster {
* @param h the specified height of the new {@code WritableRaster}
* @return a compatible {@code WritableRaster} with the specified
* size and a new sample model and data buffer.
- * @exception RasterFormatException if the width or height is less than
+ * @throws RasterFormatException if the width or height is less than
* or equal to zero.
*/
public WritableRaster createCompatibleWritableRaster(int w, int h) {
@@ -1501,7 +1501,7 @@ public class Raster {
* of the returned Raster
* @param bandList Array of band indices, or null to use all bands
* @return a new {@code Raster}.
- * @exception RasterFormatException if the specified subregion is outside
+ * @throws RasterFormatException if the specified subregion is outside
* of the raster bounds.
* @throws RasterFormatException if {@code width} or
* {@code height}
diff --git a/src/java.desktop/share/classes/java/awt/image/ShortLookupTable.java b/src/java.desktop/share/classes/java/awt/image/ShortLookupTable.java
index 3f4e236b9bc76cd542e5c32f17ca2fdb235950ac..e9c97ad864eb6316c2da9cd2393d5a3d7accfca8 100644
--- a/src/java.desktop/share/classes/java/awt/image/ShortLookupTable.java
+++ b/src/java.desktop/share/classes/java/awt/image/ShortLookupTable.java
@@ -111,7 +111,7 @@ public class ShortLookupTable extends LookupTable {
* same length as {@code src}.
* @return the array {@code dst}, an {@code int} array of
* samples.
- * @exception ArrayIndexOutOfBoundsException if {@code src} is
+ * @throws ArrayIndexOutOfBoundsException if {@code src} is
* longer than {@code dst} or if for any element
* {@code i} of {@code src},
* {@code (src[i]&0xffff)-offset} is either less than
@@ -162,7 +162,7 @@ public class ShortLookupTable extends LookupTable {
* same length as {@code src}.
* @return the array {@code dst}, an {@code int} array of
* samples.
- * @exception ArrayIndexOutOfBoundsException if {@code src} is
+ * @throws ArrayIndexOutOfBoundsException if {@code src} is
* longer than {@code dst} or if for any element
* {@code i} of {@code src},
* {@code (src[i]&0xffff)-offset} is either less than
diff --git a/src/java.desktop/share/classes/java/awt/image/SinglePixelPackedSampleModel.java b/src/java.desktop/share/classes/java/awt/image/SinglePixelPackedSampleModel.java
index 864ed00cf7617590c71d9de8fc59c50c219d1b1e..abb669e02c6699f2b27c4d17479d3b120d058aa0 100644
--- a/src/java.desktop/share/classes/java/awt/image/SinglePixelPackedSampleModel.java
+++ b/src/java.desktop/share/classes/java/awt/image/SinglePixelPackedSampleModel.java
@@ -302,7 +302,7 @@ public class SinglePixelPackedSampleModel extends SampleModel
* SinglePixelPackedSampleModel/DataBuffer combination will represent
* an image with a subset of the bands of the original
* SinglePixelPackedSampleModel/DataBuffer combination.
- * @exception RasterFormatException if the length of the bands argument is
+ * @throws RasterFormatException if the length of the bands argument is
* greater than the number of bands in
* the sample model.
*/
diff --git a/src/java.desktop/share/classes/java/awt/image/WritableRaster.java b/src/java.desktop/share/classes/java/awt/image/WritableRaster.java
index 0e345026c2b526ce5d098221f7e20425c724c687..729317d85a3c9eda95fdb512d8c88322379e37fd 100644
--- a/src/java.desktop/share/classes/java/awt/image/WritableRaster.java
+++ b/src/java.desktop/share/classes/java/awt/image/WritableRaster.java
@@ -204,7 +204,7 @@ public class WritableRaster extends Raster {
* @param bandList Array of band indices, or null to use all bands.
* @return a {@code WritableRaster} sharing all or part of the
* {@code DataBuffer} of this {@code WritableRaster}.
- * @exception RasterFormatException if the subregion is outside of the
+ * @throws RasterFormatException if the subregion is outside of the
* raster bounds.
* @throws RasterFormatException if {@code w} or
* {@code h}
diff --git a/src/java.desktop/share/classes/java/awt/print/PageFormat.java b/src/java.desktop/share/classes/java/awt/print/PageFormat.java
index b7709eb581eb36cc1fca8d6c05a83fd4bda06266..019c5d0bdcc1ec533b6bb599ee074f5d4ee0bc22 100644
--- a/src/java.desktop/share/classes/java/awt/print/PageFormat.java
+++ b/src/java.desktop/share/classes/java/awt/print/PageFormat.java
@@ -286,7 +286,7 @@ public class PageFormat implements Cloneable
* {@code PageFormat}.
* @param paper the {@code Paper} object to which to set
* the {@code Paper} object for this {@code PageFormat}.
- * @exception NullPointerException
+ * @throws NullPointerException
* a null paper instance was passed as a parameter.
* @see #getPaper
*/
diff --git a/src/java.desktop/share/classes/java/awt/print/Printable.java b/src/java.desktop/share/classes/java/awt/print/Printable.java
index 28a01cc9a16405194be435f64df4d3d476f01eab..1fbf1f7c61620f2a7864f175f7fb868d7d1b3d6e 100644
--- a/src/java.desktop/share/classes/java/awt/print/Printable.java
+++ b/src/java.desktop/share/classes/java/awt/print/Printable.java
@@ -134,7 +134,7 @@ public interface Printable {
* @return PAGE_EXISTS if the page is rendered successfully
* or NO_SUCH_PAGE if {@code pageIndex} specifies a
* non-existent page.
- * @exception java.awt.print.PrinterException
+ * @throws java.awt.print.PrinterException
* thrown when the print job is terminated.
*/
int print(Graphics graphics, PageFormat pageFormat, int pageIndex)
diff --git a/src/java.desktop/share/classes/java/awt/print/PrinterJob.java b/src/java.desktop/share/classes/java/awt/print/PrinterJob.java
index 416563671838c5cd2d3aa092e7e962aadf9620b9..ddf565f3ce3b1b0cbe0c6d0c35c143a47d31fe36 100644
--- a/src/java.desktop/share/classes/java/awt/print/PrinterJob.java
+++ b/src/java.desktop/share/classes/java/awt/print/PrinterJob.java
@@ -168,7 +168,7 @@ public abstract class PrinterJob {
* cannot support the {@code Pageable} and
* {@code Printable} interfaces necessary to support 2D printing.
* @param service a print service that supports 2D printing
- * @exception PrinterException if the specified service does not support
+ * @throws PrinterException if the specified service does not support
* 2D printing, or this PrinterJob class does not support
* setting a 2D print service, or the specified service is
* otherwise not a valid print service.
@@ -212,7 +212,7 @@ public abstract class PrinterJob {
* {@code document}.
* @param document the pages to be printed. It can not be
* {@code null}.
- * @exception NullPointerException the {@code Pageable} passed in
+ * @throws NullPointerException the {@code Pageable} passed in
* was {@code null}.
* @see PageFormat
* @see Printable
@@ -235,7 +235,7 @@ public abstract class PrinterJob {
* selected by the user.
* @return {@code true} if the user does not cancel the dialog;
* {@code false} otherwise.
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true.
* @see java.awt.GraphicsEnvironment#isHeadless
*/
@@ -279,9 +279,9 @@ public abstract class PrinterJob {
* This parameter may not be null.
* @return {@code true} if the user does not cancel the dialog;
* {@code false} otherwise.
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true.
- * @exception NullPointerException if {@code attributes} parameter
+ * @throws NullPointerException if {@code attributes} parameter
* is null.
* @see java.awt.GraphicsEnvironment#isHeadless
* @since 1.4
@@ -313,7 +313,7 @@ public abstract class PrinterJob {
* is cancelled; a new {@code PageFormat} object
* containing the format indicated by the user if the
* dialog is acknowledged.
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true.
* @see java.awt.GraphicsEnvironment#isHeadless
* @since 1.2
@@ -342,9 +342,9 @@ public abstract class PrinterJob {
* This parameter may not be null.
* @return a page format if the user does not cancel the dialog;
* {@code null} otherwise.
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true.
- * @exception NullPointerException if {@code attributes} parameter
+ * @throws NullPointerException if {@code attributes} parameter
* is null.
* @see java.awt.GraphicsEnvironment#isHeadless
* @since 1.4
@@ -495,7 +495,7 @@ public abstract class PrinterJob {
/**
* Prints a set of pages.
- * @exception PrinterException an error in the print system
+ * @throws PrinterException an error in the print system
* caused the job to be aborted.
* @see Book
* @see Pageable
@@ -533,7 +533,7 @@ public abstract class PrinterJob {
* this print() method.
*
* @param attributes a set of attributes for the job
- * @exception PrinterException an error in the print system
+ * @throws PrinterException an error in the print system
* caused the job to be aborted.
* @see Book
* @see Pageable
diff --git a/src/java.desktop/share/classes/javax/swing/AbstractButton.java b/src/java.desktop/share/classes/javax/swing/AbstractButton.java
index 8a2936cd4990e1dc2965c2f729ccba751195937f..4f79ac8e2b36af75866dd951c0a7a52f66982ba2 100644
--- a/src/java.desktop/share/classes/javax/swing/AbstractButton.java
+++ b/src/java.desktop/share/classes/javax/swing/AbstractButton.java
@@ -876,7 +876,7 @@ public abstract class AbstractButton extends JComponent implements ItemSelectabl
* textPosition
+ * @throws IllegalArgumentException if textPosition
* is not one of the legal values listed above
*/
@BeanProperty(visualUpdate = true, enumerationValues = {
@@ -953,7 +953,7 @@ public abstract class AbstractButton extends JComponent implements ItemSelectabl
* {@code IllegalArgumentException} that is thrown for an invalid
* value
* @return the {@code key} argument
- * @exception IllegalArgumentException if key is not one of the legal
+ * @throws IllegalArgumentException if key is not one of the legal
* values listed above
* @see #setHorizontalTextPosition
* @see #setHorizontalAlignment
@@ -984,7 +984,7 @@ public abstract class AbstractButton extends JComponent implements ItemSelectabl
* {@code IllegalArgumentException} that is thrown for an invalid
* value
* @return the {@code key} argument
- * @exception IllegalArgumentException if key is not one of the legal
+ * @throws IllegalArgumentException if key is not one of the legal
* values listed above
*/
protected int checkVerticalKey(int key, String exception) {
@@ -1571,7 +1571,7 @@ public abstract class AbstractButton extends JComponent implements ItemSelectabl
*
* @since 1.4
* @param index Index into the String to underline
- * @exception IllegalArgumentException will be thrown if index
+ * @throws IllegalArgumentException will be thrown if index
* is >= length of the text, or < -1
* @see #getDisplayedMnemonicIndex
*/
@@ -1654,7 +1654,7 @@ public abstract class AbstractButton extends JComponent implements ItemSelectabl
* @see #getMultiClickThreshhold
* @param threshhold the amount of time required between mouse
* press events to generate corresponding action events
- * @exception IllegalArgumentException if threshhold < 0
+ * @throws IllegalArgumentException if threshhold < 0
* @since 1.4
*/
public void setMultiClickThreshhold(long threshhold) {
@@ -1791,10 +1791,10 @@ public abstract class AbstractButton extends JComponent implements ItemSelectabl
* @param index the position in the container's list at which to
* insert the component, where -1
* means append to the end
- * @exception IllegalArgumentException if index is invalid
- * @exception IllegalArgumentException if adding the container's parent
+ * @throws IllegalArgumentException if index is invalid
+ * @throws IllegalArgumentException if adding the container's parent
* to itself
- * @exception IllegalArgumentException if adding a window to a container
+ * @throws IllegalArgumentException if adding a window to a container
* @since 1.5
*/
protected void addImpl(Component comp, Object constraints, int index) {
@@ -3064,7 +3064,7 @@ public abstract class AbstractButton extends JComponent implements ItemSelectabl
*
* @param i zero-based index of the key bindings
* @return a javax.lang.Object which specifies the key binding
- * @exception IllegalArgumentException if the index is
+ * @throws IllegalArgumentException if the index is
* out of bounds
* @see #getAccessibleKeyBindingCount
*/
diff --git a/src/java.desktop/share/classes/javax/swing/AbstractListModel.java b/src/java.desktop/share/classes/javax/swing/AbstractListModel.java
index 0396c956597fe5c6dc46846fb428a876098ca551..815fbea84070b252dc8534e7d3cae86ef784444b 100644
--- a/src/java.desktop/share/classes/javax/swing/AbstractListModel.java
+++ b/src/java.desktop/share/classes/javax/swing/AbstractListModel.java
@@ -218,7 +218,7 @@ public abstract class AbstractListModellistenerType doesn't
+ * @throws ClassCastException if listenerType doesn't
* specify a class or interface that implements
* java.util.EventListener
*
diff --git a/src/java.desktop/share/classes/javax/swing/BorderFactory.java b/src/java.desktop/share/classes/javax/swing/BorderFactory.java
index 3fcb5620e692b5bb5439e4a2c33057d10e9670f8..2e4b18848a2e65ccac85d54699e704fd56f7f269 100644
--- a/src/java.desktop/share/classes/javax/swing/BorderFactory.java
+++ b/src/java.desktop/share/classes/javax/swing/BorderFactory.java
@@ -332,7 +332,7 @@ public class BorderFactory
* @param type one of EtchedBorder.RAISED, or
* EtchedBorder.LOWERED
* @return the Border object
- * @exception IllegalArgumentException if type is not either
+ * @throws IllegalArgumentException if type is not either
* EtchedBorder.RAISED or
* EtchedBorder.LOWERED
* @since 1.3
diff --git a/src/java.desktop/share/classes/javax/swing/BoxLayout.java b/src/java.desktop/share/classes/javax/swing/BoxLayout.java
index bc84a4fa58279971dfbbe2453ec71a612782f47e..d20a05ce4ef4eb920eb4c7a5dad6f90fd11f8888 100644
--- a/src/java.desktop/share/classes/javax/swing/BoxLayout.java
+++ b/src/java.desktop/share/classes/javax/swing/BoxLayout.java
@@ -169,7 +169,7 @@ public class BoxLayout implements LayoutManager2, Serializable {
* {@code BoxLayout.X_AXIS, BoxLayout.Y_AXIS,
* BoxLayout.LINE_AXIS} or {@code BoxLayout.PAGE_AXIS}
*
- * @exception AWTError if the value of {@code axis} is invalid
+ * @throws AWTError if the value of {@code axis} is invalid
*/
@ConstructorProperties({"target", "axis"})
public BoxLayout(Container target, int axis) {
@@ -234,7 +234,7 @@ public class BoxLayout implements LayoutManager2, Serializable {
*
* @param target the affected container
*
- * @exception AWTError if the target isn't the container specified to the
+ * @throws AWTError if the target isn't the container specified to the
* BoxLayout constructor
*/
public synchronized void invalidateLayout(Container target) {
@@ -280,7 +280,7 @@ public class BoxLayout implements LayoutManager2, Serializable {
*
* @param target the container that needs to be laid out
* @return the dimensions >= 0 && <= Integer.MAX_VALUE
- * @exception AWTError if the target isn't the container specified to the
+ * @throws AWTError if the target isn't the container specified to the
* BoxLayout constructor
* @see Container
* @see #minimumLayoutSize
@@ -306,7 +306,7 @@ public class BoxLayout implements LayoutManager2, Serializable {
*
* @param target the container that needs to be laid out
* @return the dimensions >= 0 && <= Integer.MAX_VALUE
- * @exception AWTError if the target isn't the container specified to the
+ * @throws AWTError if the target isn't the container specified to the
* BoxLayout constructor
* @see #preferredLayoutSize
* @see #maximumLayoutSize
@@ -331,7 +331,7 @@ public class BoxLayout implements LayoutManager2, Serializable {
*
* @param target the container that needs to be laid out
* @return the dimensions >= 0 && <= Integer.MAX_VALUE
- * @exception AWTError if the target isn't the container specified to the
+ * @throws AWTError if the target isn't the container specified to the
* BoxLayout constructor
* @see #preferredLayoutSize
* @see #minimumLayoutSize
@@ -358,7 +358,7 @@ public class BoxLayout implements LayoutManager2, Serializable {
*
* @param target the container
* @return the alignment >= 0.0f && <= 1.0f
- * @exception AWTError if the target isn't the container specified to the
+ * @throws AWTError if the target isn't the container specified to the
* BoxLayout constructor
*/
public synchronized float getLayoutAlignmentX(Container target) {
@@ -375,7 +375,7 @@ public class BoxLayout implements LayoutManager2, Serializable {
*
* @param target the container
* @return the alignment >= 0.0f && <= 1.0f
- * @exception AWTError if the target isn't the container specified to the
+ * @throws AWTError if the target isn't the container specified to the
* BoxLayout constructor
*/
public synchronized float getLayoutAlignmentY(Container target) {
@@ -390,7 +390,7 @@ public class BoxLayout implements LayoutManager2, Serializable {
*
* @param target the container to lay out
*
- * @exception AWTError if the target isn't the container specified to the
+ * @throws AWTError if the target isn't the container specified to the
* BoxLayout constructor
*/
public void layoutContainer(Container target) {
diff --git a/src/java.desktop/share/classes/javax/swing/DefaultBoundedRangeModel.java b/src/java.desktop/share/classes/javax/swing/DefaultBoundedRangeModel.java
index 7e254d5c8b329eb9e894c8aef37ecb775ae7023f..e9bd3d96a6a20f631d8a611f99d4db2956e7060a 100644
--- a/src/java.desktop/share/classes/javax/swing/DefaultBoundedRangeModel.java
+++ b/src/java.desktop/share/classes/javax/swing/DefaultBoundedRangeModel.java
@@ -417,7 +417,7 @@ public class DefaultBoundedRangeModel implements BoundedRangeModel, Serializable
* on this model,
* or an empty array if no such
* listeners have been added
- * @exception ClassCastException if listenerType doesn't
+ * @throws ClassCastException if listenerType doesn't
* specify a class or interface that implements
* java.util.EventListener
*
diff --git a/src/java.desktop/share/classes/javax/swing/DefaultButtonModel.java b/src/java.desktop/share/classes/javax/swing/DefaultButtonModel.java
index 453b1d0ab0ecff3629914b1a020394324daab94e..d391011167ab6e8b68268cdabaa2f6c9c5fa82a6 100644
--- a/src/java.desktop/share/classes/javax/swing/DefaultButtonModel.java
+++ b/src/java.desktop/share/classes/javax/swing/DefaultButtonModel.java
@@ -488,7 +488,7 @@ public class DefaultButtonModel implements ButtonModel, Serializable {
* on this model,
* or an empty array if no such
* listeners have been added
- * @exception ClassCastException if listenerType doesn't
+ * @throws ClassCastException if listenerType doesn't
* specify a class or interface that implements
* java.util.EventListener
*
diff --git a/src/java.desktop/share/classes/javax/swing/DefaultListModel.java b/src/java.desktop/share/classes/javax/swing/DefaultListModel.java
index 88210b77c9ce589f9ec4037c36f5d99de76b5fda..9d519927b6774c5f36b8439e85aaee959ec58d00 100644
--- a/src/java.desktop/share/classes/javax/swing/DefaultListModel.java
+++ b/src/java.desktop/share/classes/javax/swing/DefaultListModel.java
@@ -345,7 +345,7 @@ public class DefaultListModellistenerType doesn't
+ * @throws ClassCastException if listenerType doesn't
* specify a class or interface that implements
* java.util.EventListener
*
@@ -750,7 +750,7 @@ public class DefaultListSelectionModel implements ListSelectionModel, Cloneable,
* Returns a clone of this selection model with the same selection.
* listenerLists are not duplicated.
*
- * @exception CloneNotSupportedException if the selection model does not
+ * @throws CloneNotSupportedException if the selection model does not
* both (a) implement the Cloneable interface and (b) define a
* clone method.
*/
diff --git a/src/java.desktop/share/classes/javax/swing/DefaultSingleSelectionModel.java b/src/java.desktop/share/classes/javax/swing/DefaultSingleSelectionModel.java
index c5c2539d41f4cc608df67824e513d701cfdc2afa..122e635fba1a1255dfa72d6391b048caf3340216 100644
--- a/src/java.desktop/share/classes/javax/swing/DefaultSingleSelectionModel.java
+++ b/src/java.desktop/share/classes/javax/swing/DefaultSingleSelectionModel.java
@@ -178,7 +178,7 @@ Serializable {
* on this model,
* or an empty array if no such
* listeners have been added
- * @exception ClassCastException if listenerType doesn't
+ * @throws ClassCastException if listenerType doesn't
* specify a class or interface that implements
* java.util.EventListener
*
diff --git a/src/java.desktop/share/classes/javax/swing/JApplet.java b/src/java.desktop/share/classes/javax/swing/JApplet.java
index a1d51bf0069f10791400c3b1682273c1fdc2e58c..e5ad62322e65d95bb9aa868db29258cf15f2253b 100644
--- a/src/java.desktop/share/classes/javax/swing/JApplet.java
+++ b/src/java.desktop/share/classes/javax/swing/JApplet.java
@@ -135,7 +135,7 @@ public class JApplet extends Applet implements Accessible,
* This constructor sets the component's locale property to the value
* returned by JComponent.getDefaultLocale.
*
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true.
* @see java.awt.GraphicsEnvironment#isHeadless
* @see JComponent#getDefaultLocale
@@ -312,10 +312,10 @@ public class JApplet extends Applet implements Accessible,
* @param comp the component to be enhanced
* @param constraints the constraints to be respected
* @param index the index
- * @exception IllegalArgumentException if index is invalid
- * @exception IllegalArgumentException if adding the container's parent
+ * @throws IllegalArgumentException if index is invalid
+ * @throws IllegalArgumentException if adding the container's parent
* to itself
- * @exception IllegalArgumentException if adding a window to a container
+ * @throws IllegalArgumentException if adding a window to a container
*
* @see #setRootPaneCheckingEnabled
* @see javax.swing.RootPaneContainer
@@ -423,7 +423,7 @@ public class JApplet extends Applet implements Accessible,
* Sets the contentPane property. This method is called by the constructor.
* @param contentPane the contentPane object for this applet
*
- * @exception java.awt.IllegalComponentStateException (a runtime
+ * @throws java.awt.IllegalComponentStateException (a runtime
* exception) if the content pane parameter is null
* @see #getContentPane
* @see RootPaneContainer#setContentPane
@@ -437,7 +437,7 @@ public class JApplet extends Applet implements Accessible,
/**
* Returns the layeredPane object for this applet.
*
- * @exception java.awt.IllegalComponentStateException (a runtime
+ * @throws java.awt.IllegalComponentStateException (a runtime
* exception) if the layered pane parameter is null
* @see #setLayeredPane
* @see RootPaneContainer#getLayeredPane
diff --git a/src/java.desktop/share/classes/javax/swing/JColorChooser.java b/src/java.desktop/share/classes/javax/swing/JColorChooser.java
index 29bf7009b4ffc7d3e909fdb93ad5f4af1003afb2..945c6f6069704705a0aab5dc582a3d44fee9c1d9 100644
--- a/src/java.desktop/share/classes/javax/swing/JColorChooser.java
+++ b/src/java.desktop/share/classes/javax/swing/JColorChooser.java
@@ -150,7 +150,7 @@ public class JColorChooser extends JComponent implements Accessible {
* @param title the String containing the dialog's title
* @param initialColor the initial Color set when the color-chooser is shown
* @return the selected color or null if the user opted out
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true.
* @see java.awt.GraphicsEnvironment#isHeadless
*/
@@ -173,7 +173,7 @@ public class JColorChooser extends JComponent implements Accessible {
* @param colorTransparencySelectionEnabled true if the transparency of
* a color can be selected
* @return the selected color or null if the user opted out
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true.
* @see java.awt.GraphicsEnvironment#isHeadless
*/
@@ -217,7 +217,7 @@ public class JColorChooser extends JComponent implements Accessible {
* @param okListener the ActionListener invoked when "OK" is pressed
* @param cancelListener the ActionListener invoked when "Cancel" is pressed
* @return a new dialog containing the color-chooser pane
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true.
* @see java.awt.GraphicsEnvironment#isHeadless
*/
@@ -343,7 +343,7 @@ public class JColorChooser extends JComponent implements Accessible {
* @param r an int specifying the amount of Red
* @param g an int specifying the amount of Green
* @param b an int specifying the amount of Blue
- * @exception IllegalArgumentException if r,g,b values are out of range
+ * @throws IllegalArgumentException if r,g,b values are out of range
* @see java.awt.Color
*/
public void setColor(int r, int g, int b) {
@@ -386,7 +386,7 @@ public class JColorChooser extends JComponent implements Accessible {
* TransferHandler.
*
* @param b the value to set the dragEnabled property to
- * @exception HeadlessException if
+ * @throws HeadlessException if
* b is true and
* GraphicsEnvironment.isHeadless()
* returns true
@@ -464,7 +464,7 @@ public class JColorChooser extends JComponent implements Accessible {
*
* @param panel a string that specifies the panel to be removed
* @return the color panel
- * @exception IllegalArgumentException if panel is not in list of
+ * @throws IllegalArgumentException if panel is not in list of
* known chooser panels
*/
public AbstractColorChooserPanel removeChooserPanel( AbstractColorChooserPanel panel ) {
diff --git a/src/java.desktop/share/classes/javax/swing/JComboBox.java b/src/java.desktop/share/classes/javax/swing/JComboBox.java
index fdbbdc686575f26e01f8e0cce1c4ab61071bf07b..f035c186896a671b32f8aeacd110b104324d4abb 100644
--- a/src/java.desktop/share/classes/javax/swing/JComboBox.java
+++ b/src/java.desktop/share/classes/javax/swing/JComboBox.java
@@ -638,7 +638,7 @@ implements ItemSelectable,ListDataListener,ActionListener, Accessible {
*
* @param anIndex an integer specifying the list item to select,
* where 0 specifies the first item in the list and -1 indicates no selection
- * @exception IllegalArgumentException if anIndex < -1 or
+ * @throws IllegalArgumentException if anIndex < -1 or
* anIndex is greater than or equal to size
*/
@BeanProperty(bound = false, preferred = true, description
@@ -815,7 +815,7 @@ implements ItemSelectable,ListDataListener,ActionListener, Accessible {
/**
* Checks that the dataModel is an instance of
* MutableComboBoxModel. If not, it throws an exception.
- * @exception RuntimeException if dataModel is not an
+ * @throws RuntimeException if dataModel is not an
* instance of MutableComboBoxModel.
*/
void checkMutableComboBoxModel() {
@@ -2298,7 +2298,7 @@ implements ItemSelectable,ListDataListener,ActionListener, Accessible {
* @return this component's locale. If this component does not have
* a locale, the locale of its parent is returned.
*
- * @exception IllegalComponentStateException
+ * @throws IllegalComponentStateException
* If the Component does not have its own locale and has not yet been
* added to a containment hierarchy such that the locale can be
* determined from the containing parent.
diff --git a/src/java.desktop/share/classes/javax/swing/JComponent.java b/src/java.desktop/share/classes/javax/swing/JComponent.java
index c572a12ebb465e801d948c43fea0a45cf050efa5..87b8c3175bdcb1432df7dc64f88abc32b8f02f30 100644
--- a/src/java.desktop/share/classes/javax/swing/JComponent.java
+++ b/src/java.desktop/share/classes/javax/swing/JComponent.java
@@ -2455,7 +2455,7 @@ public abstract class JComponent extends Container implements Serializable,
*
* @param condition one of the values listed above
* @param map the InputMap to use for the given condition
- * @exception IllegalArgumentException if condition is
+ * @throws IllegalArgumentException if condition is
* WHEN_IN_FOCUSED_WINDOW and map
* is not an instance of ComponentInputMap; or
* if condition is not one of the legal values
@@ -2554,7 +2554,7 @@ public abstract class JComponent extends Container implements Serializable,
* @return the InputMap for the given condition;
* if create is false and the InputMap
* hasn't been created, returns null
- * @exception IllegalArgumentException if condition
+ * @throws IllegalArgumentException if condition
* is not one of the legal values listed above
*/
final InputMap getInputMap(int condition, boolean create) {
@@ -4623,7 +4623,7 @@ public abstract class JComponent extends Container implements Serializable,
* @param propertyName the name of the property that was listened on
* @param oldValue the old value of the property
* @param newValue the new value of the property
- * @exception java.beans.PropertyVetoException when the attempt to set the
+ * @throws java.beans.PropertyVetoException when the attempt to set the
* property is vetoed by the component
*/
protected void fireVetoableChange(String propertyName, Object oldValue, Object newValue)
@@ -4799,7 +4799,7 @@ public abstract class JComponent extends Container implements Serializable,
* FooListeners on this component,
* or an empty array if no such
* listeners have been added
- * @exception ClassCastException if listenerType
+ * @throws ClassCastException if listenerType
* doesn't specify a class or interface that implements
* java.util.EventListener
*
diff --git a/src/java.desktop/share/classes/javax/swing/JEditorPane.java b/src/java.desktop/share/classes/javax/swing/JEditorPane.java
index 6b9189d550d584c851e9e7a1c93127bc92a9e6f1..f347621a687ce75ab75d5068e10e99145cba9a69 100644
--- a/src/java.desktop/share/classes/javax/swing/JEditorPane.java
+++ b/src/java.desktop/share/classes/javax/swing/JEditorPane.java
@@ -312,7 +312,7 @@ public class JEditorPane extends JTextComponent {
* Creates a JEditorPane based on a specified URL for input.
*
* @param initialPage the URL
- * @exception IOException if the URL is null
+ * @throws IOException if the URL is null
* or cannot be accessed
*/
public JEditorPane(URL initialPage) throws IOException {
@@ -325,7 +325,7 @@ public class JEditorPane extends JTextComponent {
* a URL specification.
*
* @param url the URL
- * @exception IOException if the URL is null or
+ * @throws IOException if the URL is null or
* cannot be accessed
*/
public JEditorPane(String url) throws IOException {
@@ -340,7 +340,7 @@ public class JEditorPane extends JTextComponent {
*
* @param type mime type of the given text
* @param text the text to initialize with; may be null
- * @exception NullPointerException if the type parameter
+ * @throws NullPointerException if the type parameter
* is null
*/
public JEditorPane(String type, String text) {
@@ -462,7 +462,7 @@ public class JEditorPane extends JTextComponent {
* thread is done whether the load was successful or not.
*
* @param page the URL of the page
- * @exception IOException for a null or invalid
+ * @throws IOException for a null or invalid
* page specification, or exception from the stream being read
* @see #getPage
*/
@@ -578,7 +578,7 @@ public class JEditorPane extends JTextComponent {
*
* @param in the stream from which to read
* @param desc an object describing the stream
- * @exception IOException as thrown by the stream being
+ * @throws IOException as thrown by the stream being
* used to initialize
* @see JTextComponent#read
* @see #setDocument
@@ -925,7 +925,7 @@ public class JEditorPane extends JTextComponent {
* Sets the current URL being displayed.
*
* @param url the URL for display
- * @exception IOException for a null or invalid URL
+ * @throws IOException for a null or invalid URL
* specification
*/
public void setPage(String url) throws IOException {
diff --git a/src/java.desktop/share/classes/javax/swing/JFileChooser.java b/src/java.desktop/share/classes/javax/swing/JFileChooser.java
index 8d286e05f3bab1f030e805182ae1aa6ba968051a..2e0a80f788b6824f105a0e8366d3e5fbfb1cdd68 100644
--- a/src/java.desktop/share/classes/javax/swing/JFileChooser.java
+++ b/src/java.desktop/share/classes/javax/swing/JFileChooser.java
@@ -446,7 +446,7 @@ public class JFileChooser extends JComponent implements Accessible {
* TransferHandler.
*
* @param b the value to set the dragEnabled property to
- * @exception HeadlessException if
+ * @throws HeadlessException if
* b is true and
* GraphicsEnvironment.isHeadless()
* returns true
@@ -658,7 +658,7 @@ public class JFileChooser extends JComponent implements Accessible {
* null
* @return a new JDialog containing this instance
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true.
* @see java.awt.GraphicsEnvironment#isHeadless
* @since 1.4
@@ -924,7 +924,7 @@ public class JFileChooser extends JComponent implements Accessible {
* dialogType is
+ * @throws IllegalArgumentException if dialogType is
* not legal
*
* @see #getDialogType
@@ -1311,7 +1311,7 @@ public class JFileChooser extends JComponent implements Accessible {
* mode is an
+ * @throws IllegalArgumentException if mode is an
* illegal file selection mode
*
* @see #getFileSelectionMode
diff --git a/src/java.desktop/share/classes/javax/swing/JFrame.java b/src/java.desktop/share/classes/javax/swing/JFrame.java
index 339268fd16547916f1cc56974a350ce3a69ccd42..9b37ae77ab00876b2de41f11834a50b1f194f6e5 100644
--- a/src/java.desktop/share/classes/javax/swing/JFrame.java
+++ b/src/java.desktop/share/classes/javax/swing/JFrame.java
@@ -169,7 +169,7 @@ public class JFrame extends Frame implements WindowConstants,
* This constructor sets the component's locale property to the value
* returned by JComponent.getDefaultLocale.
*
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true.
* @see java.awt.GraphicsEnvironment#isHeadless
* @see Component#setSize
@@ -193,7 +193,7 @@ public class JFrame extends Frame implements WindowConstants,
* to construct the new Frame;
* if gc is null, the system
* default GraphicsConfiguration is assumed
- * @exception IllegalArgumentException if gc is not from
+ * @throws IllegalArgumentException if gc is not from
* a screen device. This exception is always thrown when
* GraphicsEnvironment.isHeadless() returns true.
* @see java.awt.GraphicsEnvironment#isHeadless
@@ -213,7 +213,7 @@ public class JFrame extends Frame implements WindowConstants,
* returned by JComponent.getDefaultLocale.
*
* @param title the title for the frame
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true.
* @see java.awt.GraphicsEnvironment#isHeadless
* @see Component#setSize
@@ -239,7 +239,7 @@ public class JFrame extends Frame implements WindowConstants,
* to construct the new JFrame with;
* if gc is null, the system
* default GraphicsConfiguration is assumed
- * @exception IllegalArgumentException if gc is not from
+ * @throws IllegalArgumentException if gc is not from
* a screen device. This exception is always thrown when
* GraphicsEnvironment.isHeadless() returns true.
* @see java.awt.GraphicsEnvironment#isHeadless
@@ -357,7 +357,7 @@ public class JFrame extends Frame implements WindowConstants,
*
* @param operation the operation which should be performed when the
* user closes the frame
- * @exception IllegalArgumentException if defaultCloseOperation value
+ * @throws IllegalArgumentException if defaultCloseOperation value
* isn't one of the above valid values
* @see #addWindowListener
* @see #getDefaultCloseOperation
@@ -540,10 +540,10 @@ public class JFrame extends Frame implements WindowConstants,
* @param comp the component to be enhanced
* @param constraints the constraints to be respected
* @param index the index
- * @exception IllegalArgumentException if index is invalid
- * @exception IllegalArgumentException if adding the container's parent
+ * @throws IllegalArgumentException if index is invalid
+ * @throws IllegalArgumentException if adding the container's parent
* to itself
- * @exception IllegalArgumentException if adding a window to a container
+ * @throws IllegalArgumentException if adding a window to a container
*
* @see #setRootPaneCheckingEnabled
* @see javax.swing.RootPaneContainer
@@ -668,7 +668,7 @@ public class JFrame extends Frame implements WindowConstants,
*
* @param contentPane the contentPane object for this frame
*
- * @exception java.awt.IllegalComponentStateException (a runtime
+ * @throws java.awt.IllegalComponentStateException (a runtime
* exception) if the content pane parameter is null
* @see #getContentPane
* @see RootPaneContainer#setContentPane
@@ -696,7 +696,7 @@ public class JFrame extends Frame implements WindowConstants,
* This method is called by the constructor.
* @param layeredPane the layeredPane object for this frame
*
- * @exception java.awt.IllegalComponentStateException (a runtime
+ * @throws java.awt.IllegalComponentStateException (a runtime
* exception) if the layered pane parameter is null
* @see #getLayeredPane
* @see RootPaneContainer#setLayeredPane
diff --git a/src/java.desktop/share/classes/javax/swing/JInternalFrame.java b/src/java.desktop/share/classes/javax/swing/JInternalFrame.java
index 62efd03c0db844aad94f0065eab55a3c4330fba7..9caa5f966e305112392f4e972ff678dce1328a98 100644
--- a/src/java.desktop/share/classes/javax/swing/JInternalFrame.java
+++ b/src/java.desktop/share/classes/javax/swing/JInternalFrame.java
@@ -497,10 +497,10 @@ public class JInternalFrame extends JComponent implements
* @param comp the component to be enhanced
* @param constraints the constraints to be respected
* @param index the index
- * @exception IllegalArgumentException if index is invalid
- * @exception IllegalArgumentException if adding the container's parent
+ * @throws IllegalArgumentException if index is invalid
+ * @throws IllegalArgumentException if adding the container's parent
* to itself
- * @exception IllegalArgumentException if adding a window to a container
+ * @throws IllegalArgumentException if adding a window to a container
*
* @see #setRootPaneCheckingEnabled
* @see javax.swing.RootPaneContainer
@@ -628,7 +628,7 @@ public class JInternalFrame extends JComponent implements
*
* @param c the content pane for this internal frame
*
- * @exception java.awt.IllegalComponentStateException (a runtime
+ * @throws java.awt.IllegalComponentStateException (a runtime
* exception) if the content pane parameter is null
* @see RootPaneContainer#getContentPane
*/
@@ -657,7 +657,7 @@ public class JInternalFrame extends JComponent implements
*
* @param layered the JLayeredPane for this internal frame
*
- * @exception java.awt.IllegalComponentStateException (a runtime
+ * @throws java.awt.IllegalComponentStateException (a runtime
* exception) if the layered pane parameter is null
* @see RootPaneContainer#setLayeredPane
*/
@@ -794,7 +794,7 @@ public class JInternalFrame extends JComponent implements
*
* @param b must be true
*
- * @exception PropertyVetoException when the attempt to set the
+ * @throws PropertyVetoException when the attempt to set the
* property is vetoed by the JInternalFrame
*
* @see #isClosed()
@@ -906,7 +906,7 @@ public class JInternalFrame extends JComponent implements
*
* @param b a boolean, where true means to iconify this internal frame and
* false means to de-iconify it
- * @exception PropertyVetoException when the attempt to set the
+ * @throws PropertyVetoException when the attempt to set the
* property is vetoed by the JInternalFrame
*
* @see InternalFrameEvent#INTERNAL_FRAME_ICONIFIED
@@ -985,7 +985,7 @@ public class JInternalFrame extends JComponent implements
*
* @param b a boolean, where true maximizes this internal frame and false
* restores it
- * @exception PropertyVetoException when the attempt to set the
+ * @throws PropertyVetoException when the attempt to set the
* property is vetoed by the JInternalFrame
*/
@BeanProperty(description
@@ -1047,7 +1047,7 @@ public class JInternalFrame extends JComponent implements
* @param selected a boolean, where true means this internal frame
* should become selected (currently active)
* and false means it should become deselected
- * @exception PropertyVetoException when the attempt to set the
+ * @throws PropertyVetoException when the attempt to set the
* property is vetoed by the JInternalFrame
*
* @see #isShowing
diff --git a/src/java.desktop/share/classes/javax/swing/JLabel.java b/src/java.desktop/share/classes/javax/swing/JLabel.java
index 8dff4a8fd25b3ba8eacd741730138d189071d537..eed6a157cc1c05333e505f804986ba72650c09d7 100644
--- a/src/java.desktop/share/classes/javax/swing/JLabel.java
+++ b/src/java.desktop/share/classes/javax/swing/JLabel.java
@@ -551,7 +551,7 @@ public class JLabel extends JComponent implements SwingConstants, Accessible
*
* @since 1.4
* @param index Index into the String to underline
- * @exception IllegalArgumentException will be thrown if index
+ * @throws IllegalArgumentException will be thrown if index
* is >= length of the text, or < -1
*/
@BeanProperty(visualUpdate = true, description
@@ -595,7 +595,7 @@ public class JLabel extends JComponent implements SwingConstants, Accessible
* @param message the IllegalArgumentException detail message
* @return the key value if {@code key} is a a legal value for the
* horizontalAlignment properties
- * @exception IllegalArgumentException if key isn't LEFT, CENTER, RIGHT,
+ * @throws IllegalArgumentException if key isn't LEFT, CENTER, RIGHT,
* LEADING or TRAILING.
* @see #setHorizontalTextPosition
* @see #setHorizontalAlignment
@@ -622,7 +622,7 @@ public class JLabel extends JComponent implements SwingConstants, Accessible
* @param message the IllegalArgumentException detail message
* @return the key value if {@code key} is a legal value for the
* verticalAlignment or verticalTextPosition properties
- * @exception IllegalArgumentException if key isn't TOP, CENTER, or BOTTOM.
+ * @throws IllegalArgumentException if key isn't TOP, CENTER, or BOTTOM.
* @see #setVerticalAlignment
* @see #setVerticalTextPosition
*/
@@ -1637,7 +1637,7 @@ public class JLabel extends JComponent implements SwingConstants, Accessible
*
* @param i zero-based index of the key bindings
* @return a javax.lang.Object which specifies the key binding
- * @exception IllegalArgumentException if the index is
+ * @throws IllegalArgumentException if the index is
* out of bounds
* @see #getAccessibleKeyBindingCount
*/
diff --git a/src/java.desktop/share/classes/javax/swing/JLayer.java b/src/java.desktop/share/classes/javax/swing/JLayer.java
index 0ade190ce42fb0c8a5896020af33b1229050faf9..c2076299e442620d55fd514fa003e8d66739cd38 100644
--- a/src/java.desktop/share/classes/javax/swing/JLayer.java
+++ b/src/java.desktop/share/classes/javax/swing/JLayer.java
@@ -316,7 +316,7 @@ public final class JLayerb is true and
* GraphicsEnvironment.isHeadless()
* returns true
@@ -1493,7 +1493,7 @@ public class JListListModel that provides the
* list of items for display
- * @exception IllegalArgumentException if model is
+ * @throws IllegalArgumentException if model is
* null
* @see #getModel
* @see #clearSelection
@@ -1910,7 +1910,7 @@ public class JListListSelectionModel that
* implements the selections
- * @exception IllegalArgumentException if selectionModel
+ * @throws IllegalArgumentException if selectionModel
* is null
* @see #getSelectionModel
*/
diff --git a/src/java.desktop/share/classes/javax/swing/JMenu.java b/src/java.desktop/share/classes/javax/swing/JMenu.java
index dbac4812ca821e3470adee0ae7b829e45f69fe72..1565440969aa89cf9c1be9aa97453d9a21987f79 100644
--- a/src/java.desktop/share/classes/javax/swing/JMenu.java
+++ b/src/java.desktop/share/classes/javax/swing/JMenu.java
@@ -508,7 +508,7 @@ public class JMenu extends JMenuItem implements Accessible,MenuElement
* to manage the idiosyncrasies of the various UI implementations.
*
* @param d the number of milliseconds to delay
- * @exception IllegalArgumentException if d
+ * @throws IllegalArgumentException if d
* is less than 0
*/
@BeanProperty(bound = false, expert = true, description
@@ -674,7 +674,7 @@ public class JMenu extends JMenuItem implements Accessible,MenuElement
* @param s the text for the menu item to add
* @param pos an integer specifying the position at which to add the
* new menu item
- * @exception IllegalArgumentException when the value of
+ * @throws IllegalArgumentException when the value of
* pos < 0
*/
public void insert(String s, int pos) {
@@ -693,7 +693,7 @@ public class JMenu extends JMenuItem implements Accessible,MenuElement
* @param pos an integer specifying the position at which to add the
* new JMenuitem
* @return the new menu item
- * @exception IllegalArgumentException if the value of
+ * @throws IllegalArgumentException if the value of
* pos < 0
*/
public JMenuItem insert(JMenuItem mi, int pos) {
@@ -713,7 +713,7 @@ public class JMenu extends JMenuItem implements Accessible,MenuElement
* @param pos an integer specifying the position at which to add the
* new menu item
* @return the new menu item
- * @exception IllegalArgumentException if the value of
+ * @throws IllegalArgumentException if the value of
* pos < 0
*/
public JMenuItem insert(Action a, int pos) {
@@ -734,7 +734,7 @@ public class JMenu extends JMenuItem implements Accessible,MenuElement
*
* @param index an integer specifying the position at which to
* insert the menu separator
- * @exception IllegalArgumentException if the value of
+ * @throws IllegalArgumentException if the value of
* index < 0
*/
public void insertSeparator(int index) {
@@ -755,7 +755,7 @@ public class JMenu extends JMenuItem implements Accessible,MenuElement
* @param pos an integer specifying the position
* @return the menu item at the specified position; or null
* if the item as the specified position is not a menu item
- * @exception IllegalArgumentException if the value of
+ * @throws IllegalArgumentException if the value of
* {@code pos} < 0
*/
public JMenuItem getItem(int pos) {
@@ -790,7 +790,7 @@ public class JMenu extends JMenuItem implements Accessible,MenuElement
* yet implemented.
*
* @return true if the menu can be torn off, else false
- * @exception Error if invoked -- this method is not yet implemented
+ * @throws Error if invoked -- this method is not yet implemented
*/
@BeanProperty(bound = false)
public boolean isTearOff() {
@@ -812,7 +812,7 @@ public class JMenu extends JMenuItem implements Accessible,MenuElement
* Removes the menu item at the specified index from this menu.
*
* @param pos the position of the item to be removed
- * @exception IllegalArgumentException if the value of
+ * @throws IllegalArgumentException if the value of
* pos < 0, or if pos
* is greater than the number of menu items
*/
@@ -1024,7 +1024,7 @@ public class JMenu extends JMenuItem implements Accessible,MenuElement
* notification on this event type. The event instance
* is created lazily.
*
- * @exception Error if there is a null listener
+ * @throws Error if there is a null listener
* @see EventListenerList
*/
protected void fireMenuSelected() {
@@ -1054,7 +1054,7 @@ public class JMenu extends JMenuItem implements Accessible,MenuElement
* notification on this event type. The event instance
* is created lazily.
*
- * @exception Error if there is a null listener
+ * @throws Error if there is a null listener
* @see EventListenerList
*/
protected void fireMenuDeselected() {
@@ -1084,7 +1084,7 @@ public class JMenu extends JMenuItem implements Accessible,MenuElement
* notification on this event type. The event instance
* is created lazily.
*
- * @exception Error if there is a null listener
+ * @throws Error if there is a null listener
* @see EventListenerList
*/
protected void fireMenuCanceled() {
@@ -1238,7 +1238,7 @@ public class JMenu extends JMenuItem implements Accessible,MenuElement
*
* @param o the new component orientation of this menu and
* the components contained within it.
- * @exception NullPointerException if orientation is null.
+ * @throws NullPointerException if orientation is null.
* @see java.awt.Component#setComponentOrientation
* @see java.awt.Component#getComponentOrientation
* @since 1.4
@@ -1275,7 +1275,7 @@ public class JMenu extends JMenuItem implements Accessible,MenuElement
* @param keyStroke the keystroke combination which will invoke
* the JMenuItem's actionlisteners
* without navigating the menu hierarchy
- * @exception Error if invoked -- this method is not defined for JMenu.
+ * @throws Error if invoked -- this method is not defined for JMenu.
* Use setMnemonic instead
*/
public void setAccelerator(KeyStroke keyStroke) {
diff --git a/src/java.desktop/share/classes/javax/swing/JOptionPane.java b/src/java.desktop/share/classes/javax/swing/JOptionPane.java
index 99eee90347ba2e2b8ad21258e1e2dfb5bc3d13bd..28a547dc2cb9d2abaa39bcc13f3afb2488be65b7 100644
--- a/src/java.desktop/share/classes/javax/swing/JOptionPane.java
+++ b/src/java.desktop/share/classes/javax/swing/JOptionPane.java
@@ -435,7 +435,7 @@ public class JOptionPane extends JComponent implements Accessible
* the screen.
*
* @param message the Object to display
- * @exception HeadlessException if
+ * @throws HeadlessException if
* GraphicsEnvironment.isHeadless returns
* true
* @return user's input
@@ -471,7 +471,7 @@ public class JOptionPane extends JComponent implements Accessible
* @param parentComponent the parent Component for the
* dialog
* @param message the Object to display
- * @exception HeadlessException if
+ * @throws HeadlessException if
* GraphicsEnvironment.isHeadless returns
* true
* @return user's input
@@ -523,7 +523,7 @@ public class JOptionPane extends JComponent implements Accessible
* QUESTION_MESSAGE,
* or PLAIN_MESSAGE
* @return user's input
- * @exception HeadlessException if
+ * @throws HeadlessException if
* GraphicsEnvironment.isHeadless returns
* true
* @see java.awt.GraphicsEnvironment#isHeadless
@@ -566,7 +566,7 @@ public class JOptionPane extends JComponent implements Accessible
* field
* @return user's input, or null meaning the user
* canceled the input
- * @exception HeadlessException if
+ * @throws HeadlessException if
* GraphicsEnvironment.isHeadless returns
* true
* @see java.awt.GraphicsEnvironment#isHeadless
@@ -609,7 +609,7 @@ public class JOptionPane extends JComponent implements Accessible
* or if the parentComponent has no
* Frame, a default Frame is used
* @param message the Object to display
- * @exception HeadlessException if
+ * @throws HeadlessException if
* GraphicsEnvironment.isHeadless returns
* true
* @see java.awt.GraphicsEnvironment#isHeadless
@@ -637,7 +637,7 @@ public class JOptionPane extends JComponent implements Accessible
* WARNING_MESSAGE,
* QUESTION_MESSAGE,
* or PLAIN_MESSAGE
- * @exception HeadlessException if
+ * @throws HeadlessException if
* GraphicsEnvironment.isHeadless returns
* true
* @see java.awt.GraphicsEnvironment#isHeadless
@@ -666,7 +666,7 @@ public class JOptionPane extends JComponent implements Accessible
* or PLAIN_MESSAGE
* @param icon an icon to display in the dialog that helps the user
* identify the kind of message that is being displayed
- * @exception HeadlessException if
+ * @throws HeadlessException if
* GraphicsEnvironment.isHeadless returns
* true
* @see java.awt.GraphicsEnvironment#isHeadless
@@ -690,7 +690,7 @@ public class JOptionPane extends JComponent implements Accessible
* default Frame is used
* @param message the Object to display
* @return an integer indicating the option selected by the user
- * @exception HeadlessException if
+ * @throws HeadlessException if
* GraphicsEnvironment.isHeadless returns
* true
* @see java.awt.GraphicsEnvironment#isHeadless
@@ -718,7 +718,7 @@ public class JOptionPane extends JComponent implements Accessible
* YES_NO_CANCEL_OPTION,
* or OK_CANCEL_OPTION
* @return an int indicating the option selected by the user
- * @exception HeadlessException if
+ * @throws HeadlessException if
* GraphicsEnvironment.isHeadless returns
* true
* @see java.awt.GraphicsEnvironment#isHeadless
@@ -757,7 +757,7 @@ public class JOptionPane extends JComponent implements Accessible
* QUESTION_MESSAGE,
* or PLAIN_MESSAGE
* @return an integer indicating the option selected by the user
- * @exception HeadlessException if
+ * @throws HeadlessException if
* GraphicsEnvironment.isHeadless returns
* true
* @see java.awt.GraphicsEnvironment#isHeadless
@@ -795,7 +795,7 @@ public class JOptionPane extends JComponent implements Accessible
* or PLAIN_MESSAGE
* @param icon the icon to display in the dialog
* @return an int indicating the option selected by the user
- * @exception HeadlessException if
+ * @throws HeadlessException if
* GraphicsEnvironment.isHeadless returns
* true
* @see java.awt.GraphicsEnvironment#isHeadless
@@ -856,7 +856,7 @@ public class JOptionPane extends JComponent implements Accessible
* @return an integer indicating the option chosen by the user,
* or CLOSED_OPTION if the user closed
* the dialog
- * @exception HeadlessException if
+ * @throws HeadlessException if
* GraphicsEnvironment.isHeadless returns
* true
* @see java.awt.GraphicsEnvironment#isHeadless
@@ -919,7 +919,7 @@ public class JOptionPane extends JComponent implements Accessible
* no Frame, a default Frame is used
* @param title the title string for the dialog
* @return a new JDialog containing this instance
- * @exception HeadlessException if
+ * @throws HeadlessException if
* GraphicsEnvironment.isHeadless returns
* true
* @see java.awt.GraphicsEnvironment#isHeadless
@@ -946,7 +946,7 @@ public class JOptionPane extends JComponent implements Accessible
*
* @param title the title string for the dialog
* @return a new JDialog containing this instance
- * @exception HeadlessException if
+ * @throws HeadlessException if
* GraphicsEnvironment.isHeadless returns
* true
* @see java.awt.GraphicsEnvironment#isHeadless
@@ -1508,7 +1508,7 @@ public class JOptionPane extends JComponent implements Accessible
* frame's title bar
* @return a JInternalFrame containing a
* JOptionPane
- * @exception RuntimeException if parentComponent does
+ * @throws RuntimeException if parentComponent does
* not have a valid parent
*/
public JInternalFrame createInternalFrame(Component parentComponent,
@@ -1600,7 +1600,7 @@ public class JOptionPane extends JComponent implements Accessible
* or getRootFrame
* if the component is null,
* or does not have a valid Frame parent
- * @exception HeadlessException if
+ * @throws HeadlessException if
* GraphicsEnvironment.isHeadless returns
* true
* @see #getRootFrame
@@ -1626,7 +1626,7 @@ public class JOptionPane extends JComponent implements Accessible
* frame if the component is null,
* or does not have a valid
* Frame or Dialog parent
- * @exception HeadlessException if
+ * @throws HeadlessException if
* GraphicsEnvironment.isHeadless returns
* true
* @see java.awt.GraphicsEnvironment#isHeadless
@@ -1683,7 +1683,7 @@ public class JOptionPane extends JComponent implements Accessible
* which a frame is not provided.
*
* @return the default Frame to use
- * @exception HeadlessException if
+ * @throws HeadlessException if
* GraphicsEnvironment.isHeadless returns
* true
* @see #setRootFrame
@@ -2050,7 +2050,7 @@ public class JOptionPane extends JComponent implements Accessible
* ERROR_MESSAGE, INFORMATION_MESSAGE,
* WARNING_MESSAGE,
* QUESTION_MESSAGE, or PLAIN_MESSAGE
- * @exception RuntimeException if newType is not one of the
+ * @throws RuntimeException if newType is not one of the
* legal values listed above
* @see #getMessageType
@@ -2096,7 +2096,7 @@ public class JOptionPane extends JComponent implements Accessible
* YES_NO_OPTION,
* YES_NO_CANCEL_OPTION,
* or OK_CANCEL_OPTION
- * @exception RuntimeException if newType is not one of
+ * @throws RuntimeException if newType is not one of
* the legal values listed above
*
* @see #getOptionType
diff --git a/src/java.desktop/share/classes/javax/swing/JPasswordField.java b/src/java.desktop/share/classes/javax/swing/JPasswordField.java
index 577998cb3367c9abf49eeb9938a77bd0cb435e20..c6450d0605afc08edbd0c942c2f22a0199a00cec 100644
--- a/src/java.desktop/share/classes/javax/swing/JPasswordField.java
+++ b/src/java.desktop/share/classes/javax/swing/JPasswordField.java
@@ -288,7 +288,7 @@ public class JPasswordField extends JTextField {
* @param offs the offset >= 0
* @param len the length >= 0
* @return the text
- * @exception BadLocationException if the offset or length are invalid
+ * @throws BadLocationException if the offset or length are invalid
*/
@Deprecated
public String getText(int offs, int len) throws BadLocationException {
diff --git a/src/java.desktop/share/classes/javax/swing/JPopupMenu.java b/src/java.desktop/share/classes/javax/swing/JPopupMenu.java
index ef9ad42ef81d1f1978b1b6c7dbf49fd430009e07..a6811fad5eb7a23b46c5b58da726a56b1a96f016 100644
--- a/src/java.desktop/share/classes/javax/swing/JPopupMenu.java
+++ b/src/java.desktop/share/classes/javax/swing/JPopupMenu.java
@@ -475,7 +475,7 @@ public class JPopupMenu extends JComponent implements Accessible,MenuElement {
* Removes the component at the specified index from this popup menu.
*
* @param pos the position of the item to be removed
- * @exception IllegalArgumentException if the value of
+ * @throws IllegalArgumentException if the value of
* pos < 0, or if the value of
* pos is greater than the
* number of items
@@ -573,7 +573,7 @@ public class JPopupMenu extends JComponent implements Accessible,MenuElement {
* @param a the Action object to insert
* @param index specifies the position at which to insert the
* Action, where 0 is the first
- * @exception IllegalArgumentException if index < 0
+ * @throws IllegalArgumentException if index < 0
* @see Action
*/
public void insert(Action a, int index) {
@@ -589,7 +589,7 @@ public class JPopupMenu extends JComponent implements Accessible,MenuElement {
* @param component the Component to insert
* @param index specifies the position at which
* to insert the component, where 0 is the first
- * @exception IllegalArgumentException if index < 0
+ * @throws IllegalArgumentException if index < 0
*/
public void insert(Component component, int index) {
if (index < 0) {
diff --git a/src/java.desktop/share/classes/javax/swing/JProgressBar.java b/src/java.desktop/share/classes/javax/swing/JProgressBar.java
index 90945bb67e3add75f083db2f727cf939589fd695..edba6e4a5da2ae84725a527865f28a3c073e7e24 100644
--- a/src/java.desktop/share/classes/javax/swing/JProgressBar.java
+++ b/src/java.desktop/share/classes/javax/swing/JProgressBar.java
@@ -394,7 +394,7 @@ public class JProgressBar extends JComponent implements SwingConstants, Accessib
* is {@code SwingConstants.HORIZONTAL}.
*
* @param newOrientation HORIZONTAL or VERTICAL
- * @exception IllegalArgumentException if newOrientation
+ * @throws IllegalArgumentException if newOrientation
* is an illegal value
* @see #getOrientation
*/
diff --git a/src/java.desktop/share/classes/javax/swing/JRootPane.java b/src/java.desktop/share/classes/javax/swing/JRootPane.java
index dcc6d6bb4efae6915c99cebb001881617a3fb9f8..48e06a917fc59ce01b710f1f182c9c4aef7b3a00 100644
--- a/src/java.desktop/share/classes/javax/swing/JRootPane.java
+++ b/src/java.desktop/share/classes/javax/swing/JRootPane.java
@@ -578,7 +578,7 @@ public class JRootPane extends JComponent implements Accessible {
* replace it with an opaque JComponent.
*
* @param content the Container to use for component-contents
- * @exception java.awt.IllegalComponentStateException (a runtime
+ * @throws java.awt.IllegalComponentStateException (a runtime
* exception) if the content pane parameter is null
*/
public void setContentPane(Container content) {
@@ -605,7 +605,7 @@ public class JRootPane extends JComponent implements Accessible {
* typically holds a content pane and an optional JMenuBar.
*
* @param layered the JLayeredPane to use
- * @exception java.awt.IllegalComponentStateException (a runtime
+ * @throws java.awt.IllegalComponentStateException (a runtime
* exception) if the layered pane parameter is null
*/
public void setLayeredPane(JLayeredPane layered) {
@@ -647,7 +647,7 @@ public class JRootPane extends JComponent implements Accessible {
*
* @param glass the Component to use as the glass pane
* for this JRootPane
- * @exception NullPointerException if the glass parameter is
+ * @throws NullPointerException if the glass parameter is
* null
*/
public void setGlassPane(Component glass) {
diff --git a/src/java.desktop/share/classes/javax/swing/JScrollBar.java b/src/java.desktop/share/classes/javax/swing/JScrollBar.java
index 6bb997a6150321932bd17b41c9a2e6b1f6bcb4ac..ba65f21a95430851e6b7983f8cd87c4495fa4338 100644
--- a/src/java.desktop/share/classes/javax/swing/JScrollBar.java
+++ b/src/java.desktop/share/classes/javax/swing/JScrollBar.java
@@ -155,7 +155,7 @@ public class JScrollBar extends JComponent implements Adjustable, Accessible
* That way, when the user jumps the knob to an adjacent position,
* one or two lines of the original contents remain in view.
*
- * @exception IllegalArgumentException if orientation is not one of VERTICAL, HORIZONTAL
+ * @throws IllegalArgumentException if orientation is not one of VERTICAL, HORIZONTAL
*
* @see #setOrientation
* @see #setValue
@@ -279,7 +279,7 @@ public class JScrollBar extends JComponent implements Adjustable, Accessible
* HORIZONTAL.
*
* @param orientation an orientation of the {@code JScrollBar}
- * @exception IllegalArgumentException if orientation is not one of VERTICAL, HORIZONTAL
+ * @throws IllegalArgumentException if orientation is not one of VERTICAL, HORIZONTAL
* @see #getOrientation
*/
@BeanProperty(preferred = true, visualUpdate = true, enumerationValues = {
diff --git a/src/java.desktop/share/classes/javax/swing/JScrollPane.java b/src/java.desktop/share/classes/javax/swing/JScrollPane.java
index 2c3302178df99dd6d677d949ae8972e6d827839c..3d5385a34d1e411ba3c46ae83dbaffbdf90afd84 100644
--- a/src/java.desktop/share/classes/javax/swing/JScrollPane.java
+++ b/src/java.desktop/share/classes/javax/swing/JScrollPane.java
@@ -418,7 +418,7 @@ public class JScrollPane extends JComponent implements ScrollPaneConstants, Acce
* will invoke syncWithScrollPane on it.
*
* @param layout the specified layout manager
- * @exception ClassCastException if layout is not a
+ * @throws ClassCastException if layout is not a
* ScrollPaneLayout
* @see java.awt.Container#getLayout
* @see java.awt.Container#setLayout
@@ -476,7 +476,7 @@ public class JScrollPane extends JComponent implements ScrollPaneConstants, Acce
*
*
* @param policy one of the three values listed above
- * @exception IllegalArgumentException if policy
+ * @throws IllegalArgumentException if policy
* is not one of the legal values shown above
* @see #getVerticalScrollBarPolicy
*/
@@ -521,7 +521,7 @@ public class JScrollPane extends JComponent implements ScrollPaneConstants, Acce
*
*
* @param policy one of the three values listed above
- * @exception IllegalArgumentException if policy
+ * @throws IllegalArgumentException if policy
* is not one of the legal values shown above
* @see #getHorizontalScrollBarPolicy
*/
@@ -1195,7 +1195,7 @@ public class JScrollPane extends JComponent implements ScrollPaneConstants, Acce
* SwingConstants.HORIZONTAL or
* SwingConstants.VERTICAL
- * @exception IllegalArgumentException if orientation
+ * @throws IllegalArgumentException if orientation
* is neither SwingConstants.HORIZONTAL nor
* SwingConstants.VERTICAL
*/
@@ -190,7 +190,7 @@ public class JSeparator extends JComponent implements SwingConstants, Accessible
* The default value of this property is HORIZONTAL.
* @param orientation either SwingConstants.HORIZONTAL
* or SwingConstants.VERTICAL
- * @exception IllegalArgumentException if orientation
+ * @throws IllegalArgumentException if orientation
* is neither SwingConstants.HORIZONTAL
* nor SwingConstants.VERTICAL
*
diff --git a/src/java.desktop/share/classes/javax/swing/JSlider.java b/src/java.desktop/share/classes/javax/swing/JSlider.java
index 0d826fe7e49e1f910d4a6c1a623a62c06b1df8c9..4682acb8a54dfd4b7e2a63ea81219c0aafa8eec8 100644
--- a/src/java.desktop/share/classes/javax/swing/JSlider.java
+++ b/src/java.desktop/share/classes/javax/swing/JSlider.java
@@ -920,7 +920,7 @@ public class JSlider extends JComponent implements SwingConstants, Accessible {
* @return a new {@code Hashtable} of labels
* @see #setLabelTable
* @see #setPaintLabels
- * @exception IllegalArgumentException if {@code start} is
+ * @throws IllegalArgumentException if {@code start} is
* out of range, or if {@code increment} is less than or equal
* to zero
*/
diff --git a/src/java.desktop/share/classes/javax/swing/JSpinner.java b/src/java.desktop/share/classes/javax/swing/JSpinner.java
index a371c557439019959b7a5113bd7755619d0a0049..245212131f2ec2ee960fa0ca3b607400f0b7815a 100644
--- a/src/java.desktop/share/classes/javax/swing/JSpinner.java
+++ b/src/java.desktop/share/classes/javax/swing/JSpinner.java
@@ -1015,7 +1015,7 @@ public class JSpinner extends JComponent implements Accessible
* on the new JFormattedTextField.
*
* @param spinner the spinner whose model this editor will monitor
- * @exception IllegalArgumentException if the spinners model is not
+ * @throws IllegalArgumentException if the spinners model is not
* an instance of SpinnerDateModel
*
* @see #getModel
@@ -1039,7 +1039,7 @@ public class JSpinner extends JComponent implements Accessible
* @param dateFormatPattern the initial pattern for the
* SimpleDateFormat object that's used to display
* and parse the value of the text field.
- * @exception IllegalArgumentException if the spinners model is not
+ * @throws IllegalArgumentException if the spinners model is not
* an instance of SpinnerDateModel
*
* @see #getModel
@@ -1064,7 +1064,7 @@ public class JSpinner extends JComponent implements Accessible
* will monitor
* @param format DateFormat object that's used to display
* and parse the value of the text field.
- * @exception IllegalArgumentException if the spinners model is not
+ * @throws IllegalArgumentException if the spinners model is not
* an instance of SpinnerDateModel
*
* @see #getModel
@@ -1202,7 +1202,7 @@ public class JSpinner extends JComponent implements Accessible
* on the new JFormattedTextField.
*
* @param spinner the spinner whose model this editor will monitor
- * @exception IllegalArgumentException if the spinners model is not
+ * @throws IllegalArgumentException if the spinners model is not
* an instance of SpinnerNumberModel
*
* @see #getModel
@@ -1225,7 +1225,7 @@ public class JSpinner extends JComponent implements Accessible
* @param decimalFormatPattern the initial pattern for the
* DecimalFormat object that's used to display
* and parse the value of the text field.
- * @exception IllegalArgumentException if the spinners model is not
+ * @throws IllegalArgumentException if the spinners model is not
* an instance of SpinnerNumberModel or if
* decimalFormatPattern is not a legal
* argument to DecimalFormat
@@ -1251,7 +1251,7 @@ public class JSpinner extends JComponent implements Accessible
* @param format the initial pattern for the
* DecimalFormat object that's used to display
* and parse the value of the text field.
- * @exception IllegalArgumentException if the spinners model is not
+ * @throws IllegalArgumentException if the spinners model is not
* an instance of SpinnerNumberModel
*
* @see #getTextField
@@ -1346,7 +1346,7 @@ public class JSpinner extends JComponent implements Accessible
* on the new JFormattedTextField.
*
* @param spinner the spinner whose model this editor will monitor
- * @exception IllegalArgumentException if the spinners model is not
+ * @throws IllegalArgumentException if the spinners model is not
* an instance of SpinnerListModel
*
* @see #getModel
diff --git a/src/java.desktop/share/classes/javax/swing/JSplitPane.java b/src/java.desktop/share/classes/javax/swing/JSplitPane.java
index bd5e85ed4a6436d87c7e6c3fbd5df641746c4118..5a3cfef943e9ecd8908bbf86abe60a0c8ae1309a 100644
--- a/src/java.desktop/share/classes/javax/swing/JSplitPane.java
+++ b/src/java.desktop/share/classes/javax/swing/JSplitPane.java
@@ -262,7 +262,7 @@ public class JSplitPane extends JComponent implements Accessible
*
* @param newOrientation JSplitPane.HORIZONTAL_SPLIT or
* JSplitPane.VERTICAL_SPLIT
- * @exception IllegalArgumentException if orientation
+ * @throws IllegalArgumentException if orientation
* is not one of HORIZONTAL_SPLIT or VERTICAL_SPLIT.
*/
@ConstructorProperties({"orientation"})
@@ -281,7 +281,7 @@ public class JSplitPane extends JComponent implements Accessible
* @param newContinuousLayout a boolean, true for the components to
* redraw continuously as the divider changes position, false
* to wait until the divider position stops changing to redraw
- * @exception IllegalArgumentException if orientation
+ * @throws IllegalArgumentException if orientation
* is not one of HORIZONTAL_SPLIT or VERTICAL_SPLIT
*/
public JSplitPane(int newOrientation,
@@ -304,7 +304,7 @@ public class JSplitPane extends JComponent implements Accessible
* appear on the right
* of a horizontally-split pane, or at the bottom of a
* vertically-split pane
- * @exception IllegalArgumentException if orientation
+ * @throws IllegalArgumentException if orientation
* is not one of: HORIZONTAL_SPLIT or VERTICAL_SPLIT
*/
public JSplitPane(int newOrientation,
@@ -334,7 +334,7 @@ public class JSplitPane extends JComponent implements Accessible
* appear on the right
* of a horizontally-split pane, or at the bottom of a
* vertically-split pane
- * @exception IllegalArgumentException if orientation
+ * @throws IllegalArgumentException if orientation
* is not one of HORIZONTAL_SPLIT or VERTICAL_SPLIT
*/
public JSplitPane(int newOrientation,
@@ -622,7 +622,7 @@ public class JSplitPane extends JComponent implements Accessible
*
*
* @param orientation an integer specifying the orientation
- * @exception IllegalArgumentException if orientation is not one of:
+ * @throws IllegalArgumentException if orientation is not one of:
* HORIZONTAL_SPLIT or VERTICAL_SPLIT.
*/
@BeanProperty(enumerationValues = {
@@ -701,7 +701,7 @@ public class JSplitPane extends JComponent implements Accessible
* extra space.
*
* @param value as described above
- * @exception IllegalArgumentException if value is < 0 or > 1
+ * @throws IllegalArgumentException if value is < 0 or > 1
* @since 1.3
*/
@BeanProperty(description
@@ -754,7 +754,7 @@ public class JSplitPane extends JComponent implements Accessible
* @param proportionalLocation a double-precision floating point value
* that specifies a percentage, from zero (top/left) to 1.0
* (bottom/right)
- * @exception IllegalArgumentException if the specified location is < 0
+ * @throws IllegalArgumentException if the specified location is < 0
* or > 1.0
*/
@BeanProperty(description
@@ -964,7 +964,7 @@ public class JSplitPane extends JComponent implements Accessible
* (position) for this component
* @param index an integer specifying the index in the container's
* list.
- * @exception IllegalArgumentException if the constraints
+ * @throws IllegalArgumentException if the constraints
* object does not match an existing component
* @see java.awt.Container#addImpl(Component, Object, int)
*/
diff --git a/src/java.desktop/share/classes/javax/swing/JTabbedPane.java b/src/java.desktop/share/classes/javax/swing/JTabbedPane.java
index 4acf4f8a930d4d8e4615a2d3bc88a663ecd9b1fa..2bdd93a7e8db08dc51082f939a85a56b7df23fde 100644
--- a/src/java.desktop/share/classes/javax/swing/JTabbedPane.java
+++ b/src/java.desktop/share/classes/javax/swing/JTabbedPane.java
@@ -215,7 +215,7 @@ public class JTabbedPane extends JComponent
*
* @param tabPlacement the placement for the tabs relative to the content
* @param tabLayoutPolicy the policy for laying out tabs when all tabs will not fit on one run
- * @exception IllegalArgumentException if tab placement or tab layout policy are not
+ * @throws IllegalArgumentException if tab placement or tab layout policy are not
* one of the above supported values
* @see #addTab
* @since 1.4
@@ -505,7 +505,7 @@ public class JTabbedPane extends JComponent
* The default value, if not set, is SwingConstants.TOP.
*
* @param tabPlacement the placement for the tabs relative to the content
- * @exception IllegalArgumentException if tab placement value isn't one
+ * @throws IllegalArgumentException if tab placement value isn't one
* of the above valid values
*/
@BeanProperty(preferred = true, visualUpdate = true, enumerationValues = {
@@ -561,7 +561,7 @@ public class JTabbedPane extends JComponent
* ignored.
*
* @param tabLayoutPolicy the policy used to layout the tabs
- * @exception IllegalArgumentException if layoutPolicy value isn't one
+ * @throws IllegalArgumentException if layoutPolicy value isn't one
* of the above valid values
* @see #getTabLayoutPolicy
* @since 1.4
@@ -609,7 +609,7 @@ public class JTabbedPane extends JComponent
* the results will be implementation defined.
*
* @param index the index to be selected
- * @exception IndexOutOfBoundsException if index is out of range
+ * @throws IndexOutOfBoundsException if index is out of range
* {@code (index < -1 || index >= tab count)}
*
* @see #getSelectedIndex
@@ -696,7 +696,7 @@ public class JTabbedPane extends JComponent
* corresponding to the specified component.
*
* @param c the selected {@code Component} for this {@code TabbedPane}
- * @exception IllegalArgumentException if component not found in tabbed
+ * @throws IllegalArgumentException if component not found in tabbed
* pane
* @see #getSelectedComponent
*/
@@ -963,7 +963,7 @@ public class JTabbedPane extends JComponent
* its visibility is reset to true to ensure it will be visible
* if added to other containers.
* @param index the index of the tab to be removed
- * @exception IndexOutOfBoundsException if index is out of range
+ * @throws IndexOutOfBoundsException if index is out of range
* {@code (index < 0 || index >= tab count)}
*
* @see #addTab
@@ -1084,7 +1084,7 @@ public class JTabbedPane extends JComponent
*
* @param index the index of the component to remove from the
* tabbedpane
- * @exception IndexOutOfBoundsException if index is out of range
+ * @throws IndexOutOfBoundsException if index is out of range
* {@code (index < 0 || index >= tab count)}
* @see #addTab
* @see #removeTabAt
@@ -1148,7 +1148,7 @@ public class JTabbedPane extends JComponent
*
* @param index the index of the item being queried
* @return the title at index
- * @exception IndexOutOfBoundsException if index is out of range
+ * @throws IndexOutOfBoundsException if index is out of range
* {@code (index < 0 || index >= tab count)}
* @see #setTitleAt
*/
@@ -1161,7 +1161,7 @@ public class JTabbedPane extends JComponent
*
* @param index the index of the item being queried
* @return the icon at index
- * @exception IndexOutOfBoundsException if index is out of range
+ * @throws IndexOutOfBoundsException if index is out of range
* {@code (index < 0 || index >= tab count)}
*
* @see #setIconAt
@@ -1180,7 +1180,7 @@ public class JTabbedPane extends JComponent
*
* @param index the index of the item being queried
* @return the icon at index
- * @exception IndexOutOfBoundsException if index is out of range
+ * @throws IndexOutOfBoundsException if index is out of range
* {@code (index < 0 || index >= tab count)}
*
* @see #setDisabledIconAt
@@ -1198,7 +1198,7 @@ public class JTabbedPane extends JComponent
*
* @param index the index of the item being queried
* @return a string containing the tool tip text at index
- * @exception IndexOutOfBoundsException if index is out of range
+ * @throws IndexOutOfBoundsException if index is out of range
* {@code (index < 0 || index >= tab count)}
*
* @see #setToolTipTextAt
@@ -1214,7 +1214,7 @@ public class JTabbedPane extends JComponent
* @param index the index of the item being queried
* @return the Color of the tab background at
* index
- * @exception IndexOutOfBoundsException if index is out of range
+ * @throws IndexOutOfBoundsException if index is out of range
* {@code (index < 0 || index >= tab count)}
*
* @see #setBackgroundAt
@@ -1229,7 +1229,7 @@ public class JTabbedPane extends JComponent
* @param index the index of the item being queried
* @return the Color of the tab foreground at
* index
- * @exception IndexOutOfBoundsException if index is out of range
+ * @throws IndexOutOfBoundsException if index is out of range
* {@code (index < 0 || index >= tab count)}
*
* @see #setForegroundAt
@@ -1245,7 +1245,7 @@ public class JTabbedPane extends JComponent
* @param index the index of the item being queried
* @return true if the tab at index is enabled;
* false otherwise
- * @exception IndexOutOfBoundsException if index is out of range
+ * @throws IndexOutOfBoundsException if index is out of range
* {@code (index < 0 || index >= tab count)}
*
* @see #setEnabledAt
@@ -1259,7 +1259,7 @@ public class JTabbedPane extends JComponent
*
* @param index the index of the item being queried
* @return the Component at index
- * @exception IndexOutOfBoundsException if index is out of range
+ * @throws IndexOutOfBoundsException if index is out of range
* {@code (index < 0 || index >= tab count)}
*
* @see #setComponentAt
@@ -1278,7 +1278,7 @@ public class JTabbedPane extends JComponent
* @param tabIndex the index of the tab that the mnemonic refers to
* @return the key code which represents the mnemonic;
* -1 if a mnemonic is not specified for the tab
- * @exception IndexOutOfBoundsException if index is out of range
+ * @throws IndexOutOfBoundsException if index is out of range
* (tabIndex < 0 ||
* tabIndex >= tab count)
* @see #setDisplayedMnemonicIndexAt(int,int)
@@ -1299,7 +1299,7 @@ public class JTabbedPane extends JComponent
* @param tabIndex the index of the tab that the mnemonic refers to
* @return index representing mnemonic character if one exists;
* otherwise returns -1
- * @exception IndexOutOfBoundsException if index is out of range
+ * @throws IndexOutOfBoundsException if index is out of range
* (tabIndex < 0 ||
* tabIndex >= tab count)
* @see #setDisplayedMnemonicIndexAt(int,int)
@@ -1324,7 +1324,7 @@ public class JTabbedPane extends JComponent
* index, or null if tab at
* index is not currently visible in the UI,
* or if there is no UI set on this tabbedpane
- * @exception IndexOutOfBoundsException if index is out of range
+ * @throws IndexOutOfBoundsException if index is out of range
* {@code (index < 0 || index >= tab count)}
*/
public Rectangle getBoundsAt(int index) {
@@ -1346,7 +1346,7 @@ public class JTabbedPane extends JComponent
*
* @param index the tab index where the title should be set
* @param title the title to be displayed in the tab
- * @exception IndexOutOfBoundsException if index is out of range
+ * @throws IndexOutOfBoundsException if index is out of range
* {@code (index < 0 || index >= tab count)}
*
* @see #getTitleAt
@@ -1386,7 +1386,7 @@ public class JTabbedPane extends JComponent
*
* @param index the tab index where the icon should be set
* @param icon the icon to be displayed in the tab
- * @exception IndexOutOfBoundsException if index is out of range
+ * @throws IndexOutOfBoundsException if index is out of range
* {@code (index < 0 || index >= tab count)}
*
* @see #setDisabledIconAt
@@ -1428,7 +1428,7 @@ public class JTabbedPane extends JComponent
*
* @param index the tab index where the disabled icon should be set
* @param disabledIcon the icon to be displayed in the tab when disabled
- * @exception IndexOutOfBoundsException if index is out of range
+ * @throws IndexOutOfBoundsException if index is out of range
* {@code (index < 0 || index >= tab count)}
*
* @see #getDisabledIconAt
@@ -1451,7 +1451,7 @@ public class JTabbedPane extends JComponent
*
* @param index the tab index where the tooltip text should be set
* @param toolTipText the tooltip text to be displayed for the tab
- * @exception IndexOutOfBoundsException if index is out of range
+ * @throws IndexOutOfBoundsException if index is out of range
* {@code (index < 0 || index >= tab count)}
*
* @see #getToolTipTextAt
@@ -1486,7 +1486,7 @@ public class JTabbedPane extends JComponent
*
* @param index the tab index where the background should be set
* @param background the color to be displayed in the tab's background
- * @exception IndexOutOfBoundsException if index is out of range
+ * @throws IndexOutOfBoundsException if index is out of range
* {@code (index < 0 || index >= tab count)}
*
* @see #getBackgroundAt
@@ -1517,7 +1517,7 @@ public class JTabbedPane extends JComponent
*
* @param index the tab index where the foreground should be set
* @param foreground the color to be displayed as the tab's foreground
- * @exception IndexOutOfBoundsException if index is out of range
+ * @throws IndexOutOfBoundsException if index is out of range
* {@code (index < 0 || index >= tab count)}
*
* @see #getForegroundAt
@@ -1542,7 +1542,7 @@ public class JTabbedPane extends JComponent
*
* @param index the tab index which should be enabled/disabled
* @param enabled whether or not the tab should be enabled
- * @exception IndexOutOfBoundsException if index is out of range
+ * @throws IndexOutOfBoundsException if index is out of range
* {@code (index < 0 || index >= tab count)}
*
* @see #isEnabledAt
@@ -1562,7 +1562,7 @@ public class JTabbedPane extends JComponent
*
* @param index the tab index where this component is being placed
* @param component the component for the tab
- * @exception IndexOutOfBoundsException if index is out of range
+ * @throws IndexOutOfBoundsException if index is out of range
* {@code (index < 0 || index >= tab count)}
*
* @see #getComponentAt
@@ -1638,10 +1638,10 @@ public class JTabbedPane extends JComponent
* @since 1.4
* @param tabIndex the index of the tab that the mnemonic refers to
* @param mnemonicIndex index into the String to underline
- * @exception IndexOutOfBoundsException if tabIndex is
+ * @throws IndexOutOfBoundsException if tabIndex is
* out of range ({@code tabIndex < 0 || tabIndex >= tab
* count})
- * @exception IllegalArgumentException will be thrown if
+ * @throws IllegalArgumentException will be thrown if
* mnemonicIndex is >= length of the tab
* title , or < -1
* @see #setMnemonicAt(int,int)
@@ -1678,7 +1678,7 @@ public class JTabbedPane extends JComponent
* @since 1.4
* @param tabIndex the index of the tab that the mnemonic refers to
* @param mnemonic the key code which represents the mnemonic
- * @exception IndexOutOfBoundsException if tabIndex is out
+ * @throws IndexOutOfBoundsException if tabIndex is out
* of range ({@code tabIndex < 0 || tabIndex >= tab count})
* @see #getMnemonicAt(int)
* @see #setDisplayedMnemonicIndexAt(int,int)
@@ -2001,7 +2001,7 @@ public class JTabbedPane extends JComponent
*
* @param i zero-based index of child
* @return the Accessible child of the object
- * @exception IllegalArgumentException if index is out of bounds
+ * @throws IllegalArgumentException if index is out of bounds
*/
public Accessible getAccessibleChild(int i) {
if (i < 0 || i >= getTabCount()) {
@@ -2426,9 +2426,9 @@ public class JTabbedPane extends JComponent
* @param index the tab index where the component should be set
* @param component the component to render the title for the
* specified tab
- * @exception IndexOutOfBoundsException if index is out of range
+ * @throws IndexOutOfBoundsException if index is out of range
* {@code (index < 0 || index >= tab count)}
- * @exception IllegalArgumentException if component has already been
+ * @throws IllegalArgumentException if component has already been
* added to this JTabbedPane
*
* @see #getTabComponentAt
@@ -2456,7 +2456,7 @@ public class JTabbedPane extends JComponent
*
* @param index the index of the item being queried
* @return the tab component at index
- * @exception IndexOutOfBoundsException if index is out of range
+ * @throws IndexOutOfBoundsException if index is out of range
* {@code (index < 0 || index >= tab count)}
*
* @see #setTabComponentAt
diff --git a/src/java.desktop/share/classes/javax/swing/JTable.java b/src/java.desktop/share/classes/javax/swing/JTable.java
index c70ec2f935e49ac93c4e23980b4dfb03fe4da7c7..5d27be294541dcf88d0cf3176c229678956062a6 100644
--- a/src/java.desktop/share/classes/javax/swing/JTable.java
+++ b/src/java.desktop/share/classes/javax/swing/JTable.java
@@ -991,7 +991,7 @@ public class JTable extends JComponent implements TableModelListener, Scrollable
* the row margin.
*
* @param rowHeight new row height
- * @exception IllegalArgumentException if rowHeight is
+ * @throws IllegalArgumentException if rowHeight is
* less than 1
* @see #getRowHeight
*/
@@ -1037,7 +1037,7 @@ public class JTable extends JComponent implements TableModelListener, Scrollable
* @param row the row whose height is being
changed
* @param rowHeight new row height, in pixels
- * @exception IllegalArgumentException if rowHeight is
+ * @throws IllegalArgumentException if rowHeight is
* less than 1
* @since 1.3
*/
@@ -1126,7 +1126,7 @@ public class JTable extends JComponent implements TableModelListener, Scrollable
* The default color is look and feel dependent.
*
* @param gridColor the new color of the grid lines
- * @exception IllegalArgumentException if gridColor is null
+ * @throws IllegalArgumentException if gridColor is null
* @see #getGridColor
*/
@BeanProperty(description
@@ -1485,7 +1485,7 @@ public class JTable extends JComponent implements TableModelListener, Scrollable
* table's {@code TransferHandler}.
*
* @param b whether or not to enable automatic drag handling
- * @exception HeadlessException if
+ * @throws HeadlessException if
* b is true and
* GraphicsEnvironment.isHeadless()
* returns true
@@ -2220,7 +2220,7 @@ public class JTable extends JComponent implements TableModelListener, Scrollable
* Selects the rows from index0 to index1,
* inclusive.
*
- * @exception IllegalArgumentException if index0 or
+ * @throws IllegalArgumentException if index0 or
* index1 lie outside
* [0, getRowCount()-1]
* @param index0 one end of the interval
@@ -2234,7 +2234,7 @@ public class JTable extends JComponent implements TableModelListener, Scrollable
* Selects the columns from index0 to index1,
* inclusive.
*
- * @exception IllegalArgumentException if index0 or
+ * @throws IllegalArgumentException if index0 or
* index1 lie outside
* [0, getColumnCount()-1]
* @param index0 one end of the interval
@@ -2248,7 +2248,7 @@ public class JTable extends JComponent implements TableModelListener, Scrollable
* Adds the rows from index0 to index1, inclusive, to
* the current selection.
*
- * @exception IllegalArgumentException if index0 or index1
+ * @throws IllegalArgumentException if index0 or index1
* lie outside [0, getRowCount()-1]
* @param index0 one end of the interval
* @param index1 the other end of the interval
@@ -2261,7 +2261,7 @@ public class JTable extends JComponent implements TableModelListener, Scrollable
* Adds the columns from index0 to index1,
* inclusive, to the current selection.
*
- * @exception IllegalArgumentException if index0 or
+ * @throws IllegalArgumentException if index0 or
* index1 lie outside
* [0, getColumnCount()-1]
* @param index0 one end of the interval
@@ -2274,7 +2274,7 @@ public class JTable extends JComponent implements TableModelListener, Scrollable
/**
* Deselects the rows from index0 to index1, inclusive.
*
- * @exception IllegalArgumentException if index0 or
+ * @throws IllegalArgumentException if index0 or
* index1 lie outside
* [0, getRowCount()-1]
* @param index0 one end of the interval
@@ -2287,7 +2287,7 @@ public class JTable extends JComponent implements TableModelListener, Scrollable
/**
* Deselects the columns from index0 to index1, inclusive.
*
- * @exception IllegalArgumentException if index0 or
+ * @throws IllegalArgumentException if index0 or
* index1 lie outside
* [0, getColumnCount()-1]
* @param index0 one end of the interval
@@ -2596,7 +2596,7 @@ public class JTable extends JComponent implements TableModelListener, Scrollable
* equals.
*
* @return the TableColumn object that matches the identifier
- * @exception IllegalArgumentException if identifier is null or no TableColumn has this identifier
+ * @throws IllegalArgumentException if identifier is null or no TableColumn has this identifier
*
* @param identifier the identifier object
*/
@@ -8355,7 +8355,7 @@ public class JTable extends JComponent implements TableModelListener, Scrollable
*
* @return this component's locale; if this component does
* not have a locale, the locale of its parent is returned
- * @exception IllegalComponentStateException if the
+ * @throws IllegalComponentStateException if the
* Component does not have its own locale
* and has not yet been added to a containment hierarchy
* such that the locale can be determined from the
@@ -9161,7 +9161,7 @@ public class JTable extends JComponent implements TableModelListener, Scrollable
*
* @return this component's locale; if this component does
* not have a locale, the locale of its parent is returned
- * @exception IllegalComponentStateException if the
+ * @throws IllegalComponentStateException if the
* Component does not have its own locale
* and has not yet been added to a containment hierarchy
* such that the locale can be determined from the
diff --git a/src/java.desktop/share/classes/javax/swing/JTextArea.java b/src/java.desktop/share/classes/javax/swing/JTextArea.java
index ecc9342f05a0dd4c9bca710f4a09449312cb18c2..03b3bc7e9bd20979b5e8dffd1379718f2a1fb21b 100644
--- a/src/java.desktop/share/classes/javax/swing/JTextArea.java
+++ b/src/java.desktop/share/classes/javax/swing/JTextArea.java
@@ -166,7 +166,7 @@ public class JTextArea extends JTextComponent {
*
* @param rows the number of rows >= 0
* @param columns the number of columns >= 0
- * @exception IllegalArgumentException if the rows or columns
+ * @throws IllegalArgumentException if the rows or columns
* arguments are negative.
*/
public JTextArea(int rows, int columns) {
@@ -180,7 +180,7 @@ public class JTextArea extends JTextComponent {
* @param text the text to be displayed, or null
* @param rows the number of rows >= 0
* @param columns the number of columns >= 0
- * @exception IllegalArgumentException if the rows or columns
+ * @throws IllegalArgumentException if the rows or columns
* arguments are negative.
*/
public JTextArea(String text, int rows, int columns) {
@@ -206,7 +206,7 @@ public class JTextArea extends JTextComponent {
* @param text the text to be displayed, null if none
* @param rows the number of rows >= 0
* @param columns the number of columns >= 0
- * @exception IllegalArgumentException if the rows or columns
+ * @throws IllegalArgumentException if the rows or columns
* arguments are negative.
*/
public JTextArea(Document doc, String text, int rows, int columns) {
@@ -370,7 +370,7 @@ public class JTextArea extends JTextComponent {
*
* @param offset the offset >= 0
* @return the line number >= 0
- * @exception BadLocationException thrown if the offset is
+ * @throws BadLocationException thrown if the offset is
* less than zero or greater than the document length.
*/
public int getLineOfOffset(int offset) throws BadLocationException {
@@ -401,7 +401,7 @@ public class JTextArea extends JTextComponent {
*
* @param line the line number to translate >= 0
* @return the offset >= 0
- * @exception BadLocationException thrown if the line is
+ * @throws BadLocationException thrown if the line is
* less than zero or greater or equal to the number of
* lines contained in the document (as reported by
* getLineCount).
@@ -424,7 +424,7 @@ public class JTextArea extends JTextComponent {
*
* @param line the line >= 0
* @return the offset >= 0
- * @exception BadLocationException Thrown if the line is
+ * @throws BadLocationException Thrown if the line is
* less than zero or greater or equal to the number of
* lines contained in the document (as reported by
* getLineCount).
@@ -452,7 +452,7 @@ public class JTextArea extends JTextComponent {
*
* @param str the text to insert
* @param pos the position at which to insert >= 0
- * @exception IllegalArgumentException if pos is an
+ * @throws IllegalArgumentException if pos is an
* invalid position in the model
* @see TextComponent#setText
* @see #replaceRange
@@ -493,7 +493,7 @@ public class JTextArea extends JTextComponent {
* @param str the text to use as the replacement
* @param start the start position >= 0
* @param end the end position >= start
- * @exception IllegalArgumentException if part of the range is an
+ * @throws IllegalArgumentException if part of the range is an
* invalid position in the model
* @see #insert
*/
@@ -532,7 +532,7 @@ public class JTextArea extends JTextComponent {
* setting the new value.
*
* @param rows the number of rows >= 0
- * @exception IllegalArgumentException if rows is less than 0
+ * @throws IllegalArgumentException if rows is less than 0
* @see #getRows
*/
@BeanProperty(bound = false, description
@@ -576,7 +576,7 @@ public class JTextArea extends JTextComponent {
* after setting the new value.
*
* @param columns the number of columns >= 0
- * @exception IllegalArgumentException if columns is less than 0
+ * @throws IllegalArgumentException if columns is less than 0
* @see #getColumns
*/
@BeanProperty(bound = false, description
@@ -726,7 +726,7 @@ public class JTextArea extends JTextComponent {
* @param direction Less than zero to scroll up/left,
* greater than zero for down/right.
* @return The "unit" increment for scrolling in the specified direction
- * @exception IllegalArgumentException for an invalid orientation
+ * @throws IllegalArgumentException for an invalid orientation
* @see JScrollBar#setUnitIncrement
* @see #getRowHeight
* @see #getColumnWidth
diff --git a/src/java.desktop/share/classes/javax/swing/JTextField.java b/src/java.desktop/share/classes/javax/swing/JTextField.java
index 3abe09d056542f18aebb4b8dc2c5d62779d77721..0d66209d8af5bc075f43b00addc84061378817c3 100644
--- a/src/java.desktop/share/classes/javax/swing/JTextField.java
+++ b/src/java.desktop/share/classes/javax/swing/JTextField.java
@@ -242,7 +242,7 @@ public class JTextField extends JTextComponent implements SwingConstants {
* the preferred width >= 0; if columns
* is set to zero, the preferred width will be whatever
* naturally results from the component implementation
- * @exception IllegalArgumentException if columns < 0
+ * @throws IllegalArgumentException if columns < 0
*/
public JTextField(Document doc, String text, int columns) {
if (columns < 0) {
@@ -343,7 +343,7 @@ public class JTextField extends JTextComponent implements SwingConstants {
* and a PropertyChange event ("horizontalAlignment") is fired.
*
* @param alignment the alignment
- * @exception IllegalArgumentException if alignment
+ * @throws IllegalArgumentException if alignment
* is not a valid key
*/
@BeanProperty(preferred = true, enumerationValues = {
@@ -393,7 +393,7 @@ public class JTextField extends JTextComponent implements SwingConstants {
* and then invalidate the layout.
*
* @param columns the number of columns >= 0
- * @exception IllegalArgumentException if columns
+ * @throws IllegalArgumentException if columns
* is less than 0
*/
@BeanProperty(bound = false, description
diff --git a/src/java.desktop/share/classes/javax/swing/JTextPane.java b/src/java.desktop/share/classes/javax/swing/JTextPane.java
index 41e16034c23fb0a56b311b6902ddaf96c8abddb9..228181f31f76a5c31c204860d652d92ef2cea19c 100644
--- a/src/java.desktop/share/classes/javax/swing/JTextPane.java
+++ b/src/java.desktop/share/classes/javax/swing/JTextPane.java
@@ -138,7 +138,7 @@ public class JTextPane extends JEditorPane {
* must be a StyledDocument.
*
* @param doc the document to display/edit
- * @exception IllegalArgumentException if doc can't
+ * @throws IllegalArgumentException if doc can't
* be narrowed to a StyledDocument which is the
* required type of model for this text component
*/
@@ -480,7 +480,7 @@ public class JTextPane extends JEditorPane {
* establishes the content type of the editor.
*
* @param kit the desired editor behavior
- * @exception IllegalArgumentException if kit is not a
+ * @throws IllegalArgumentException if kit is not a
* StyledEditorKit
*/
public final void setEditorKit(EditorKit kit) {
diff --git a/src/java.desktop/share/classes/javax/swing/JToolBar.java b/src/java.desktop/share/classes/javax/swing/JToolBar.java
index 114ef0d169c2a8c0c97c01f858c237f3fbd9a119..4d93a1bceefe453f48a4aa746d74bf65b9725ec2 100644
--- a/src/java.desktop/share/classes/javax/swing/JToolBar.java
+++ b/src/java.desktop/share/classes/javax/swing/JToolBar.java
@@ -142,7 +142,7 @@ public class JToolBar extends JComponent implements SwingConstants, Accessible
* @param name the name of the tool bar
* @param orientation the initial orientation -- it must be
* either HORIZONTAL or VERTICAL
- * @exception IllegalArgumentException if orientation is neither
+ * @throws IllegalArgumentException if orientation is neither
* HORIZONTAL nor VERTICAL
* @since 1.3
*/
@@ -406,7 +406,7 @@ public class JToolBar extends JComponent implements SwingConstants, Accessible
*
* @param o the new orientation -- either HORIZONTAL or
* VERTICAL
- * @exception IllegalArgumentException if orientation is neither
+ * @throws IllegalArgumentException if orientation is neither
* HORIZONTAL nor VERTICAL
* @see #getOrientation
*/
diff --git a/src/java.desktop/share/classes/javax/swing/JTree.java b/src/java.desktop/share/classes/javax/swing/JTree.java
index ae90ea8be8bec502faf56b15683af34a8d75a161..e6e591bad27ca8843dbf796fb40d7f2dca988068 100644
--- a/src/java.desktop/share/classes/javax/swing/JTree.java
+++ b/src/java.desktop/share/classes/javax/swing/JTree.java
@@ -1251,7 +1251,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
* tree's {@code TransferHandler}.
*
* @param b whether or not to enable automatic drag handling
- * @exception HeadlessException if
+ * @throws HeadlessException if
* b is true and
* GraphicsEnvironment.isHeadless()
* returns true
@@ -3087,7 +3087,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
* Position.Bias.Forward or Position.Bias.Backward.
* @return the TreePath of the next tree element that
* starts with the prefix; otherwise null
- * @exception IllegalArgumentException if prefix is null
+ * @throws IllegalArgumentException if prefix is null
* or startingRow is out of bounds
* @since 1.4
*/
@@ -5053,7 +5053,7 @@ public class JTree extends JComponent implements Scrollable, Accessible
*
* @return This component's locale. If this component does not have
* a locale, the locale of its parent is returned.
- * @exception IllegalComponentStateException
+ * @throws IllegalComponentStateException
* If the Component does not have its own locale and has not yet
* been added to a containment hierarchy such that the locale can be
* determined from the containing parent.
diff --git a/src/java.desktop/share/classes/javax/swing/JViewport.java b/src/java.desktop/share/classes/javax/swing/JViewport.java
index e3974a84f27761730a95371f7e6968cd1c9c8e31..ff082acc694bdfd768c69ae95842c2182f1f0d75 100644
--- a/src/java.desktop/share/classes/javax/swing/JViewport.java
+++ b/src/java.desktop/share/classes/javax/swing/JViewport.java
@@ -565,7 +565,7 @@ public class JViewport extends JComponent implements Accessible
* a JViewPort.
*
* @param border the Border to set
- * @exception IllegalArgumentException this method is not implemented
+ * @throws IllegalArgumentException this method is not implemented
*/
public final void setBorder(Border border) {
if (border != null) {
diff --git a/src/java.desktop/share/classes/javax/swing/JWindow.java b/src/java.desktop/share/classes/javax/swing/JWindow.java
index 69269c9f284ce1354a7fcadc6db024ee7192f483..a306ea6d4ea1b95e2291032005d4583e25a2afbf 100644
--- a/src/java.desktop/share/classes/javax/swing/JWindow.java
+++ b/src/java.desktop/share/classes/javax/swing/JWindow.java
@@ -387,10 +387,10 @@ public class JWindow extends Window implements Accessible,
* @param comp the component to be enhanced
* @param constraints the constraints to be respected
* @param index the index
- * @exception IllegalArgumentException if index is invalid
- * @exception IllegalArgumentException if adding the container's parent
+ * @throws IllegalArgumentException if index is invalid
+ * @throws IllegalArgumentException if adding the container's parent
* to itself
- * @exception IllegalArgumentException if adding a window to a container
+ * @throws IllegalArgumentException if adding a window to a container
*
* @see #setRootPaneCheckingEnabled
* @see javax.swing.RootPaneContainer
@@ -504,7 +504,7 @@ public class JWindow extends Window implements Accessible,
*
* @param contentPane the new contentPane
*
- * @exception IllegalComponentStateException (a runtime
+ * @throws IllegalComponentStateException (a runtime
* exception) if the content pane parameter is null
* @see #getContentPane
* @see RootPaneContainer#setContentPane
@@ -532,7 +532,7 @@ public class JWindow extends Window implements Accessible,
*
* @param layeredPane the new layeredPane object
*
- * @exception IllegalComponentStateException (a runtime
+ * @throws IllegalComponentStateException (a runtime
* exception) if the content pane parameter is null
* @see #getLayeredPane
* @see RootPaneContainer#setLayeredPane
diff --git a/src/java.desktop/share/classes/javax/swing/OverlayLayout.java b/src/java.desktop/share/classes/javax/swing/OverlayLayout.java
index 0067f6fd6bd54bab9fe7b8461f4917852bcc1579..71ca34f1aa069ab14f5c2d49310d8e18b45c808c 100644
--- a/src/java.desktop/share/classes/javax/swing/OverlayLayout.java
+++ b/src/java.desktop/share/classes/javax/swing/OverlayLayout.java
@@ -217,7 +217,7 @@ public class OverlayLayout implements LayoutManager2,Serializable {
*
* @param target the container to lay out
*
- * @exception AWTError if the target isn't the container specified to the
+ * @throws AWTError if the target isn't the container specified to the
* constructor
*/
public void layoutContainer(Container target) {
diff --git a/src/java.desktop/share/classes/javax/swing/Popup.java b/src/java.desktop/share/classes/javax/swing/Popup.java
index 605ecd6fd78099b72d97f605246788da84c9de0a..15c90ad3be775215efc26bc6b7dd3e44020425f2 100644
--- a/src/java.desktop/share/classes/javax/swing/Popup.java
+++ b/src/java.desktop/share/classes/javax/swing/Popup.java
@@ -82,7 +82,7 @@ public class Popup {
* @param contents Contents of the Popup
* @param x Initial x screen coordinate
* @param y Initial y screen coordinate
- * @exception IllegalArgumentException if contents is null
+ * @throws IllegalArgumentException if contents is null
*/
protected Popup(Component owner, Component contents, int x, int y) {
this();
diff --git a/src/java.desktop/share/classes/javax/swing/PopupFactory.java b/src/java.desktop/share/classes/javax/swing/PopupFactory.java
index 462675fa828587cbe6b08bc2f35151a32b4d9fa4..a30aba6f2fc0a6d359f997c619bdb76567ad0930 100644
--- a/src/java.desktop/share/classes/javax/swing/PopupFactory.java
+++ b/src/java.desktop/share/classes/javax/swing/PopupFactory.java
@@ -127,7 +127,7 @@ public class PopupFactory {
* factory is null.
*
* @param factory Shared PopupFactory
- * @exception IllegalArgumentException if factory is null
+ * @throws IllegalArgumentException if factory is null
* @see #getPopup
*/
public static void setSharedInstance(PopupFactory factory) {
@@ -186,7 +186,7 @@ public class PopupFactory {
* @param contents Contents of the Popup
* @param x Initial x screen coordinate
* @param y Initial y screen coordinate
- * @exception IllegalArgumentException if contents is null
+ * @throws IllegalArgumentException if contents is null
* @return Popup containing Contents
*/
public Popup getPopup(Component owner, Component contents,
diff --git a/src/java.desktop/share/classes/javax/swing/ProgressMonitor.java b/src/java.desktop/share/classes/javax/swing/ProgressMonitor.java
index 8733d5b3cfef510a19889614ae5ff76e41f43f39..6f2d1eda4b674a4899e0b8d9adb39b440709c343 100644
--- a/src/java.desktop/share/classes/javax/swing/ProgressMonitor.java
+++ b/src/java.desktop/share/classes/javax/swing/ProgressMonitor.java
@@ -794,7 +794,7 @@ public class ProgressMonitor implements Accessible
* @return this component's locale. If this component does not have
* a locale, the locale of its parent is returned.
*
- * @exception IllegalComponentStateException
+ * @throws IllegalComponentStateException
* If the Component does not have its own locale and has not yet been
* added to a containment hierarchy such that the locale can be
* determined from the containing parent.
diff --git a/src/java.desktop/share/classes/javax/swing/RootPaneContainer.java b/src/java.desktop/share/classes/javax/swing/RootPaneContainer.java
index 76dc2286f8725085cba8ce80a279f5150033a25d..b05e0c52e554784c2cb6ff6453d687c3b920cf0b 100644
--- a/src/java.desktop/share/classes/javax/swing/RootPaneContainer.java
+++ b/src/java.desktop/share/classes/javax/swing/RootPaneContainer.java
@@ -103,7 +103,7 @@ public interface RootPaneContainer
* Generally implemented with
* getRootPane().setContentPane(contentPane);
*
- * @exception java.awt.IllegalComponentStateException (a runtime
+ * @throws java.awt.IllegalComponentStateException (a runtime
* exception) if the content pane parameter is null
* @param contentPane the Container to use for the contents of this
* JRootPane
@@ -134,7 +134,7 @@ public interface RootPaneContainer
* getRootPane().setLayeredPane(layeredPane);
*
* @param layeredPane the layered pane
- * @exception java.awt.IllegalComponentStateException (a runtime
+ * @throws java.awt.IllegalComponentStateException (a runtime
* exception) if the layered pane parameter is null
* @see #getLayeredPane
* @see JRootPane#getLayeredPane
diff --git a/src/java.desktop/share/classes/javax/swing/ScrollPaneLayout.java b/src/java.desktop/share/classes/javax/swing/ScrollPaneLayout.java
index 9f9e66606664bbd0cb6cdd55fccefe71b3960a5b..0b8d8576f1469f1f60c25c36875599de1a91d973 100644
--- a/src/java.desktop/share/classes/javax/swing/ScrollPaneLayout.java
+++ b/src/java.desktop/share/classes/javax/swing/ScrollPaneLayout.java
@@ -230,7 +230,7 @@ public class ScrollPaneLayout
*
* @param s the component identifier
* @param c the component to be added
- * @exception IllegalArgumentException if s is an invalid key
+ * @throws IllegalArgumentException if s is an invalid key
*/
public void addLayoutComponent(String s, Component c)
{
@@ -328,7 +328,7 @@ public class ScrollPaneLayout
* with the Swing 1.0.2 (and earlier) versions of this class.
*
* @param x an integer giving the display policy
- * @exception IllegalArgumentException if x is an invalid
+ * @throws IllegalArgumentException if x is an invalid
* vertical scroll bar policy, as listed above
*/
public void setVerticalScrollBarPolicy(int x) {
@@ -366,7 +366,7 @@ public class ScrollPaneLayout
* with the Swing 1.0.2 (and earlier) versions of this class.
*
* @param x an int giving the display policy
- * @exception IllegalArgumentException if x is not a valid
+ * @throws IllegalArgumentException if x is not a valid
* horizontal scrollbar policy, as listed above
*/
public void setHorizontalScrollBarPolicy(int x) {
diff --git a/src/java.desktop/share/classes/javax/swing/SizeSequence.java b/src/java.desktop/share/classes/javax/swing/SizeSequence.java
index 899a64570f3145d3ab0b51315cba10af4ebb6edf..c6877dc8b2b1b15ef75563017ba19fb9c3cd83d6 100644
--- a/src/java.desktop/share/classes/javax/swing/SizeSequence.java
+++ b/src/java.desktop/share/classes/javax/swing/SizeSequence.java
@@ -142,7 +142,7 @@ public class SizeSequence {
* all initialized to have size 0.
*
* @param numEntries the number of sizes to track
- * @exception NegativeArraySizeException if
+ * @throws NegativeArraySizeException if
* numEntries < 0
*/
public SizeSequence(int numEntries) {
@@ -355,7 +355,7 @@ public class SizeSequence {
* in the group
* @param length the number of entries in the group
* @param value the size to be assigned to each new entry
- * @exception ArrayIndexOutOfBoundsException if the parameters
+ * @throws ArrayIndexOutOfBoundsException if the parameters
* are outside of the range:
* (0 <= start < (getSizes().length)) AND (length >= 0)
*/
diff --git a/src/java.desktop/share/classes/javax/swing/SwingUtilities.java b/src/java.desktop/share/classes/javax/swing/SwingUtilities.java
index 5e3965e69b8edf7601ec495dd0c1aaefe251352a..1d58541dfee4f2e20a4173b329249b6f2446e01f 100644
--- a/src/java.desktop/share/classes/javax/swing/SwingUtilities.java
+++ b/src/java.desktop/share/classes/javax/swing/SwingUtilities.java
@@ -1466,10 +1466,10 @@ public class SwingUtilities implements SwingConstants
* java.awt.EventQueue.invokeAndWait().
*
* @param doRun the instance of {@code Runnable}
- * @exception InterruptedException if we're interrupted while waiting for
+ * @throws InterruptedException if we're interrupted while waiting for
* the event dispatching thread to finish executing
* doRun.run()
- * @exception InvocationTargetException if an exception is thrown
+ * @throws InvocationTargetException if an exception is thrown
* while running doRun
*
* @see #invokeLater
@@ -1984,7 +1984,7 @@ public class SwingUtilities implements SwingConstants
* Returns a toolkit-private, shared, invisible Frame
* to be the owner for JDialogs and JWindows created with
* {@code null} owners.
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true.
* @see java.awt.GraphicsEnvironment#isHeadless
*/
@@ -2002,7 +2002,7 @@ public class SwingUtilities implements SwingConstants
/**
* Returns a SharedOwnerFrame's shutdown listener to dispose the SharedOwnerFrame
* if it has no more displayable children.
- * @exception HeadlessException if GraphicsEnvironment.isHeadless()
+ * @throws HeadlessException if GraphicsEnvironment.isHeadless()
* returns true.
* @see java.awt.GraphicsEnvironment#isHeadless
*/
diff --git a/src/java.desktop/share/classes/javax/swing/Timer.java b/src/java.desktop/share/classes/javax/swing/Timer.java
index 6b4f95be108038b04c2989d0cd6d393e97595f53..ced691f4e06d6398cd08dcce339fdcd9496bdcfa 100644
--- a/src/java.desktop/share/classes/javax/swing/Timer.java
+++ b/src/java.desktop/share/classes/javax/swing/Timer.java
@@ -341,7 +341,7 @@ public class Timer implements Serializable
* on this timer,
* or an empty array if no such
* listeners have been added
- * @exception ClassCastException if listenerType doesn't
+ * @throws ClassCastException if listenerType doesn't
* specify a class or interface that implements
* java.util.EventListener
*
diff --git a/src/java.desktop/share/classes/javax/swing/TransferHandler.java b/src/java.desktop/share/classes/javax/swing/TransferHandler.java
index f2622880e7fa3e6576df41ee1f9bdc2e354f2444..445234e4bdab544bea5349cee36b18d69832ed42 100644
--- a/src/java.desktop/share/classes/javax/swing/TransferHandler.java
+++ b/src/java.desktop/share/classes/javax/swing/TransferHandler.java
@@ -1172,9 +1172,9 @@ public class TransferHandler implements Serializable {
*
* @param flavor the requested flavor for the data
* @see DataFlavor#getRepresentationClass
- * @exception IOException if the data is no longer available
+ * @throws IOException if the data is no longer available
* in the requested flavor.
- * @exception UnsupportedFlavorException if the requested data flavor is
+ * @throws UnsupportedFlavorException if the requested data flavor is
* not supported.
*/
public Object getTransferData(DataFlavor flavor) throws UnsupportedFlavorException, IOException {
diff --git a/src/java.desktop/share/classes/javax/swing/colorchooser/AbstractColorChooserPanel.java b/src/java.desktop/share/classes/javax/swing/colorchooser/AbstractColorChooserPanel.java
index 2f2163c89397b19e1aafe4e6c0e62b0392a2338c..9a42849251289866e0c0cb6a1aacd9408e7f2a51 100644
--- a/src/java.desktop/share/classes/javax/swing/colorchooser/AbstractColorChooserPanel.java
+++ b/src/java.desktop/share/classes/javax/swing/colorchooser/AbstractColorChooserPanel.java
@@ -161,7 +161,7 @@ public abstract class AbstractColorChooserPanel extends JPanel {
* If you override this, be sure to call super.
*
* @param enclosingChooser the chooser to which the panel is to be added
- * @exception RuntimeException if the chooser panel has already been
+ * @throws RuntimeException if the chooser panel has already been
* installed
*/
public void installChooserPanel(JColorChooser enclosingChooser) {
diff --git a/src/java.desktop/share/classes/javax/swing/event/EventListenerList.java b/src/java.desktop/share/classes/javax/swing/event/EventListenerList.java
index 1be0228864c1e84410ef3138cbda74dc407aef99..81ae23930088de548cd41a41f61bd490b4122dc9 100644
--- a/src/java.desktop/share/classes/javax/swing/event/EventListenerList.java
+++ b/src/java.desktop/share/classes/javax/swing/event/EventListenerList.java
@@ -144,7 +144,7 @@ public class EventListenerList implements Serializable {
* @param FooListeners on this component,
* or an empty array if no such
* listeners have been added
- * @exception ClassCastException if listenerType
+ * @throws ClassCastException if listenerType
* doesn't specify a class or interface that implements
* java.util.EventListener
*
diff --git a/src/java.desktop/share/classes/javax/swing/table/DefaultTableColumnModel.java b/src/java.desktop/share/classes/javax/swing/table/DefaultTableColumnModel.java
index ab5ff974eb9dd96e0ac0e59b852fece5ef314b91..e1a6264a4788ef0a279f58a8eb3d49cf003b3f99 100644
--- a/src/java.desktop/share/classes/javax/swing/table/DefaultTableColumnModel.java
+++ b/src/java.desktop/share/classes/javax/swing/table/DefaultTableColumnModel.java
@@ -109,7 +109,7 @@ public class DefaultTableColumnModel implements TableColumnModel,
* event to its listeners.
*
* @param aColumn the TableColumn to be added
- * @exception IllegalArgumentException if aColumn is
+ * @throws IllegalArgumentException if aColumn is
* null
* @see #removeColumn
*/
@@ -170,7 +170,7 @@ public class DefaultTableColumnModel implements TableColumnModel,
*
* @param columnIndex the index of column to be moved
* @param newIndex new index to move the column
- * @exception IllegalArgumentException if column or
+ * @throws IllegalArgumentException if column or
* newIndex
* are not in the valid range
*/
@@ -258,7 +258,7 @@ public class DefaultTableColumnModel implements TableColumnModel,
* @return the index of the first column in the
* tableColumns array whose identifier
* is equal to identifier
- * @exception IllegalArgumentException if identifier
+ * @throws IllegalArgumentException if identifier
* is null, or if no
* TableColumn has this
* identifier
@@ -368,7 +368,7 @@ public class DefaultTableColumnModel implements TableColumnModel,
* an exception is thrown.
*
* @param newModel the new selection model
- * @exception IllegalArgumentException if newModel
+ * @throws IllegalArgumentException if newModel
* is null
* @see #getSelectionModel
*/
@@ -636,7 +636,7 @@ public class DefaultTableColumnModel implements TableColumnModel,
* FooListeners on this model,
* or an empty array if no such
* listeners have been added
- * @exception ClassCastException if listenerType
+ * @throws ClassCastException if listenerType
* doesn't specify a class or interface that implements
* java.util.EventListener
*
diff --git a/src/java.desktop/share/classes/javax/swing/table/DefaultTableModel.java b/src/java.desktop/share/classes/javax/swing/table/DefaultTableModel.java
index 08dfc85b0a961ea795bc2aedbf7f991cdfb28237..cdb3f29b76a11efe3f7a78b1590560ecdea5794f 100644
--- a/src/java.desktop/share/classes/javax/swing/table/DefaultTableModel.java
+++ b/src/java.desktop/share/classes/javax/swing/table/DefaultTableModel.java
@@ -375,7 +375,7 @@ public class DefaultTableModel extends AbstractTableModel implements Serializabl
*
* @param row the row index of the row to be inserted
* @param rowData optional data of the row being added
- * @exception ArrayIndexOutOfBoundsException if the row was invalid
+ * @throws ArrayIndexOutOfBoundsException if the row was invalid
*/
public void insertRow(int row, Vector rowData) {
dataVector.insertElementAt(rowData, row);
@@ -390,7 +390,7 @@ public class DefaultTableModel extends AbstractTableModel implements Serializabl
*
* @param row the row index of the row to be inserted
* @param rowData optional data of the row being added
- * @exception ArrayIndexOutOfBoundsException if the row was invalid
+ * @throws ArrayIndexOutOfBoundsException if the row was invalid
*/
public void insertRow(int row, Object[] rowData) {
insertRow(row, convertToVector(rowData));
@@ -438,7 +438,7 @@ public class DefaultTableModel extends AbstractTableModel implements Serializabl
* @param start the starting row index to be moved
* @param end the ending row index to be moved
* @param to the destination of the rows to be moved
- * @exception ArrayIndexOutOfBoundsException if any of the elements
+ * @throws ArrayIndexOutOfBoundsException if any of the elements
* would be moved out of the table's range
*
*/
@@ -463,7 +463,7 @@ public class DefaultTableModel extends AbstractTableModel implements Serializabl
* of the row being removed will be sent to all the listeners.
*
* @param row the row index of the row to be removed
- * @exception ArrayIndexOutOfBoundsException if the row was invalid
+ * @throws ArrayIndexOutOfBoundsException if the row was invalid
*/
public void removeRow(int row) {
dataVector.removeElementAt(row);
@@ -652,7 +652,7 @@ public class DefaultTableModel extends AbstractTableModel implements Serializabl
* @param row the row whose value is to be queried
* @param column the column whose value is to be queried
* @return the value Object at the specified cell
- * @exception ArrayIndexOutOfBoundsException if an invalid row or
+ * @throws ArrayIndexOutOfBoundsException if an invalid row or
* column was given
*/
public Object getValueAt(int row, int column) {
@@ -669,7 +669,7 @@ public class DefaultTableModel extends AbstractTableModel implements Serializabl
* @param aValue the new value; this can be null
* @param row the row whose value is to be changed
* @param column the column whose value is to be changed
- * @exception ArrayIndexOutOfBoundsException if an invalid row or
+ * @throws ArrayIndexOutOfBoundsException if an invalid row or
* column was given
*/
public void setValueAt(Object aValue, int row, int column) {
diff --git a/src/java.desktop/share/classes/javax/swing/table/JTableHeader.java b/src/java.desktop/share/classes/javax/swing/table/JTableHeader.java
index f36b5646e3d4ffc22728865f8eb171863d8c3ce9..561d6a71c75493b962a6447e30cfbf731c36c3b6 100644
--- a/src/java.desktop/share/classes/javax/swing/table/JTableHeader.java
+++ b/src/java.desktop/share/classes/javax/swing/table/JTableHeader.java
@@ -550,7 +550,7 @@ public class JTableHeader extends JComponent implements TableColumnModelListener
* for listener notifications from the new column model.
*
* @param columnModel the new data source for this table
- * @exception IllegalArgumentException
+ * @throws IllegalArgumentException
* if newModel is null
* @see #getColumnModel
*/
diff --git a/src/java.desktop/share/classes/javax/swing/table/TableColumnModel.java b/src/java.desktop/share/classes/javax/swing/table/TableColumnModel.java
index eaaa8447ef701f93ce3b08aeef3a0c9f5c109c32..4cf4870b5e3543787deb710cb20c927fc3374627 100644
--- a/src/java.desktop/share/classes/javax/swing/table/TableColumnModel.java
+++ b/src/java.desktop/share/classes/javax/swing/table/TableColumnModel.java
@@ -79,7 +79,7 @@ public interface TableColumnModel
*
* @param columnIndex the index of column to be moved
* @param newIndex index of the column's new location
- * @exception IllegalArgumentException if columnIndex or
+ * @throws IllegalArgumentException if columnIndex or
* newIndex
* are not in the valid range
*/
@@ -119,7 +119,7 @@ public interface TableColumnModel
* @param columnIdentifier the identifier object
* @return the index of the first table column
* whose identifier is equal to identifier
- * @exception IllegalArgumentException if identifier
+ * @throws IllegalArgumentException if identifier
* is null, or no
* TableColumn has this
* identifier
diff --git a/src/java.desktop/share/classes/javax/swing/text/AbstractDocument.java b/src/java.desktop/share/classes/javax/swing/text/AbstractDocument.java
index 1b97006bc34723021fef05e40aad70554481f4c5..db19b81e8e50471cb04fb52d0e3e08e4b19230da 100644
--- a/src/java.desktop/share/classes/javax/swing/text/AbstractDocument.java
+++ b/src/java.desktop/share/classes/javax/swing/text/AbstractDocument.java
@@ -344,7 +344,7 @@ public abstract class AbstractDocument implements Document, Serializable {
* FooListeners on this component,
* or an empty array if no such
* listeners have been added
- * @exception ClassCastException if listenerType
+ * @throws ClassCastException if listenerType
* doesn't specify a class or interface that implements
* java.util.EventListener
*
@@ -604,7 +604,7 @@ public abstract class AbstractDocument implements Document, Serializable {
*
* @param offs the starting offset >= 0
* @param len the number of characters to remove >= 0
- * @exception BadLocationException the given remove position is not a valid
+ * @throws BadLocationException the given remove position is not a valid
* position within the document
* @see Document#remove
*/
@@ -674,7 +674,7 @@ public abstract class AbstractDocument implements Document, Serializable {
* null
* is legal, and typically treated as an empty attributeset,
* but exact interpretation is left to the subclass
- * @exception BadLocationException the given position is not a valid
+ * @throws BadLocationException the given position is not a valid
* position within the document
* @since 1.4
*/
@@ -718,7 +718,7 @@ public abstract class AbstractDocument implements Document, Serializable {
* @param offs the starting offset >= 0
* @param str the string to insert; does nothing with null/empty strings
* @param a the attributes for the inserted content
- * @exception BadLocationException the given insert position is not a valid
+ * @throws BadLocationException the given insert position is not a valid
* position within the document
* @see Document#insertString
*/
@@ -792,7 +792,7 @@ public abstract class AbstractDocument implements Document, Serializable {
* @param offset the starting offset >= 0
* @param length the number of characters to retrieve >= 0
* @return the text
- * @exception BadLocationException the range given includes a position
+ * @throws BadLocationException the range given includes a position
* that is not a valid position within the document
* @see Document#getText
*/
@@ -833,7 +833,7 @@ public abstract class AbstractDocument implements Document, Serializable {
* @param offset the starting offset >= 0
* @param length the number of characters to retrieve >= 0
* @param txt the Segment object to retrieve the text into
- * @exception BadLocationException the range given includes a position
+ * @throws BadLocationException the range given includes a position
* that is not a valid position within the document
*/
public void getText(int offset, int length, Segment txt) throws BadLocationException {
@@ -854,7 +854,7 @@ public abstract class AbstractDocument implements Document, Serializable {
*
* @param offs the position in the model >= 0
* @return the position
- * @exception BadLocationException if the given position does not
+ * @throws BadLocationException if the given position does not
* represent a valid location in the associated document
* @see Document#createPosition
*/
@@ -1354,7 +1354,7 @@ public abstract class AbstractDocument implements Document, Serializable {
* Document will be left in a locked state so that no
* reading or writing can be done.
*
- * @exception IllegalStateException thrown on illegal lock
+ * @throws IllegalStateException thrown on illegal lock
* attempt. If the document is implemented properly, this can
* only happen if a document listener attempts to mutate the
* document. This situation violates the bean event model
@@ -1633,7 +1633,7 @@ public abstract class AbstractDocument implements Document, Serializable {
*
* @param offset the offset in the content >= 0
* @return a Position
- * @exception BadLocationException for an invalid offset
+ * @throws BadLocationException for an invalid offset
*/
public Position createPosition(int offset) throws BadLocationException;
@@ -1652,7 +1652,7 @@ public abstract class AbstractDocument implements Document, Serializable {
* @return if the implementation supports a history mechanism,
* a reference to an Edit implementation will be returned,
* otherwise returns null
- * @exception BadLocationException thrown if the area covered by
+ * @throws BadLocationException thrown if the area covered by
* the arguments is not contained in the character sequence
*/
public UndoableEdit insertString(int where, String str) throws BadLocationException;
@@ -1666,7 +1666,7 @@ public abstract class AbstractDocument implements Document, Serializable {
* @return If the implementation supports a history mechanism,
* a reference to an Edit implementation will be returned,
* otherwise null.
- * @exception BadLocationException Thrown if the area covered by
+ * @throws BadLocationException Thrown if the area covered by
* the arguments is not contained in the character sequence.
*/
public UndoableEdit remove(int where, int nitems) throws BadLocationException;
@@ -1677,7 +1677,7 @@ public abstract class AbstractDocument implements Document, Serializable {
* @param where Offset into the sequence to fetch >= 0.
* @param len number of characters to copy >= 0.
* @return the string
- * @exception BadLocationException Thrown if the area covered by
+ * @throws BadLocationException Thrown if the area covered by
* the arguments is not contained in the character sequence.
*/
public String getString(int where, int len) throws BadLocationException;
@@ -1688,7 +1688,7 @@ public abstract class AbstractDocument implements Document, Serializable {
* @param where the starting offset >= 0
* @param len the number of characters >= 0
* @param txt the target location to copy into
- * @exception BadLocationException Thrown if the area covered by
+ * @throws BadLocationException Thrown if the area covered by
* the arguments is not contained in the character sequence.
*/
public void getChars(int where, int len, Segment txt) throws BadLocationException;
@@ -2819,7 +2819,7 @@ public abstract class AbstractDocument implements Document, Serializable {
/**
* Redoes a change.
*
- * @exception CannotRedoException if the change cannot be redone
+ * @throws CannotRedoException if the change cannot be redone
*/
public void redo() throws CannotRedoException {
writeLock();
@@ -2843,7 +2843,7 @@ public abstract class AbstractDocument implements Document, Serializable {
/**
* Undoes a change.
*
- * @exception CannotUndoException if the change cannot be undone
+ * @throws CannotUndoException if the change cannot be undone
*/
public void undo() throws CannotUndoException {
writeLock();
@@ -3187,7 +3187,7 @@ public abstract class AbstractDocument implements Document, Serializable {
/**
* Redoes a change.
*
- * @exception CannotRedoException if the change cannot be redone
+ * @throws CannotRedoException if the change cannot be redone
*/
public void redo() throws CannotRedoException {
super.redo();
@@ -3204,7 +3204,7 @@ public abstract class AbstractDocument implements Document, Serializable {
/**
* Undoes a change.
*
- * @exception CannotUndoException if the change cannot be undone
+ * @throws CannotUndoException if the change cannot be undone
*/
public void undo() throws CannotUndoException {
super.undo();
diff --git a/src/java.desktop/share/classes/javax/swing/text/AbstractWriter.java b/src/java.desktop/share/classes/javax/swing/text/AbstractWriter.java
index 0ca0fecb5a845fc33616b35b175cdce1df1e7c55..07a8301f0b5e4aebbe4e932d48a21f82e089c2cd 100644
--- a/src/java.desktop/share/classes/javax/swing/text/AbstractWriter.java
+++ b/src/java.desktop/share/classes/javax/swing/text/AbstractWriter.java
@@ -270,7 +270,7 @@ public abstract class AbstractWriter {
* when encountered.
*
* @param elem an Element
- * @exception BadLocationException if pos represents an invalid
+ * @throws BadLocationException if pos represents an invalid
* location within the document
* @return the text as a String
*/
@@ -286,8 +286,8 @@ public abstract class AbstractWriter {
* out.
*
* @param elem an Element.
- * @exception IOException on any I/O error
- * @exception BadLocationException if pos represents an invalid
+ * @throws IOException on any I/O error
+ * @throws BadLocationException if pos represents an invalid
* location within the document.
*/
protected void text(Element elem) throws BadLocationException,
@@ -462,7 +462,7 @@ public abstract class AbstractWriter {
* line is empty, this will not make it so that the current line is
* still considered empty.
*
- * @exception IOException on any I/O error
+ * @throws IOException on any I/O error
*/
protected void indent() throws IOException {
int max = getIndentLevel() * getIndentSpace();
@@ -485,7 +485,7 @@ public abstract class AbstractWriter {
* the write method that takes a char[].
*
* @param ch a char.
- * @exception IOException on any I/O error
+ * @throws IOException on any I/O error
*/
protected void write(char ch) throws IOException {
if (tempChars == null) {
@@ -500,7 +500,7 @@ public abstract class AbstractWriter {
* write method that takes a char[].
*
* @param content a String.
- * @exception IOException on any I/O error
+ * @throws IOException on any I/O error
*/
protected void write(String content) throws IOException {
if (content == null) {
@@ -671,7 +671,7 @@ public abstract class AbstractWriter {
* pairs. It throws an IOException when encountered.
*
* @param attr an AttributeSet.
- * @exception IOException on any I/O error
+ * @throws IOException on any I/O error
*/
protected void writeAttributes(AttributeSet attr) throws IOException {
diff --git a/src/java.desktop/share/classes/javax/swing/text/AsyncBoxView.java b/src/java.desktop/share/classes/javax/swing/text/AsyncBoxView.java
index a9e4c58fbaa931e5911bbb29db58c7b6af1b43bc..ac0dd40b28a6f6607c2cb472ab370198298c0beb 100644
--- a/src/java.desktop/share/classes/javax/swing/text/AsyncBoxView.java
+++ b/src/java.desktop/share/classes/javax/swing/text/AsyncBoxView.java
@@ -640,7 +640,7 @@ public class AsyncBoxView extends View {
* Typically the view is told to render into the span
* that is returned, although there is no guarantee.
* The parent may choose to resize or break the view.
- * @exception IllegalArgumentException for an invalid axis type
+ * @throws IllegalArgumentException for an invalid axis type
*/
public float getPreferredSpan(int axis) {
float margin = getInsetSpan(axis);
@@ -665,7 +665,7 @@ public class AsyncBoxView extends View {
* Typically the view is told to render into the span
* that is returned, although there is no guarantee.
* The parent may choose to resize or break the view.
- * @exception IllegalArgumentException for an invalid axis type
+ * @throws IllegalArgumentException for an invalid axis type
*/
public float getMinimumSpan(int axis) {
if (axis == this.axis) {
@@ -693,7 +693,7 @@ public class AsyncBoxView extends View {
* Typically the view is told to render into the span
* that is returned, although there is no guarantee.
* The parent may choose to resize or break the view.
- * @exception IllegalArgumentException for an invalid axis type
+ * @throws IllegalArgumentException for an invalid axis type
*/
public float getMaximumSpan(int axis) {
if (axis == this.axis) {
@@ -773,9 +773,9 @@ public class AsyncBoxView extends View {
* next character represented by the offset, in case the
* position is a boundary of two views.
* @return the bounding box of the given position is returned
- * @exception BadLocationException if the given position does
+ * @throws BadLocationException if the given position does
* not represent a valid location in the associated document
- * @exception IllegalArgumentException for an invalid bias argument
+ * @throws IllegalArgumentException for an invalid bias argument
* @see View#viewToModel
*/
public Shape modelToView(int pos, Shape a, Position.Bias b) throws BadLocationException {
@@ -864,9 +864,9 @@ public class AsyncBoxView extends View {
* @param biasRet an array contain the bias that was checked
* @return the location within the model that best represents the next
* location visual position
- * @exception BadLocationException the given position is not a valid
+ * @throws BadLocationException the given position is not a valid
* position within the document
- * @exception IllegalArgumentException if direction is invalid
+ * @throws IllegalArgumentException if direction is invalid
*/
public int getNextVisualPositionFrom(int pos, Position.Bias b, Shape a,
int direction,
diff --git a/src/java.desktop/share/classes/javax/swing/text/BoxView.java b/src/java.desktop/share/classes/javax/swing/text/BoxView.java
index afaefacccf5457dcf74c8cfdcf67a4c6e06cf99b..cc21e03902173279df746ef44f86d0d619e2218e 100644
--- a/src/java.desktop/share/classes/javax/swing/text/BoxView.java
+++ b/src/java.desktop/share/classes/javax/swing/text/BoxView.java
@@ -293,7 +293,7 @@ public class BoxView extends CompositeView {
* @param axis may be either View.X_AXIS or
* View.Y_AXIS
* @return the weight
- * @exception IllegalArgumentException for an invalid axis
+ * @throws IllegalArgumentException for an invalid axis
*/
public int getResizeWeight(int axis) {
checkRequests(axis);
@@ -473,7 +473,7 @@ public class BoxView extends CompositeView {
* @param pos the position to convert >= 0
* @param a the allocated region to render into
* @return the bounding box of the given position
- * @exception BadLocationException if the given position does
+ * @throws BadLocationException if the given position does
* not represent a valid location in the associated document
* @see View#modelToView
*/
@@ -519,7 +519,7 @@ public class BoxView extends CompositeView {
* origin and 1.0 indicates alignment to the full span
* away from the origin; an alignment of 0.5 would be the
* center of the view
- * @exception IllegalArgumentException for an invalid axis
+ * @throws IllegalArgumentException for an invalid axis
*/
public float getAlignment(int axis) {
checkRequests(axis);
@@ -540,7 +540,7 @@ public class BoxView extends CompositeView {
* typically the view is told to render into the span
* that is returned, although there is no guarantee;
* the parent may choose to resize or break the view
- * @exception IllegalArgumentException for an invalid axis type
+ * @throws IllegalArgumentException for an invalid axis type
*/
public float getPreferredSpan(int axis) {
checkRequests(axis);
@@ -563,7 +563,7 @@ public class BoxView extends CompositeView {
* typically the view is told to render into the span
* that is returned, although there is no guarantee;
* the parent may choose to resize or break the view
- * @exception IllegalArgumentException for an invalid axis type
+ * @throws IllegalArgumentException for an invalid axis type
*/
public float getMinimumSpan(int axis) {
checkRequests(axis);
@@ -586,7 +586,7 @@ public class BoxView extends CompositeView {
* typically the view is told to render into the span
* that is returned, although there is no guarantee;
* the parent may choose to resize or break the view
- * @exception IllegalArgumentException for an invalid axis type
+ * @throws IllegalArgumentException for an invalid axis type
*/
public float getMaximumSpan(int axis) {
checkRequests(axis);
@@ -919,7 +919,7 @@ public class BoxView extends CompositeView {
/**
* Checks the request cache and update if needed.
* @param axis the axis being studied
- * @exception IllegalArgumentException if axis is
+ * @throws IllegalArgumentException if axis is
* neither View.X_AXIS nor View.Y_AXIS
*/
void checkRequests(int axis) {
diff --git a/src/java.desktop/share/classes/javax/swing/text/ComponentView.java b/src/java.desktop/share/classes/javax/swing/text/ComponentView.java
index a4aaa30e512bcc585064331d7b8f9de209a54735..0d8743f86edad48cebe44313e9a291cad5408f2e 100644
--- a/src/java.desktop/share/classes/javax/swing/text/ComponentView.java
+++ b/src/java.desktop/share/classes/javax/swing/text/ComponentView.java
@@ -132,7 +132,7 @@ public class ComponentView extends View {
* Typically the view is told to render into the span
* that is returned, although there is no guarantee.
* The parent may choose to resize or break the view.
- * @exception IllegalArgumentException for an invalid axis
+ * @throws IllegalArgumentException for an invalid axis
*/
public float getPreferredSpan(int axis) {
if ((axis != X_AXIS) && (axis != Y_AXIS)) {
@@ -160,7 +160,7 @@ public class ComponentView extends View {
* Typically the view is told to render into the span
* that is returned, although there is no guarantee.
* The parent may choose to resize or break the view.
- * @exception IllegalArgumentException for an invalid axis
+ * @throws IllegalArgumentException for an invalid axis
*/
public float getMinimumSpan(int axis) {
if ((axis != X_AXIS) && (axis != Y_AXIS)) {
@@ -188,7 +188,7 @@ public class ComponentView extends View {
* Typically the view is told to render into the span
* that is returned, although there is no guarantee.
* The parent may choose to resize or break the view.
- * @exception IllegalArgumentException for an invalid axis
+ * @throws IllegalArgumentException for an invalid axis
*/
public float getMaximumSpan(int axis) {
if ((axis != X_AXIS) && (axis != Y_AXIS)) {
@@ -325,7 +325,7 @@ public class ComponentView extends View {
* @param pos the position to convert >=0
* @param a the allocated region to render into
* @return the bounding box of the given position is returned
- * @exception BadLocationException if the given position does not
+ * @throws BadLocationException if the given position does not
* represent a valid location in the associated document
* @see View#modelToView
*/
diff --git a/src/java.desktop/share/classes/javax/swing/text/CompositeView.java b/src/java.desktop/share/classes/javax/swing/text/CompositeView.java
index 343c02feddc17be09cd220ef71e32e1dd87be07a..5220395d35ad05fb2615d3ff92d9768f27c1b433 100644
--- a/src/java.desktop/share/classes/javax/swing/text/CompositeView.java
+++ b/src/java.desktop/share/classes/javax/swing/text/CompositeView.java
@@ -244,7 +244,7 @@ public abstract class CompositeView extends View {
* @param b a bias value of either Position.Bias.Forward
* or Position.Bias.Backward
* @return the bounding box of the given position
- * @exception BadLocationException if the given position does
+ * @throws BadLocationException if the given position does
* not represent a valid location in the associated document
* @see View#modelToView
*/
@@ -294,9 +294,9 @@ public abstract class CompositeView extends View {
* position is a boundary of two views
* @param a the allocated region to render into
* @return the bounding box of the given position is returned
- * @exception BadLocationException if the given position does
+ * @throws BadLocationException if the given position does
* not represent a valid location in the associated document
- * @exception IllegalArgumentException for an invalid bias argument
+ * @throws IllegalArgumentException for an invalid bias argument
* @see View#viewToModel
*/
public Shape modelToView(int p0, Position.Bias b0, int p1, Position.Bias b1, Shape a) throws BadLocationException {
@@ -458,9 +458,9 @@ public abstract class CompositeView extends View {
* @param biasRet an array containing the bias that was checked
* @return the location within the model that best represents the next
* location visual position
- * @exception BadLocationException the given position is not a valid
+ * @throws BadLocationException the given position is not a valid
* position within the document
- * @exception IllegalArgumentException if direction is invalid
+ * @throws IllegalArgumentException if direction is invalid
*/
public int getNextVisualPositionFrom(int pos, Position.Bias b, Shape a,
int direction, Position.Bias[] biasRet)
@@ -715,8 +715,8 @@ public abstract class CompositeView extends View {
* @param biasRet an array containing the bias that was checked
* @return the location within the model that best represents the next
* north or south location
- * @exception BadLocationException for a bad location within a document model
- * @exception IllegalArgumentException if direction is invalid
+ * @throws BadLocationException for a bad location within a document model
+ * @throws IllegalArgumentException if direction is invalid
* @see #getNextVisualPositionFrom
*/
protected int getNextNorthSouthVisualPositionFrom(int pos, Position.Bias b,
@@ -748,8 +748,8 @@ public abstract class CompositeView extends View {
* @param biasRet an array containing the bias that was checked
* @return the location within the model that best represents the next
* west or east location
- * @exception BadLocationException for a bad location within a document model
- * @exception IllegalArgumentException if direction is invalid
+ * @throws BadLocationException for a bad location within a document model
+ * @throws IllegalArgumentException if direction is invalid
* @see #getNextVisualPositionFrom
*/
protected int getNextEastWestVisualPositionFrom(int pos, Position.Bias b,
diff --git a/src/java.desktop/share/classes/javax/swing/text/DefaultCaret.java b/src/java.desktop/share/classes/javax/swing/text/DefaultCaret.java
index a980268bd941d503ffa44a23386abc6cebb86b0e..ff4d37224e370f9f3fa43a694503aa1d7e958466 100644
--- a/src/java.desktop/share/classes/javax/swing/text/DefaultCaret.java
+++ b/src/java.desktop/share/classes/javax/swing/text/DefaultCaret.java
@@ -870,7 +870,7 @@ public class DefaultCaret extends Rectangle implements Caret, FocusListener, Mou
* FooListeners on this component,
* or an empty array if no such
* listeners have been added
- * @exception ClassCastException if listenerType
+ * @throws ClassCastException if listenerType
* doesn't specify a class or interface that implements
* java.util.EventListener
*
diff --git a/src/java.desktop/share/classes/javax/swing/text/DefaultEditorKit.java b/src/java.desktop/share/classes/javax/swing/text/DefaultEditorKit.java
index ee1db4739ceaf27c0b8c72ecdb5c3a802b2c9135..2d9971d3794300630524e3c92ebae0f89550a5e8 100644
--- a/src/java.desktop/share/classes/javax/swing/text/DefaultEditorKit.java
+++ b/src/java.desktop/share/classes/javax/swing/text/DefaultEditorKit.java
@@ -142,8 +142,8 @@ public class DefaultEditorKit extends EditorKit {
* @param doc The destination for the insertion.
* @param pos The location in the document to place the
* content >=0.
- * @exception IOException on any I/O error
- * @exception BadLocationException if pos represents an invalid
+ * @throws IOException on any I/O error
+ * @throws BadLocationException if pos represents an invalid
* location within the document.
*/
public void read(InputStream in, Document doc, int pos)
@@ -161,8 +161,8 @@ public class DefaultEditorKit extends EditorKit {
* @param pos The location in the document to fetch the
* content >=0.
* @param len The amount to write out >=0.
- * @exception IOException on any I/O error
- * @exception BadLocationException if pos represents an invalid
+ * @throws IOException on any I/O error
+ * @throws BadLocationException if pos represents an invalid
* location within the document.
*/
public void write(OutputStream out, Document doc, int pos, int len)
@@ -193,8 +193,8 @@ public class DefaultEditorKit extends EditorKit {
* @param doc The destination for the insertion.
* @param pos The location in the document to place the
* content >=0.
- * @exception IOException on any I/O error
- * @exception BadLocationException if pos represents an invalid
+ * @throws IOException on any I/O error
+ * @throws BadLocationException if pos represents an invalid
* location within the document.
*/
public void read(Reader in, Document doc, int pos)
@@ -303,8 +303,8 @@ public class DefaultEditorKit extends EditorKit {
* @param pos The location in the document to fetch the
* content from >=0.
* @param len The amount to write out >=0.
- * @exception IOException on any I/O error
- * @exception BadLocationException if pos is not within 0 and
+ * @throws IOException on any I/O error
+ * @throws BadLocationException if pos is not within 0 and
* the length of the document.
*/
public void write(Writer out, Document doc, int pos, int len)
diff --git a/src/java.desktop/share/classes/javax/swing/text/DefaultHighlighter.java b/src/java.desktop/share/classes/javax/swing/text/DefaultHighlighter.java
index 4e874ec1f007433bff147c63cd7ab12889161afb..0465b9157e28f959a68041861eb69c132fef5a12 100644
--- a/src/java.desktop/share/classes/javax/swing/text/DefaultHighlighter.java
+++ b/src/java.desktop/share/classes/javax/swing/text/DefaultHighlighter.java
@@ -110,7 +110,7 @@ public class DefaultHighlighter extends LayeredHighlighter {
* @param p the painter to use to actually render the highlight
* @return an object that can be used as a tag
* to refer to the highlight
- * @exception BadLocationException if the specified location is invalid
+ * @throws BadLocationException if the specified location is invalid
*/
public Object addHighlight(int p0, int p1, Highlighter.HighlightPainter p) throws BadLocationException {
if (p0 < 0) {
@@ -222,7 +222,7 @@ public class DefaultHighlighter extends LayeredHighlighter {
* @param tag the highlight tag
* @param p0 the beginning of the range >= 0
* @param p1 the end of the range >= p0
- * @exception BadLocationException if the specified location is invalid
+ * @throws BadLocationException if the specified location is invalid
*/
public void changeHighlight(Object tag, int p0, int p1) throws BadLocationException {
if (p0 < 0) {
diff --git a/src/java.desktop/share/classes/javax/swing/text/DefaultStyledDocument.java b/src/java.desktop/share/classes/javax/swing/text/DefaultStyledDocument.java
index f549f522ff2b7513449091c0a64ca8aebe4636ac..5d373177eaf0b96295e672c2bfaaa3da3c8a41b9 100644
--- a/src/java.desktop/share/classes/javax/swing/text/DefaultStyledDocument.java
+++ b/src/java.desktop/share/classes/javax/swing/text/DefaultStyledDocument.java
@@ -182,7 +182,7 @@ public class DefaultStyledDocument extends AbstractDocument implements StyledDoc
*
* @param offset the starting offset >= 0
* @param data the element data
- * @exception BadLocationException for an invalid starting offset
+ * @throws BadLocationException for an invalid starting offset
*/
protected void insert(int offset, ElementSpec[] data) throws BadLocationException {
if (data == null || data.length == 0) {
@@ -2548,7 +2548,7 @@ public class DefaultStyledDocument extends AbstractDocument implements StyledDoc
/**
* Redoes a change.
*
- * @exception CannotRedoException if the change cannot be redone
+ * @throws CannotRedoException if the change cannot be redone
*/
public void redo() throws CannotRedoException {
super.redo();
@@ -2562,7 +2562,7 @@ public class DefaultStyledDocument extends AbstractDocument implements StyledDoc
/**
* Undoes a change.
*
- * @exception CannotUndoException if the change cannot be undone
+ * @throws CannotUndoException if the change cannot be undone
*/
public void undo() throws CannotUndoException {
super.undo();
@@ -2604,7 +2604,7 @@ public class DefaultStyledDocument extends AbstractDocument implements StyledDoc
/**
* Redoes a change.
*
- * @exception CannotRedoException if the change cannot be redone
+ * @throws CannotRedoException if the change cannot be redone
*/
public void redo() throws CannotRedoException {
super.redo();
@@ -2614,7 +2614,7 @@ public class DefaultStyledDocument extends AbstractDocument implements StyledDoc
/**
* Undoes a change.
*
- * @exception CannotUndoException if the change cannot be undone
+ * @throws CannotUndoException if the change cannot be undone
*/
public void undo() throws CannotUndoException {
super.undo();
diff --git a/src/java.desktop/share/classes/javax/swing/text/Document.java b/src/java.desktop/share/classes/javax/swing/text/Document.java
index e0f4ac791d5e8962a593fcb51f8dea61351cef15..09f162733cfcb97bd959e44827c11bb0690e1d83 100644
--- a/src/java.desktop/share/classes/javax/swing/text/Document.java
+++ b/src/java.desktop/share/classes/javax/swing/text/Document.java
@@ -453,7 +453,7 @@ public interface Document {
*
* @param offs the offset from the beginning >= 0
* @param len the number of characters to remove >= 0
- * @exception BadLocationException some portion of the removal range
+ * @throws BadLocationException some portion of the removal range
* was not a valid part of the document. The location in the exception
* is the first bad position encountered.
* @see javax.swing.event.DocumentEvent
@@ -490,7 +490,7 @@ public interface Document {
* @param str the string to insert
* @param a the attributes to associate with the inserted
* content. This may be null if there are no attributes.
- * @exception BadLocationException the given insert position is not a valid
+ * @throws BadLocationException the given insert position is not a valid
* position within the document
* @see javax.swing.event.DocumentEvent
* @see javax.swing.event.DocumentListener
@@ -507,7 +507,7 @@ public interface Document {
* start of the text >= 0
* @param length the length of the desired string >= 0
* @return the text, in a String of length >= 0
- * @exception BadLocationException some portion of the given range
+ * @throws BadLocationException some portion of the given range
* was not a valid part of the document. The location in the exception
* is the first bad position encountered.
*/
@@ -546,7 +546,7 @@ public interface Document {
* @param length the length of the desired string >= 0
* @param txt the Segment object to return the text in
*
- * @exception BadLocationException Some portion of the given range
+ * @throws BadLocationException Some portion of the given range
* was not a valid part of the document. The location in the exception
* is the first bad position encountered.
*/
@@ -582,7 +582,7 @@ public interface Document {
*
* @param offs the offset from the start of the document >= 0
* @return the position
- * @exception BadLocationException if the given position does not
+ * @throws BadLocationException if the given position does not
* represent a valid location in the associated document
*/
public Position createPosition(int offs) throws BadLocationException;
diff --git a/src/java.desktop/share/classes/javax/swing/text/DocumentFilter.java b/src/java.desktop/share/classes/javax/swing/text/DocumentFilter.java
index 5f69882ff8ef9733f66560f0ad1aa21071bcc342..d0334bce45e11a324d515c45d1dfb19f1bcc8f78 100644
--- a/src/java.desktop/share/classes/javax/swing/text/DocumentFilter.java
+++ b/src/java.desktop/share/classes/javax/swing/text/DocumentFilter.java
@@ -75,7 +75,7 @@ public class DocumentFilter {
* @param fb FilterBypass that can be used to mutate Document
* @param offset the offset from the beginning >= 0
* @param length the number of characters to remove >= 0
- * @exception BadLocationException some portion of the removal range
+ * @throws BadLocationException some portion of the removal range
* was not a valid part of the document. The location in the exception
* is the first bad position encountered.
*/
@@ -97,7 +97,7 @@ public class DocumentFilter {
* @param string the string to insert
* @param attr the attributes to associate with the inserted
* content. This may be null if there are no attributes.
- * @exception BadLocationException the given insert position is not a
+ * @throws BadLocationException the given insert position is not a
* valid position within the document
*/
public void insertString(FilterBypass fb, int offset, String string,
@@ -117,7 +117,7 @@ public class DocumentFilter {
* @param text Text to insert, null indicates no text to insert
* @param attrs AttributeSet indicating attributes of inserted text,
* null is legal.
- * @exception BadLocationException the given insert position is not a
+ * @throws BadLocationException the given insert position is not a
* valid position within the document
*/
public void replace(FilterBypass fb, int offset, int length, String text,
@@ -153,7 +153,7 @@ public class DocumentFilter {
*
* @param offset the offset from the beginning >= 0
* @param length the number of characters to remove >= 0
- * @exception BadLocationException some portion of the removal range
+ * @throws BadLocationException some portion of the removal range
* was not a valid part of the document. The location in the
* exception is the first bad position encountered.
*/
@@ -169,7 +169,7 @@ public class DocumentFilter {
* @param string the string to insert
* @param attr the attributes to associate with the inserted
* content. This may be null if there are no attributes.
- * @exception BadLocationException the given insert position is not a
+ * @throws BadLocationException the given insert position is not a
* valid position within the document
*/
public abstract void insertString(int offset, String string,
@@ -186,7 +186,7 @@ public class DocumentFilter {
* @param string Text to insert, null indicates no text to insert
* @param attrs AttributeSet indicating attributes of inserted text,
* null is legal.
- * @exception BadLocationException the given insert is not a
+ * @throws BadLocationException the given insert is not a
* valid position within the document
*/
public abstract void replace(int offset, int length, String string,
diff --git a/src/java.desktop/share/classes/javax/swing/text/EditorKit.java b/src/java.desktop/share/classes/javax/swing/text/EditorKit.java
index 9163a6361e4cc3cc77a3fc153d170c97c241c9e1..cd491fb5bac4b5abff14c9c00129a65588b01051 100644
--- a/src/java.desktop/share/classes/javax/swing/text/EditorKit.java
+++ b/src/java.desktop/share/classes/javax/swing/text/EditorKit.java
@@ -141,8 +141,8 @@ public abstract class EditorKit implements Cloneable, Serializable {
* @param doc The destination for the insertion.
* @param pos The location in the document to place the
* content >= 0.
- * @exception IOException on any I/O error
- * @exception BadLocationException if pos represents an invalid
+ * @throws IOException on any I/O error
+ * @throws BadLocationException if pos represents an invalid
* location within the document.
*/
public abstract void read(InputStream in, Document doc, int pos)
@@ -157,8 +157,8 @@ public abstract class EditorKit implements Cloneable, Serializable {
* @param pos The location in the document to fetch the
* content from >= 0.
* @param len The amount to write out >= 0.
- * @exception IOException on any I/O error
- * @exception BadLocationException if pos represents an invalid
+ * @throws IOException on any I/O error
+ * @throws BadLocationException if pos represents an invalid
* location within the document.
*/
public abstract void write(OutputStream out, Document doc, int pos, int len)
@@ -178,8 +178,8 @@ public abstract class EditorKit implements Cloneable, Serializable {
* @param doc The destination for the insertion.
* @param pos The location in the document to place the
* content >= 0.
- * @exception IOException on any I/O error
- * @exception BadLocationException if pos represents an invalid
+ * @throws IOException on any I/O error
+ * @throws BadLocationException if pos represents an invalid
* location within the document.
*/
public abstract void read(Reader in, Document doc, int pos)
@@ -199,8 +199,8 @@ public abstract class EditorKit implements Cloneable, Serializable {
* @param pos The location in the document to fetch the
* content >= 0.
* @param len The amount to write out >= 0.
- * @exception IOException on any I/O error
- * @exception BadLocationException if pos represents an invalid
+ * @throws IOException on any I/O error
+ * @throws BadLocationException if pos represents an invalid
* location within the document.
*/
public abstract void write(Writer out, Document doc, int pos, int len)
diff --git a/src/java.desktop/share/classes/javax/swing/text/FieldView.java b/src/java.desktop/share/classes/javax/swing/text/FieldView.java
index 936a78700beb40346c5bf38e1507c1b56eae4556..b5ad636994527f59113ebb51eb2b28c07961aff2 100644
--- a/src/java.desktop/share/classes/javax/swing/text/FieldView.java
+++ b/src/java.desktop/share/classes/javax/swing/text/FieldView.java
@@ -258,7 +258,7 @@ public class FieldView extends PlainView {
* @param pos the position to convert >= 0
* @param a the allocated region to render into
* @return the bounding box of the given position
- * @exception BadLocationException if the given position does not
+ * @throws BadLocationException if the given position does not
* represent a valid location in the associated document
* @see View#modelToView
*/
diff --git a/src/java.desktop/share/classes/javax/swing/text/GapContent.java b/src/java.desktop/share/classes/javax/swing/text/GapContent.java
index c59c350541b117fad90cd1c992cb4d5fe88d5836..6c96b2b0ec3db8db94b91ebc0101385de3caabae 100644
--- a/src/java.desktop/share/classes/javax/swing/text/GapContent.java
+++ b/src/java.desktop/share/classes/javax/swing/text/GapContent.java
@@ -130,7 +130,7 @@ public class GapContent extends GapVector implements AbstractDocument.Content, S
* @param where the starting position >= 0, < length()
* @param str the non-null string to insert
* @return an UndoableEdit object for undoing
- * @exception BadLocationException if the specified position is invalid
+ * @throws BadLocationException if the specified position is invalid
* @see AbstractDocument.Content#insertString
*/
public UndoableEdit insertString(int where, String str) throws BadLocationException {
@@ -148,7 +148,7 @@ public class GapContent extends GapVector implements AbstractDocument.Content, S
* @param where the starting position >= 0, where + nitems < length()
* @param nitems the number of characters to remove >= 0
* @return an UndoableEdit object for undoing
- * @exception BadLocationException if the specified position is invalid
+ * @throws BadLocationException if the specified position is invalid
* @see AbstractDocument.Content#remove
*/
public UndoableEdit remove(int where, int nitems) throws BadLocationException {
@@ -168,7 +168,7 @@ public class GapContent extends GapVector implements AbstractDocument.Content, S
* @param where the starting position >= 0
* @param len the length to retrieve >= 0
* @return a string representing the content
- * @exception BadLocationException if the specified position is invalid
+ * @throws BadLocationException if the specified position is invalid
* @see AbstractDocument.Content#getString
*/
public String getString(int where, int len) throws BadLocationException {
@@ -186,7 +186,7 @@ public class GapContent extends GapVector implements AbstractDocument.Content, S
* @param where the starting position >= 0, where + len <= length()
* @param len the number of characters to retrieve >= 0
* @param chars the Segment object to return the characters in
- * @exception BadLocationException if the specified position is invalid
+ * @throws BadLocationException if the specified position is invalid
* @see AbstractDocument.Content#getChars
*/
public void getChars(int where, int len, Segment chars) throws BadLocationException {
@@ -237,7 +237,7 @@ public class GapContent extends GapVector implements AbstractDocument.Content, S
*
* @param offset the offset to track >= 0
* @return the position
- * @exception BadLocationException if the specified position is invalid
+ * @throws BadLocationException if the specified position is invalid
*/
public Position createPosition(int offset) throws BadLocationException {
while ( queue.poll() != null ) {
diff --git a/src/java.desktop/share/classes/javax/swing/text/GlyphPainter2.java b/src/java.desktop/share/classes/javax/swing/text/GlyphPainter2.java
index 3a070bb4040f605712ffd4fbb9bc1087575871ac..59e2a9da491cff09b9c29de942560dc87e922289 100644
--- a/src/java.desktop/share/classes/javax/swing/text/GlyphPainter2.java
+++ b/src/java.desktop/share/classes/javax/swing/text/GlyphPainter2.java
@@ -231,8 +231,8 @@ class GlyphPainter2 extends GlyphView.GlyphPainter {
* SwingConstants.NORTH, or SwingConstants.SOUTH.
* @return the location within the model that best represents the next
* location visual position.
- * @exception BadLocationException
- * @exception IllegalArgumentException for an invalid direction
+ * @throws BadLocationException
+ * @throws IllegalArgumentException for an invalid direction
*/
public int getNextVisualPositionFrom(GlyphView v, int pos,
Position.Bias b, Shape a,
diff --git a/src/java.desktop/share/classes/javax/swing/text/GlyphView.java b/src/java.desktop/share/classes/javax/swing/text/GlyphView.java
index b075356593c595e667935f58a5d6846ada4b8aae..8a4828f62d54775aea6d64560722dddd8bbdfd82 100644
--- a/src/java.desktop/share/classes/javax/swing/text/GlyphView.java
+++ b/src/java.desktop/share/classes/javax/swing/text/GlyphView.java
@@ -637,7 +637,7 @@ public class GlyphView extends View implements TabableView, Cloneable {
* @param b either Position.Bias.Forward
* or Position.Bias.Backward
* @return the bounding box of the given position
- * @exception BadLocationException if the given position does not represent a
+ * @throws BadLocationException if the given position does not represent a
* valid location in the associated document
* @see View#modelToView
*/
@@ -885,9 +885,9 @@ public class GlyphView extends View implements TabableView, Cloneable {
* SwingConstants.NORTH, or SwingConstants.SOUTH.
* @return the location within the model that best represents the next
* location visual position.
- * @exception BadLocationException the given position is not a valid
+ * @throws BadLocationException the given position is not a valid
* position within the document
- * @exception IllegalArgumentException for an invalid direction
+ * @throws IllegalArgumentException for an invalid direction
*/
public int getNextVisualPositionFrom(int pos, Position.Bias b, Shape a,
int direction,
@@ -1199,7 +1199,7 @@ public class GlyphView extends View implements TabableView, Cloneable {
* or Position.Bias.Backward
* @param a Bounds of the View
* @return the bounding box of the given position
- * @exception BadLocationException if the given position does not represent a
+ * @throws BadLocationException if the given position does not represent a
* valid location in the associated document
* @see View#modelToView
*/
@@ -1283,8 +1283,8 @@ public class GlyphView extends View implements TabableView, Cloneable {
* is returned as the zero-th element of this array
* @return the location within the model that best represents the next
* location visual position.
- * @exception BadLocationException for a bad location within a document model
- * @exception IllegalArgumentException for an invalid direction
+ * @throws BadLocationException for a bad location within a document model
+ * @throws IllegalArgumentException for an invalid direction
*/
public int getNextVisualPositionFrom(GlyphView v, int pos, Position.Bias b, Shape a,
int direction,
diff --git a/src/java.desktop/share/classes/javax/swing/text/Highlighter.java b/src/java.desktop/share/classes/javax/swing/text/Highlighter.java
index 10243f10cdd9b34d9e2e6a7c907bee56f0ccbd15..7913e47b948c28e232e89975be00d0b798948fc0 100644
--- a/src/java.desktop/share/classes/javax/swing/text/Highlighter.java
+++ b/src/java.desktop/share/classes/javax/swing/text/Highlighter.java
@@ -70,7 +70,7 @@ public interface Highlighter {
* @param p1 the end of the range >= p0
* @param p the painter to use for the actual highlighting
* @return an object that refers to the highlight
- * @exception BadLocationException for an invalid range specification
+ * @throws BadLocationException for an invalid range specification
*/
public Object addHighlight(int p0, int p1, HighlightPainter p) throws BadLocationException;
@@ -95,7 +95,7 @@ public interface Highlighter {
* @param tag which highlight to change
* @param p0 the beginning of the range >= 0
* @param p1 the end of the range >= p0
- * @exception BadLocationException for an invalid range specification
+ * @throws BadLocationException for an invalid range specification
*/
public void changeHighlight(Object tag, int p0, int p1) throws BadLocationException;
diff --git a/src/java.desktop/share/classes/javax/swing/text/IconView.java b/src/java.desktop/share/classes/javax/swing/text/IconView.java
index c908e973753cc385e1c8f2ba0c4b406a95a8f4e2..76cb653c9ae0d14484400b1c99dbfb46ac5f602b 100644
--- a/src/java.desktop/share/classes/javax/swing/text/IconView.java
+++ b/src/java.desktop/share/classes/javax/swing/text/IconView.java
@@ -81,7 +81,7 @@ public class IconView extends View {
* Typically the view is told to render into the span
* that is returned, although there is no guarantee.
* The parent may choose to resize or break the view.
- * @exception IllegalArgumentException for an invalid axis
+ * @throws IllegalArgumentException for an invalid axis
*/
public float getPreferredSpan(int axis) {
switch (axis) {
@@ -123,7 +123,7 @@ public class IconView extends View {
* @param pos the position to convert >= 0
* @param a the allocated region to render into
* @return the bounding box of the given position
- * @exception BadLocationException if the given position does not
+ * @throws BadLocationException if the given position does not
* represent a valid location in the associated document
* @see View#modelToView
*/
diff --git a/src/java.desktop/share/classes/javax/swing/text/JTextComponent.java b/src/java.desktop/share/classes/javax/swing/text/JTextComponent.java
index cbdd308cc84b81dc0b516a9da0ad7d9d25e5105c..d618dc6a2a1989db5a22684e4d6e99340980c433 100644
--- a/src/java.desktop/share/classes/javax/swing/text/JTextComponent.java
+++ b/src/java.desktop/share/classes/javax/swing/text/JTextComponent.java
@@ -672,7 +672,7 @@ public abstract class JTextComponent extends JComponent implements Scrollable, A
* component's {@code TransferHandler}.
*
* @param b whether or not to enable automatic drag handling
- * @exception HeadlessException if
+ * @throws HeadlessException if
* b is true and
* GraphicsEnvironment.isHeadless()
* returns true
@@ -1358,7 +1358,7 @@ public abstract class JTextComponent extends JComponent implements Scrollable, A
* @param offs the offset ≥ 0
* @param len the length ≥ 0
* @return the text
- * @exception BadLocationException if the offset or length are invalid
+ * @throws BadLocationException if the offset or length are invalid
*/
public String getText(int offs, int len) throws BadLocationException {
return getDocument().getText(offs, len);
@@ -1376,7 +1376,7 @@ public abstract class JTextComponent extends JComponent implements Scrollable, A
* @return the coordinates as a rectangle, with (r.x, r.y) as the location
* in the coordinate system, or null if the component does
* not yet have a positive size.
- * @exception BadLocationException if the given position does not
+ * @throws BadLocationException if the given position does not
* represent a valid location in the associated document
* @see TextUI#modelToView
*
@@ -1400,7 +1400,7 @@ public abstract class JTextComponent extends JComponent implements Scrollable, A
* @return the coordinates as a rectangle, with (r.x, r.y) as the location
* in the coordinate system, or null if the component does
* not yet have a positive size.
- * @exception BadLocationException if the given position does not
+ * @throws BadLocationException if the given position does not
* represent a valid location in the associated document
* @see TextUI#modelToView2D
*
@@ -1545,7 +1545,7 @@ public abstract class JTextComponent extends JComponent implements Scrollable, A
* an exception is thrown.
*
* @param pos the position
- * @exception IllegalArgumentException if the value supplied
+ * @throws IllegalArgumentException if the value supplied
* for position is less than zero or greater
* than the component's text length
* @see #setCaretPosition
@@ -1617,7 +1617,7 @@ public abstract class JTextComponent extends JComponent implements Scrollable, A
* of documents (such as html for example) might be
* able to make use of this information; if non-null,
* it is added as a property of the document
- * @exception IOException as thrown by the stream being
+ * @throws IOException as thrown by the stream being
* used to initialize
* @see EditorKit#createDefaultDocument
* @see #setDocument
@@ -1643,7 +1643,7 @@ public abstract class JTextComponent extends JComponent implements Scrollable, A
* text.
*
* @param out the output stream
- * @exception IOException on any I/O error
+ * @throws IOException on any I/O error
*/
public void write(Writer out) throws IOException {
Document doc = getDocument();
@@ -1672,7 +1672,7 @@ public abstract class JTextComponent extends JComponent implements Scrollable, A
* an exception is thrown.
*
* @param position the position
- * @exception IllegalArgumentException if the value supplied
+ * @throws IllegalArgumentException if the value supplied
* for position is less than zero or greater
* than the component's text length
*/
@@ -1743,7 +1743,7 @@ public abstract class JTextComponent extends JComponent implements Scrollable, A
* use DocumentListener.
*
* @return the text
- * @exception NullPointerException if the document is null
+ * @throws NullPointerException if the document is null
* @see #setText
*/
public String getText() {
@@ -1763,7 +1763,7 @@ public abstract class JTextComponent extends JComponent implements Scrollable, A
* null or the document empty, returns null.
*
* @return the text
- * @exception IllegalArgumentException if the selection doesn't
+ * @throws IllegalArgumentException if the selection doesn't
* have a valid mapping into the document for some reason
* @see #setText
*/
@@ -2013,7 +2013,7 @@ public abstract class JTextComponent extends JComponent implements Scrollable, A
* @param direction less than zero to scroll up/left, greater than
* zero for down/right
* @return the "unit" increment for scrolling in the specified direction
- * @exception IllegalArgumentException for an invalid orientation
+ * @throws IllegalArgumentException for an invalid orientation
* @see JScrollBar#setUnitIncrement
*/
public int getScrollableUnitIncrement(Rectangle visibleRect, int orientation, int direction) {
@@ -2043,7 +2043,7 @@ public abstract class JTextComponent extends JComponent implements Scrollable, A
* @param direction less than zero to scroll up/left, greater than zero
* for down/right
* @return the "block" increment for scrolling in the specified direction
- * @exception IllegalArgumentException for an invalid orientation
+ * @throws IllegalArgumentException for an invalid orientation
* @see JScrollBar#setBlockIncrement
*/
public int getScrollableBlockIncrement(Rectangle visibleRect, int orientation, int direction) {
diff --git a/src/java.desktop/share/classes/javax/swing/text/NavigationFilter.java b/src/java.desktop/share/classes/javax/swing/text/NavigationFilter.java
index 648625e8974f7b8e832412561aa4e99226105caa..a7d85a71e02d130cb67b4508862c0f1bccd1a22e 100644
--- a/src/java.desktop/share/classes/javax/swing/text/NavigationFilter.java
+++ b/src/java.desktop/share/classes/javax/swing/text/NavigationFilter.java
@@ -105,8 +105,8 @@ public class NavigationFilter {
* @param biasRet Used to return resulting Bias of next position
* @return the location within the model that best represents the next
* location visual position
- * @exception BadLocationException for a bad location within a document model
- * @exception IllegalArgumentException if direction
+ * @throws BadLocationException for a bad location within a document model
+ * @throws IllegalArgumentException if direction
* doesn't have one of the legal values above
*/
public int getNextVisualPositionFrom(JTextComponent text, int pos,
diff --git a/src/java.desktop/share/classes/javax/swing/text/ParagraphView.java b/src/java.desktop/share/classes/javax/swing/text/ParagraphView.java
index f8d0e390cb2a84e9c1f0042dcf213a8d70ddb80a..e24583af13b140a8ec5557169a34161549e21053 100644
--- a/src/java.desktop/share/classes/javax/swing/text/ParagraphView.java
+++ b/src/java.desktop/share/classes/javax/swing/text/ParagraphView.java
@@ -876,7 +876,7 @@ public class ParagraphView extends FlowView implements TabExpander {
* @param pos the position to convert
* @param a the allocated region to render into
* @return the bounding box of the given position
- * @exception BadLocationException if the given position does not represent a
+ * @throws BadLocationException if the given position does not represent a
* valid location in the associated document
* @see View#modelToView
*/
diff --git a/src/java.desktop/share/classes/javax/swing/text/PasswordView.java b/src/java.desktop/share/classes/javax/swing/text/PasswordView.java
index 38bb0eec13ea1c1f0bf5daeb926ea454e192c0ca..bdf8d5cdfe64c6aedb7c7b03cdb7dc1fe04fc71f 100644
--- a/src/java.desktop/share/classes/javax/swing/text/PasswordView.java
+++ b/src/java.desktop/share/classes/javax/swing/text/PasswordView.java
@@ -61,7 +61,7 @@ public class PasswordView extends FieldView {
* @param p0 the starting offset in the model >= 0
* @param p1 the ending offset in the model >= p0
* @return the X location of the end of the range >= 0
- * @exception BadLocationException if p0 or p1 are out of range
+ * @throws BadLocationException if p0 or p1 are out of range
*
* @deprecated replaced by
* {@link #drawUnselectedText(Graphics2D, float, float, int, int)}
@@ -131,7 +131,7 @@ public class PasswordView extends FieldView {
* @param p0 the starting offset in the model >= 0
* @param p1 the ending offset in the model >= p0
* @return the X location of the end of the range >= 0
- * @exception BadLocationException if p0 or p1 are out of range
+ * @throws BadLocationException if p0 or p1 are out of range
*
* @deprecated replaced by
* {@link #drawSelectedText(Graphics2D, float, float, int, int)}
@@ -240,7 +240,7 @@ public class PasswordView extends FieldView {
* @param pos the position to convert >= 0
* @param a the allocated region to render into
* @return the bounding box of the given position
- * @exception BadLocationException if the given position does not
+ * @throws BadLocationException if the given position does not
* represent a valid location in the associated document
* @see View#modelToView
*/
diff --git a/src/java.desktop/share/classes/javax/swing/text/PlainDocument.java b/src/java.desktop/share/classes/javax/swing/text/PlainDocument.java
index cd397d12a684b17707be2299a5c96f10d5a5d5d9..ad6a0bdf2d3e9b7448830fbcd979569db8bd2792 100644
--- a/src/java.desktop/share/classes/javax/swing/text/PlainDocument.java
+++ b/src/java.desktop/share/classes/javax/swing/text/PlainDocument.java
@@ -107,7 +107,7 @@ public class PlainDocument extends AbstractDocument {
* @param offs the starting offset >= 0
* @param str the string to insert; does nothing with null/empty strings
* @param a the attributes for the inserted content
- * @exception BadLocationException the given insert position is not a valid
+ * @throws BadLocationException the given insert position is not a valid
* position within the document
* @see Document#insertString
*/
diff --git a/src/java.desktop/share/classes/javax/swing/text/PlainView.java b/src/java.desktop/share/classes/javax/swing/text/PlainView.java
index 725dec9bb7dd783bb356b2f7392778638cc33693..0c245196d995420f2b8dd0cb786374ba3822d889 100644
--- a/src/java.desktop/share/classes/javax/swing/text/PlainView.java
+++ b/src/java.desktop/share/classes/javax/swing/text/PlainView.java
@@ -179,7 +179,7 @@ public class PlainView extends View implements TabExpander {
* @param p0 the beginning position in the model >= 0
* @param p1 the ending position in the model >= 0
* @return the X location of the end of the range >= 0
- * @exception BadLocationException if the range is invalid
+ * @throws BadLocationException if the range is invalid
*
* @deprecated replaced by
* {@link #drawUnselectedText(Graphics2D, float, float, int, int)}
@@ -224,7 +224,7 @@ public class PlainView extends View implements TabExpander {
* @param p0 the beginning position in the model {@code >= 0}
* @param p1 the ending position in the model {@code >= 0}
* @return the X location of the end of the range {@code >= 0}
- * @exception BadLocationException if the range is invalid
+ * @throws BadLocationException if the range is invalid
*
* @since 9
*/
@@ -245,7 +245,7 @@ public class PlainView extends View implements TabExpander {
* @param p0 the beginning position in the model >= 0
* @param p1 the ending position in the model >= 0
* @return the location of the end of the range
- * @exception BadLocationException if the range is invalid
+ * @throws BadLocationException if the range is invalid
*
* @deprecated replaced by
* {@link #drawSelectedText(Graphics2D, float, float, int, int)}
@@ -294,7 +294,7 @@ public class PlainView extends View implements TabExpander {
* @param p0 the beginning position in the model {@code >= 0}
* @param p1 the ending position in the model {@code >= 0}
* @return the location of the end of the range
- * @exception BadLocationException if the range is invalid
+ * @throws BadLocationException if the range is invalid
*
* @since 9
*/
@@ -351,7 +351,7 @@ public class PlainView extends View implements TabExpander {
* Typically the view is told to render into the span
* that is returned, although there is no guarantee.
* The parent may choose to resize or break the view.
- * @exception IllegalArgumentException for an invalid axis
+ * @throws IllegalArgumentException for an invalid axis
*/
public float getPreferredSpan(int axis) {
updateMetrics();
@@ -468,7 +468,7 @@ public class PlainView extends View implements TabExpander {
* @param pos the position to convert >= 0
* @param a the allocated region to render into
* @return the bounding box of the given position
- * @exception BadLocationException if the given position does not
+ * @throws BadLocationException if the given position does not
* represent a valid location in the associated document
* @see View#modelToView
*/
diff --git a/src/java.desktop/share/classes/javax/swing/text/StringContent.java b/src/java.desktop/share/classes/javax/swing/text/StringContent.java
index 7f154df38edffce7203667f93ff9980c0c6268ba..04bd4d7e0b464880b01f3857a57fd6c7c1cb6a8b 100644
--- a/src/java.desktop/share/classes/javax/swing/text/StringContent.java
+++ b/src/java.desktop/share/classes/javax/swing/text/StringContent.java
@@ -90,7 +90,7 @@ public final class StringContent implements AbstractDocument.Content, Serializab
* @param where the starting position >= 0 && < length()
* @param str the non-null string to insert
* @return an UndoableEdit object for undoing
- * @exception BadLocationException if the specified position is invalid
+ * @throws BadLocationException if the specified position is invalid
* @see AbstractDocument.Content#insertString
*/
public UndoableEdit insertString(int where, String str) throws BadLocationException {
@@ -111,7 +111,7 @@ public final class StringContent implements AbstractDocument.Content, Serializab
* @param where the starting position >= 0
* @param nitems the number of characters to remove >= 0
* @return an UndoableEdit object for undoing
- * @exception BadLocationException if the specified position is invalid
+ * @throws BadLocationException if the specified position is invalid
* @see AbstractDocument.Content#remove
*/
public UndoableEdit remove(int where, int nitems) throws BadLocationException {
@@ -134,7 +134,7 @@ public final class StringContent implements AbstractDocument.Content, Serializab
* @param where the starting position >= 0
* @param len the length to retrieve >= 0
* @return a string representing the content; may be empty
- * @exception BadLocationException if the specified position is invalid
+ * @throws BadLocationException if the specified position is invalid
* @see AbstractDocument.Content#getString
*/
public String getString(int where, int len) throws BadLocationException {
@@ -150,7 +150,7 @@ public final class StringContent implements AbstractDocument.Content, Serializab
* @param where the starting position >= 0
* @param len the number of characters to retrieve >= 0
* @param chars the Segment object to return the characters in
- * @exception BadLocationException if the specified position is invalid
+ * @throws BadLocationException if the specified position is invalid
* @see AbstractDocument.Content#getChars
*/
public void getChars(int where, int len, Segment chars) throws BadLocationException {
@@ -168,7 +168,7 @@ public final class StringContent implements AbstractDocument.Content, Serializab
*
* @param offset the offset to create a position for >= 0
* @return the position
- * @exception BadLocationException if the specified position is invalid
+ * @throws BadLocationException if the specified position is invalid
*/
public Position createPosition(int offset) throws BadLocationException {
// some small documents won't have any sticky positions
diff --git a/src/java.desktop/share/classes/javax/swing/text/StyleContext.java b/src/java.desktop/share/classes/javax/swing/text/StyleContext.java
index 9e01aecd3fb6dc3c5cef3abdfdebf0368cf9c77f..70da1356b99557b11cb9a83540ee0c45b144962c 100644
--- a/src/java.desktop/share/classes/javax/swing/text/StyleContext.java
+++ b/src/java.desktop/share/classes/javax/swing/text/StyleContext.java
@@ -579,7 +579,7 @@ public class StyleContext implements Serializable, AbstractDocument.AttributeCon
* Context-specific handling of writing out attributes
* @param out the output stream
* @param a the attribute set
- * @exception IOException on any I/O error
+ * @throws IOException on any I/O error
*/
public void writeAttributes(ObjectOutputStream out,
AttributeSet a) throws IOException {
@@ -591,9 +591,9 @@ public class StyleContext implements Serializable, AbstractDocument.AttributeCon
* @param in the object stream to read the attribute data from.
* @param a the attribute set to place the attribute
* definitions in.
- * @exception ClassNotFoundException passed upward if encountered
+ * @throws ClassNotFoundException passed upward if encountered
* when reading the object stream.
- * @exception IOException passed upward if encountered when
+ * @throws IOException passed upward if encountered when
* reading the object stream.
*/
public void readAttributes(ObjectInputStream in,
@@ -613,7 +613,7 @@ public class StyleContext implements Serializable, AbstractDocument.AttributeCon
*
* @param out the output stream
* @param a the attribute set
- * @exception IOException on any I/O error
+ * @throws IOException on any I/O error
*/
public static void writeAttributeSet(ObjectOutputStream out,
AttributeSet a) throws IOException {
@@ -660,9 +660,9 @@ public class StyleContext implements Serializable, AbstractDocument.AttributeCon
* @param in the object stream to read the attribute data from.
* @param a the attribute set to place the attribute
* definitions in.
- * @exception ClassNotFoundException passed upward if encountered
+ * @throws ClassNotFoundException passed upward if encountered
* when reading the object stream.
- * @exception IOException passed upward if encountered when
+ * @throws IOException passed upward if encountered when
* reading the object stream.
*/
public static void readAttributeSet(ObjectInputStream in,
@@ -1077,7 +1077,7 @@ public class StyleContext implements Serializable, AbstractDocument.AttributeCon
* Returns the next element of this enumeration.
*
* @return the next element of this enumeration.
- * @exception NoSuchElementException if no more elements exist.
+ * @throws NoSuchElementException if no more elements exist.
* @since 1.0
*/
public Object nextElement() {
diff --git a/src/java.desktop/share/classes/javax/swing/text/StyledEditorKit.java b/src/java.desktop/share/classes/javax/swing/text/StyledEditorKit.java
index 00ad982cbf45d939dd91fc37146f1018b8eee6b5..a4984efce6c0f609443a661a1c1ed82923def864 100644
--- a/src/java.desktop/share/classes/javax/swing/text/StyledEditorKit.java
+++ b/src/java.desktop/share/classes/javax/swing/text/StyledEditorKit.java
@@ -411,7 +411,7 @@ public class StyledEditorKit extends DefaultEditorKit {
*
* @param e the editor
* @return the document
- * @exception IllegalArgumentException for the wrong document type
+ * @throws IllegalArgumentException for the wrong document type
*/
protected final StyledDocument getStyledDocument(JEditorPane e) {
Document d = e.getDocument();
@@ -426,7 +426,7 @@ public class StyledEditorKit extends DefaultEditorKit {
*
* @param e the editor pane
* @return the kit
- * @exception IllegalArgumentException for the wrong document type
+ * @throws IllegalArgumentException for the wrong document type
*/
protected final StyledEditorKit getStyledEditorKit(JEditorPane e) {
EditorKit k = e.getEditorKit();
diff --git a/src/java.desktop/share/classes/javax/swing/text/TableView.java b/src/java.desktop/share/classes/javax/swing/text/TableView.java
index bd1c677ffaec7d48d74ba615dc23f52490775e0f..d18bd5a93db49bd3db24cb1b0e69c4da2836edd5 100644
--- a/src/java.desktop/share/classes/javax/swing/text/TableView.java
+++ b/src/java.desktop/share/classes/javax/swing/text/TableView.java
@@ -805,7 +805,7 @@ public abstract class TableView extends BoxView {
*
* @param axis may be either View.X_AXIS or View.Y_AXIS
* @return the resize weight
- * @exception IllegalArgumentException for an invalid axis
+ * @throws IllegalArgumentException for an invalid axis
*/
public int getResizeWeight(int axis) {
return 1;
diff --git a/src/java.desktop/share/classes/javax/swing/text/Utilities.java b/src/java.desktop/share/classes/javax/swing/text/Utilities.java
index ae93b5a40b5f01dc1a79ec277bcf0cfbfc9a27c8..62f323f076aa5ac23eb7481f07935b43e940bb96 100644
--- a/src/java.desktop/share/classes/javax/swing/text/Utilities.java
+++ b/src/java.desktop/share/classes/javax/swing/text/Utilities.java
@@ -683,7 +683,7 @@ public class Utilities {
* @param offs the offset in the document >= 0
* @return the position >= 0 if the request can be computed, otherwise
* a value of -1 will be returned.
- * @exception BadLocationException if the offset is out of range
+ * @throws BadLocationException if the offset is out of range
*/
@SuppressWarnings("deprecation")
public static final int getRowStart(JTextComponent c, int offs) throws BadLocationException {
@@ -714,7 +714,7 @@ public class Utilities {
* @param offs the offset in the document >= 0
* @return the position >= 0 if the request can be computed, otherwise
* a value of -1 will be returned.
- * @exception BadLocationException if the offset is out of range
+ * @throws BadLocationException if the offset is out of range
*/
@SuppressWarnings("deprecation")
public static final int getRowEnd(JTextComponent c, int offs) throws BadLocationException {
@@ -747,7 +747,7 @@ public class Utilities {
* @param x the X coordinate >= 0
* @return the position >= 0 if the request can be computed, otherwise
* a value of -1 will be returned.
- * @exception BadLocationException if the offset is out of range
+ * @throws BadLocationException if the offset is out of range
*
* @deprecated replaced by
* {@link #getPositionAbove(JTextComponent, int, float)}
@@ -802,7 +802,7 @@ public class Utilities {
* @param x the X coordinate {@code >= 0}
* @return the position {@code >= 0} if the request can be computed, otherwise
* a value of -1 will be returned.
- * @exception BadLocationException if the offset is out of range
+ * @throws BadLocationException if the offset is out of range
*
* @since 9
*/
@@ -822,7 +822,7 @@ public class Utilities {
* @param x the X coordinate >= 0
* @return the position >= 0 if the request can be computed, otherwise
* a value of -1 will be returned.
- * @exception BadLocationException if the offset is out of range
+ * @throws BadLocationException if the offset is out of range
*
* @deprecated replaced by
* {@link #getPositionBelow(JTextComponent, int, float)}
@@ -878,7 +878,7 @@ public class Utilities {
* @param x the X coordinate {@code >= 0}
* @return the position {@code >= 0} if the request can be computed, otherwise
* a value of -1 will be returned.
- * @exception BadLocationException if the offset is out of range
+ * @throws BadLocationException if the offset is out of range
*
* @since 9
*/
@@ -894,7 +894,7 @@ public class Utilities {
* @param c the editor
* @param offs the offset in the document >= 0
* @return the location in the model of the word start >= 0
- * @exception BadLocationException if the offset is out of range
+ * @throws BadLocationException if the offset is out of range
*/
public static final int getWordStart(JTextComponent c, int offs) throws BadLocationException {
Document doc = c.getDocument();
@@ -928,7 +928,7 @@ public class Utilities {
* @param c the editor
* @param offs the offset in the document >= 0
* @return the location in the model of the word end >= 0
- * @exception BadLocationException if the offset is out of range
+ * @throws BadLocationException if the offset is out of range
*/
public static final int getWordEnd(JTextComponent c, int offs) throws BadLocationException {
Document doc = c.getDocument();
@@ -961,7 +961,7 @@ public class Utilities {
* @param c the editor
* @param offs the offset in the document >= 0
* @return the location in the model of the word start >= 0
- * @exception BadLocationException if the offset is out of range
+ * @throws BadLocationException if the offset is out of range
*/
public static final int getNextWord(JTextComponent c, int offs) throws BadLocationException {
int nextWord;
@@ -1039,7 +1039,7 @@ public class Utilities {
* @param c the editor
* @param offs the offset in the document >= 0
* @return the location in the model of the word start >= 0
- * @exception BadLocationException if the offset is out of range
+ * @throws BadLocationException if the offset is out of range
*/
public static final int getPreviousWord(JTextComponent c, int offs) throws BadLocationException {
int prevWord;
@@ -1271,8 +1271,8 @@ public class Utilities {
* @param biasRet an array contain the bias that was checked
* @return the location within the model that best represents the next
* location visual position
- * @exception BadLocationException
- * @exception IllegalArgumentException if direction is invalid
+ * @throws BadLocationException
+ * @throws IllegalArgumentException if direction is invalid
*/
static int getNextVisualPositionFrom(View v, int pos, Position.Bias b,
Shape alloc, int direction,
diff --git a/src/java.desktop/share/classes/javax/swing/text/View.java b/src/java.desktop/share/classes/javax/swing/text/View.java
index a3ad927e3a8e5185d471f53677be8715f96a1e43..eb10efb0e83fb36f933dd46c20a72b74da601604 100644
--- a/src/java.desktop/share/classes/javax/swing/text/View.java
+++ b/src/java.desktop/share/classes/javax/swing/text/View.java
@@ -495,9 +495,9 @@ public abstract class View implements SwingConstants {
* @param biasRet the returned bias
* @return the location within the model that best represents the next
* location visual position
- * @exception BadLocationException the given position is not a valid
+ * @throws BadLocationException the given position is not a valid
* position within the document
- * @exception IllegalArgumentException if direction
+ * @throws IllegalArgumentException if direction
* doesn't have one of the legal values above
*/
@SuppressWarnings("deprecation")
@@ -585,9 +585,9 @@ public abstract class View implements SwingConstants {
*
* @return the bounding box, in view coordinate space,
* of the character at the specified position
- * @exception BadLocationException if the specified position does
+ * @throws BadLocationException if the specified position does
* not represent a valid location in the associated document
- * @exception IllegalArgumentException if b is not one of the
+ * @throws IllegalArgumentException if b is not one of the
* legal Position.Bias values listed above
* @see View#viewToModel
*/
@@ -615,9 +615,9 @@ public abstract class View implements SwingConstants {
* @param a the area of the view, which encompasses the requested region
* @return the bounding box which is a union of the region specified
* by the first and last character positions
- * @exception BadLocationException if the given position does
+ * @throws BadLocationException if the given position does
* not represent a valid location in the associated document
- * @exception IllegalArgumentException if b0 or
+ * @throws IllegalArgumentException if b0 or
* b1 are not one of the
* legal Position.Bias values listed above
* @see View#viewToModel
@@ -1337,7 +1337,7 @@ public abstract class View implements SwingConstants {
* @param pos the position to convert >= 0
* @param a the allocated region in which to render
* @return the bounding box of the given position is returned
- * @exception BadLocationException if the given position does
+ * @throws BadLocationException if the given position does
* not represent a valid location in the associated document
* @see View#modelToView
* @deprecated
diff --git a/src/java.desktop/share/classes/javax/swing/text/WrappedPlainView.java b/src/java.desktop/share/classes/javax/swing/text/WrappedPlainView.java
index b229fa69f9f88c1ddeccf9a9508a4b3cc79104ca..d3587c8b40b4bd56b40dc98cb399ac8f6d9e8a50 100644
--- a/src/java.desktop/share/classes/javax/swing/text/WrappedPlainView.java
+++ b/src/java.desktop/share/classes/javax/swing/text/WrappedPlainView.java
@@ -207,7 +207,7 @@ public class WrappedPlainView extends BoxView implements TabExpander {
* @param p0 the beginning position in the model >= 0
* @param p1 the ending position in the model >= p0
* @return the X location of the end of the range >= 0
- * @exception BadLocationException if the range is invalid
+ * @throws BadLocationException if the range is invalid
*
* @deprecated replaced by
* {@link #drawUnselectedText(Graphics2D, float, float, int, int)}
@@ -252,7 +252,7 @@ public class WrappedPlainView extends BoxView implements TabExpander {
* @param p0 the beginning position in the model >= 0
* @param p1 the ending position in the model >= p0
* @return the X location of the end of the range >= 0
- * @exception BadLocationException if the range is invalid
+ * @throws BadLocationException if the range is invalid
*
* @since 9
*/
@@ -272,7 +272,7 @@ public class WrappedPlainView extends BoxView implements TabExpander {
* @param p0 the beginning position in the model >= 0
* @param p1 the ending position in the model >= p0
* @return the location of the end of the range.
- * @exception BadLocationException if the range is invalid
+ * @throws BadLocationException if the range is invalid
*
* @deprecated replaced by
* {@link #drawSelectedText(Graphics2D, float, float, int, int)}
@@ -320,7 +320,7 @@ public class WrappedPlainView extends BoxView implements TabExpander {
* @param p0 the beginning position in the model >= 0
* @param p1 the ending position in the model >= p0
* @return the location of the end of the range.
- * @exception BadLocationException if the range is invalid
+ * @throws BadLocationException if the range is invalid
*
* @since 9
*/
@@ -748,7 +748,7 @@ public class WrappedPlainView extends BoxView implements TabExpander {
* @param pos the position to convert
* @param a the allocated region to render into
* @return the bounding box of the given position is returned
- * @exception BadLocationException if the given position does not represent a
+ * @throws BadLocationException if the given position does not represent a
* valid location in the associated document
* @see View#modelToView
*/
diff --git a/src/java.desktop/share/classes/javax/swing/text/ZoneView.java b/src/java.desktop/share/classes/javax/swing/text/ZoneView.java
index 1deb927fb6e5fdc558c75710c8a6caef5cff7598..595eafc336bd9ec71cb7df0da0f6c118665a4d2b 100644
--- a/src/java.desktop/share/classes/javax/swing/text/ZoneView.java
+++ b/src/java.desktop/share/classes/javax/swing/text/ZoneView.java
@@ -134,7 +134,7 @@ public class ZoneView extends BoxView {
*
* @param mzl the desired maximum number of zones
* to be actively loaded, must be greater than 0
- * @exception IllegalArgumentException if mzl is < 1
+ * @throws IllegalArgumentException if mzl is < 1
*/
public void setMaxZonesLoaded(int mzl) {
if (mzl < 1) {
@@ -579,7 +579,7 @@ public class ZoneView extends BoxView {
* @param pos the position to convert
* @param a the allocated region to render into
* @return the bounding box of the given position
- * @exception BadLocationException if the given position does not represent a
+ * @throws BadLocationException if the given position does not represent a
* valid location in the associated document
* @see View#modelToView
*/
diff --git a/src/java.desktop/share/classes/javax/swing/text/html/AccessibleHTML.java b/src/java.desktop/share/classes/javax/swing/text/html/AccessibleHTML.java
index 12cd5a74a721795e3814091d2bdd31621d3491e9..77623a541e00d3aa059c2d2483ae9765d1e95dbf 100644
--- a/src/java.desktop/share/classes/javax/swing/text/html/AccessibleHTML.java
+++ b/src/java.desktop/share/classes/javax/swing/text/html/AccessibleHTML.java
@@ -384,7 +384,7 @@ class AccessibleHTML implements Accessible {
* @return this component's locale. If this component does not have
* a locale, the locale of its parent is returned.
*
- * @exception IllegalComponentStateException
+ * @throws IllegalComponentStateException
* If the Component does not have its own locale and has not yet been
* added to a containment hierarchy such that the locale can be
* determined from the containing parent.
diff --git a/src/java.desktop/share/classes/javax/swing/text/html/BlockView.java b/src/java.desktop/share/classes/javax/swing/text/html/BlockView.java
index 524a57d93c1ee47ddfd762d46b56effeff90459f..dc2a5e22477128b73508d6f9de47acbfc1b9cd07 100644
--- a/src/java.desktop/share/classes/javax/swing/text/html/BlockView.java
+++ b/src/java.desktop/share/classes/javax/swing/text/html/BlockView.java
@@ -300,7 +300,7 @@ public class BlockView extends BoxView {
*
* @param axis may be either X_AXIS or Y_AXIS
* @return the weight
- * @exception IllegalArgumentException for an invalid axis
+ * @throws IllegalArgumentException for an invalid axis
*/
public int getResizeWeight(int axis) {
switch (axis) {
@@ -356,7 +356,7 @@ public class BlockView extends BoxView {
* typically the view is told to render into the span
* that is returned, although there is no guarantee;
* the parent may choose to resize or break the view
- * @exception IllegalArgumentException for an invalid axis type
+ * @throws IllegalArgumentException for an invalid axis type
*/
public float getPreferredSpan(int axis) {
return super.getPreferredSpan(axis);
@@ -372,7 +372,7 @@ public class BlockView extends BoxView {
* typically the view is told to render into the span
* that is returned, although there is no guarantee;
* the parent may choose to resize or break the view
- * @exception IllegalArgumentException for an invalid axis type
+ * @throws IllegalArgumentException for an invalid axis type
*/
public float getMinimumSpan(int axis) {
return super.getMinimumSpan(axis);
@@ -388,7 +388,7 @@ public class BlockView extends BoxView {
* typically the view is told to render into the span
* that is returned, although there is no guarantee;
* the parent may choose to resize or break the view
- * @exception IllegalArgumentException for an invalid axis type
+ * @throws IllegalArgumentException for an invalid axis type
*/
public float getMaximumSpan(int axis) {
return super.getMaximumSpan(axis);
diff --git a/src/java.desktop/share/classes/javax/swing/text/html/FormView.java b/src/java.desktop/share/classes/javax/swing/text/html/FormView.java
index 467651a9d98d2071c3aa6c5165eb92d3e45f800d..b0855832a1d3924b9299b1afaec5c1fc8b4ac570 100644
--- a/src/java.desktop/share/classes/javax/swing/text/html/FormView.java
+++ b/src/java.desktop/share/classes/javax/swing/text/html/FormView.java
@@ -380,7 +380,7 @@ public class FormView extends ComponentView implements ActionListener {
* Typically the view is told to render into the span
* that is returned, although there is no guarantee.
* The parent may choose to resize or break the view.
- * @exception IllegalArgumentException for an invalid axis
+ * @throws IllegalArgumentException for an invalid axis
*/
public float getMaximumSpan(int axis) {
switch (axis) {
diff --git a/src/java.desktop/share/classes/javax/swing/text/html/HRuleView.java b/src/java.desktop/share/classes/javax/swing/text/html/HRuleView.java
index 885f0b7f2c9d63411d4b0210a5d22c957531db11..29a7fce803df876197d20c091f96452bc1163b9d 100644
--- a/src/java.desktop/share/classes/javax/swing/text/html/HRuleView.java
+++ b/src/java.desktop/share/classes/javax/swing/text/html/HRuleView.java
@@ -245,7 +245,7 @@ class HRuleView extends View {
* @param pos the position to convert
* @param a the allocated region to render into
* @return the bounding box of the given position
- * @exception BadLocationException if the given position does not
+ * @throws BadLocationException if the given position does not
* represent a valid location in the associated document
* @see View#modelToView
*/
diff --git a/src/java.desktop/share/classes/javax/swing/text/html/HTMLDocument.java b/src/java.desktop/share/classes/javax/swing/text/html/HTMLDocument.java
index 46d84e3cadcc31da718c032f2d172a431dc3501a..f4bbb772e78c70d50035a5b751e156abae21226a 100644
--- a/src/java.desktop/share/classes/javax/swing/text/html/HTMLDocument.java
+++ b/src/java.desktop/share/classes/javax/swing/text/html/HTMLDocument.java
@@ -427,7 +427,7 @@ public class HTMLDocument extends DefaultStyledDocument {
*
* @param offset the starting offset
* @param data the element data
- * @exception BadLocationException if the given position does not
+ * @throws BadLocationException if the given position does not
* represent a valid location in the associated document.
*/
protected void insert(int offset, ElementSpec[] data) throws BadLocationException {
diff --git a/src/java.desktop/share/classes/javax/swing/text/html/HTMLEditorKit.java b/src/java.desktop/share/classes/javax/swing/text/html/HTMLEditorKit.java
index 8d78819b0e8d4e169bf6894804976c50fcf784e2..a5c1067f03f1f4fb25918668b6a2302d5bb77fb7 100644
--- a/src/java.desktop/share/classes/javax/swing/text/html/HTMLEditorKit.java
+++ b/src/java.desktop/share/classes/javax/swing/text/html/HTMLEditorKit.java
@@ -298,10 +298,10 @@ public class HTMLEditorKit extends StyledEditorKit implements Accessible {
* @param doc the destination for the insertion
* @param pos the location in the document to place the
* content
- * @exception IOException on any I/O error
- * @exception BadLocationException if pos represents an invalid
+ * @throws IOException on any I/O error
+ * @throws BadLocationException if pos represents an invalid
* location within the document
- * @exception RuntimeException (will eventually be a BadLocationException)
+ * @throws RuntimeException (will eventually be a BadLocationException)
* if pos is invalid
*/
public void read(Reader in, Document doc, int pos) throws IOException, BadLocationException {
@@ -337,7 +337,7 @@ public class HTMLEditorKit extends StyledEditorKit implements Accessible {
*
* @throws BadLocationException if {@code offset} is invalid
* @throws IOException on I/O error
- * @exception RuntimeException (will eventually be a BadLocationException)
+ * @throws RuntimeException (will eventually be a BadLocationException)
* if pos is invalid
*/
public void insertHTML(HTMLDocument doc, int offset, String html,
@@ -367,8 +367,8 @@ public class HTMLEditorKit extends StyledEditorKit implements Accessible {
* @param pos the location in the document to fetch the
* content
* @param len the amount to write out
- * @exception IOException on any I/O error
- * @exception BadLocationException if {@code pos} represents an invalid
+ * @throws IOException on any I/O error
+ * @throws BadLocationException if {@code pos} represents an invalid
* location within the document
*/
public void write(Writer out, Document doc, int pos, int len)
diff --git a/src/java.desktop/share/classes/javax/swing/text/html/HTMLWriter.java b/src/java.desktop/share/classes/javax/swing/text/html/HTMLWriter.java
index c11214d71e3bce696dcef6900888ad0eabf6ce92..270e46153098e93549e69cb4006b2dd97c5a759c 100644
--- a/src/java.desktop/share/classes/javax/swing/text/html/HTMLWriter.java
+++ b/src/java.desktop/share/classes/javax/swing/text/html/HTMLWriter.java
@@ -125,8 +125,8 @@ public class HTMLWriter extends AbstractWriter {
* Element tree and controls the writing out of
* all the tags and its attributes.
*
- * @exception IOException on any I/O error
- * @exception BadLocationException if pos represents an invalid
+ * @throws IOException on any I/O error
+ * @throws BadLocationException if pos represents an invalid
* location within the document.
*
*/
@@ -248,7 +248,7 @@ public class HTMLWriter extends AbstractWriter {
* HTML.Attribute.ENDTAG.
*
* @param attr an AttributeSet
- * @exception IOException on any I/O error
+ * @throws IOException on any I/O error
*
*/
protected void writeAttributes(AttributeSet attr) throws IOException {
@@ -273,8 +273,8 @@ public class HTMLWriter extends AbstractWriter {
* corresponding end tag).
*
* @param elem an Element
- * @exception IOException on any I/O error
- * @exception BadLocationException if pos represents an invalid
+ * @throws IOException on any I/O error
+ * @throws BadLocationException if pos represents an invalid
* location within the document.
*/
protected void emptyTag(Element elem) throws BadLocationException, IOException {
@@ -451,8 +451,8 @@ public class HTMLWriter extends AbstractWriter {
* element.
*
* @param attr an AttributeSet
- * @exception IOException on any I/O error
- * @exception BadLocationException if pos represents an invalid
+ * @throws IOException on any I/O error
+ * @throws BadLocationException if pos represents an invalid
* location within the document.
*/
protected void textAreaContent(AttributeSet attr) throws BadLocationException, IOException {
@@ -485,8 +485,8 @@ public class HTMLWriter extends AbstractWriter {
* out.
*
* @param elem an Element
- * @exception IOException on any I/O error
- * @exception BadLocationException if pos represents an invalid
+ * @throws IOException on any I/O error
+ * @throws BadLocationException if pos represents an invalid
* location within the document.
*/
protected void text(Element elem) throws BadLocationException, IOException {
@@ -523,7 +523,7 @@ public class HTMLWriter extends AbstractWriter {
* Writes out the content of the SELECT form element.
*
* @param attr the AttributeSet associated with the form element
- * @exception IOException on any I/O error
+ * @throws IOException on any I/O error
*/
protected void selectContent(AttributeSet attr) throws IOException {
Object model = attr.getAttribute(StyleConstants.ModelAttribute);
@@ -552,7 +552,7 @@ public class HTMLWriter extends AbstractWriter {
/**
* Writes out the content of the Option form element.
* @param option an Option
- * @exception IOException on any I/O error
+ * @throws IOException on any I/O error
*
*/
protected void writeOption(Option option) throws IOException {
@@ -580,7 +580,7 @@ public class HTMLWriter extends AbstractWriter {
* Writes out an end tag for the element.
*
* @param elem an Element
- * @exception IOException on any I/O error
+ * @throws IOException on any I/O error
*/
protected void endTag(Element elem) throws IOException {
if (synthesizedElement(elem)) {
@@ -615,8 +615,8 @@ public class HTMLWriter extends AbstractWriter {
* Writes out comments.
*
* @param elem an Element
- * @exception IOException on any I/O error
- * @exception BadLocationException if pos represents an invalid
+ * @throws IOException on any I/O error
+ * @throws BadLocationException if pos represents an invalid
* location within the document.
*/
protected void comment(Element elem) throws BadLocationException, IOException {
@@ -637,8 +637,8 @@ public class HTMLWriter extends AbstractWriter {
* Writes out comment string.
*
* @param string the comment
- * @exception IOException on any I/O error
- * @exception BadLocationException if pos represents an invalid
+ * @throws IOException on any I/O error
+ * @throws BadLocationException if pos represents an invalid
* location within the document.
*/
void writeComment(String string) throws IOException {
@@ -712,7 +712,7 @@ public class HTMLWriter extends AbstractWriter {
* written out.
*
* @param attr a set of attributes
- * @exception IOException on any I/O error
+ * @throws IOException on any I/O error
*/
protected void writeEmbeddedTags(AttributeSet attr) throws IOException {
@@ -767,7 +767,7 @@ public class HTMLWriter extends AbstractWriter {
* end tag is written out.
*
* @param attr a set of attributes
- * @exception IOException on any I/O error
+ * @throws IOException on any I/O error
*/
protected void closeOutUnwantedEmbeddedTags(AttributeSet attr) throws IOException {
diff --git a/src/java.desktop/share/classes/javax/swing/text/html/ImageView.java b/src/java.desktop/share/classes/javax/swing/text/html/ImageView.java
index 6f0a7cbdff41431d09ea34caa4183ed216fb074a..7d2583509c16a4be9fd0c2001c70e67c3ef43af3 100644
--- a/src/java.desktop/share/classes/javax/swing/text/html/ImageView.java
+++ b/src/java.desktop/share/classes/javax/swing/text/html/ImageView.java
@@ -557,7 +557,7 @@ public class ImageView extends View {
* @param pos the position to convert
* @param a the allocated region to render into
* @return the bounding box of the given position
- * @exception BadLocationException if the given position does not represent a
+ * @throws BadLocationException if the given position does not represent a
* valid location in the associated document
* @see View#modelToView
*/
diff --git a/src/java.desktop/share/classes/javax/swing/text/html/MinimalHTMLWriter.java b/src/java.desktop/share/classes/javax/swing/text/html/MinimalHTMLWriter.java
index caa8dd07051938e66e38691ca7fd785fae5d788e..712cb350ee95d5e3036c3bf5963085c2078740e0 100644
--- a/src/java.desktop/share/classes/javax/swing/text/html/MinimalHTMLWriter.java
+++ b/src/java.desktop/share/classes/javax/swing/text/html/MinimalHTMLWriter.java
@@ -128,8 +128,8 @@ public class MinimalHTMLWriter extends AbstractWriter {
* Generates HTML output
* from a StyledDocument.
*
- * @exception IOException on any I/O error
- * @exception BadLocationException if pos represents an invalid
+ * @throws IOException on any I/O error
+ * @throws BadLocationException if pos represents an invalid
* location within the document.
*
*/
@@ -152,7 +152,7 @@ public class MinimalHTMLWriter extends AbstractWriter {
* The attribute name and value are separated by a colon.
* Each pair is separated by a semicolon.
*
- * @exception IOException on any I/O error
+ * @throws IOException on any I/O error
*/
protected void writeAttributes(AttributeSet attr) throws IOException {
Enumeration attributeNames = attr.getAttributeNames();
@@ -178,7 +178,7 @@ public class MinimalHTMLWriter extends AbstractWriter {
/**
* Writes out text.
*
- * @exception IOException on any I/O error
+ * @throws IOException on any I/O error
*/
protected void text(Element elem) throws IOException, BadLocationException {
String contentStr = getText(elem);
@@ -196,7 +196,7 @@ public class MinimalHTMLWriter extends AbstractWriter {
* indented. Also increments the indent level.
*
* @param tag a start tag
- * @exception IOException on any I/O error
+ * @throws IOException on any I/O error
*/
protected void writeStartTag(String tag) throws IOException {
indent();
@@ -211,7 +211,7 @@ public class MinimalHTMLWriter extends AbstractWriter {
* indented. Also decrements the indent level.
*
* @param endTag an end tag
- * @exception IOException on any I/O error
+ * @throws IOException on any I/O error
*/
protected void writeEndTag(String endTag) throws IOException {
decrIndent();
@@ -230,7 +230,7 @@ public class MinimalHTMLWriter extends AbstractWriter {
* document is viewable in applications/browsers
* that do not support the tag.
*
- * @exception IOException on any I/O error
+ * @throws IOException on any I/O error
*/
protected void writeHeader() throws IOException {
writeStartTag("");
@@ -248,7 +248,7 @@ public class MinimalHTMLWriter extends AbstractWriter {
* Writes out all the named styles as the
* content of the <style> tag.
*
- * @exception IOException on any I/O error
+ * @throws IOException on any I/O error
*/
protected void writeStyles() throws IOException {
/*
@@ -338,7 +338,7 @@ public class MinimalHTMLWriter extends AbstractWriter {
* that all other tags that have been opened are
* appropriately closed off.
*
- * @exception IOException on any I/O error
+ * @throws IOException on any I/O error
*/
protected void writeEndParagraph() throws IOException {
writeEndMask(fontMask);
@@ -359,7 +359,7 @@ public class MinimalHTMLWriter extends AbstractWriter {
* style.
*
* @param elem an element
- * @exception IOException on any I/O error
+ * @throws IOException on any I/O error
*/
protected void writeStartParagraph(Element elem) throws IOException {
AttributeSet attr = elem.getAttributes();
@@ -377,7 +377,7 @@ public class MinimalHTMLWriter extends AbstractWriter {
* elements.
*
* @param elem an element
- * @exception IOException on any I/O error
+ * @throws IOException on any I/O error
*/
protected void writeLeaf(Element elem) throws IOException {
indent();
@@ -434,8 +434,8 @@ public class MinimalHTMLWriter extends AbstractWriter {
*
* @param elem an element
* @param needsIndenting indention will be added if {@code needsIndenting} is {@code true}
- * @exception IOException on any I/O error
- * @exception BadLocationException if pos represents an invalid
+ * @throws IOException on any I/O error
+ * @throws BadLocationException if pos represents an invalid
* location within the document.
*/
protected void writeContent(Element elem, boolean needsIndenting)
@@ -457,7 +457,7 @@ public class MinimalHTMLWriter extends AbstractWriter {
* text based on its attribute settings.
*
* @param attr a set of attributes
- * @exception IOException on any I/O error
+ * @throws IOException on any I/O error
*/
protected void writeHTMLTags(AttributeSet attr) throws IOException {
@@ -522,7 +522,7 @@ public class MinimalHTMLWriter extends AbstractWriter {
* Writes out start tags <u>, <i>, and <b> based on
* the mask settings.
*
- * @exception IOException on any I/O error
+ * @throws IOException on any I/O error
*/
private void writeStartMask(int mask) throws IOException {
if (mask != 0) {
@@ -542,7 +542,7 @@ public class MinimalHTMLWriter extends AbstractWriter {
* Writes out end tags for <u>, <i>, and <b> based on
* the mask settings.
*
- * @exception IOException on any I/O error
+ * @throws IOException on any I/O error
*/
private void writeEndMask(int mask) throws IOException {
if (mask != 0) {
@@ -569,7 +569,7 @@ public class MinimalHTMLWriter extends AbstractWriter {
* attributes just like inline styles.
*
* @param attr a set of attributes
- * @exception IOException on any I/O error
+ * @throws IOException on any I/O error
*/
protected void writeNonHTMLAttributes(AttributeSet attr) throws IOException {
@@ -636,7 +636,7 @@ public class MinimalHTMLWriter extends AbstractWriter {
*
* Writes out an end tag for the <font> tag.
*
- * @exception IOException on any I/O error
+ * @throws IOException on any I/O error
*/
protected void endFontTag() throws IOException {
write(NEWLINE);
@@ -655,7 +655,7 @@ public class MinimalHTMLWriter extends AbstractWriter {
* new start tag.
*
* @param style a font style
- * @exception IOException on any I/O error
+ * @throws IOException on any I/O error
*/
protected void startFontTag(String style) throws IOException {
boolean callIndent = false;
@@ -676,7 +676,7 @@ public class MinimalHTMLWriter extends AbstractWriter {
* any enclosing font tag before writing out a
* new start tag.
*
- * @exception IOException on any I/O error
+ * @throws IOException on any I/O error
*/
private void startSpanTag(String style) throws IOException {
boolean callIndent = false;
@@ -693,7 +693,7 @@ public class MinimalHTMLWriter extends AbstractWriter {
/**
* Writes out an end tag for the <span> tag.
*
- * @exception IOException on any I/O error
+ * @throws IOException on any I/O error
*/
private void endSpanTag() throws IOException {
write(NEWLINE);
diff --git a/src/java.desktop/share/classes/javax/swing/text/html/OptionListModel.java b/src/java.desktop/share/classes/javax/swing/text/html/OptionListModel.java
index 2b84b54b3e162ddb924c985c7d2d63f5fb7b53d8..c7f0ff34a9bd1ff62f6b33197a7e26b20a04cf5c 100644
--- a/src/java.desktop/share/classes/javax/swing/text/html/OptionListModel.java
+++ b/src/java.desktop/share/classes/javax/swing/text/html/OptionListModel.java
@@ -464,7 +464,7 @@ class OptionListModel Garbage collection is performed using mark-compact. listenerLists are not duplicated.
*
* @return a clone of the receiver
- * @exception CloneNotSupportedException if the receiver does not
+ * @throws CloneNotSupportedException if the receiver does not
* both (a) implement the Cloneable interface
* and (b) define a clone method
*/
diff --git a/src/java.desktop/share/classes/javax/swing/text/html/StyleSheet.java b/src/java.desktop/share/classes/javax/swing/text/html/StyleSheet.java
index 9ce35f47ee9eb420129ac6aef21a54da87209670..35002f9fff27e7887fa672a2bdfd8bc3b89bb9e4 100644
--- a/src/java.desktop/share/classes/javax/swing/text/html/StyleSheet.java
+++ b/src/java.desktop/share/classes/javax/swing/text/html/StyleSheet.java
@@ -1886,7 +1886,7 @@ public class StyleSheet extends StyleContext {
* used to get the AttributeSet, and may be used to
* resolve percentage arguments.
* @return the inset needed for the margin, border and padding.
- * @exception IllegalArgumentException for an invalid direction
+ * @throws IllegalArgumentException for an invalid direction
*/
public float getInset(int side, View v) {
AttributeSet a = v.getAttributes();
diff --git a/src/java.desktop/share/classes/javax/swing/text/html/TableView.java b/src/java.desktop/share/classes/javax/swing/text/html/TableView.java
index c088bf0eb9a773ed0b0a280d39402dc6d95da1db..11b383acd3187ed587cf97eea3a1351d8ddb6e4c 100644
--- a/src/java.desktop/share/classes/javax/swing/text/html/TableView.java
+++ b/src/java.desktop/share/classes/javax/swing/text/html/TableView.java
@@ -1611,7 +1611,7 @@ import javax.swing.text.*;
*
* @param axis may be either View.X_AXIS or View.Y_AXIS
* @return the resize weight
- * @exception IllegalArgumentException for an invalid axis
+ * @throws IllegalArgumentException for an invalid axis
*/
public int getResizeWeight(int axis) {
return 1;
diff --git a/src/java.desktop/share/classes/javax/swing/text/rtf/RTFEditorKit.java b/src/java.desktop/share/classes/javax/swing/text/rtf/RTFEditorKit.java
index 794c2cfee40b3b4dea5bac1ff444f6c6d76ff0bf..f841d9119f50924268f966eaf953e5243b90db1f 100644
--- a/src/java.desktop/share/classes/javax/swing/text/rtf/RTFEditorKit.java
+++ b/src/java.desktop/share/classes/javax/swing/text/rtf/RTFEditorKit.java
@@ -70,8 +70,8 @@ public class RTFEditorKit extends StyledEditorKit {
* @param doc The destination for the insertion.
* @param pos The location in the document to place the
* content.
- * @exception IOException on any I/O error
- * @exception BadLocationException if pos represents an invalid
+ * @throws IOException on any I/O error
+ * @throws BadLocationException if pos represents an invalid
* location within the document.
*/
public void read(InputStream in, Document doc, int pos) throws IOException, BadLocationException {
@@ -97,8 +97,8 @@ public class RTFEditorKit extends StyledEditorKit {
* @param pos The location in the document to fetch the
* content.
* @param len The amount to write out.
- * @exception IOException on any I/O error
- * @exception BadLocationException if pos represents an invalid
+ * @throws IOException on any I/O error
+ * @throws BadLocationException if pos represents an invalid
* location within the document.
*/
public void write(OutputStream out, Document doc, int pos, int len)
@@ -117,8 +117,8 @@ public class RTFEditorKit extends StyledEditorKit {
* @param doc The destination for the insertion.
* @param pos The location in the document to place the
* content.
- * @exception IOException on any I/O error
- * @exception BadLocationException if pos represents an invalid
+ * @throws IOException on any I/O error
+ * @throws BadLocationException if pos represents an invalid
* location within the document.
*/
public void read(Reader in, Document doc, int pos)
@@ -143,8 +143,8 @@ public class RTFEditorKit extends StyledEditorKit {
* @param pos The location in the document to fetch the
* content.
* @param len The amount to write out.
- * @exception IOException on any I/O error
- * @exception BadLocationException if pos represents an invalid
+ * @throws IOException on any I/O error
+ * @throws BadLocationException if pos represents an invalid
* location within the document.
*/
public void write(Writer out, Document doc, int pos, int len)
diff --git a/src/java.desktop/share/classes/javax/swing/tree/DefaultMutableTreeNode.java b/src/java.desktop/share/classes/javax/swing/tree/DefaultMutableTreeNode.java
index 7735895502ecce78574ffbbf314c928975b9ec26..11efb12e7a288791f7b721e2c31b5f33319fdb5f 100644
--- a/src/java.desktop/share/classes/javax/swing/tree/DefaultMutableTreeNode.java
+++ b/src/java.desktop/share/classes/javax/swing/tree/DefaultMutableTreeNode.java
@@ -174,12 +174,12 @@ public class DefaultMutableTreeNode implements Cloneable,
* @param newChild the MutableTreeNode to insert under this node
* @param childIndex the index in this node's child array
* where this node is to be inserted
- * @exception ArrayIndexOutOfBoundsException if
+ * @throws ArrayIndexOutOfBoundsException if
* childIndex is out of bounds
- * @exception IllegalArgumentException if
+ * @throws IllegalArgumentException if
* newChild is null or is an
* ancestor of this node
- * @exception IllegalStateException if this node does not allow
+ * @throws IllegalStateException if this node does not allow
* children
* @see #isNodeDescendant
*/
@@ -211,7 +211,7 @@ public class DefaultMutableTreeNode implements Cloneable,
*
* @param childIndex the index in this node's child array
* of the child to remove
- * @exception ArrayIndexOutOfBoundsException if
+ * @throws ArrayIndexOutOfBoundsException if
* childIndex is out of bounds
*/
public void remove(int childIndex) {
@@ -247,7 +247,7 @@ public class DefaultMutableTreeNode implements Cloneable,
* Returns the child at the specified index in this node's child array.
*
* @param index an index into this node's child array
- * @exception ArrayIndexOutOfBoundsException if index
+ * @throws ArrayIndexOutOfBoundsException if index
* is out of bounds
* @return the TreeNode in this node's child array at the specified index
*/
@@ -278,7 +278,7 @@ public class DefaultMutableTreeNode implements Cloneable,
* where n is the number of children.
*
* @param aChild the TreeNode to search for among this node's children
- * @exception IllegalArgumentException if aChild
+ * @throws IllegalArgumentException if aChild
* is null
* @return an int giving the index of the node in this node's child
* array, or -1 if the specified node is a not
@@ -382,7 +382,7 @@ public class DefaultMutableTreeNode implements Cloneable,
* null parent.
*
* @param aChild a child of this node to remove
- * @exception IllegalArgumentException if aChild
+ * @throws IllegalArgumentException if aChild
* is null or is not a child of this node
*/
public void remove(MutableTreeNode aChild) {
@@ -412,9 +412,9 @@ public class DefaultMutableTreeNode implements Cloneable,
*
* @see #insert
* @param newChild node to add as a child of this node
- * @exception IllegalArgumentException if newChild
+ * @throws IllegalArgumentException if newChild
* is null
- * @exception IllegalStateException if this node does not allow
+ * @throws IllegalStateException if this node does not allow
* children
*/
public void add(MutableTreeNode newChild) {
@@ -846,7 +846,7 @@ public class DefaultMutableTreeNode implements Cloneable,
* @param ancestor the node to start enumeration from
* @see #isNodeAncestor
* @see #isNodeDescendant
- * @exception IllegalArgumentException if ancestor is
+ * @throws IllegalArgumentException if ancestor is
* not an ancestor of this node
* @return an enumeration for following the path from an ancestor of
* this node to this one
@@ -890,7 +890,7 @@ public class DefaultMutableTreeNode implements Cloneable,
* throws NoSuchElementException.
*
* @return the first child of this node
- * @exception NoSuchElementException if this node has no children
+ * @throws NoSuchElementException if this node has no children
*/
public TreeNode getFirstChild() {
if (getChildCount() == 0) {
@@ -905,7 +905,7 @@ public class DefaultMutableTreeNode implements Cloneable,
* throws NoSuchElementException.
*
* @return the last child of this node
- * @exception NoSuchElementException if this node has no children
+ * @throws NoSuchElementException if this node has no children
*/
public TreeNode getLastChild() {
if (getChildCount() == 0) {
@@ -925,7 +925,7 @@ public class DefaultMutableTreeNode implements Cloneable,
*
* @param aChild the child node to look for next child after it
* @see #children
- * @exception IllegalArgumentException if aChild is
+ * @throws IllegalArgumentException if aChild is
* null or is not a child of this node
* @return the child of this node that immediately follows
* aChild
@@ -957,7 +957,7 @@ public class DefaultMutableTreeNode implements Cloneable,
* and is O(n) where n is the number of children.
*
* @param aChild the child node to look for previous child before it
- * @exception IllegalArgumentException if aChild is null
+ * @throws IllegalArgumentException if aChild is null
* or is not a child of this node
* @return the child of this node that immediately precedes
* aChild
diff --git a/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeModel.java b/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeModel.java
index 4cdec3f6b381895d6c1bf98e8c489a1e43933ccf..511cde568c0929e9b189bf4ea4a850a6ee7f6fb3 100644
--- a/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeModel.java
+++ b/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeModel.java
@@ -672,7 +672,7 @@ public class DefaultTreeModel implements Serializable, TreeModel {
* FooListeners on this component,
* or an empty array if no such
* listeners have been added
- * @exception ClassCastException if listenerType
+ * @throws ClassCastException if listenerType
* doesn't specify a class or interface that implements
* java.util.EventListener
*
diff --git a/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java b/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java
index e1bdc4fc94b3952bdf3856f43dc80d3979e1361c..ff7ed27302dcbbd9a5841e09c028fbe68e9e6cc0 100644
--- a/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java
+++ b/src/java.desktop/share/classes/javax/swing/tree/DefaultTreeSelectionModel.java
@@ -679,7 +679,7 @@ public class DefaultTreeSelectionModel implements Cloneable, Serializable, TreeS
* FooListeners on this component,
* or an empty array if no such
* listeners have been added
- * @exception ClassCastException if listenerType
+ * @throws ClassCastException if listenerType
* doesn't specify a class or interface that implements
* java.util.EventListener
*
@@ -1187,7 +1187,7 @@ public class DefaultTreeSelectionModel implements Cloneable, Serializable, TreeS
* This method does not duplicate
* selection listeners and property listeners.
*
- * @exception CloneNotSupportedException never thrown by instances of
+ * @throws CloneNotSupportedException never thrown by instances of
* this class
*/
public Object clone() throws CloneNotSupportedException {
diff --git a/src/java.desktop/share/classes/javax/swing/undo/AbstractUndoableEdit.java b/src/java.desktop/share/classes/javax/swing/undo/AbstractUndoableEdit.java
index 7184557d1e77afb39045042080962bba6a1c6e47..94f5eb69a74ad19bc0f1fb3d22128e7005013c39 100644
--- a/src/java.desktop/share/classes/javax/swing/undo/AbstractUndoableEdit.java
+++ b/src/java.desktop/share/classes/javax/swing/undo/AbstractUndoableEdit.java
@@ -102,7 +102,7 @@ public class AbstractUndoableEdit implements UndoableEdit, Serializable {
* operation represented by this edit. Override should begin with
* a call to super.
*
- * @exception CannotUndoException if canUndo
+ * @throws CannotUndoException if canUndo
* returns false
* @see #canUndo
*/
@@ -134,7 +134,7 @@ public class AbstractUndoableEdit implements UndoableEdit, Serializable {
* Subclasses should override to redo the operation represented by
* this edit. Override should begin with a call to super.
*
- * @exception CannotRedoException if canRedo
+ * @throws CannotRedoException if canRedo
* returns false
* @see #canRedo
*/
diff --git a/make/data/dtdbuilder/HTMLlat1.sgml b/src/java.desktop/share/data/dtdbuilder/HTMLlat1.sgml
similarity index 100%
rename from make/data/dtdbuilder/HTMLlat1.sgml
rename to src/java.desktop/share/data/dtdbuilder/HTMLlat1.sgml
diff --git a/make/data/dtdbuilder/HTMLspecial.sgml b/src/java.desktop/share/data/dtdbuilder/HTMLspecial.sgml
similarity index 100%
rename from make/data/dtdbuilder/HTMLspecial.sgml
rename to src/java.desktop/share/data/dtdbuilder/HTMLspecial.sgml
diff --git a/make/data/dtdbuilder/HTMLsymbol.sgml b/src/java.desktop/share/data/dtdbuilder/HTMLsymbol.sgml
similarity index 100%
rename from make/data/dtdbuilder/HTMLsymbol.sgml
rename to src/java.desktop/share/data/dtdbuilder/HTMLsymbol.sgml
diff --git a/make/data/dtdbuilder/html32.dtd b/src/java.desktop/share/data/dtdbuilder/html32.dtd
similarity index 100%
rename from make/data/dtdbuilder/html32.dtd
rename to src/java.desktop/share/data/dtdbuilder/html32.dtd
diff --git a/make/data/dtdbuilder/public.map b/src/java.desktop/share/data/dtdbuilder/public.map
similarity index 100%
rename from make/data/dtdbuilder/public.map
rename to src/java.desktop/share/data/dtdbuilder/public.map
diff --git a/src/java.desktop/share/native/liblcms/LCMS.c b/src/java.desktop/share/native/liblcms/LCMS.c
index 27c23c6d92f6f749173aa80115f5a44364d724e5..06a7eb261408bfd8505e3a27109438fda335741b 100644
--- a/src/java.desktop/share/native/liblcms/LCMS.c
+++ b/src/java.desktop/share/native/liblcms/LCMS.c
@@ -734,34 +734,43 @@ static cmsHPROFILE _writeCookedTag(const cmsHPROFILE pfTarget,
// now we have all tags moved to the new profile.
// do some sanity checks: write it to a memory buffer and read again.
+ void* buf = NULL;
if (cmsSaveProfileToMem(p, NULL, &pfSize)) {
- void* buf = malloc(pfSize);
+ buf = malloc(pfSize);
if (buf != NULL) {
// load raw profile data into the buffer
if (cmsSaveProfileToMem(p, buf, &pfSize)) {
pfSanity = cmsOpenProfileFromMem(buf, pfSize);
}
- free(buf);
}
}
+ cmsCloseProfile(p); // No longer needed.
+
if (pfSanity == NULL) {
// for some reason, we failed to save and read the updated profile
// It likely indicates that the profile is not correct, so we report
// a failure here.
- cmsCloseProfile(p);
- p = NULL;
+ free(buf);
+ return NULL;
} else {
// do final check whether we can read and handle the target tag.
const void* pTag = cmsReadTag(pfSanity, sig);
if (pTag == NULL) {
// the tag can not be cooked
- cmsCloseProfile(p);
- p = NULL;
+ free(buf);
+ cmsCloseProfile(pfSanity);
+ return NULL;
}
+ // The profile we used for sanity checking needs to be returned
+ // since the one we updated is raw - not cooked.
+ // Except we want to re-open it since the call to cmsReadTag()
+ // means we may not get back the same bytes as we set.
+ // Whilst this may change later anyway, we can at least prevent
+ // it from happening immediately.
cmsCloseProfile(pfSanity);
- pfSanity = NULL;
+ pfSanity = cmsOpenProfileFromMem(buf, pfSize);
+ free(buf);
+ return pfSanity;
}
-
- return p;
}
diff --git a/make/data/x11wrappergen/sizes-32.txt b/src/java.desktop/unix/data/x11wrappergen/sizes-32.txt
similarity index 100%
rename from make/data/x11wrappergen/sizes-32.txt
rename to src/java.desktop/unix/data/x11wrappergen/sizes-32.txt
diff --git a/make/data/x11wrappergen/sizes-64.txt b/src/java.desktop/unix/data/x11wrappergen/sizes-64.txt
similarity index 100%
rename from make/data/x11wrappergen/sizes-64.txt
rename to src/java.desktop/unix/data/x11wrappergen/sizes-64.txt
diff --git a/make/data/x11wrappergen/xlibtypes.txt b/src/java.desktop/unix/data/x11wrappergen/xlibtypes.txt
similarity index 100%
rename from make/data/x11wrappergen/xlibtypes.txt
rename to src/java.desktop/unix/data/x11wrappergen/xlibtypes.txt
diff --git a/src/java.desktop/unix/native/common/awt/fontpath.c b/src/java.desktop/unix/native/common/awt/fontpath.c
index 051c9de88fa851296b8c4134c423f80ebd396af9..fd28f5c0ea6dc1d2fe33afffb7462e206da0c837 100644
--- a/src/java.desktop/unix/native/common/awt/fontpath.c
+++ b/src/java.desktop/unix/native/common/awt/fontpath.c
@@ -496,6 +496,7 @@ typedef FcResult (*FcPatternGetStringFuncType)(const FcPattern *p,
FcChar8 ** s);
typedef FcChar8* (*FcStrDirnameFuncType)(const FcChar8 *file);
typedef void (*FcPatternDestroyFuncType)(FcPattern *p);
+typedef void (*FcObjectSetDestroyFuncType)(FcObjectSet *os);
typedef void (*FcFontSetDestroyFuncType)(FcFontSet *s);
typedef FcPattern* (*FcNameParseFuncType)(const FcChar8 *name);
typedef FcBool (*FcPatternAddStringFuncType)(FcPattern *p,
@@ -542,6 +543,7 @@ static char **getFontConfigLocations() {
FcPatternGetStringFuncType FcPatternGetString;
FcStrDirnameFuncType FcStrDirname;
FcPatternDestroyFuncType FcPatternDestroy;
+ FcObjectSetDestroyFuncType FcObjectSetDestroy;
FcFontSetDestroyFuncType FcFontSetDestroy;
FcConfig *fontconfig;
@@ -571,6 +573,8 @@ static char **getFontConfigLocations() {
(FcStrDirnameFuncType)dlsym(libfontconfig, "FcStrDirname");
FcPatternDestroy =
(FcPatternDestroyFuncType)dlsym(libfontconfig, "FcPatternDestroy");
+ FcObjectSetDestroy =
+ (FcObjectSetDestroyFuncType)dlsym(libfontconfig, "FcObjectSetDestroy");
FcFontSetDestroy =
(FcFontSetDestroyFuncType)dlsym(libfontconfig, "FcFontSetDestroy");
@@ -580,6 +584,7 @@ static char **getFontConfigLocations() {
FcFontList == NULL ||
FcStrDirname == NULL ||
FcPatternDestroy == NULL ||
+ FcObjectSetDestroy == NULL ||
FcFontSetDestroy == NULL) { /* problem with the library: return. */
closeFontConfig(libfontconfig, JNI_FALSE);
return NULL;
@@ -636,6 +641,7 @@ static char **getFontConfigLocations() {
cleanup:
/* Free memory and close the ".so" */
+ (*FcObjectSetDestroy)(objset);
(*FcPatternDestroy)(pattern);
closeFontConfig(libfontconfig, JNI_TRUE);
return fontdirs;
diff --git a/make/data/fontconfig/windows.fontconfig.properties b/src/java.desktop/windows/data/fontconfig/fontconfig.properties
similarity index 100%
rename from make/data/fontconfig/windows.fontconfig.properties
rename to src/java.desktop/windows/data/fontconfig/fontconfig.properties
diff --git a/src/java.management/share/classes/java/lang/management/ManagementFactory.java b/src/java.management/share/classes/java/lang/management/ManagementFactory.java
index 13db85d0f094cc3b10e07d40500a662f15981cb2..375f0ebb719b18dd8ecc405843237c9bb03eebb1 100644
--- a/src/java.management/share/classes/java/lang/management/ManagementFactory.java
+++ b/src/java.management/share/classes/java/lang/management/ManagementFactory.java
@@ -936,8 +936,7 @@ public class ManagementFactory {
all.add(new DefaultPlatformMBeanProvider());
return all;
}
- }, null, new FilePermission("<
diff --git a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java
index 750b125f10d8ba6101a09d03e6232d6bef36b2b2..1b9e23f0fde8eace75184933e53e9449e96ca82e 100644
--- a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java
+++ b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java
@@ -30,6 +30,7 @@ import java.net.UnknownHostException;
import java.net.URLClassLoader;
import java.security.cert.CertPathValidatorException;
import java.security.cert.PKIXBuilderParameters;
+import java.security.interfaces.ECKey;
import java.util.*;
import java.util.stream.Collectors;
import java.util.zip.*;
@@ -1244,13 +1245,13 @@ public class Main {
if ((legacyAlg & 8) == 8) {
warnings.add(String.format(
rb.getString("The.1.signing.key.has.a.keysize.of.2.which.is.considered.a.security.risk..This.key.size.will.be.disabled.in.a.future.update."),
- privateKey.getAlgorithm(), KeyUtil.getKeySize(privateKey)));
+ KeyUtil.fullDisplayAlgName(privateKey), KeyUtil.getKeySize(privateKey)));
}
if ((disabledAlg & 8) == 8) {
errors.add(String.format(
rb.getString("The.1.signing.key.has.a.keysize.of.2.which.is.considered.a.security.risk.and.is.disabled."),
- privateKey.getAlgorithm(), KeyUtil.getKeySize(privateKey)));
+ KeyUtil.fullDisplayAlgName(privateKey), KeyUtil.getKeySize(privateKey)));
}
} else {
if ((legacyAlg & 1) != 0) {
@@ -1274,7 +1275,7 @@ public class Main {
if ((legacyAlg & 8) == 8) {
warnings.add(String.format(
rb.getString("The.1.signing.key.has.a.keysize.of.2.which.is.considered.a.security.risk..This.key.size.will.be.disabled.in.a.future.update."),
- weakPublicKey.getAlgorithm(), KeyUtil.getKeySize(weakPublicKey)));
+ KeyUtil.fullDisplayAlgName(weakPublicKey), KeyUtil.getKeySize(weakPublicKey)));
}
}
@@ -1451,7 +1452,12 @@ public class Main {
JAR_DISABLED_CHECK.permits(key.getAlgorithm(), jcp, true);
} catch (CertPathValidatorException e) {
disabledAlgFound = true;
- return String.format(rb.getString("key.bit.disabled"), kLen);
+ if (key instanceof ECKey) {
+ return String.format(rb.getString("key.bit.eccurve.disabled"), kLen,
+ KeyUtil.fullDisplayAlgName(key));
+ } else {
+ return String.format(rb.getString("key.bit.disabled"), kLen);
+ }
}
try {
LEGACY_CHECK.permits(key.getAlgorithm(), jcp, true);
@@ -1463,7 +1469,12 @@ public class Main {
} catch (CertPathValidatorException e) {
weakPublicKey = key;
legacyAlg |= 8;
- return String.format(rb.getString("key.bit.weak"), kLen);
+ if (key instanceof ECKey) {
+ return String.format(rb.getString("key.bit.eccurve.weak"), kLen,
+ KeyUtil.fullDisplayAlgName(key));
+ } else {
+ return String.format(rb.getString("key.bit.weak"), kLen);
+ }
}
}
@@ -1516,7 +1527,12 @@ public class Main {
try {
CERTPATH_DISABLED_CHECK.permits(key.getAlgorithm(), cpcp, true);
} catch (CertPathValidatorException e) {
- return String.format(rb.getString("key.bit.disabled"), kLen);
+ if (key instanceof ECKey) {
+ return String.format(rb.getString("key.bit.eccurve.disabled"), kLen,
+ KeyUtil.fullDisplayAlgName(key));
+ } else {
+ return String.format(rb.getString("key.bit.disabled"), kLen);
+ }
}
try {
LEGACY_CHECK.permits(key.getAlgorithm(), cpcp, true);
@@ -1526,7 +1542,12 @@ public class Main {
return rb.getString("unknown.size");
}
} catch (CertPathValidatorException e) {
- return String.format(rb.getString("key.bit.weak"), kLen);
+ if (key instanceof ECKey) {
+ return String.format(rb.getString("key.bit.eccurve.weak"), kLen,
+ KeyUtil.fullDisplayAlgName(key));
+ } else {
+ return String.format(rb.getString("key.bit.weak"), kLen);
+ }
}
}
diff --git a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources.java b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources.java
index f5a1bb2e3cba6bad22b5f9156392e2170fa44a53..37a1f24f90d018b452ad5482ceee51e4ff389781 100644
--- a/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources.java
+++ b/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources.java
@@ -181,7 +181,9 @@ public class Resources extends java.util.ListResourceBundle {
{"with.algparams.disabled", "%1$s using %2$s (disabled)"},
{"key.bit", "%d-bit key"},
{"key.bit.weak", "%d-bit key (weak)"},
+ {"key.bit.eccurve.weak", "%1$d-bit %2$s key (weak)"},
{"key.bit.disabled", "%d-bit key (disabled)"},
+ {"key.bit.eccurve.disabled", "%1$d-bit %2$s key (disabled)"},
{"unknown.size", "unknown size"},
{"extra.attributes.detected", "POSIX file permission and/or symlink attributes detected. These attributes are ignored when signing and are not protected by the signature."},
diff --git a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java
index b33c39005447de519c637160a8e0dc87d7761039..e8fb77654d16521783e76c54e4b6368ab62aa26f 100644
--- a/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java
+++ b/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java
@@ -313,7 +313,7 @@ public class HtmlDoclet extends AbstractDoclet {
private void copyJqueryFiles() throws DocletException {
List
-
-
+ ","
"],col:[2,"
"],tr:[2,"","
"],td:[3,"
"],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?S.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;n","