--- old/src/java.xml/share/classes/org/xml/sax/helpers/DefaultHandler.java	2020-08-25 18:28:59.234713111 +0000
+++ new/src/java.xml/share/classes/org/xml/sax/helpers/DefaultHandler.java	2020-08-25 18:28:58.924697245 +0000
@@ -94,12 +94,13 @@
      *                 document.
      * @return The new input source, or null to require the
      *         default behaviour.
-     * @exception java.io.IOException If there is an error setting
+     * @throws java.io.IOException If there is an error setting
      *            up the new input source.
-     * @exception org.xml.sax.SAXException Any SAX exception, possibly
+     * @throws org.xml.sax.SAXException Any SAX exception, possibly
      *            wrapping another exception.
      * @see org.xml.sax.EntityResolver#resolveEntity
      */
+    @Override
     public InputSource resolveEntity (String publicId, String systemId)
         throws IOException, SAXException
     {
@@ -124,10 +125,11 @@
      * @param publicId The notation public identifier, or null if not
      *                 available.
      * @param systemId The notation system identifier.
-     * @exception org.xml.sax.SAXException Any SAX exception, possibly
+     * @throws org.xml.sax.SAXException Any SAX exception, possibly
      *            wrapping another exception.
      * @see org.xml.sax.DTDHandler#notationDecl
      */
+    @Override
     public void notationDecl (String name, String publicId, String systemId)
         throws SAXException
     {
@@ -147,10 +149,11 @@
      *                 available.
      * @param systemId The entity system identifier.
      * @param notationName The name of the associated notation.
-     * @exception org.xml.sax.SAXException Any SAX exception, possibly
+     * @throws org.xml.sax.SAXException Any SAX exception, possibly
      *            wrapping another exception.
      * @see org.xml.sax.DTDHandler#unparsedEntityDecl
      */
+    @Override
     public void unparsedEntityDecl (String name, String publicId,
                                     String systemId, String notationName)
         throws SAXException
@@ -176,6 +179,7 @@
      * @see org.xml.sax.ContentHandler#setDocumentLocator
      * @see org.xml.sax.Locator
      */
+    @Override
     public void setDocumentLocator (Locator locator)
     {
         // no op
@@ -190,10 +194,11 @@
      * of a document (such as allocating the root node of a tree or
      * creating an output file).</p>
      *
-     * @exception org.xml.sax.SAXException Any SAX exception, possibly
+     * @throws org.xml.sax.SAXException Any SAX exception, possibly
      *            wrapping another exception.
      * @see org.xml.sax.ContentHandler#startDocument
      */
+    @Override
     public void startDocument ()
         throws SAXException
     {
@@ -209,10 +214,11 @@
      * of a document (such as finalising a tree or closing an output
      * file).</p>
      *
-     * @exception org.xml.sax.SAXException Any SAX exception, possibly
+     * @throws org.xml.sax.SAXException Any SAX exception, possibly
      *            wrapping another exception.
      * @see org.xml.sax.ContentHandler#endDocument
      */
+    @Override
     public void endDocument ()
         throws SAXException
     {
@@ -229,10 +235,11 @@
      *
      * @param prefix The Namespace prefix being declared.
      * @param uri The Namespace URI mapped to the prefix.
-     * @exception org.xml.sax.SAXException Any SAX exception, possibly
+     * @throws org.xml.sax.SAXException Any SAX exception, possibly
      *            wrapping another exception.
      * @see org.xml.sax.ContentHandler#startPrefixMapping
      */
+    @Override
     public void startPrefixMapping (String prefix, String uri)
         throws SAXException
     {
@@ -248,10 +255,11 @@
      * each prefix mapping.</p>
      *
      * @param prefix The Namespace prefix being declared.
-     * @exception org.xml.sax.SAXException Any SAX exception, possibly
+     * @throws org.xml.sax.SAXException Any SAX exception, possibly
      *            wrapping another exception.
      * @see org.xml.sax.ContentHandler#endPrefixMapping
      */
+    @Override
     public void endPrefixMapping (String prefix)
         throws SAXException
     {
@@ -278,10 +286,11 @@
      * @param attributes The attributes attached to the element.  If
      *        there are no attributes, it shall be an empty
      *        Attributes object.
-     * @exception org.xml.sax.SAXException Any SAX exception, possibly
+     * @throws org.xml.sax.SAXException Any SAX exception, possibly
      *            wrapping another exception.
      * @see org.xml.sax.ContentHandler#startElement
      */
+    @Override
     public void startElement (String uri, String localName,
                               String qName, Attributes attributes)
         throws SAXException
@@ -306,10 +315,11 @@
      *        performed.
      * @param qName The qualified name (with prefix), or the
      *        empty string if qualified names are not available.
-     * @exception org.xml.sax.SAXException Any SAX exception, possibly
+     * @throws org.xml.sax.SAXException Any SAX exception, possibly
      *            wrapping another exception.
      * @see org.xml.sax.ContentHandler#endElement
      */
+    @Override
     public void endElement (String uri, String localName, String qName)
         throws SAXException
     {
@@ -329,10 +339,11 @@
      * @param start The start position in the character array.
      * @param length The number of characters to use from the
      *               character array.
-     * @exception org.xml.sax.SAXException Any SAX exception, possibly
+     * @throws org.xml.sax.SAXException Any SAX exception, possibly
      *            wrapping another exception.
      * @see org.xml.sax.ContentHandler#characters
      */
+    @Override
     public void characters (char ch[], int start, int length)
         throws SAXException
     {
@@ -352,10 +363,11 @@
      * @param start The start position in the character array.
      * @param length The number of characters to use from the
      *               character array.
-     * @exception org.xml.sax.SAXException Any SAX exception, possibly
+     * @throws org.xml.sax.SAXException Any SAX exception, possibly
      *            wrapping another exception.
      * @see org.xml.sax.ContentHandler#ignorableWhitespace
      */
+    @Override
     public void ignorableWhitespace (char ch[], int start, int length)
         throws SAXException
     {
@@ -374,10 +386,11 @@
      * @param target The processing instruction target.
      * @param data The processing instruction data, or null if
      *             none is supplied.
-     * @exception org.xml.sax.SAXException Any SAX exception, possibly
+     * @throws org.xml.sax.SAXException Any SAX exception, possibly
      *            wrapping another exception.
      * @see org.xml.sax.ContentHandler#processingInstruction
      */
+    @Override
     public void processingInstruction (String target, String data)
         throws SAXException
     {
@@ -394,10 +407,11 @@
      * invoking other methods.</p>
      *
      * @param name The name of the skipped entity.
-     * @exception org.xml.sax.SAXException Any SAX exception, possibly
+     * @throws org.xml.sax.SAXException Any SAX exception, possibly
      *            wrapping another exception.
      * @see org.xml.sax.ContentHandler#processingInstruction
      */
+    @Override
     public void skippedEntity (String name)
         throws SAXException
     {
@@ -420,11 +434,12 @@
      * printing it to the console.</p>
      *
      * @param e The warning information encoded as an exception.
-     * @exception org.xml.sax.SAXException Any SAX exception, possibly
+     * @throws org.xml.sax.SAXException Any SAX exception, possibly
      *            wrapping another exception.
      * @see org.xml.sax.ErrorHandler#warning
      * @see org.xml.sax.SAXParseException
      */
+    @Override
     public void warning (SAXParseException e)
         throws SAXException
     {
@@ -441,11 +456,12 @@
      * printing it to the console.</p>
      *
      * @param e The error information encoded as an exception.
-     * @exception org.xml.sax.SAXException Any SAX exception, possibly
+     * @throws org.xml.sax.SAXException Any SAX exception, possibly
      *            wrapping another exception.
      * @see org.xml.sax.ErrorHandler#warning
      * @see org.xml.sax.SAXParseException
      */
+    @Override
     public void error (SAXParseException e)
         throws SAXException
     {
@@ -465,11 +481,12 @@
      * the parser may no longer report parsing events.</p>
      *
      * @param e The error information encoded as an exception.
-     * @exception org.xml.sax.SAXException Any SAX exception, possibly
+     * @throws org.xml.sax.SAXException Any SAX exception, possibly
      *            wrapping another exception.
      * @see org.xml.sax.ErrorHandler#fatalError
      * @see org.xml.sax.SAXParseException
      */
+    @Override
     public void fatalError (SAXParseException e)
         throws SAXException
     {