From 0138e1fe6e25f13c61dabbf137429706fbeb13e3 Mon Sep 17 00:00:00 2001
From: Naveen Kumar <naveen.ah.kumar@oracle.com>
Date: Tue, 24 Nov 2015 13:22:00 +0900
Subject: [PATCH] 8073211: javadoc of Format parseObject methods should specify
 NullPointerExceptions

Reviewed-by: naoto, peytoia, okutsu
---
 jdk/src/java.base/share/classes/java/text/DateFormat.java    | 2 +-
 jdk/src/java.base/share/classes/java/text/Format.java        | 3 ++-
 jdk/src/java.base/share/classes/java/text/MessageFormat.java | 2 +-
 jdk/src/java.base/share/classes/java/text/NumberFormat.java  | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/jdk/src/java.base/share/classes/java/text/DateFormat.java b/jdk/src/java.base/share/classes/java/text/DateFormat.java
index 710e9dd9007..3072dec87b4 100644
--- a/jdk/src/java.base/share/classes/java/text/DateFormat.java
+++ b/jdk/src/java.base/share/classes/java/text/DateFormat.java
@@ -418,7 +418,7 @@ public abstract class DateFormat extends Format {
      *            index information as described above.
      * @return A <code>Date</code> parsed from the string. In case of
      *         error, returns null.
-     * @exception NullPointerException if <code>pos</code> is null.
+     * @throws NullPointerException if {@code source} or {@code pos} is null.
      */
     public Object parseObject(String source, ParsePosition pos) {
         return parse(source, pos);
diff --git a/jdk/src/java.base/share/classes/java/text/Format.java b/jdk/src/java.base/share/classes/java/text/Format.java
index 74fcc37d1bf..f24b4ee0083 100644
--- a/jdk/src/java.base/share/classes/java/text/Format.java
+++ b/jdk/src/java.base/share/classes/java/text/Format.java
@@ -225,7 +225,7 @@ public abstract class Format implements Serializable, Cloneable {
      *            index information as described above.
      * @return An <code>Object</code> parsed from the string. In case of
      *         error, returns null.
-     * @exception NullPointerException if <code>pos</code> is null.
+     * @throws NullPointerException if {@code source} or {@code pos} is null.
      */
     public abstract Object parseObject (String source, ParsePosition pos);
 
@@ -237,6 +237,7 @@ public abstract class Format implements Serializable, Cloneable {
      * @return An <code>Object</code> parsed from the string.
      * @exception ParseException if the beginning of the specified string
      *            cannot be parsed.
+     * @throws NullPointerException if {@code source} is null.
      */
     public Object parseObject(String source) throws ParseException {
         ParsePosition pos = new ParsePosition(0);
diff --git a/jdk/src/java.base/share/classes/java/text/MessageFormat.java b/jdk/src/java.base/share/classes/java/text/MessageFormat.java
index dc5da063722..f907f4f9bb7 100644
--- a/jdk/src/java.base/share/classes/java/text/MessageFormat.java
+++ b/jdk/src/java.base/share/classes/java/text/MessageFormat.java
@@ -1068,7 +1068,7 @@ public class MessageFormat extends Format {
      *            index information as described above.
      * @return An <code>Object</code> array parsed from the string. In case of
      *         error, returns null.
-     * @exception NullPointerException if <code>pos</code> is null.
+     * @throws NullPointerException if {@code source} or {@code pos} is null.
      */
     public Object parseObject(String source, ParsePosition pos) {
         return parse(source, pos);
diff --git a/jdk/src/java.base/share/classes/java/text/NumberFormat.java b/jdk/src/java.base/share/classes/java/text/NumberFormat.java
index 1431187e530..68f30d12563 100644
--- a/jdk/src/java.base/share/classes/java/text/NumberFormat.java
+++ b/jdk/src/java.base/share/classes/java/text/NumberFormat.java
@@ -271,7 +271,7 @@ public abstract class NumberFormat extends Format  {
      *            index information as described above.
      * @return A <code>Number</code> parsed from the string. In case of
      *         error, returns null.
-     * @exception NullPointerException if <code>pos</code> is null.
+     * @throws NullPointerException if {@code source} or {@code pos} is null.
      */
     @Override
     public final Object parseObject(String source, ParsePosition pos) {