diff --git a/src/java.desktop/share/classes/java/applet/Applet.java b/src/java.desktop/share/classes/java/applet/Applet.java
index 42abb0bd25871..1592bee3f87fb 100644
--- a/src/java.desktop/share/classes/java/applet/Applet.java
+++ b/src/java.desktop/share/classes/java/applet/Applet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2020, 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
@@ -579,7 +579,7 @@ protected class AccessibleApplet extends AccessibleAWTPanel {
         private static final long serialVersionUID = 8127374778187708896L;
 
         /**
-         * Constructs an {@code AccessibleApplet}
+         * Constructs an {@code AccessibleApplet}.
          */
         protected AccessibleApplet() {}
 
diff --git a/src/java.desktop/share/classes/java/awt/Button.java b/src/java.desktop/share/classes/java/awt/Button.java
index 89419f7e4eecd..c4b44effb5c3b 100644
--- a/src/java.desktop/share/classes/java/awt/Button.java
+++ b/src/java.desktop/share/classes/java/awt/Button.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2020, 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
@@ -538,7 +538,7 @@ protected class AccessibleAWTButton extends AccessibleAWTComponent
         private static final long serialVersionUID = -5932203980244017102L;
 
         /**
-         * Constructs an {@code AccessibleAWTButton}
+         * Constructs an {@code AccessibleAWTButton}.
          */
         protected AccessibleAWTButton() {}
 
diff --git a/src/java.desktop/share/classes/java/awt/Canvas.java b/src/java.desktop/share/classes/java/awt/Canvas.java
index 0af731061d49e..079487097fa5d 100644
--- a/src/java.desktop/share/classes/java/awt/Canvas.java
+++ b/src/java.desktop/share/classes/java/awt/Canvas.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2020, 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
@@ -241,7 +241,7 @@ protected class AccessibleAWTCanvas extends AccessibleAWTComponent
         private static final long serialVersionUID = -6325592262103146699L;
 
         /**
-         * Constructs an {@code AccessibleAWTCanvas}
+         * Constructs an {@code AccessibleAWTCanvas}.
          */
         protected AccessibleAWTCanvas() {}
 
diff --git a/src/java.desktop/share/classes/java/awt/CheckboxMenuItem.java b/src/java.desktop/share/classes/java/awt/CheckboxMenuItem.java
index e0e7eb7db3261..c7f164cc40b6d 100644
--- a/src/java.desktop/share/classes/java/awt/CheckboxMenuItem.java
+++ b/src/java.desktop/share/classes/java/awt/CheckboxMenuItem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2020, 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
@@ -537,7 +537,7 @@ protected class AccessibleAWTCheckboxMenuItem extends AccessibleAWTMenuItem
         private static final long serialVersionUID = -1122642964303476L;
 
         /**
-         * Constructs an {@code AccessibleAWTCheckboxMenuItem}
+         * Constructs an {@code AccessibleAWTCheckboxMenuItem}.
          */
         protected AccessibleAWTCheckboxMenuItem() {}
 
diff --git a/src/java.desktop/share/classes/java/awt/Component.java b/src/java.desktop/share/classes/java/awt/Component.java
index 2a2ff4d7aa82e..7b63b1b111c5e 100644
--- a/src/java.desktop/share/classes/java/awt/Component.java
+++ b/src/java.desktop/share/classes/java/awt/Component.java
@@ -9342,7 +9342,7 @@ protected class AccessibleAWTComponentHandler implements ComponentListener, Seri
             private static final long serialVersionUID = -1009684107426231869L;
 
             /**
-             * Constructs an {@code AccessibleAWTComponentHandler}
+             * Constructs an {@code AccessibleAWTComponentHandler}.
              */
             protected AccessibleAWTComponentHandler() {}
 
@@ -9379,7 +9379,7 @@ protected class AccessibleAWTFocusHandler implements FocusListener, Serializable
             private static final long serialVersionUID = 3150908257351582233L;
 
             /**
-             * Constructs an {@code AccessibleAWTFocusHandler}
+             * Constructs an {@code AccessibleAWTFocusHandler}.
              */
             protected AccessibleAWTFocusHandler() {}
 
diff --git a/src/java.desktop/share/classes/java/awt/Container.java b/src/java.desktop/share/classes/java/awt/Container.java
index c91da6de7bfb5..b93b0d8bfd1b0 100644
--- a/src/java.desktop/share/classes/java/awt/Container.java
+++ b/src/java.desktop/share/classes/java/awt/Container.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2020, 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
@@ -3807,7 +3807,7 @@ protected class AccessibleAWTContainer extends AccessibleAWTComponent {
         private static final long serialVersionUID = 5081320404842566097L;
 
         /**
-         * Constructs an {@code AccessibleAWTContainer}
+         * Constructs an {@code AccessibleAWTContainer}.
          */
         protected AccessibleAWTContainer() {}
 
@@ -3869,7 +3869,7 @@ protected class AccessibleContainerHandler
             private static final long serialVersionUID = -480855353991814677L;
 
             /**
-             * Constructs an {@code AccessibleContainerHandler}
+             * Constructs an {@code AccessibleContainerHandler}.
              */
             protected AccessibleContainerHandler() {}
 
diff --git a/src/java.desktop/share/classes/java/awt/Dialog.java b/src/java.desktop/share/classes/java/awt/Dialog.java
index 6c9926c17a4e9..3954d1bd5656c 100644
--- a/src/java.desktop/share/classes/java/awt/Dialog.java
+++ b/src/java.desktop/share/classes/java/awt/Dialog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2020, 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
@@ -1659,7 +1659,7 @@ protected class AccessibleAWTDialog extends AccessibleAWTWindow
         private static final long serialVersionUID = 4837230331833941201L;
 
         /**
-         * Constructs an {@code AccessibleAWTDialog}
+         * Constructs an {@code AccessibleAWTDialog}.
          */
         protected AccessibleAWTDialog() {}
 
diff --git a/src/java.desktop/share/classes/java/awt/Frame.java b/src/java.desktop/share/classes/java/awt/Frame.java
index a6d568f422a78..10f9a2f4e8ee8 100644
--- a/src/java.desktop/share/classes/java/awt/Frame.java
+++ b/src/java.desktop/share/classes/java/awt/Frame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2020, 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
@@ -1298,7 +1298,7 @@ protected class AccessibleAWTFrame extends AccessibleAWTWindow
         private static final long serialVersionUID = -6172960752956030250L;
 
         /**
-         * Constructs an {@code AccessibleAWTFrame}
+         * Constructs an {@code AccessibleAWTFrame}.
          */
         protected AccessibleAWTFrame() {}
 
diff --git a/src/java.desktop/share/classes/java/awt/Menu.java b/src/java.desktop/share/classes/java/awt/Menu.java
index 1c308997022c3..b98692b3e69aa 100644
--- a/src/java.desktop/share/classes/java/awt/Menu.java
+++ b/src/java.desktop/share/classes/java/awt/Menu.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2020, 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
@@ -625,7 +625,7 @@ protected class AccessibleAWTMenu extends AccessibleAWTMenuItem
         private static final long serialVersionUID = 5228160894980069094L;
 
         /**
-         * Constructs an {@code AccessibleAWTMenu}
+         * Constructs an {@code AccessibleAWTMenu}.
          */
         protected AccessibleAWTMenu() {}
 
diff --git a/src/java.desktop/share/classes/java/awt/MenuBar.java b/src/java.desktop/share/classes/java/awt/MenuBar.java
index cc1072f6b7590..76f738b046205 100644
--- a/src/java.desktop/share/classes/java/awt/MenuBar.java
+++ b/src/java.desktop/share/classes/java/awt/MenuBar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2020, 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
@@ -512,7 +512,7 @@ protected class AccessibleAWTMenuBar extends AccessibleAWTMenuComponent
         private static final long serialVersionUID = -8577604491830083815L;
 
         /**
-         * Constructs an {@code AccessibleAWTMenuBar}
+         * Constructs an {@code AccessibleAWTMenuBar}.
          */
         protected AccessibleAWTMenuBar() {}
 
diff --git a/src/java.desktop/share/classes/java/awt/MenuItem.java b/src/java.desktop/share/classes/java/awt/MenuItem.java
index 3b1ddbb961c2e..d9e6e7afb327e 100644
--- a/src/java.desktop/share/classes/java/awt/MenuItem.java
+++ b/src/java.desktop/share/classes/java/awt/MenuItem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2020, 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
@@ -824,7 +824,7 @@ protected class AccessibleAWTMenuItem extends AccessibleAWTMenuComponent
         private static final long serialVersionUID = -217847831945965825L;
 
         /**
-         * Constructs an {@code AccessibleAWTMenuItem}
+         * Constructs an {@code AccessibleAWTMenuItem}.
          */
         protected AccessibleAWTMenuItem() {}
 
diff --git a/src/java.desktop/share/classes/java/awt/Panel.java b/src/java.desktop/share/classes/java/awt/Panel.java
index cc2107687d4b0..036ca64028b53 100644
--- a/src/java.desktop/share/classes/java/awt/Panel.java
+++ b/src/java.desktop/share/classes/java/awt/Panel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2020, 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
@@ -120,7 +120,7 @@ protected class AccessibleAWTPanel extends AccessibleAWTContainer {
         private static final long serialVersionUID = -6409552226660031050L;
 
         /**
-         * Constructs an {@code AccessibleAWTPanel}
+         * Constructs an {@code AccessibleAWTPanel}.
          */
         protected AccessibleAWTPanel() {}
 
diff --git a/src/java.desktop/share/classes/java/awt/PopupMenu.java b/src/java.desktop/share/classes/java/awt/PopupMenu.java
index a5cc04a345620..40f1904399aae 100644
--- a/src/java.desktop/share/classes/java/awt/PopupMenu.java
+++ b/src/java.desktop/share/classes/java/awt/PopupMenu.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2020, 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
@@ -229,7 +229,7 @@ protected class AccessibleAWTPopupMenu extends AccessibleAWTMenu
         private static final long serialVersionUID = -4282044795947239955L;
 
         /**
-         * Constructs an {@code AccessibleAWTPopupMenu}
+         * Constructs an {@code AccessibleAWTPopupMenu}.
          */
         protected AccessibleAWTPopupMenu() {}
 
diff --git a/src/java.desktop/share/classes/java/awt/ScrollPane.java b/src/java.desktop/share/classes/java/awt/ScrollPane.java
index 28634f2d7f5bc..99ed72ead2147 100644
--- a/src/java.desktop/share/classes/java/awt/ScrollPane.java
+++ b/src/java.desktop/share/classes/java/awt/ScrollPane.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2020, 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
@@ -792,7 +792,7 @@ protected class AccessibleAWTScrollPane extends AccessibleAWTContainer
         private static final long serialVersionUID = 6100703663886637L;
 
         /**
-         * Constructs an {@code AccessibleAWTScrollPane}
+         * Constructs an {@code AccessibleAWTScrollPane}.
          */
         protected AccessibleAWTScrollPane() {}
 
diff --git a/src/java.desktop/share/classes/java/awt/Scrollbar.java b/src/java.desktop/share/classes/java/awt/Scrollbar.java
index 3e4ffca3cd2bd..98da483bf66b2 100644
--- a/src/java.desktop/share/classes/java/awt/Scrollbar.java
+++ b/src/java.desktop/share/classes/java/awt/Scrollbar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2020, 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
@@ -1263,7 +1263,7 @@ protected class AccessibleAWTScrollBar extends AccessibleAWTComponent
         private static final long serialVersionUID = -344337268523697807L;
 
         /**
-         * Constructs an {@code AccessibleAWTScrollBar}
+         * Constructs an {@code AccessibleAWTScrollBar}.
          */
         protected AccessibleAWTScrollBar() {}
 
diff --git a/src/java.desktop/share/classes/java/awt/TextArea.java b/src/java.desktop/share/classes/java/awt/TextArea.java
index b8bceb590bbfe..9bbbeed6554f5 100644
--- a/src/java.desktop/share/classes/java/awt/TextArea.java
+++ b/src/java.desktop/share/classes/java/awt/TextArea.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2020, 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
@@ -720,7 +720,7 @@ protected class AccessibleAWTTextArea extends AccessibleAWTTextComponent
         private static final long serialVersionUID = 3472827823632144419L;
 
         /**
-         * Constructs an {@code AccessibleAWTTextArea}
+         * Constructs an {@code AccessibleAWTTextArea}.
          */
         protected AccessibleAWTTextArea() {}
 
diff --git a/src/java.desktop/share/classes/java/awt/TextField.java b/src/java.desktop/share/classes/java/awt/TextField.java
index 029856d0d936d..0c3d45ad3183b 100644
--- a/src/java.desktop/share/classes/java/awt/TextField.java
+++ b/src/java.desktop/share/classes/java/awt/TextField.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2020, 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
@@ -789,7 +789,7 @@ protected class AccessibleAWTTextField extends AccessibleAWTTextComponent
         private static final long serialVersionUID = 6219164359235943158L;
 
         /**
-         * Constructs an {@code AccessibleAWTTextField}
+         * Constructs an {@code AccessibleAWTTextField}.
          */
         protected AccessibleAWTTextField() {}
 
diff --git a/src/java.desktop/share/classes/java/awt/Window.java b/src/java.desktop/share/classes/java/awt/Window.java
index a3a6e13fb7b10..8acca72fe52ab 100644
--- a/src/java.desktop/share/classes/java/awt/Window.java
+++ b/src/java.desktop/share/classes/java/awt/Window.java
@@ -3164,7 +3164,7 @@ protected class AccessibleAWTWindow extends AccessibleAWTContainer
         private static final long serialVersionUID = 4215068635060671780L;
 
         /**
-         * Constructs an {@code AccessibleAWTWindow}
+         * Constructs an {@code AccessibleAWTWindow}.
          */
         protected AccessibleAWTWindow() {}
 
diff --git a/src/java.desktop/share/classes/javax/sound/midi/spi/MidiDeviceProvider.java b/src/java.desktop/share/classes/javax/sound/midi/spi/MidiDeviceProvider.java
index c79f5916a304b..ae3d005c7cd8b 100644
--- a/src/java.desktop/share/classes/javax/sound/midi/spi/MidiDeviceProvider.java
+++ b/src/java.desktop/share/classes/javax/sound/midi/spi/MidiDeviceProvider.java
@@ -39,7 +39,7 @@
 public abstract class MidiDeviceProvider {
 
     /**
-     * Constructs a {@code MidiDeviceProvider}.
+     * Constructor for subclasses to call.
      */
     protected MidiDeviceProvider() {}
 
diff --git a/src/java.desktop/share/classes/javax/sound/midi/spi/MidiFileReader.java b/src/java.desktop/share/classes/javax/sound/midi/spi/MidiFileReader.java
index 6694456c877d8..243251ef7ecf2 100644
--- a/src/java.desktop/share/classes/javax/sound/midi/spi/MidiFileReader.java
+++ b/src/java.desktop/share/classes/javax/sound/midi/spi/MidiFileReader.java
@@ -46,7 +46,7 @@
 public abstract class MidiFileReader {
 
     /**
-     * Constructs a {@code MidiFileReader}.
+     * Constructor for subclasses to call.
      */
     protected MidiFileReader() {}
 
diff --git a/src/java.desktop/share/classes/javax/sound/midi/spi/MidiFileWriter.java b/src/java.desktop/share/classes/javax/sound/midi/spi/MidiFileWriter.java
index 672da99f32a27..98b45702d18ef 100644
--- a/src/java.desktop/share/classes/javax/sound/midi/spi/MidiFileWriter.java
+++ b/src/java.desktop/share/classes/javax/sound/midi/spi/MidiFileWriter.java
@@ -43,7 +43,7 @@
 public abstract class MidiFileWriter {
 
     /**
-     * Constructs a {@code MidiFileWriter}.
+     * Constructor for subclasses to call.
      */
     protected MidiFileWriter() {}
 
diff --git a/src/java.desktop/share/classes/javax/sound/midi/spi/SoundbankReader.java b/src/java.desktop/share/classes/javax/sound/midi/spi/SoundbankReader.java
index b34c462237486..23dcb3ece79fa 100644
--- a/src/java.desktop/share/classes/javax/sound/midi/spi/SoundbankReader.java
+++ b/src/java.desktop/share/classes/javax/sound/midi/spi/SoundbankReader.java
@@ -45,7 +45,7 @@
 public abstract class SoundbankReader {
 
     /**
-     * Constructs a {@code SoundbankReader}.
+     * Constructor for subclasses to call.
      */
     protected SoundbankReader() {}
 
diff --git a/src/java.desktop/share/classes/javax/sound/sampled/spi/AudioFileReader.java b/src/java.desktop/share/classes/javax/sound/sampled/spi/AudioFileReader.java
index 39475fad07e87..8ff88af3316b5 100644
--- a/src/java.desktop/share/classes/javax/sound/sampled/spi/AudioFileReader.java
+++ b/src/java.desktop/share/classes/javax/sound/sampled/spi/AudioFileReader.java
@@ -45,7 +45,7 @@
 public abstract class AudioFileReader {
 
     /**
-     * Constructs an {@code AudioFileReader}.
+     * Constructor for subclasses to call.
      */
     protected AudioFileReader() {}
 
diff --git a/src/java.desktop/share/classes/javax/sound/sampled/spi/AudioFileWriter.java b/src/java.desktop/share/classes/javax/sound/sampled/spi/AudioFileWriter.java
index 25f3140f57c85..787cfc5ef129f 100644
--- a/src/java.desktop/share/classes/javax/sound/sampled/spi/AudioFileWriter.java
+++ b/src/java.desktop/share/classes/javax/sound/sampled/spi/AudioFileWriter.java
@@ -46,7 +46,7 @@
 public abstract class AudioFileWriter {
 
     /**
-     * Constructs an {@code AudioFileWriter}.
+     * Constructor for subclasses to call.
      */
     protected AudioFileWriter() {}
 
diff --git a/src/java.desktop/share/classes/javax/sound/sampled/spi/FormatConversionProvider.java b/src/java.desktop/share/classes/javax/sound/sampled/spi/FormatConversionProvider.java
index 803f7a2c554bd..e7058fc627364 100644
--- a/src/java.desktop/share/classes/javax/sound/sampled/spi/FormatConversionProvider.java
+++ b/src/java.desktop/share/classes/javax/sound/sampled/spi/FormatConversionProvider.java
@@ -52,7 +52,7 @@
 public abstract class FormatConversionProvider {
 
     /**
-     * Constructs a {@code FormatConversionProvider}.
+     * Constructor for subclasses to call.
      */
     protected FormatConversionProvider() {}
 
diff --git a/src/java.desktop/share/classes/javax/sound/sampled/spi/MixerProvider.java b/src/java.desktop/share/classes/javax/sound/sampled/spi/MixerProvider.java
index 4360d90d65ba6..13610d1ae3c70 100644
--- a/src/java.desktop/share/classes/javax/sound/sampled/spi/MixerProvider.java
+++ b/src/java.desktop/share/classes/javax/sound/sampled/spi/MixerProvider.java
@@ -40,7 +40,7 @@
 public abstract class MixerProvider {
 
     /**
-     * Constructs a {@code MixerProvider}.
+     * Constructor for subclasses to call.
      */
     protected MixerProvider() {}
 
diff --git a/src/java.desktop/share/classes/javax/swing/Box.java b/src/java.desktop/share/classes/javax/swing/Box.java
index 35d1cce327340..1fd81249a95a9 100644
--- a/src/java.desktop/share/classes/javax/swing/Box.java
+++ b/src/java.desktop/share/classes/javax/swing/Box.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2020, 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
@@ -384,8 +384,9 @@ public AccessibleContext getAccessibleContext() {
          */
         @SuppressWarnings("serial")
         protected class AccessibleBoxFiller extends AccessibleAWTComponent {
+
             /**
-             * Constructor for subclasses to call.
+             * Constructs an {@code AccessibleBoxFiller}.
              */
             protected AccessibleBoxFiller() {}
 
@@ -431,8 +432,9 @@ public AccessibleContext getAccessibleContext() {
      */
     @SuppressWarnings("serial")
     protected class AccessibleBox extends AccessibleAWTContainer {
+
         /**
-         * Constructor for subclasses to call.
+         * Constructs an {@code AccessibleBox}.
          */
         protected AccessibleBox() {}
 
diff --git a/src/java.desktop/share/classes/javax/swing/CellRendererPane.java b/src/java.desktop/share/classes/javax/swing/CellRendererPane.java
index f5db762d7603d..67e8b59ccd14f 100644
--- a/src/java.desktop/share/classes/javax/swing/CellRendererPane.java
+++ b/src/java.desktop/share/classes/javax/swing/CellRendererPane.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2020, 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
@@ -244,8 +244,9 @@ public AccessibleContext getAccessibleContext() {
      * <code>CellRendererPane</code> class.
      */
     protected class AccessibleCellRendererPane extends AccessibleAWTContainer {
+
         /**
-         * Constructor for subclasses to call.
+         * Constructs an {@code AccessibleCellRendererPane}.
          */
         protected AccessibleCellRendererPane() {}
 
diff --git a/src/java.desktop/share/classes/javax/swing/DefaultCellEditor.java b/src/java.desktop/share/classes/javax/swing/DefaultCellEditor.java
index 1cd40fc4bfabd..0001dfa6c297b 100644
--- a/src/java.desktop/share/classes/javax/swing/DefaultCellEditor.java
+++ b/src/java.desktop/share/classes/javax/swing/DefaultCellEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2020, 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
@@ -304,7 +304,7 @@ protected class EditorDelegate implements ActionListener, ItemListener, Serializ
         protected Object value;
 
         /**
-         * Constructor for subclasses to call.
+         * Constructs an {@code EditorDelegate}.
          */
         protected EditorDelegate() {}
 
diff --git a/src/java.desktop/share/classes/javax/swing/ImageIcon.java b/src/java.desktop/share/classes/javax/swing/ImageIcon.java
index da3f6bedeaccd..c790a5f35e40f 100644
--- a/src/java.desktop/share/classes/javax/swing/ImageIcon.java
+++ b/src/java.desktop/share/classes/javax/swing/ImageIcon.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2020, 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
@@ -597,7 +597,7 @@ protected class AccessibleImageIcon extends AccessibleContext
         implements AccessibleIcon, Serializable {
 
         /**
-         * Constructor for subclasses to call.
+         * Constructs an {@code AccessibleImageIcon}.
          */
         protected AccessibleImageIcon() {}
 
diff --git a/src/java.desktop/share/classes/javax/swing/JApplet.java b/src/java.desktop/share/classes/javax/swing/JApplet.java
index 7770056b9b944..59adfba696d0c 100644
--- a/src/java.desktop/share/classes/javax/swing/JApplet.java
+++ b/src/java.desktop/share/classes/javax/swing/JApplet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2020, 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
@@ -566,8 +566,9 @@ public AccessibleContext getAccessibleContext() {
      * <code>JApplet</code> class.
      */
     protected class AccessibleJApplet extends AccessibleApplet {
+
         /**
-         * Constructor for subclasses to call.
+         * Constructs an {@code AccessibleJApplet}.
          */
         protected AccessibleJApplet() {}
 
diff --git a/src/java.desktop/share/classes/javax/swing/JButton.java b/src/java.desktop/share/classes/javax/swing/JButton.java
index 20ef56a9f1607..0a5c2e2cadc3f 100644
--- a/src/java.desktop/share/classes/javax/swing/JButton.java
+++ b/src/java.desktop/share/classes/javax/swing/JButton.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2020, 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,7 +302,7 @@ public AccessibleContext getAccessibleContext() {
     protected class AccessibleJButton extends AccessibleAbstractButton {
 
         /**
-         * Constructor for subclasses to call.
+         * Constructs an {@code AccessibleJButton}.
          */
         protected AccessibleJButton() {}
 
diff --git a/src/java.desktop/share/classes/javax/swing/JCheckBox.java b/src/java.desktop/share/classes/javax/swing/JCheckBox.java
index 3e6634a8711b9..44112936a2b18 100644
--- a/src/java.desktop/share/classes/javax/swing/JCheckBox.java
+++ b/src/java.desktop/share/classes/javax/swing/JCheckBox.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2020, 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
@@ -333,7 +333,7 @@ public AccessibleContext getAccessibleContext() {
     protected class AccessibleJCheckBox extends AccessibleJToggleButton {
 
         /**
-         * Constructor for subclasses to call.
+         * Constructs an {@code AccessibleJCheckBox}.
          */
         protected AccessibleJCheckBox() {}
 
diff --git a/src/java.desktop/share/classes/javax/swing/JCheckBoxMenuItem.java b/src/java.desktop/share/classes/javax/swing/JCheckBoxMenuItem.java
index 24d6dd1cec94a..6604e2cbc7d21 100644
--- a/src/java.desktop/share/classes/javax/swing/JCheckBoxMenuItem.java
+++ b/src/java.desktop/share/classes/javax/swing/JCheckBoxMenuItem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2020, 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
@@ -304,8 +304,9 @@ public AccessibleContext getAccessibleContext() {
      */
     @SuppressWarnings("serial") // Same-version serialization only
     protected class AccessibleJCheckBoxMenuItem extends AccessibleJMenuItem {
+
         /**
-         * Constructor for subclasses to call.
+         * Constructs an {@code AccessibleJCheckBoxMenuItem}.
          */
         protected AccessibleJCheckBoxMenuItem() {}
 
diff --git a/src/java.desktop/share/classes/javax/swing/JColorChooser.java b/src/java.desktop/share/classes/javax/swing/JColorChooser.java
index 83e1a7e4587c6..ae352e25ce990 100644
--- a/src/java.desktop/share/classes/javax/swing/JColorChooser.java
+++ b/src/java.desktop/share/classes/javax/swing/JColorChooser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2020, 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
@@ -600,7 +600,7 @@ public AccessibleContext getAccessibleContext() {
     protected class AccessibleJColorChooser extends AccessibleJComponent {
 
         /**
-         * Constructor for subclasses to call.
+         * Constructs an {@code AccessibleJColorChooser}.
          */
         protected AccessibleJColorChooser() {}
 
diff --git a/src/java.desktop/share/classes/javax/swing/JComponent.java b/src/java.desktop/share/classes/javax/swing/JComponent.java
index d835ec619e1df..45190d3319959 100644
--- a/src/java.desktop/share/classes/javax/swing/JComponent.java
+++ b/src/java.desktop/share/classes/javax/swing/JComponent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2020, 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
@@ -3710,8 +3710,9 @@ protected AccessibleJComponent() {
          */
         protected class AccessibleContainerHandler
             implements ContainerListener {
+
             /**
-             * Constructor for subclasses to call.
+             * Constructs an {@code AccessibleContainerHandler}.
              */
             protected AccessibleContainerHandler() {}
             public void componentAdded(ContainerEvent e) {
@@ -3743,7 +3744,7 @@ public void componentRemoved(ContainerEvent e) {
         @Deprecated
         protected class AccessibleFocusHandler implements FocusListener {
            /**
-            * Constructor for subclasses to call.
+            * Constructs an {@code AccessibleFocusHandler}.
             */
            protected AccessibleFocusHandler() {}
            public void focusGained(FocusEvent event) {
diff --git a/src/java.desktop/share/classes/javax/swing/JDesktopPane.java b/src/java.desktop/share/classes/javax/swing/JDesktopPane.java
index 0c5f488fbe40b..df9f5d19f7182 100644
--- a/src/java.desktop/share/classes/javax/swing/JDesktopPane.java
+++ b/src/java.desktop/share/classes/javax/swing/JDesktopPane.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2020, 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
@@ -628,7 +628,7 @@ public AccessibleContext getAccessibleContext() {
     protected class AccessibleJDesktopPane extends AccessibleJComponent {
 
         /**
-         * Constructor for subclasses to call.
+         * Constructs an {@code AccessibleJDesktopPane}.
          */
         protected AccessibleJDesktopPane() {}
 
diff --git a/src/java.desktop/share/classes/javax/swing/JDialog.java b/src/java.desktop/share/classes/javax/swing/JDialog.java
index 147bb723d6c16..522c8dae0a005 100644
--- a/src/java.desktop/share/classes/javax/swing/JDialog.java
+++ b/src/java.desktop/share/classes/javax/swing/JDialog.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2020, 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
@@ -1239,7 +1239,7 @@ public AccessibleContext getAccessibleContext() {
     protected class AccessibleJDialog extends AccessibleAWTDialog {
 
         /**
-         * Constructor for subclasses to call.
+         * Constructs an {@code AccessibleJDialog}.
          */
         protected AccessibleJDialog() {}
 
diff --git a/src/java.desktop/share/classes/javax/swing/JEditorPane.java b/src/java.desktop/share/classes/javax/swing/JEditorPane.java
index d222460e7de4b..ff965f7dd8f79 100644
--- a/src/java.desktop/share/classes/javax/swing/JEditorPane.java
+++ b/src/java.desktop/share/classes/javax/swing/JEditorPane.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2020, 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
@@ -1660,7 +1660,7 @@ public AccessibleContext getAccessibleContext() {
     protected class AccessibleJEditorPane extends AccessibleJTextComponent {
 
         /**
-         * Constructor for subclasses to call.
+         * Constructs an {@code AccessibleJEditorPane}.
          */
         protected AccessibleJEditorPane() {}
 
diff --git a/src/java.desktop/share/classes/javax/swing/JFileChooser.java b/src/java.desktop/share/classes/javax/swing/JFileChooser.java
index 16c52873b0c5d..56a456b977991 100644
--- a/src/java.desktop/share/classes/javax/swing/JFileChooser.java
+++ b/src/java.desktop/share/classes/javax/swing/JFileChooser.java
@@ -2042,7 +2042,7 @@ public AccessibleContext getAccessibleContext() {
     protected class AccessibleJFileChooser extends AccessibleJComponent {
 
         /**
-         * Constructor for subclasses to call.
+         * Constructs an {@code AccessibleJFileChooser}.
          */
         protected AccessibleJFileChooser() {}
 
diff --git a/src/java.desktop/share/classes/javax/swing/JFrame.java b/src/java.desktop/share/classes/javax/swing/JFrame.java
index a25b1a31a495a..a87f10ec9b72a 100644
--- a/src/java.desktop/share/classes/javax/swing/JFrame.java
+++ b/src/java.desktop/share/classes/javax/swing/JFrame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2020, 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
@@ -883,7 +883,7 @@ public AccessibleContext getAccessibleContext() {
     protected class AccessibleJFrame extends AccessibleAWTFrame {
 
         /**
-         * Constructor for subclasses to call.
+         * Constructs an {@code AccessibleJFrame}.
          */
         protected AccessibleJFrame() {}
 
diff --git a/src/java.desktop/share/classes/javax/swing/JInternalFrame.java b/src/java.desktop/share/classes/javax/swing/JInternalFrame.java
index a8515fe0a5dfb..8ab38c3b6bfd6 100644
--- a/src/java.desktop/share/classes/javax/swing/JInternalFrame.java
+++ b/src/java.desktop/share/classes/javax/swing/JInternalFrame.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2020, 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
@@ -2012,7 +2012,7 @@ protected class AccessibleJInternalFrame extends AccessibleJComponent
         implements AccessibleValue {
 
         /**
-         * Constructor for subclasses to call.
+         * Constructs an {@code AccessibleJInternalFrame}.
          */
         protected AccessibleJInternalFrame() {}
 
@@ -2308,7 +2308,7 @@ protected class AccessibleJDesktopIcon extends AccessibleJComponent
             implements AccessibleValue {
 
             /**
-             * Constructor for subclasses to call.
+             * Constructs an {@code AccessibleJDesktopIcon}.
              */
             protected AccessibleJDesktopIcon() {}
 
diff --git a/src/java.desktop/share/classes/javax/swing/JLabel.java b/src/java.desktop/share/classes/javax/swing/JLabel.java
index efe314688593a..7be241df4b0e3 100644
--- a/src/java.desktop/share/classes/javax/swing/JLabel.java
+++ b/src/java.desktop/share/classes/javax/swing/JLabel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2020, 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
@@ -1044,7 +1044,7 @@ protected class AccessibleJLabel extends AccessibleJComponent
         implements AccessibleText, AccessibleExtendedComponent {
 
         /**
-         * Constructor for subclasses to call.
+         * Constructs an {@code AccessibleJLabel}.
          */
         protected AccessibleJLabel() {}
 
diff --git a/src/java.desktop/share/classes/javax/swing/JLayeredPane.java b/src/java.desktop/share/classes/javax/swing/JLayeredPane.java
index b42479546db49..4e4f0215f3e0d 100644
--- a/src/java.desktop/share/classes/javax/swing/JLayeredPane.java
+++ b/src/java.desktop/share/classes/javax/swing/JLayeredPane.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2020, 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
@@ -767,7 +767,7 @@ public AccessibleContext getAccessibleContext() {
     protected class AccessibleJLayeredPane extends AccessibleJComponent {
 
         /**
-         * Constructor for subclasses to call.
+         * Constructs an {@code AccessibleJLayeredPane}.
          */
         protected AccessibleJLayeredPane() {}
 
diff --git a/src/java.desktop/share/classes/javax/swing/JMenu.java b/src/java.desktop/share/classes/javax/swing/JMenu.java
index 9da984684e9df..c3e91e5404922 100644
--- a/src/java.desktop/share/classes/javax/swing/JMenu.java
+++ b/src/java.desktop/share/classes/javax/swing/JMenu.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2020, 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
@@ -1396,7 +1396,7 @@ protected class AccessibleJMenu extends AccessibleJMenuItem
         implements AccessibleSelection {
 
         /**
-         * Constructor for subclasses to call.
+         * Constructs an {@code AccessibleJMenu}.
          */
         protected AccessibleJMenu() {}
 
diff --git a/src/java.desktop/share/classes/javax/swing/JMenuBar.java b/src/java.desktop/share/classes/javax/swing/JMenuBar.java
index 27f58de299a61..4a42d061b16d7 100644
--- a/src/java.desktop/share/classes/javax/swing/JMenuBar.java
+++ b/src/java.desktop/share/classes/javax/swing/JMenuBar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2020, 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
@@ -511,7 +511,7 @@ protected class AccessibleJMenuBar extends AccessibleJComponent
         implements AccessibleSelection {
 
         /**
-         * Constructor for subclasses to call.
+         * Constructs an {@code AccessibleJMenuBar}.
          */
         protected AccessibleJMenuBar() {}
 
diff --git a/src/java.desktop/share/classes/javax/swing/JOptionPane.java b/src/java.desktop/share/classes/javax/swing/JOptionPane.java
index a5367b42f8c74..861d3b6ee6d57 100644
--- a/src/java.desktop/share/classes/javax/swing/JOptionPane.java
+++ b/src/java.desktop/share/classes/javax/swing/JOptionPane.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2020, 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
@@ -2548,7 +2548,7 @@ public AccessibleContext getAccessibleContext() {
     protected class AccessibleJOptionPane extends AccessibleJComponent {
 
         /**
-         * Constructor for subclasses to call.
+         * Constructs an {@code AccessibleJOptionPane}.
          */
         protected AccessibleJOptionPane() {}
 
diff --git a/src/java.desktop/share/classes/javax/swing/JPanel.java b/src/java.desktop/share/classes/javax/swing/JPanel.java
index 6467f3d5489b3..89fd8a5666514 100644
--- a/src/java.desktop/share/classes/javax/swing/JPanel.java
+++ b/src/java.desktop/share/classes/javax/swing/JPanel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2020, 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
@@ -232,8 +232,9 @@ public AccessibleContext getAccessibleContext() {
      */
     @SuppressWarnings("serial") // Same-version serialization only
     protected class AccessibleJPanel extends AccessibleJComponent {
+
         /**
-         * Constructor for subclasses to call.
+         * Constructs an {@code AccessibleJPanel}.
          */
         protected AccessibleJPanel() {}
 
diff --git a/src/java.desktop/share/classes/javax/swing/JPasswordField.java b/src/java.desktop/share/classes/javax/swing/JPasswordField.java
index 40faaad88e98d..ae90708b72bbd 100644
--- a/src/java.desktop/share/classes/javax/swing/JPasswordField.java
+++ b/src/java.desktop/share/classes/javax/swing/JPasswordField.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2020, 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
@@ -407,7 +407,7 @@ public AccessibleContext getAccessibleContext() {
     protected class AccessibleJPasswordField extends AccessibleJTextField {
 
         /**
-         * Constructor for subclasses to call.
+         * Constructs an {@code AccessibleJPasswordField}.
          */
         protected AccessibleJPasswordField() {}
 
diff --git a/src/java.desktop/share/classes/javax/swing/JProgressBar.java b/src/java.desktop/share/classes/javax/swing/JProgressBar.java
index 2635298772b4a..499a110ec3ea3 100644
--- a/src/java.desktop/share/classes/javax/swing/JProgressBar.java
+++ b/src/java.desktop/share/classes/javax/swing/JProgressBar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2020, 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
@@ -1012,7 +1012,7 @@ protected class AccessibleJProgressBar extends AccessibleJComponent
         implements AccessibleValue {
 
         /**
-         * Constructor for subclasses to call.
+         * Constructs an {@code AccessibleJProgressBar}.
          */
         protected AccessibleJProgressBar() {}
 
diff --git a/src/java.desktop/share/classes/javax/swing/JRadioButton.java b/src/java.desktop/share/classes/javax/swing/JRadioButton.java
index 75880d11f9739..d007a761ddcf4 100644
--- a/src/java.desktop/share/classes/javax/swing/JRadioButton.java
+++ b/src/java.desktop/share/classes/javax/swing/JRadioButton.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2020, 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
@@ -286,7 +286,7 @@ public AccessibleContext getAccessibleContext() {
     protected class AccessibleJRadioButton extends AccessibleJToggleButton {
 
         /**
-         * Constructor for subclasses to call.
+         * Constructs an {@code AccessibleJRadioButton}.
          */
         protected AccessibleJRadioButton() {}
 
diff --git a/src/java.desktop/share/classes/javax/swing/JRadioButtonMenuItem.java b/src/java.desktop/share/classes/javax/swing/JRadioButtonMenuItem.java
index bfddd2e45d8de..44c44a4e4bfb0 100644
--- a/src/java.desktop/share/classes/javax/swing/JRadioButtonMenuItem.java
+++ b/src/java.desktop/share/classes/javax/swing/JRadioButtonMenuItem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2020, 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
@@ -278,8 +278,9 @@ public AccessibleContext getAccessibleContext() {
      */
     @SuppressWarnings("serial") // Same-version serialization only
     protected class AccessibleJRadioButtonMenuItem extends AccessibleJMenuItem {
+
         /**
-         * Constructor for subclasses to call.
+         * Constructs an {@code AccessibleJRadioButtonMenuItem}.
          */
         protected AccessibleJRadioButtonMenuItem() {}
 
diff --git a/src/java.desktop/share/classes/javax/swing/JRootPane.java b/src/java.desktop/share/classes/javax/swing/JRootPane.java
index 556e298b2ad60..e191cc6d40523 100644
--- a/src/java.desktop/share/classes/javax/swing/JRootPane.java
+++ b/src/java.desktop/share/classes/javax/swing/JRootPane.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2020, 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
@@ -848,7 +848,7 @@ && getComponent(0) != glassPane) {
     protected class RootLayout implements LayoutManager2, Serializable
     {
         /**
-         * Constructor for subclasses to call.
+         * Constructs a {@code RootLayout}.
          */
         protected RootLayout() {}
 
@@ -1017,8 +1017,9 @@ public AccessibleContext getAccessibleContext() {
      */
     @SuppressWarnings("serial")
     protected class AccessibleJRootPane extends AccessibleJComponent {
+
         /**
-         * Constructor for subclasses to call.
+         * Constructs an {@code AccessibleJRootPane}.
          */
         protected AccessibleJRootPane() {}
 
diff --git a/src/java.desktop/share/classes/javax/swing/JScrollBar.java b/src/java.desktop/share/classes/javax/swing/JScrollBar.java
index 3281a0d8fa711..d1051765eec3b 100644
--- a/src/java.desktop/share/classes/javax/swing/JScrollBar.java
+++ b/src/java.desktop/share/classes/javax/swing/JScrollBar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2020, 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
@@ -856,7 +856,7 @@ protected class AccessibleJScrollBar extends AccessibleJComponent
         implements AccessibleValue {
 
         /**
-         * Constructor for subclasses to call.
+         * Constructs an {@code AccessibleJScrollBar}.
          */
         protected AccessibleJScrollBar() {}
 
diff --git a/src/java.desktop/share/classes/javax/swing/JSeparator.java b/src/java.desktop/share/classes/javax/swing/JSeparator.java
index b678bfc96e2a3..e554823b7c40e 100644
--- a/src/java.desktop/share/classes/javax/swing/JSeparator.java
+++ b/src/java.desktop/share/classes/javax/swing/JSeparator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2020, 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
@@ -278,7 +278,7 @@ public AccessibleContext getAccessibleContext() {
     protected class AccessibleJSeparator extends AccessibleJComponent {
 
         /**
-         * Constructor for subclasses to call.
+         * Constructs an {@code AccessibleJSeparator}.
          */
         protected AccessibleJSeparator() {}
 
diff --git a/src/java.desktop/share/classes/javax/swing/JSplitPane.java b/src/java.desktop/share/classes/javax/swing/JSplitPane.java
index 6b013cceb0556..2ff7722f45822 100644
--- a/src/java.desktop/share/classes/javax/swing/JSplitPane.java
+++ b/src/java.desktop/share/classes/javax/swing/JSplitPane.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2020, 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
@@ -1135,8 +1135,9 @@ public AccessibleContext getAccessibleContext() {
     @SuppressWarnings("serial") // Same-version serialization only
     protected class AccessibleJSplitPane extends AccessibleJComponent
         implements AccessibleValue {
+
         /**
-         * Constructor for subclasses to call.
+         * Constructs an {@code AccessibleJSplitPane}.
          */
         protected AccessibleJSplitPane() {}
 
diff --git a/src/java.desktop/share/classes/javax/swing/JTabbedPane.java b/src/java.desktop/share/classes/javax/swing/JTabbedPane.java
index 8e3146daab320..cffa9e784f428 100644
--- a/src/java.desktop/share/classes/javax/swing/JTabbedPane.java
+++ b/src/java.desktop/share/classes/javax/swing/JTabbedPane.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2020, 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
@@ -289,8 +289,9 @@ public String getUIClassID() {
      * the tabbedpane (instead of the model itself) as the event source.
      */
     protected class ModelListener implements ChangeListener, Serializable {
+
         /**
-         * Constructor for subclasses to call.
+         * Constructs a {@code ModelListener}.
          */
         protected ModelListener() {}
 
diff --git a/src/java.desktop/share/classes/javax/swing/JTextArea.java b/src/java.desktop/share/classes/javax/swing/JTextArea.java
index e370aade002e6..57b62e7153591 100644
--- a/src/java.desktop/share/classes/javax/swing/JTextArea.java
+++ b/src/java.desktop/share/classes/javax/swing/JTextArea.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2020, 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
@@ -784,7 +784,7 @@ public AccessibleContext getAccessibleContext() {
     protected class AccessibleJTextArea extends AccessibleJTextComponent {
 
         /**
-         * Constructor for subclasses to call.
+         * Constructs an {@code AccessibleJTextArea}.
          */
         protected AccessibleJTextArea() {}
 
diff --git a/src/java.desktop/share/classes/javax/swing/JTextField.java b/src/java.desktop/share/classes/javax/swing/JTextField.java
index fc4a492c6d023..f4fb65d68985d 100644
--- a/src/java.desktop/share/classes/javax/swing/JTextField.java
+++ b/src/java.desktop/share/classes/javax/swing/JTextField.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2020, 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
@@ -951,7 +951,7 @@ public AccessibleContext getAccessibleContext() {
     protected class AccessibleJTextField extends AccessibleJTextComponent {
 
         /**
-         * Constructor for subclasses to call.
+         * Constructs an {@code AccessibleJTextField}.
          */
         protected AccessibleJTextField() {}
 
diff --git a/src/java.desktop/share/classes/javax/swing/JToolBar.java b/src/java.desktop/share/classes/javax/swing/JToolBar.java
index 7c2fef9d8c588..b8bbdbb617926 100644
--- a/src/java.desktop/share/classes/javax/swing/JToolBar.java
+++ b/src/java.desktop/share/classes/javax/swing/JToolBar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2020, 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
@@ -832,7 +832,7 @@ public AccessibleContext getAccessibleContext() {
     protected class AccessibleJToolBar extends AccessibleJComponent {
 
         /**
-         * Constructor for subclasses to call.
+         * Constructs an {@code AccessibleJToolBar}.
          */
         protected AccessibleJToolBar() {}
 
diff --git a/src/java.desktop/share/classes/javax/swing/JToolTip.java b/src/java.desktop/share/classes/javax/swing/JToolTip.java
index 817200fec1f83..d22c7ba888476 100644
--- a/src/java.desktop/share/classes/javax/swing/JToolTip.java
+++ b/src/java.desktop/share/classes/javax/swing/JToolTip.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2020, 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
@@ -262,7 +262,7 @@ public AccessibleContext getAccessibleContext() {
     protected class AccessibleJToolTip extends AccessibleJComponent {
 
         /**
-         * Constructor for subclasses to call.
+         * Constructs an {@code AccessibleJToolTip}.
          */
         protected AccessibleJToolTip() {}
 
diff --git a/src/java.desktop/share/classes/javax/swing/JTree.java b/src/java.desktop/share/classes/javax/swing/JTree.java
index 810bea55b5f63..43112a781a428 100644
--- a/src/java.desktop/share/classes/javax/swing/JTree.java
+++ b/src/java.desktop/share/classes/javax/swing/JTree.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2020, 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
@@ -3321,7 +3321,7 @@ protected static class EmptySelectionModel extends
               DefaultTreeSelectionModel
     {
         /**
-         * Constructor for subclasses to call.
+         * Constructs an {@code EmptySelectionModel}.
          */
         protected EmptySelectionModel() {}
 
@@ -3448,7 +3448,7 @@ protected class TreeSelectionRedirector implements Serializable,
                     TreeSelectionListener
     {
         /**
-         * Constructor for subclasses to call.
+         * Constructs a {@code TreeSelectionRedirector}.
          */
         protected TreeSelectionRedirector() {}
 
@@ -3873,10 +3873,11 @@ void removeDescendantSelectedPaths(TreeModelEvent e) {
       * accordingly when nodes are removed, or changed.
       */
     protected class TreeModelHandler implements TreeModelListener {
-         /**
-          * Constructor for subclasses to call.
-          */
-         protected TreeModelHandler() {}
+
+        /**
+         * Constructs a {@code TreeModelHandler}.
+         */
+        protected TreeModelHandler() {}
 
         public void treeNodesChanged(TreeModelEvent e) { }
 
diff --git a/src/java.desktop/share/classes/javax/swing/JViewport.java b/src/java.desktop/share/classes/javax/swing/JViewport.java
index ac2cfd747013f..26549bfb2862a 100644
--- a/src/java.desktop/share/classes/javax/swing/JViewport.java
+++ b/src/java.desktop/share/classes/javax/swing/JViewport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2020, 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
@@ -1406,7 +1406,7 @@ public void setExtentSize(Dimension newExtent) {
     protected class ViewListener extends ComponentAdapter implements Serializable
     {
         /**
-         * Constructor for subclasses to call.
+         * Constructs a {@code ViewListener}.
          */
         protected ViewListener() {}
 
@@ -1882,7 +1882,7 @@ public AccessibleContext getAccessibleContext() {
     protected class AccessibleJViewport extends AccessibleJComponent {
 
         /**
-         * Constructor for subclasses to call.
+         * Constructs an {@code AccessibleJViewport}.
          */
         protected AccessibleJViewport() {}
 
diff --git a/src/java.desktop/share/classes/javax/swing/JWindow.java b/src/java.desktop/share/classes/javax/swing/JWindow.java
index 7ca38702353e0..69269c9f284ce 100644
--- a/src/java.desktop/share/classes/javax/swing/JWindow.java
+++ b/src/java.desktop/share/classes/javax/swing/JWindow.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2020, 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
@@ -655,7 +655,7 @@ public AccessibleContext getAccessibleContext() {
     protected class AccessibleJWindow extends AccessibleAWTWindow {
         // everything is in the new parent, AccessibleAWTWindow
         /**
-         * Constructor for subclasses to call.
+         * Constructs an {@code AccessibleJWindow}.
          */
         protected AccessibleJWindow() {}
     }
diff --git a/src/java.desktop/share/classes/javax/swing/ToolTipManager.java b/src/java.desktop/share/classes/javax/swing/ToolTipManager.java
index b0b179b9c7b35..bb37b05e906f0 100644
--- a/src/java.desktop/share/classes/javax/swing/ToolTipManager.java
+++ b/src/java.desktop/share/classes/javax/swing/ToolTipManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2020, 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
@@ -677,8 +677,9 @@ private void checkForTipChange(MouseEvent event) {
      * Inside timer action.
      */
     protected class insideTimerAction implements ActionListener {
+
         /**
-         * Constructor for subclasses to call.
+         * Constructs an {@code insideTimerAction}.
          */
         protected insideTimerAction() {}
 
@@ -712,8 +713,9 @@ public void actionPerformed(ActionEvent e) {
      * Outside timer action.
      */
     protected class outsideTimerAction implements ActionListener {
+
         /**
-         * Constructor for subclasses to call.
+         * Constructs an {@code outsideTimerAction}.
          */
         protected outsideTimerAction() {}
 
@@ -729,8 +731,9 @@ public void actionPerformed(ActionEvent e) {
      * Still inside timer action.
      */
     protected class stillInsideTimerAction implements ActionListener {
+
         /**
-         * Constructor for subclasses to call.
+         * Constructs a {@code stillInsideTimerAction}.
          */
         protected stillInsideTimerAction() {}
 
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 504e9078f1ad6..7b80dd876f1af 100644
--- a/src/java.desktop/share/classes/javax/swing/table/JTableHeader.java
+++ b/src/java.desktop/share/classes/javax/swing/table/JTableHeader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2020, 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
@@ -809,7 +809,7 @@ public AccessibleContext getAccessibleContext() {
     protected class AccessibleJTableHeader extends AccessibleJComponent {
 
         /**
-         * Constructor for subclasses to call.
+         * Constructs an {@code AccessibleJTableHeader}.
          */
         protected AccessibleJTableHeader() {}
 
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 4ce1c7952587f..467651a9d98d2 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2020, 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
@@ -553,7 +553,7 @@ private void storePostData(HTMLDocument doc, String target, String data) {
     protected class MouseEventListener extends MouseAdapter {
 
         /**
-         * Constructor for subclasses to call.
+         * Constructs a {@code MouseEventListener}.
          */
         protected MouseEventListener() {}