nokogiri 1.11.0.rc1-java → 1.11.2-java

data/ext/java/nokogiri/internals/XmlSaxParser.java

@@ -17,10 +17,10 @@
  * 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.
@@ -42,24 +42,31 @@ import org.apache.xerces.xni.XNIException;
  *
  * @author Patrick Mahoney <pat@polycrystal.org>
  */
-public class XmlSaxParser extends SAXParser {
+public class XmlSaxParser extends SAXParser
+{
 
-    protected XmlDeclHandler xmlDeclHandler = null;
+  protected XmlDeclHandler xmlDeclHandler = null;
 
-    public XmlSaxParser() {
-        super();
-    }
+  public
+  XmlSaxParser()
+  {
+    super();
+  }
 
-    public void setXmlDeclHandler(XmlDeclHandler xmlDeclHandler) {
-        this.xmlDeclHandler = xmlDeclHandler;
-    }
+  public void
+  setXmlDeclHandler(XmlDeclHandler xmlDeclHandler)
+  {
+    this.xmlDeclHandler = xmlDeclHandler;
+  }
 
-    @Override
-    public void xmlDecl(String version, String encoding, String standalone,
-                        Augmentations augs) throws XNIException {
-        super.xmlDecl(version, encoding, standalone, augs);
-        if (xmlDeclHandler != null) {
-            xmlDeclHandler.xmlDecl(version, encoding, standalone);
-        }
+  @Override
+  public void
+  xmlDecl(String version, String encoding, String standalone,
+          Augmentations augs) throws XNIException
+  {
+    super.xmlDecl(version, encoding, standalone, augs);
+    if (xmlDeclHandler != null) {
+      xmlDeclHandler.xmlDecl(version, encoding, standalone);
     }
+  }
 }

data/ext/java/nokogiri/internals/c14n/AttrCompare.java

@@ -28,7 +28,7 @@ import org.w3c.dom.Attr;
  * Compares two attributes based on the C14n specification.
  *
  * <UL>
- * <LI>Namespace nodes have a lesser document order position than attribute 
+ * <LI>Namespace nodes have a lesser document order position than attribute
  *   nodes.
  * <LI> An element's namespace nodes are sorted lexicographically by
  *   local name (the default namespace node, if one exists, has no
@@ -40,80 +40,83 @@ import org.w3c.dom.Attr;
  *
  * @author Christian Geuer-Pollmann
  */
-public class AttrCompare implements Comparator<Attr>, Serializable {
+public class AttrCompare implements Comparator<Attr>, Serializable
+{
 
-    private static final long serialVersionUID = -7113259629930576230L;
-    private static final int ATTR0_BEFORE_ATTR1 = -1;
-    private static final int ATTR1_BEFORE_ATTR0 = 1;
-    private static final String XMLNS = Constants.NamespaceSpecNS;
+  private static final long serialVersionUID = -7113259629930576230L;
+  private static final int ATTR0_BEFORE_ATTR1 = -1;
+  private static final int ATTR1_BEFORE_ATTR0 = 1;
+  private static final String XMLNS = Constants.NamespaceSpecNS;
 
-    /**
-     * Compares two attributes based on the C14n specification.
-     *
-     * <UL>
-     * <LI>Namespace nodes have a lesser document order position than 
-     *   attribute nodes.
-     * <LI> An element's namespace nodes are sorted lexicographically by
-     *   local name (the default namespace node, if one exists, has no
-     *   local name and is therefore lexicographically least).
-     * <LI> An element's attribute nodes are sorted lexicographically with
-     *   namespace URI as the primary key and local name as the secondary
-     *   key (an empty namespace URI is lexicographically least).
-     * </UL>
-     *
-     * @param attr0
-     * @param attr1
-     * @return returns a negative integer, zero, or a positive integer as 
-     *   obj0 is less than, equal to, or greater than obj1
-     *
-     */
-    public int compare(Attr attr0, Attr attr1) {
-        String namespaceURI0 = attr0.getNamespaceURI();      
-        String namespaceURI1 = attr1.getNamespaceURI();
-      
-        boolean isNamespaceAttr0 = XMLNS.equals(namespaceURI0);
-        boolean isNamespaceAttr1 = XMLNS.equals(namespaceURI1);
+  /**
+   * Compares two attributes based on the C14n specification.
+   *
+   * <UL>
+   * <LI>Namespace nodes have a lesser document order position than
+   *   attribute nodes.
+   * <LI> An element's namespace nodes are sorted lexicographically by
+   *   local name (the default namespace node, if one exists, has no
+   *   local name and is therefore lexicographically least).
+   * <LI> An element's attribute nodes are sorted lexicographically with
+   *   namespace URI as the primary key and local name as the secondary
+   *   key (an empty namespace URI is lexicographically least).
+   * </UL>
+   *
+   * @param attr0
+   * @param attr1
+   * @return returns a negative integer, zero, or a positive integer as
+   *   obj0 is less than, equal to, or greater than obj1
+   *
+   */
+  public int
+  compare(Attr attr0, Attr attr1)
+  {
+    String namespaceURI0 = attr0.getNamespaceURI();
+    String namespaceURI1 = attr1.getNamespaceURI();
 
-        if (isNamespaceAttr0) {
-            if (isNamespaceAttr1) {
-                // both are namespaces
-                String localname0 = attr0.getLocalName();
-                String localname1 = attr1.getLocalName();
+    boolean isNamespaceAttr0 = XMLNS.equals(namespaceURI0);
+    boolean isNamespaceAttr1 = XMLNS.equals(namespaceURI1);
 
-                if ("xmlns".equals(localname0)) {
-                    localname0 = "";
-                }
+    if (isNamespaceAttr0) {
+      if (isNamespaceAttr1) {
+        // both are namespaces
+        String localname0 = attr0.getLocalName();
+        String localname1 = attr1.getLocalName();
 
-                if ("xmlns".equals(localname1)) {
-                    localname1 = "";
-                }
+        if ("xmlns".equals(localname0)) {
+          localname0 = "";
+        }
 
-                return localname0.compareTo(localname1);
-            }
-            // attr0 is a namespace, attr1 is not
-            return ATTR0_BEFORE_ATTR1;
-        } else if (isNamespaceAttr1) {
-            // attr1 is a namespace, attr0 is not
-            return ATTR1_BEFORE_ATTR0;
-        } 
+        if ("xmlns".equals(localname1)) {
+          localname1 = "";
+        }
 
-        // none is a namespace
-        if (namespaceURI0 == null) {
-            if (namespaceURI1 == null) {
-                String name0 = attr0.getName();
-                String name1 = attr1.getName();
-                return name0.compareTo(name1);
-            }
-            return ATTR0_BEFORE_ATTR1;
-        } else if (namespaceURI1 == null) {
-            return ATTR1_BEFORE_ATTR0;
-        } 
+        return localname0.compareTo(localname1);
+      }
+      // attr0 is a namespace, attr1 is not
+      return ATTR0_BEFORE_ATTR1;
+    } else if (isNamespaceAttr1) {
+      // attr1 is a namespace, attr0 is not
+      return ATTR1_BEFORE_ATTR0;
+    }
 
-        int a = namespaceURI0.compareTo(namespaceURI1);
-        if (a != 0) {
-            return a;
-        }
-      
-        return (attr0.getLocalName()).compareTo(attr1.getLocalName());
+    // none is a namespace
+    if (namespaceURI0 == null) {
+      if (namespaceURI1 == null) {
+        String name0 = attr0.getName();
+        String name1 = attr1.getName();
+        return name0.compareTo(name1);
+      }
+      return ATTR0_BEFORE_ATTR1;
+    } else if (namespaceURI1 == null) {
+      return ATTR1_BEFORE_ATTR0;
     }
+
+    int a = namespaceURI0.compareTo(namespaceURI1);
+    if (a != 0) {
+      return a;
+    }
+
+    return (attr0.getLocalName()).compareTo(attr1.getLocalName());
+  }
 }

data/ext/java/nokogiri/internals/c14n/C14nHelper.java

@@ -29,131 +29,150 @@ import org.w3c.dom.NamedNodeMap;
  *
  * @author Christian Geuer-Pollmann
  */
-public class C14nHelper {
-
-    /**
-     * Constructor C14nHelper
-     *
-     */
-    private C14nHelper() {
-        // don't allow instantiation
+public class C14nHelper
+{
+
+  /**
+   * Constructor C14nHelper
+   *
+   */
+  private
+  C14nHelper()
+  {
+    // don't allow instantiation
+  }
+
+  /**
+   * Method namespaceIsRelative
+   *
+   * @param namespace
+   * @return true if the given namespace is relative.
+   */
+  public static boolean
+  namespaceIsRelative(Attr namespace)
+  {
+    return !namespaceIsAbsolute(namespace);
+  }
+
+  /**
+   * Method namespaceIsRelative
+   *
+   * @param namespaceValue
+   * @return true if the given namespace is relative.
+   */
+  public static boolean
+  namespaceIsRelative(String namespaceValue)
+  {
+    return !namespaceIsAbsolute(namespaceValue);
+  }
+
+  /**
+   * Method namespaceIsAbsolute
+   *
+   * @param namespace
+   * @return true if the given namespace is absolute.
+   */
+  public static boolean
+  namespaceIsAbsolute(Attr namespace)
+  {
+    return namespaceIsAbsolute(namespace.getValue());
+  }
+
+  /**
+   * Method namespaceIsAbsolute
+   *
+   * @param namespaceValue
+   * @return true if the given namespace is absolute.
+   */
+  public static boolean
+  namespaceIsAbsolute(String namespaceValue)
+  {
+    // assume empty namespaces are absolute
+    if (namespaceValue.length() == 0) {
+      return true;
     }
-
-    /**
-     * Method namespaceIsRelative
-     *
-     * @param namespace
-     * @return true if the given namespace is relative. 
-     */
-    public static boolean namespaceIsRelative(Attr namespace) {
-        return !namespaceIsAbsolute(namespace);
+    return namespaceValue.indexOf(':') > 0;
+  }
+
+  /**
+   * This method throws an exception if the Attribute value contains
+   * a relative URI.
+   *
+   * @param attr
+   * @throws CanonicalizationException
+   */
+  public static void
+  assertNotRelativeNS(Attr attr) throws CanonicalizationException
+  {
+    if (attr == null) {
+      return;
     }
 
-    /**
-     * Method namespaceIsRelative
-     *
-     * @param namespaceValue
-     * @return true if the given namespace is relative.
-     */
-    public static boolean namespaceIsRelative(String namespaceValue) {
-        return !namespaceIsAbsolute(namespaceValue);
-    }
+    String nodeAttrName = attr.getNodeName();
+    boolean definesDefaultNS = nodeAttrName.equals("xmlns");
+    boolean definesNonDefaultNS = nodeAttrName.startsWith("xmlns:");
 
-    /**
-     * Method namespaceIsAbsolute
-     *
-     * @param namespace
-     * @return true if the given namespace is absolute.
-     */
-    public static boolean namespaceIsAbsolute(Attr namespace) {
-        return namespaceIsAbsolute(namespace.getValue());
-    }
+    if ((definesDefaultNS || definesNonDefaultNS) && namespaceIsRelative(attr)) {
+      String parentName = attr.getOwnerElement().getTagName();
+      String attrValue = attr.getValue();
+      Object exArgs[] = { parentName, nodeAttrName, attrValue };
 
-    /**
-     * Method namespaceIsAbsolute
-     *
-     * @param namespaceValue
-     * @return true if the given namespace is absolute.
-     */
-    public static boolean namespaceIsAbsolute(String namespaceValue) {
-        // assume empty namespaces are absolute
-        if (namespaceValue.length() == 0) {
-            return true;
-        }
-        return namespaceValue.indexOf(':') > 0;
+      throw new CanonicalizationException(
+        "c14n.Canonicalizer.RelativeNamespace", exArgs
+      );
     }
-
-    /**
-     * This method throws an exception if the Attribute value contains
-     * a relative URI.
-     *
-     * @param attr
-     * @throws CanonicalizationException
-     */
-    public static void assertNotRelativeNS(Attr attr) throws CanonicalizationException {
-        if (attr == null) {
-            return;
-        }
-
-        String nodeAttrName = attr.getNodeName();
-        boolean definesDefaultNS = nodeAttrName.equals("xmlns");
-        boolean definesNonDefaultNS = nodeAttrName.startsWith("xmlns:");
-
-        if ((definesDefaultNS || definesNonDefaultNS) && namespaceIsRelative(attr)) {
-            String parentName = attr.getOwnerElement().getTagName();
-            String attrValue = attr.getValue();
-            Object exArgs[] = { parentName, nodeAttrName, attrValue };
-
-            throw new CanonicalizationException(
-                "c14n.Canonicalizer.RelativeNamespace", exArgs
-            );
-        }
+  }
+
+  /**
+   * This method throws a CanonicalizationException if the supplied Document
+   * is not able to be traversed using a TreeWalker.
+   *
+   * @param document
+   * @throws CanonicalizationException
+   */
+  public static void
+  checkTraversability(Document document)
+  throws CanonicalizationException
+  {
+    if (!document.isSupported("Traversal", "2.0")) {
+      Object exArgs[] = {document.getImplementation().getClass().getName() };
+
+      throw new CanonicalizationException(
+        "c14n.Canonicalizer.TraversalNotSupported", exArgs
+      );
     }
-
-    /**
-     * This method throws a CanonicalizationException if the supplied Document
-     * is not able to be traversed using a TreeWalker.
-     *
-     * @param document
-     * @throws CanonicalizationException
-     */
-    public static void checkTraversability(Document document)
-        throws CanonicalizationException {
-        if (!document.isSupported("Traversal", "2.0")) {
-            Object exArgs[] = {document.getImplementation().getClass().getName() };
-
-            throw new CanonicalizationException(
-                "c14n.Canonicalizer.TraversalNotSupported", exArgs
-            );
-        }
-    }
-
-    /**
-     * This method throws a CanonicalizationException if the supplied Element
-     * contains any relative namespaces.
-     *
-     * @param ctxNode
-     * @throws CanonicalizationException
-     * @see C14nHelper#assertNotRelativeNS(Attr)
-     */
-    public static void checkForRelativeNamespace(Element ctxNode)
-        throws CanonicalizationException {
-        if (ctxNode != null) {
-            NamedNodeMap attributes = ctxNode.getAttributes();
-
-            for (int i = 0; i < attributes.getLength(); i++) {
-                C14nHelper.assertNotRelativeNS((Attr) attributes.item(i));
-            }
-        } else {
-            throw new CanonicalizationException("Called checkForRelativeNamespace() on null");
-        }
+  }
+
+  /**
+   * This method throws a CanonicalizationException if the supplied Element
+   * contains any relative namespaces.
+   *
+   * @param ctxNode
+   * @throws CanonicalizationException
+   * @see C14nHelper#assertNotRelativeNS(Attr)
+   */
+  public static void
+  checkForRelativeNamespace(Element ctxNode)
+  throws CanonicalizationException
+  {
+    if (ctxNode != null) {
+      NamedNodeMap attributes = ctxNode.getAttributes();
+
+      for (int i = 0; i < attributes.getLength(); i++) {
+        C14nHelper.assertNotRelativeNS((Attr) attributes.item(i));
+      }
+    } else {
+      throw new CanonicalizationException("Called checkForRelativeNamespace() on null");
     }
-    
-    public static String getErrorMessage(String message, Object... exArgs) {
-        StringBuffer sb = new StringBuffer(message);
-        for (Object arg : exArgs) {
-            sb.append(", ").append(arg.toString());
-        }
-        return new String(sb);
+  }
+
+  public static String
+  getErrorMessage(String message, Object... exArgs)
+  {
+    StringBuffer sb = new StringBuffer(message);
+    for (Object arg : exArgs) {
+      sb.append(", ").append(arg.toString());
     }
+    return new String(sb);
+  }
 }