changeset 1830:d602665bb21a

Merge
author asaha
date Thu, 27 Aug 2009 15:08:10 -0700
parents b926bce8348e 25371bf31658
children 14bfd1c39550
files
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/javax/swing/text/ParagraphView.java	Wed Aug 26 08:38:57 2009 -0700
+++ b/src/share/classes/javax/swing/text/ParagraphView.java	Thu Aug 27 15:08:10 2009 -0700
@@ -716,7 +716,7 @@
      * @param axis  the minor axis
      * @param r     the input {@code SizeRequirements} object
      * @return      the new or adjusted {@code SizeRequirements} object
-     * @throw IllegalArgumentException  if the {@code axis} parameter is invalid
+     * @throws IllegalArgumentException  if the {@code axis} parameter is invalid
      */
     @Override
     protected SizeRequirements calculateMinorAxisRequirements(int axis,
--- a/src/share/classes/javax/swing/text/html/ParagraphView.java	Wed Aug 26 08:38:57 2009 -0700
+++ b/src/share/classes/javax/swing/text/html/ParagraphView.java	Thu Aug 27 15:08:10 2009 -0700
@@ -150,7 +150,7 @@
      * @param axis  the minor axis
      * @param r     the input {@code SizeRequirements} object
      * @return      the new or adjusted {@code SizeRequirements} object
-     * @throw IllegalArgumentException  if the {@code axis} parameter is invalid
+     * @throws IllegalArgumentException  if the {@code axis} parameter is invalid
      */
     protected SizeRequirements calculateMinorAxisRequirements(
                                                 int axis, SizeRequirements r) {