cleanup and simplify XMLLocator

Author: rbri

src/main/java/org/htmlunit/cyberneko/HTMLScanner.java

@@ -630,7 +630,7 @@ public String getLiteralSystemId() {
 
     /** Returns the expanded system identifier. */
     @Override
-    public String getExpandedSystemId() {
+    public String getSystemId() {
         return fCurrentEntity != null ? fCurrentEntity.expandedSystemId : null;
     }
 

src/main/java/org/htmlunit/cyberneko/xerces/parsers/AbstractDOMParser.java

@@ -283,7 +283,7 @@ public void startDocument(final XMLLocator locator, final String encoding, final
             // set actual encoding
             fDocumentImpl.setInputEncoding(encoding);
             // set documentURI
-            fDocumentImpl.setDocumentURI(locator.getExpandedSystemId());
+            fDocumentImpl.setDocumentURI(locator.getSystemId());
         }
         else {
             // use specified document class
@@ -299,7 +299,7 @@ public void startDocument(final XMLLocator locator, final String encoding, final
                 fDocumentImpl.setInputEncoding(encoding);
                 // set documentURI
                 if (locator != null) {
-                    fDocumentImpl.setDocumentURI(locator.getExpandedSystemId());
+                    fDocumentImpl.setDocumentURI(locator.getSystemId());
                 }
             }
             catch (final Exception e) {

src/main/java/org/htmlunit/cyberneko/xerces/parsers/AbstractSAXParser.java

@@ -19,7 +19,6 @@
 
 import org.htmlunit.cyberneko.xerces.util.ErrorHandlerWrapper;
 import org.htmlunit.cyberneko.xerces.util.SAXMessageFormatter;
-import org.htmlunit.cyberneko.xerces.util.XMLAttributesImpl;
 import org.htmlunit.cyberneko.xerces.xni.Augmentations;
 import org.htmlunit.cyberneko.xerces.xni.NamespaceContext;
 import org.htmlunit.cyberneko.xerces.xni.QName;
@@ -42,9 +41,7 @@
 import org.xml.sax.SAXNotSupportedException;
 import org.xml.sax.SAXParseException;
 import org.xml.sax.XMLReader;
-import org.xml.sax.ext.Attributes2;
 import org.xml.sax.ext.LexicalHandler;
-import org.xml.sax.ext.Locator2;
 import org.xml.sax.ext.Locator2Impl;
 
 /**
@@ -145,7 +142,7 @@ public void startDocument(final XMLLocator locator, final String encoding, final
             // SAX2
             if (fContentHandler != null) {
                 if (locator != null) {
-                    fContentHandler.setDocumentLocator(new LocatorProxy(locator));
+                    fContentHandler.setDocumentLocator(locator);
                 }
                 // The application may have set the ContentHandler to null
                 // within setDocumentLocator() so we need to check again.
@@ -1008,64 +1005,4 @@ public void reset() throws XNIException {
         // features
         fNamespaces = parserConfiguration_.getFeature(NAMESPACES);
     }
-
-    protected static final class LocatorProxy implements Locator2 {
-
-        /** XML locator. */
-        private final XMLLocator fLocator;
-
-        // Constructs an XML locator proxy.
-        public LocatorProxy(final XMLLocator locator) {
-            fLocator = locator;
-        }
-
-        /**
-         * {@inheritDoc}
-         */
-        @Override
-        public String getPublicId() {
-            return fLocator.getPublicId();
-        }
-
-        /**
-         * {@inheritDoc}
-         */
-        @Override
-        public String getSystemId() {
-            return fLocator.getExpandedSystemId();
-        }
-
-        /**
-         * {@inheritDoc}
-         */
-        @Override
-        public int getLineNumber() {
-            return fLocator.getLineNumber();
-        }
-
-        /**
-         * {@inheritDoc}
-         */
-        @Override
-        public int getColumnNumber() {
-            return fLocator.getColumnNumber();
-        }
-
-        /**
-         * {@inheritDoc}
-         */
-        @Override
-        public String getXMLVersion() {
-            return fLocator.getXMLVersion();
-        }
-
-        /**
-         * {@inheritDoc}
-         */
-        @Override
-        public String getEncoding() {
-            return fLocator.getEncoding();
-        }
-
-    }
 }

src/main/java/org/htmlunit/cyberneko/xerces/util/ErrorHandlerWrapper.java

@@ -166,7 +166,7 @@ protected static SAXParseException createSAXParseException(final XMLParseExcepti
     // Creates an XMLParseException from a SAXParseException. */
     protected static XMLParseException createXMLParseException(final SAXParseException exception) {
         final String fPublicId = exception.getPublicId();
-        final String fExpandedSystemId = exception.getSystemId();
+        final String fSystemId = exception.getSystemId();
         final int fLineNumber = exception.getLineNumber();
         final int fColumnNumber = exception.getColumnNumber();
         final XMLLocator location = new XMLLocator() {
@@ -176,8 +176,8 @@ public String getPublicId() {
             }
 
             @Override
-            public String getExpandedSystemId() {
-                return fExpandedSystemId;
+            public String getSystemId() {
+                return fSystemId;
             }
 
             @Override

src/main/java/org/htmlunit/cyberneko/xerces/xni/XMLLocator.java

@@ -14,62 +14,24 @@
  */
 package org.htmlunit.cyberneko.xerces.xni;
 
+import org.xml.sax.ext.Locator2;
+
 /**
  * Location information.
  *
  * @author Andy Clark, IBM
  */
-public interface XMLLocator {
-
-    /** @return the public identifier. */
-    String getPublicId();
+public interface XMLLocator extends Locator2 {
 
     /** @return the literal system identifier. */
     String getLiteralSystemId();
 
     /** @return the base system identifier. */
     String getBaseSystemId();
 
-    /** @return the expanded system identifier. */
-    String getExpandedSystemId();
-
-    /**
-     * @return the line number, or <code>-1</code> if no line number is available.
-     */
-    int getLineNumber();
-
-    /**
-     * @return the column number, or <code>-1</code> if no column number is
-     *         available.
-     */
-    int getColumnNumber();
-
     /**
      * @return the character offset, or <code>-1</code> if no character offset is
      *         available.
      */
     int getCharacterOffset();
-
-    /**
-     * @return the encoding of the current entity. Note that, for a given entity,
-     *         this value can only be considered final once the encoding declaration
-     *         has been read (or once it has been determined that there is no such
-     *         declaration) since, no encoding having been specified on the
-     *         XMLInputSource, the parser will make an initial "guess" which could
-     *         be in error.
-     */
-    String getEncoding();
-
-    /**
-     * @return the XML version of the current entity. This will normally be the
-     *         value from the XML or text declaration or defaulted by the parser.
-     *         Note that this value may be different from the version of the
-     *         processing rules applied to the current entity. For instance, an XML
-     *         1.1 document may refer to XML 1.0 entities. In such a case the rules
-     *         of XML 1.1 are applied to the entire document. Also note that, for a
-     *         given entity, this value can only be considered final once the XML or
-     *         text declaration has been read or once it has been determined that
-     *         there is no such declaration.
-     */
-    String getXMLVersion();
 }

src/main/java/org/htmlunit/cyberneko/xerces/xni/parser/XMLParseException.java

@@ -53,7 +53,7 @@ public XMLParseException(final XMLLocator locator, final String message) {
         if (locator != null) {
             publicId_ = locator.getPublicId();
             literalSystemId_ = locator.getLiteralSystemId();
-            expandedSystemId_ = locator.getExpandedSystemId();
+            expandedSystemId_ = locator.getSystemId();
             baseSystemId_ = locator.getBaseSystemId();
             lineNumber_ = locator.getLineNumber();
             columnNumber_ = locator.getColumnNumber();
@@ -67,7 +67,7 @@ public XMLParseException(final XMLLocator locator, final String message, final E
         if (locator != null) {
             publicId_ = locator.getPublicId();
             literalSystemId_ = locator.getLiteralSystemId();
-            expandedSystemId_ = locator.getExpandedSystemId();
+            expandedSystemId_ = locator.getSystemId();
             baseSystemId_ = locator.getBaseSystemId();
             lineNumber_ = locator.getLineNumber();
             columnNumber_ = locator.getColumnNumber();