--- a/src/java.desktop/share/classes/java/awt/event/InputEvent.java	Thu Nov 15 11:25:13 2018 +0530
+++ b/src/java.desktop/share/classes/java/awt/event/InputEvent.java	Thu Nov 15 14:14:31 2018 -0800
@@ -536,9 +536,6 @@
      * Zero parameter means that no modifiers were passed and will
      * cause the returning an empty string.
      *
-     * @return a String describing the extended modifier keys and
-     * mouse buttons
-     *
      * @param modifiers a modifier mask describing the extended
      *                modifier keys and mouse buttons for the event
      * @return a text description of the combination of extended

--- a/src/java.desktop/share/classes/javax/swing/JCheckBoxMenuItem.java	Thu Nov 15 11:25:13 2018 +0530
+++ b/src/java.desktop/share/classes/javax/swing/JCheckBoxMenuItem.java	Thu Nov 15 14:14:31 2018 -0800
@@ -178,7 +178,7 @@
      * Returns the name of the L&F class
      * that renders this component.
      *
-     * @return "CheckBoxMenuItemUI"
+     * @return the string "CheckBoxMenuItemUI"
      * @see JComponent#getUIClassID
      * @see UIDefaults#getUI
      */

--- a/src/java.desktop/share/classes/javax/swing/JLabel.java	Thu Nov 15 11:25:13 2018 +0530
+++ b/src/java.desktop/share/classes/javax/swing/JLabel.java	Thu Nov 15 14:14:31 2018 -0800
@@ -275,8 +275,7 @@
      * Returns a string that specifies the name of the l&f class
      * that renders this component.
      *
-     * @return String "LabelUI"
-     *
+     * @return the string "LabelUI"
      * @see JComponent#getUIClassID
      * @see UIDefaults#getUI
      */

--- a/src/java.desktop/share/classes/javax/swing/JPanel.java	Thu Nov 15 11:25:13 2018 +0530
+++ b/src/java.desktop/share/classes/javax/swing/JPanel.java	Thu Nov 15 14:14:31 2018 -0800
@@ -154,7 +154,7 @@
      * Returns a string that specifies the name of the L&F class
      * that renders this component.
      *
-     * @return "PanelUI"
+     * @return the string "PanelUI"
      * @see JComponent#getUIClassID
      * @see UIDefaults#getUI
      */

--- a/src/java.desktop/share/classes/javax/swing/JRadioButton.java	Thu Nov 15 11:25:13 2018 +0530
+++ b/src/java.desktop/share/classes/javax/swing/JRadioButton.java	Thu Nov 15 14:14:31 2018 -0800
@@ -196,7 +196,7 @@
      * Returns the name of the L&F class
      * that renders this component.
      *
-     * @return String "RadioButtonUI"
+     * @return the string "RadioButtonUI"
      * @see JComponent#getUIClassID
      * @see UIDefaults#getUI
      */

--- a/src/java.desktop/share/classes/javax/swing/JScrollBar.java	Thu Nov 15 11:25:13 2018 +0530
+++ b/src/java.desktop/share/classes/javax/swing/JScrollBar.java	Thu Nov 15 14:14:31 2018 -0800
@@ -235,7 +235,7 @@
     /**
      * Returns the name of the LookAndFeel class for this component.
      *
-     * @return "ScrollBarUI"
+     * @return the string "ScrollBarUI"
      * @see JComponent#getUIClassID
      * @see UIDefaults#getUI
      */

--- a/src/java.desktop/share/classes/javax/swing/JSlider.java	Thu Nov 15 11:25:13 2018 +0530
+++ b/src/java.desktop/share/classes/javax/swing/JSlider.java	Thu Nov 15 14:14:31 2018 -0800
@@ -335,7 +335,7 @@
     /**
      * Returns the name of the L&F class that renders this component.
      *
-     * @return "SliderUI"
+     * @return the string "SliderUI"
      * @see JComponent#getUIClassID
      * @see UIDefaults#getUI
      */

--- a/src/java.desktop/share/classes/javax/swing/JTextArea.java	Thu Nov 15 11:25:13 2018 +0530
+++ b/src/java.desktop/share/classes/javax/swing/JTextArea.java	Thu Nov 15 14:14:31 2018 -0800
@@ -226,7 +226,7 @@
     /**
      * Returns the class ID for the UI.
      *
-     * @return the ID ("TextAreaUI")
+     * @return the string "TextAreaUI"
      * @see JComponent#getUIClassID
      * @see UIDefaults#getUI
      */

--- a/src/java.desktop/share/classes/javax/swing/JToggleButton.java	Thu Nov 15 11:25:13 2018 +0530
+++ b/src/java.desktop/share/classes/javax/swing/JToggleButton.java	Thu Nov 15 14:14:31 2018 -0800
@@ -190,7 +190,7 @@
      * Returns a string that specifies the name of the l&f class
      * that renders this component.
      *
-     * @return String "ToggleButtonUI"
+     * @return the string "ToggleButtonUI"
      * @see JComponent#getUIClassID
      * @see UIDefaults#getUI
      */

--- a/src/java.desktop/share/classes/javax/swing/table/JTableHeader.java	Thu Nov 15 11:25:13 2018 +0530
+++ b/src/java.desktop/share/classes/javax/swing/table/JTableHeader.java	Thu Nov 15 14:14:31 2018 -0800
@@ -506,9 +506,8 @@
     /**
      * Returns the suffix used to construct the name of the look and feel
      * (L&F) class used to render this component.
+     *
      * @return the string "TableHeaderUI"
-     *
-     * @return "TableHeaderUI"
      * @see JComponent#getUIClassID
      * @see UIDefaults#getUI
      */

--- a/src/java.desktop/share/classes/javax/swing/text/CompositeView.java	Thu Nov 15 11:25:13 2018 +0530
+++ b/src/java.desktop/share/classes/javax/swing/text/CompositeView.java	Thu Nov 15 14:14:31 2018 -0800
@@ -718,8 +718,6 @@
      * @exception BadLocationException for a bad location within a document model
      * @exception IllegalArgumentException if <code>direction</code> is invalid
      * @see #getNextVisualPositionFrom
-     *
-     * @return the next position west of the passed in position
      */
     protected int getNextNorthSouthVisualPositionFrom(int pos, Position.Bias b,
                                                       Shape a, int direction,

--- a/src/java.desktop/share/classes/javax/swing/text/LabelView.java	Thu Nov 15 11:25:13 2018 +0530
+++ b/src/java.desktop/share/classes/javax/swing/text/LabelView.java	Thu Nov 15 14:14:31 2018 -0800
@@ -253,7 +253,6 @@
 
     /**
      * Determines if the glyphs should be rendered as superscript.
-     * @return the value of the cached subscript property
      *
      * <p>When you request this property, <code>LabelView</code>
      * re-syncs its state with the properties of the