nokogiri 1.11.0.rc1-java → 1.11.2-java

data/ext/java/nokogiri/XmlEntityReference.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.
@@ -47,55 +47,64 @@ import org.w3c.dom.Node;
 
 /**
  * Class for Nokogiri::XML::EntityReference
- * 
+ *
  * @author sergio
  * @author Patrick Mahoney <pat@polycrystal.org>
  * @author Yoko Harada <yokolet@gmail.com>
  */
-@JRubyClass(name="Nokogiri::XML::EntityReference", parent="Nokogiri::XML::Node")
-public class XmlEntityReference extends XmlNode {
+@JRubyClass(name = "Nokogiri::XML::EntityReference", parent = "Nokogiri::XML::Node")
+public class XmlEntityReference extends XmlNode
+{
 
-    public XmlEntityReference(Ruby ruby, RubyClass klazz) {
-        super(ruby, klazz);
-    }
+  public
+  XmlEntityReference(Ruby ruby, RubyClass klazz)
+  {
+    super(ruby, klazz);
+  }
+
+  public
+  XmlEntityReference(Ruby ruby, RubyClass klass, Node node)
+  {
+    super(ruby, klass, node);
+  }
 
-    public XmlEntityReference(Ruby ruby, RubyClass klass, Node node) {
-        super(ruby, klass, node);
+  protected void
+  init(ThreadContext context, IRubyObject[] args)
+  {
+    if (args.length < 2) {
+      throw context.runtime.newArgumentError(args.length, 2);
     }
 
-    protected void init(ThreadContext context, IRubyObject[] args) {
-        if (args.length < 2) {
-            throw context.runtime.newArgumentError(args.length, 2);
-        }
+    IRubyObject doc = args[0];
+    IRubyObject name = args[1];
 
-        IRubyObject doc = args[0];
-        IRubyObject name = args[1];
+    Document document = ((XmlNode) doc).getOwnerDocument();
+    // FIXME: disable error checking as a workaround for #719. this depends on the internals of Xerces.
+    CoreDocumentImpl internalDocument = (CoreDocumentImpl) document;
+    boolean oldErrorChecking = internalDocument.getErrorChecking();
+    internalDocument.setErrorChecking(false);
+    Node node = document.createEntityReference(rubyStringToString(name));
+    internalDocument.setErrorChecking(oldErrorChecking);
+    setNode(context.runtime, node);
+  }
 
-        Document document = ((XmlNode) doc).getOwnerDocument();
-        // FIXME: disable error checking as a workaround for #719. this depends on the internals of Xerces.
-        CoreDocumentImpl internalDocument = (CoreDocumentImpl) document;
-        boolean oldErrorChecking = internalDocument.getErrorChecking();
-        internalDocument.setErrorChecking(false);
-        Node node = document.createEntityReference(rubyStringToString(name));
-        internalDocument.setErrorChecking(oldErrorChecking);
-        setNode(context.runtime, node);
-    }
-    
-    @Override
-    public void accept(ThreadContext context, SaveContextVisitor visitor) {
-        visitor.enter(node);
-        Node child = node.getFirstChild();
-        while (child != null) {
-            IRubyObject nokoNode = getCachedNodeOrCreate(context.getRuntime(), child);
-            if (nokoNode instanceof XmlNode) {
-                XmlNode cur = (XmlNode) nokoNode;
-                cur.accept(context, visitor);
-            } else if (nokoNode instanceof XmlNamespace) {
-                XmlNamespace cur = (XmlNamespace) nokoNode;
-                cur.accept(context, visitor);
-            }
-            child = child.getNextSibling();
-        }
-        visitor.leave(node);
+  @Override
+  public void
+  accept(ThreadContext context, SaveContextVisitor visitor)
+  {
+    visitor.enter(node);
+    Node child = node.getFirstChild();
+    while (child != null) {
+      IRubyObject nokoNode = getCachedNodeOrCreate(context.getRuntime(), child);
+      if (nokoNode instanceof XmlNode) {
+        XmlNode cur = (XmlNode) nokoNode;
+        cur.accept(context, visitor);
+      } else if (nokoNode instanceof XmlNamespace) {
+        XmlNamespace cur = (XmlNamespace) nokoNode;
+        cur.accept(context, visitor);
+      }
+      child = child.getNextSibling();
     }
+    visitor.leave(node);
+  }
 }

data/ext/java/nokogiri/XmlNamespace.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.
@@ -50,150 +50,182 @@ import org.w3c.dom.Node;
 
 /**
  * Class for Nokogiri::XML::Namespace
- * 
+ *
  * @author serabe
  * @author Yoko Harada <yokolet@gmail.com>
  */
-@JRubyClass(name="Nokogiri::XML::Namespace")
-public class XmlNamespace extends RubyObject {
-    private Attr attr;
-    private transient IRubyObject prefixRuby;
-    private transient IRubyObject hrefRuby;
-    private String prefix;
-    private String href;
-
-    public XmlNamespace(Ruby runtime, RubyClass klazz) {
-        super(runtime, klazz);
-    }
-
-    XmlNamespace(Ruby runtime, Attr attr, String prefix, String href, IRubyObject document) {
-        this(runtime, attr, prefix, null, href, null, document);
-    }
-
-    private XmlNamespace(Ruby runtime, Attr attr, String prefix, IRubyObject prefixRuby,
-                         String href, IRubyObject hrefRuby, IRubyObject document) {
-        super(runtime, getNokogiriClass(runtime, "Nokogiri::XML::Namespace"));
-
-        this.attr = attr;
-        this.prefix = prefix;
-        this.href = href;
-        this.prefixRuby = prefixRuby;
-        this.hrefRuby = hrefRuby;
-        setInstanceVariable("@document", document);
-    }
-
-    public Node getNode() {
-        return attr;
-    }
-    
-    public String getPrefix() {
-        return prefix;
-    }
-
-    boolean hasPrefix(String prefix) {
-        return prefix == null ? this.prefix == null : prefix.equals(this.prefix);
-    }
-
-    public String getHref() {
-        return href;
-    }
-    
-    void deleteHref() {
-        href = "http://www.w3.org/XML/1998/namespace";
-        hrefRuby = null;
-        attr.getOwnerElement().removeAttributeNode(attr);
-    }
-    
-    public static XmlNamespace createFromAttr(Ruby runtime, Attr attr) {
-        String prefixStr = getLocalNameForNamespace(attr.getName(), null);
-        IRubyObject prefix = prefixStr == null ? runtime.getNil() : null;
-        String hrefStr = attr.getValue();
-        // check namespace cache
-        XmlDocument xmlDocument = (XmlDocument) getCachedNodeOrCreate(runtime, attr.getOwnerDocument());
-        XmlNamespace namespace = xmlDocument.getNamespaceCache().get(prefixStr, hrefStr);
-        if (namespace != null) return namespace;
-
-        namespace = new XmlNamespace(runtime, attr, prefixStr, prefix, hrefStr, null, xmlDocument);
-        xmlDocument.getNamespaceCache().put(namespace, attr.getOwnerElement());
-        return namespace;
-    }
-    
-    static XmlNamespace createImpl(Node owner, IRubyObject prefix, String prefixStr, IRubyObject href, String hrefStr) {
-        final Ruby runtime = prefix.getRuntime();
-
-        Document document = owner.getOwnerDocument();
-        XmlDocument xmlDocument = (XmlDocument) getCachedNodeOrCreate(runtime, document);
-
-        assert xmlDocument.getNamespaceCache().get(prefixStr, hrefStr) == null;
-
-        // creating XmlNamespace instance
-        String attrName = "xmlns";
-        if (prefixStr != null && !prefixStr.isEmpty()) attrName = attrName + ':' + prefixStr;
-
-        Attr attrNode = document.createAttribute(attrName);
-        attrNode.setNodeValue(hrefStr);
-
-        XmlNamespace namespace = new XmlNamespace(runtime, attrNode, prefixStr, prefix, hrefStr, href, xmlDocument);
-        xmlDocument.getNamespaceCache().put(namespace, owner);
-        return namespace;
-    }
-    
-    // owner should be an Attr node
-    public static XmlNamespace createDefaultNamespace(Ruby runtime, Node owner) {
-        String prefixStr = owner.getPrefix();
-        String hrefStr = owner.getNamespaceURI();
-        // check namespace cache
-        XmlDocument xmlDocument = (XmlDocument) getCachedNodeOrCreate(runtime, owner.getOwnerDocument());
-        XmlNamespace namespace = xmlDocument.getNamespaceCache().get(prefixStr, hrefStr);
-        if (namespace != null) return namespace;
-
-        namespace = new XmlNamespace(runtime, (Attr) owner, prefixStr, hrefStr, xmlDocument);
-        xmlDocument.getNamespaceCache().put(namespace, owner);
-        return namespace;
-    }
-    
-    /**
-     * Create and return a copy of this object.
-     *
-     * @return a clone of this object
-     */
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-
-    public boolean isEmpty() {
-        return prefix == null && href == null;
-    }
-
-    @JRubyMethod
-    public IRubyObject href(ThreadContext context) {
-        if (hrefRuby == null) {
-            if (href == null) return hrefRuby = context.nil;
-            return hrefRuby = context.runtime.newString(href);
-        }
-        return hrefRuby;
-    }
-
-    @JRubyMethod
-    public IRubyObject prefix(ThreadContext context) {
-        if (prefixRuby == null) {
-            if (prefix == null) return prefixRuby = context.nil;
-            return prefixRuby = context.runtime.newString(prefix);
-        }
-        return prefixRuby;
-    }
-    
-    public void accept(ThreadContext context, SaveContextVisitor visitor) {
-        String prefix = this.prefix;
-        if (prefix == null) prefix = "";
-        String href = this.href;
-        if (href == null) href = "";
-        String string = ' ' + prefix + '=' + '"' + href + '"';
-        visitor.enter(string);
-        visitor.leave(string);
-        // is below better?
-        //visitor.enter(attr);
-        //visitor.leave(attr);
-    }
+@JRubyClass(name = "Nokogiri::XML::Namespace")
+public class XmlNamespace extends RubyObject
+{
+  private Attr attr;
+  private transient IRubyObject prefixRuby;
+  private transient IRubyObject hrefRuby;
+  private String prefix;
+  private String href;
+
+  public
+  XmlNamespace(Ruby runtime, RubyClass klazz)
+  {
+    super(runtime, klazz);
+  }
+
+  XmlNamespace(Ruby runtime, Attr attr, String prefix, String href, IRubyObject document)
+  {
+    this(runtime, attr, prefix, null, href, null, document);
+  }
+
+  private
+  XmlNamespace(Ruby runtime, Attr attr, String prefix, IRubyObject prefixRuby,
+               String href, IRubyObject hrefRuby, IRubyObject document)
+  {
+    super(runtime, getNokogiriClass(runtime, "Nokogiri::XML::Namespace"));
+
+    this.attr = attr;
+    this.prefix = prefix;
+    this.href = href;
+    this.prefixRuby = prefixRuby;
+    this.hrefRuby = hrefRuby;
+    setInstanceVariable("@document", document);
+  }
+
+  public Node
+  getNode()
+  {
+    return attr;
+  }
+
+  public String
+  getPrefix()
+  {
+    return prefix;
+  }
+
+  boolean
+  hasPrefix(String prefix)
+  {
+    return prefix == null ? this.prefix == null : prefix.equals(this.prefix);
+  }
+
+  public String
+  getHref()
+  {
+    return href;
+  }
+
+  void
+  deleteHref()
+  {
+    href = "http://www.w3.org/XML/1998/namespace";
+    hrefRuby = null;
+    attr.getOwnerElement().removeAttributeNode(attr);
+  }
+
+  public static XmlNamespace
+  createFromAttr(Ruby runtime, Attr attr)
+  {
+    String prefixStr = getLocalNameForNamespace(attr.getName(), null);
+    IRubyObject prefix = prefixStr == null ? runtime.getNil() : null;
+    String hrefStr = attr.getValue();
+    // check namespace cache
+    XmlDocument xmlDocument = (XmlDocument) getCachedNodeOrCreate(runtime, attr.getOwnerDocument());
+    XmlNamespace namespace = xmlDocument.getNamespaceCache().get(prefixStr, hrefStr);
+    if (namespace != null) { return namespace; }
+
+    namespace = new XmlNamespace(runtime, attr, prefixStr, prefix, hrefStr, null, xmlDocument);
+    xmlDocument.getNamespaceCache().put(namespace, attr.getOwnerElement());
+    return namespace;
+  }
+
+  static XmlNamespace
+  createImpl(Node owner, IRubyObject prefix, String prefixStr, IRubyObject href, String hrefStr)
+  {
+    final Ruby runtime = prefix.getRuntime();
+
+    Document document = owner.getOwnerDocument();
+    XmlDocument xmlDocument = (XmlDocument) getCachedNodeOrCreate(runtime, document);
+
+    assert xmlDocument.getNamespaceCache().get(prefixStr, hrefStr) == null;
+
+    // creating XmlNamespace instance
+    String attrName = "xmlns";
+    if (prefixStr != null && !prefixStr.isEmpty()) { attrName = attrName + ':' + prefixStr; }
+
+    Attr attrNode = document.createAttribute(attrName);
+    attrNode.setNodeValue(hrefStr);
+
+    XmlNamespace namespace = new XmlNamespace(runtime, attrNode, prefixStr, prefix, hrefStr, href, xmlDocument);
+    xmlDocument.getNamespaceCache().put(namespace, owner);
+    return namespace;
+  }
+
+  // owner should be an Attr node
+  public static XmlNamespace
+  createDefaultNamespace(Ruby runtime, Node owner)
+  {
+    String prefixStr = owner.getPrefix();
+    String hrefStr = owner.getNamespaceURI();
+    // check namespace cache
+    XmlDocument xmlDocument = (XmlDocument) getCachedNodeOrCreate(runtime, owner.getOwnerDocument());
+    XmlNamespace namespace = xmlDocument.getNamespaceCache().get(prefixStr, hrefStr);
+    if (namespace != null) { return namespace; }
+
+    namespace = new XmlNamespace(runtime, (Attr) owner, prefixStr, hrefStr, xmlDocument);
+    xmlDocument.getNamespaceCache().put(namespace, owner);
+    return namespace;
+  }
+
+  /**
+   * Create and return a copy of this object.
+   *
+   * @return a clone of this object
+   */
+  @Override
+  public Object
+  clone() throws CloneNotSupportedException
+  {
+    return super.clone();
+  }
+
+  public boolean
+  isEmpty()
+  {
+    return prefix == null && href == null;
+  }
+
+  @JRubyMethod
+  public IRubyObject
+  href(ThreadContext context)
+  {
+    if (hrefRuby == null) {
+      if (href == null) { return hrefRuby = context.nil; }
+      return hrefRuby = context.runtime.newString(href);
+    }
+    return hrefRuby;
+  }
+
+  @JRubyMethod
+  public IRubyObject
+  prefix(ThreadContext context)
+  {
+    if (prefixRuby == null) {
+      if (prefix == null) { return prefixRuby = context.nil; }
+      return prefixRuby = context.runtime.newString(prefix);
+    }
+    return prefixRuby;
+  }
+
+  public void
+  accept(ThreadContext context, SaveContextVisitor visitor)
+  {
+    String prefix = this.prefix;
+    if (prefix == null) { prefix = ""; }
+    String href = this.href;
+    if (href == null) { href = ""; }
+    String string = ' ' + prefix + '=' + '"' + href + '"';
+    visitor.enter(string);
+    visitor.leave(string);
+    // is below better?
+    //visitor.enter(attr);
+    //visitor.leave(attr);
+  }
 }