Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorasaha
Thu, 27 Aug 2009 15:08:10 -0700
changeset 4196 438f122d2c58
parent 4195 c1657486e9f1 (current diff)
parent 3709 e7cf22d025bb (diff)
child 4197 f6266efbfc05
Merge
--- a/jdk/src/share/classes/javax/swing/text/ParagraphView.java	Wed Aug 26 08:38:57 2009 -0700
+++ b/jdk/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/jdk/src/share/classes/javax/swing/text/html/ParagraphView.java	Wed Aug 26 08:38:57 2009 -0700
+++ b/jdk/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) {
jdk-sandbox