nokogiri 1.11.0.rc3-java → 1.11.4-java

data/ext/java/nokogiri/internals/NokogiriNonStrictErrorHandler.java

@@ -1,35 +1,3 @@
-/**
- * (The MIT License)
- *
- * Copyright (c) 2008 - 2011:
- *
- * * {Aaron Patterson}[http://tenderlovemaking.com]
- * * {Mike Dalessio}[http://mike.daless.io]
- * * {Charles Nutter}[http://blog.headius.com]
- * * {Sergio Arbeo}[http://www.serabe.com]
- * * {Patrick Mahoney}[http://polycrystal.org]
- * * {Yoko Harada}[http://yokolet.blogspot.com]
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * 'Software'), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * 
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
 package nokogiri.internals;
 
 import org.apache.xerces.xni.parser.XMLParseException;
@@ -38,63 +6,80 @@ import org.xml.sax.SAXParseException;
 
 /**
  * Error Handler for XML document when recover is true (default).
- * 
+ *
  * @author sergio
  * @author Yoko Harada <yokolet@gmail.com>
  */
-public class NokogiriNonStrictErrorHandler extends NokogiriErrorHandler{
-    public NokogiriNonStrictErrorHandler(boolean noerror, boolean nowarning) {
-        super(noerror, nowarning);
-    }
+public class NokogiriNonStrictErrorHandler extends NokogiriErrorHandler
+{
+  public
+  NokogiriNonStrictErrorHandler(boolean noerror, boolean nowarning)
+  {
+    super(noerror, nowarning);
+  }
 
-    public void warning(SAXParseException ex) throws SAXException {
-        errors.add(ex);
-    }
+  public void
+  warning(SAXParseException ex) throws SAXException
+  {
+    errors.add(ex);
+  }
 
-    public void error(SAXParseException ex) throws SAXException {
-        errors.add(ex);
-    }
+  public void
+  error(SAXParseException ex) throws SAXException
+  {
+    errors.add(ex);
+  }
 
-    public void fatalError(SAXParseException ex) throws SAXException {
-        // fix #837
-        // Xerces won't skip the reference entity (and other invalid) constructs
-        // found in the prolog, instead it will keep calling this method and we'll
-        // keep inserting the error in the document errors array until we run
-        // out of memory
-        errors.add(ex);
-        String message = ex.getMessage();
+  public void
+  fatalError(SAXParseException ex) throws SAXException
+  {
+    // fix #837
+    // Xerces won't skip the reference entity (and other invalid) constructs
+    // found in the prolog, instead it will keep calling this method and we'll
+    // keep inserting the error in the document errors array until we run
+    // out of memory
+    errors.add(ex);
+    String message = ex.getMessage();
 
-        // The problem with Xerces is that some errors will cause the
-        // parser not to advance the reader and it will keep reporting
-        // the same error over and over, which will cause the parser
-        // to enter an infinite loop unless we throw the exception.
-        if (message != null && isFatal(message)) {
-          throw ex;
-        }
+    // The problem with Xerces is that some errors will cause the
+    // parser not to advance the reader and it will keep reporting
+    // the same error over and over, which will cause the parser
+    // to enter an infinite loop unless we throw the exception.
+    if (message != null && isFatal(message)) {
+      throw ex;
     }
+  }
 
-    public void error(String domain, String key, XMLParseException e) {
-        errors.add(e);
-    }
+  public void
+  error(String domain, String key, XMLParseException e)
+  {
+    errors.add(e);
+  }
 
-    public void fatalError(String domain, String key, XMLParseException e) {
-        errors.add(e);
-    }
+  public void
+  fatalError(String domain, String key, XMLParseException e)
+  {
+    errors.add(e);
+  }
 
-    public void warning(String domain, String key, XMLParseException e) {
-        errors.add(e);
-    }
+  public void
+  warning(String domain, String key, XMLParseException e)
+  {
+    errors.add(e);
+  }
 
-    /*
-     * Determine whether this is a fatal error that should cause
-     * the parsing to stop, or an error that can be ignored.
-     */
-    private static boolean isFatal(String msg) {
-        String msgLowerCase = msg.toLowerCase();
-        return
-          msgLowerCase.contains("in prolog") ||
-          msgLowerCase.contains("limit") ||
-          msgLowerCase.contains("preceding the root element must be well-formed") ||
-          msgLowerCase.contains("following the root element must be well-formed");
-    }
+  /*
+   * Determine whether this is a fatal error that should cause
+   * the parsing to stop, or an error that can be ignored.
+   */
+  private static boolean
+  isFatal(String msg)
+  {
+    String msgLowerCase = msg.toLowerCase();
+    return
+      msgLowerCase.contains("in prolog") ||
+      msgLowerCase.contains("limit") ||
+      msgLowerCase.contains("preceding the root element must be well-formed") ||
+      msgLowerCase.contains("following the root element must be well-formed");
+  }
 }

data/ext/java/nokogiri/internals/NokogiriNonStrictErrorHandler4NekoHtml.java

@@ -1,35 +1,3 @@
-/**
- * (The MIT License)
- *
- * Copyright (c) 2008 - 2011:
- *
- * * {Aaron Patterson}[http://tenderlovemaking.com]
- * * {Mike Dalessio}[http://mike.daless.io]
- * * {Charles Nutter}[http://blog.headius.com]
- * * {Sergio Arbeo}[http://www.serabe.com]
- * * {Patrick Mahoney}[http://polycrystal.org]
- * * {Yoko Harada}[http://yokolet.blogspot.com]
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * 'Software'), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * 
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
 package nokogiri.internals;
 
 import org.apache.xerces.xni.parser.XMLParseException;
@@ -38,84 +6,101 @@ import org.xml.sax.SAXParseException;
 
 /**
  * Non-strict error handler for NekoHtml.
- * 
+ *
  * NekoHtml adds too many warnings, which makes later processing hard. For example,
- * Nokogiri wants to know whether number of errors have been increased or not to judge 
- * availability of creating NodeSet from a given fragment. When the fragment nodes 
+ * Nokogiri wants to know whether number of errors have been increased or not to judge
+ * availability of creating NodeSet from a given fragment. When the fragment nodes
  * are to be created from HTML document, which means NekoHtml is used, always errors
  * increases. As a result, even though the given fragment is correct HTML, NodeSet
  * base on the given fragment won't be created. This is why all warnings are eliminated.
- * 
+ *
  * @author Yoko Harada <yokolet@gmail.com>
  */
-public class NokogiriNonStrictErrorHandler4NekoHtml extends NokogiriErrorHandler {
-    
-    public NokogiriNonStrictErrorHandler4NekoHtml(boolean nowarning) {
-        super(false, nowarning);
-    }
-    
-    public NokogiriNonStrictErrorHandler4NekoHtml(boolean noerror, boolean nowarning) {
-        super(noerror, nowarning);
-    }
+public class NokogiriNonStrictErrorHandler4NekoHtml extends NokogiriErrorHandler
+{
+
+  public
+  NokogiriNonStrictErrorHandler4NekoHtml(boolean nowarning)
+  {
+    super(false, nowarning);
+  }
+
+  public
+  NokogiriNonStrictErrorHandler4NekoHtml(boolean noerror, boolean nowarning)
+  {
+    super(noerror, nowarning);
+  }
 
-    public void warning(SAXParseException ex) throws SAXException {
-        //noop. NekoHtml adds too many warnings.
-    }
+  public void
+  warning(SAXParseException ex) throws SAXException
+  {
+    //noop. NekoHtml adds too many warnings.
+  }
 
-    public void error(SAXParseException ex) throws SAXException {
-        errors.add(ex);
-    }
+  public void
+  error(SAXParseException ex) throws SAXException
+  {
+    errors.add(ex);
+  }
 
-    public void fatalError(SAXParseException ex) throws SAXException {
-        errors.add(ex);
-    }
+  public void
+  fatalError(SAXParseException ex) throws SAXException
+  {
+    errors.add(ex);
+  }
 
-    /**
-     * Implementation of org.apache.xerces.xni.parser.XMLErrorHandler. This method
-     * is invoked during parsing fired by HtmlDomParserContext and is a NekoHtml requirement.
-     * 
-     * @param domain The domain of the error. The domain can be any string but is 
-     *               suggested to be a valid URI. The domain can be used to conveniently
-     *               specify a web site location of the relevant specification or 
-     *               document pertaining to this warning.
-     * @param key The error key. This key can be any string and is implementation
-     *            dependent.
-     * @param e Exception.
-     */
-    public void error(String domain, String key, XMLParseException e) {
-        errors.add(e);
-    }
+  /**
+   * Implementation of org.apache.xerces.xni.parser.XMLErrorHandler. This method
+   * is invoked during parsing fired by HtmlDomParserContext and is a NekoHtml requirement.
+   *
+   * @param domain The domain of the error. The domain can be any string but is
+   *               suggested to be a valid URI. The domain can be used to conveniently
+   *               specify a web site location of the relevant specification or
+   *               document pertaining to this warning.
+   * @param key The error key. This key can be any string and is implementation
+   *            dependent.
+   * @param e Exception.
+   */
+  public void
+  error(String domain, String key, XMLParseException e)
+  {
+    errors.add(e);
+  }
 
-    /**
-     * Implementation of org.apache.xerces.xni.parser.XMLErrorHandler. This method
-     * is invoked during parsing fired by HtmlDomParserContext and is a NekoHtml requirement.
-     * 
-     * @param domain The domain of the fatal error. The domain can be any string but is 
-     *               suggested to be a valid URI. The domain can be used to conveniently
-     *               specify a web site location of the relevant specification or 
-     *               document pertaining to this warning.
-     * @param key The fatal error key. This key can be any string and is implementation
-     *            dependent.
-     * @param e Exception.
-     */
-    public void fatalError(String domain, String key, XMLParseException e) {
-        errors.add(e);
-    }
+  /**
+   * Implementation of org.apache.xerces.xni.parser.XMLErrorHandler. This method
+   * is invoked during parsing fired by HtmlDomParserContext and is a NekoHtml requirement.
+   *
+   * @param domain The domain of the fatal error. The domain can be any string but is
+   *               suggested to be a valid URI. The domain can be used to conveniently
+   *               specify a web site location of the relevant specification or
+   *               document pertaining to this warning.
+   * @param key The fatal error key. This key can be any string and is implementation
+   *            dependent.
+   * @param e Exception.
+   */
+  public void
+  fatalError(String domain, String key, XMLParseException e)
+  {
+    errors.add(e);
+  }
 
-    /**
-     * Implementation of org.apache.xerces.xni.parser.XMLErrorHandler. This method
-     * is invoked during parsing fired by HtmlDomParserContext and is a NekoHtml requirement.
-     * 
-     * @param domain The domain of the warning. The domain can be any string but is 
-     *               suggested to be a valid URI. The domain can be used to conveniently
-     *               specify a web site location of the relevant specification or 
-     *               document pertaining to this warning.
-     * @param key The warning key. This key can be any string and is implementation
-     *            dependent.
-     * @param e Exception.
-     */
-    public void warning(String domain, String key, XMLParseException e) {
-        errors.add(e);
-    }
+  /**
+   * Implementation of org.apache.xerces.xni.parser.XMLErrorHandler. This method
+   * is invoked during parsing fired by HtmlDomParserContext and is a NekoHtml requirement.
+   *
+   * @param domain The domain of the warning. The domain can be any string but is
+   *               suggested to be a valid URI. The domain can be used to conveniently
+   *               specify a web site location of the relevant specification or
+   *               document pertaining to this warning.
+   * @param key The warning key. This key can be any string and is implementation
+   *            dependent.
+   * @param e Exception.
+   */
+  public void
+  warning(String domain, String key, XMLParseException e)
+  {
+    errors.add(e);
+  }
 
 }

data/ext/java/nokogiri/internals/NokogiriStrictErrorHandler.java

@@ -1,35 +1,3 @@
-/**
- * (The MIT License)
- *
- * Copyright (c) 2008 - 2011:
- *
- * * {Aaron Patterson}[http://tenderlovemaking.com]
- * * {Mike Dalessio}[http://mike.daless.io]
- * * {Charles Nutter}[http://blog.headius.com]
- * * {Sergio Arbeo}[http://www.serabe.com]
- * * {Patrick Mahoney}[http://polycrystal.org]
- * * {Yoko Harada}[http://yokolet.blogspot.com]
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * 'Software'), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- * 
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
 package nokogiri.internals;
 
 import org.apache.xerces.xni.parser.XMLParseException;
@@ -39,40 +7,55 @@ import org.xml.sax.SAXParseException;
 /**
  * Strict error handler. Even though strict is specified, Nokogiri allows to go further
  * when NOERROR or/both NOWARNING is/are true.
- * 
+ *
  * @author sergio
  * @author Yoko Harada <yokolet@gmail.com>
  */
-public class NokogiriStrictErrorHandler extends NokogiriErrorHandler {
-    public NokogiriStrictErrorHandler(boolean noerror, boolean nowarning) {
-        super(noerror, nowarning);
-    }
-
-    public void warning(SAXParseException spex) throws SAXException {
-        if (!nowarning) throw spex;
-        else errors.add(spex);
-    }
-
-    public void error(SAXParseException spex) throws SAXException {
-        if (!noerror) throw spex;
-        else errors.add(spex);
-    }
-
-    public void fatalError(SAXParseException spex) throws SAXException {
-        throw spex;
-    }
-
-    public void error(String domain, String key, XMLParseException e) throws XMLParseException {
-        if (!noerror) throw e;
-        else errors.add(e);
-    }
-
-    public void fatalError(String domain, String key, XMLParseException e) throws XMLParseException {
-        throw e;
-    }
-
-    public void warning(String domain, String key, XMLParseException e) throws XMLParseException {
-        if (!nowarning) throw e;
-        if (!usesNekoHtml(domain)) errors.add(e);
-    }
+public class NokogiriStrictErrorHandler extends NokogiriErrorHandler
+{
+  public
+  NokogiriStrictErrorHandler(boolean noerror, boolean nowarning)
+  {
+    super(noerror, nowarning);
+  }
+
+  public void
+  warning(SAXParseException spex) throws SAXException
+  {
+    if (!nowarning) { throw spex; }
+    else { errors.add(spex); }
+  }
+
+  public void
+  error(SAXParseException spex) throws SAXException
+  {
+    if (!noerror) { throw spex; }
+    else { errors.add(spex); }
+  }
+
+  public void
+  fatalError(SAXParseException spex) throws SAXException
+  {
+    throw spex;
+  }
+
+  public void
+  error(String domain, String key, XMLParseException e) throws XMLParseException
+  {
+    if (!noerror) { throw e; }
+    else { errors.add(e); }
+  }
+
+  public void
+  fatalError(String domain, String key, XMLParseException e) throws XMLParseException
+  {
+    throw e;
+  }
+
+  public void
+  warning(String domain, String key, XMLParseException e) throws XMLParseException
+  {
+    if (!nowarning) { throw e; }
+    if (!usesNekoHtml(domain)) { errors.add(e); }
+  }
 }