nokogiri 1.11.0.rc1-java → 1.11.2-java

data/ext/java/nokogiri/XmlElementDecl.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.
@@ -51,97 +51,128 @@ import org.w3c.dom.Node;
  * @author Patrick Mahoney <pat@polycrystal.org>
  * @author Yoko Harada <yokolet@gmail.com>
  */
-@JRubyClass(name="Nokogiri::XML::ElementDecl", parent="Nokogiri::XML::Node")
-public class XmlElementDecl extends XmlNode {
-    RubyArray attrDecls;
-    IRubyObject contentModel;
-    
-    public XmlElementDecl(Ruby runtime, RubyClass klazz) {
-        super(runtime, klazz);
-        attrDecls = RubyArray.newArray(runtime);
-        contentModel = runtime.getNil();
-    }
-
-    /**
-     * Initialize based on an elementDecl node from a NekoDTD parsed DTD.
-     */
-    public XmlElementDecl(Ruby ruby, RubyClass klass, Node elemDeclNode) {
-        super(ruby, klass, elemDeclNode);
-    }
-
-    @Override // gets called from constructor ^^^
-    public void setNode(Ruby runtime, Node node) {
-        super.setNode(runtime, node);
-        attrDecls = RubyArray.newArray(runtime);
-        contentModel = runtime.getNil();
-    }
-
-    static XmlElementDecl create(ThreadContext context, Node elemDeclNode) {
-        return new XmlElementDecl(context.runtime,
-            getNokogiriClass(context.runtime, "Nokogiri::XML::ElementDecl"),
-            elemDeclNode
-        );
-    }
-
-    public IRubyObject element_name(ThreadContext context) {
-        return getAttribute(context, "ename");
-    }
-
-    public void setContentModel(IRubyObject cm) {
-        contentModel = cm;
-    }
-
-    @Override
-    @JRubyMethod
-    public IRubyObject content(ThreadContext context) {
-        return contentModel;
-    }
-
-    public boolean isEmpty() {
-        return "EMPTY".equals(getAttribute("model"));
-    }
-
-    @JRubyMethod
-    public IRubyObject prefix(ThreadContext context) {
-        String enamePrefix = getPrefix(getAttribute("ename"));
-        if (enamePrefix == null) return context.nil;
-        return context.runtime.newString(enamePrefix);
-    }
-
-    /**
-     * Returns the local part of the element name.
-     */
-    @Override
-    @JRubyMethod
-    public IRubyObject node_name(ThreadContext context) {
-        String ename = getLocalPart(getAttribute("ename"));
-        return context.runtime.newString(ename);
-    }
-
-    @Override
-    @JRubyMethod(name = "node_name=")
-    public IRubyObject node_name_set(ThreadContext context, IRubyObject name) {
-        throw context.runtime.newRuntimeError("cannot change name of DTD decl");
-    }
-
-    @Override
-    @JRubyMethod
-    public IRubyObject attribute_nodes(ThreadContext context) {
-        return attrDecls;
-    }
-
-    @Override
-    @JRubyMethod
-    public IRubyObject attribute(ThreadContext context, IRubyObject name) {
-        throw context.runtime.newRuntimeError("attribute by name not implemented");
-    }
-
-    public void appendAttrDecl(XmlAttributeDecl decl) {
-        attrDecls.append(decl);
-    }
-
-    @JRubyMethod
-    public IRubyObject element_type(ThreadContext context) {
-        return context.runtime.newFixnum(node.getNodeType());
-    }
+@JRubyClass(name = "Nokogiri::XML::ElementDecl", parent = "Nokogiri::XML::Node")
+public class XmlElementDecl extends XmlNode
+{
+  RubyArray attrDecls;
+  IRubyObject contentModel;
+
+  public
+  XmlElementDecl(Ruby runtime, RubyClass klazz)
+  {
+    super(runtime, klazz);
+    attrDecls = RubyArray.newArray(runtime);
+    contentModel = runtime.getNil();
+  }
+
+  /**
+   * Initialize based on an elementDecl node from a NekoDTD parsed DTD.
+   */
+  public
+  XmlElementDecl(Ruby ruby, RubyClass klass, Node elemDeclNode)
+  {
+    super(ruby, klass, elemDeclNode);
+  }
+
+  @Override // gets called from constructor ^^^
+  public void
+  setNode(Ruby runtime, Node node)
+  {
+    super.setNode(runtime, node);
+    attrDecls = RubyArray.newArray(runtime);
+    contentModel = runtime.getNil();
+  }
+
+  static XmlElementDecl
+  create(ThreadContext context, Node elemDeclNode)
+  {
+    return new XmlElementDecl(context.runtime,
+                              getNokogiriClass(context.runtime, "Nokogiri::XML::ElementDecl"),
+                              elemDeclNode
+                             );
+  }
+
+  public IRubyObject
+  element_name(ThreadContext context)
+  {
+    return getAttribute(context, "ename");
+  }
+
+  public void
+  setContentModel(IRubyObject cm)
+  {
+    contentModel = cm;
+  }
+
+  @Override
+  @JRubyMethod
+  public IRubyObject
+  content(ThreadContext context)
+  {
+    return contentModel;
+  }
+
+  public boolean
+  isEmpty()
+  {
+    return "EMPTY".equals(getAttribute("model"));
+  }
+
+  @JRubyMethod
+  public IRubyObject
+  prefix(ThreadContext context)
+  {
+    String enamePrefix = getPrefix(getAttribute("ename"));
+    if (enamePrefix == null) { return context.nil; }
+    return context.runtime.newString(enamePrefix);
+  }
+
+  /**
+   * Returns the local part of the element name.
+   */
+  @Override
+  @JRubyMethod
+  public IRubyObject
+  node_name(ThreadContext context)
+  {
+    String ename = getLocalPart(getAttribute("ename"));
+    return context.runtime.newString(ename);
+  }
+
+  @Override
+  @JRubyMethod(name = "node_name=")
+  public IRubyObject
+  node_name_set(ThreadContext context, IRubyObject name)
+  {
+    throw context.runtime.newRuntimeError("cannot change name of DTD decl");
+  }
+
+  @Override
+  @JRubyMethod
+  public IRubyObject
+  attribute_nodes(ThreadContext context)
+  {
+    return attrDecls;
+  }
+
+  @Override
+  @JRubyMethod
+  public IRubyObject
+  attribute(ThreadContext context, IRubyObject name)
+  {
+    throw context.runtime.newRuntimeError("attribute by name not implemented");
+  }
+
+  public void
+  appendAttrDecl(XmlAttributeDecl decl)
+  {
+    attrDecls.append(decl);
+  }
+
+  @JRubyMethod
+  public IRubyObject
+  element_type(ThreadContext context)
+  {
+    return context.runtime.newFixnum(node.getNodeType());
+  }
 }

data/ext/java/nokogiri/XmlEntityDecl.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.
@@ -49,109 +49,133 @@ import org.w3c.dom.Node;
  * @author Patrick Mahoney <pat@polycrystal.org>
  * @author Yoko Harada <yokolet@gmail.com>
  */
-@JRubyClass(name="Nokogiri::XML::EntityDecl", parent="Nokogiri::XML::Node")
-public class XmlEntityDecl extends XmlNode {
-    public static final int INTERNAL_GENERAL = 1;
-    public static final int EXTERNAL_GENERAL_PARSED = 2;
-    public static final int EXTERNAL_GENERAL_UNPARSED  = 3;
-    public static final int INTERNAL_PARAMETER = 4;
-    public static final int EXTERNAL_PARAMETER = 5;
-    public static final int INTERNAL_PREDEFINED = 6;
-    
-    private IRubyObject entityType;
-    private IRubyObject name;
-    private IRubyObject external_id;
-    private IRubyObject system_id;
-    private IRubyObject content;
-
-    XmlEntityDecl(Ruby runtime, RubyClass klass) {
-        super(runtime, klass);
-    }
+@JRubyClass(name = "Nokogiri::XML::EntityDecl", parent = "Nokogiri::XML::Node")
+public class XmlEntityDecl extends XmlNode
+{
+  public static final int INTERNAL_GENERAL = 1;
+  public static final int EXTERNAL_GENERAL_PARSED = 2;
+  public static final int EXTERNAL_GENERAL_UNPARSED  = 3;
+  public static final int INTERNAL_PARAMETER = 4;
+  public static final int EXTERNAL_PARAMETER = 5;
+  public static final int INTERNAL_PREDEFINED = 6;
 
-    /**
-     * Initialize based on an entityDecl node from a NekoDTD parsed DTD.
-     */
-    public XmlEntityDecl(Ruby runtime, RubyClass klass, Node entDeclNode) {
-        super(runtime, klass, entDeclNode);
-        entityType = RubyFixnum.newFixnum(runtime, XmlEntityDecl.INTERNAL_GENERAL);
-        name = external_id = system_id = content = runtime.getNil();
-    }
-    
-    public XmlEntityDecl(Ruby runtime, RubyClass klass, Node entDeclNode, IRubyObject[] argv) {
-        super(runtime, klass, entDeclNode);
-        name = argv[0];
-        entityType = RubyFixnum.newFixnum(runtime, XmlEntityDecl.INTERNAL_GENERAL);
-        external_id = system_id = content = runtime.getNil();
-
-        if (argv.length > 1) entityType = argv[1];
-        if (argv.length > 4) {
-            external_id = argv[2];
-            system_id = argv[3];
-            content = argv[4];
-        }
-    }
+  private IRubyObject entityType;
+  private IRubyObject name;
+  private IRubyObject external_id;
+  private IRubyObject system_id;
+  private IRubyObject content;
 
-    static XmlEntityDecl create(ThreadContext context, Node entDeclNode) {
-        return new XmlEntityDecl(context.runtime,
-            getNokogiriClass(context.runtime, "Nokogiri::XML::EntityDecl"),
-            entDeclNode
-        );
-    }
-    
-    // when entity is created by create_entity method
-    static XmlEntityDecl create(ThreadContext context, Node entDeclNode, IRubyObject... argv) {
-        return new XmlEntityDecl(context.runtime,
-            getNokogiriClass(context.runtime, "Nokogiri::XML::EntityDecl"),
-            entDeclNode, argv
-        );
-    }
+  XmlEntityDecl(Ruby runtime, RubyClass klass)
+  {
+    super(runtime, klass);
+  }
 
-    /**
-     * Returns the local part of the element name.
-     */
-    @Override
-    @JRubyMethod
-    public IRubyObject node_name(ThreadContext context) {
-        IRubyObject value = getAttribute(context, "name");
-        if (value.isNil()) value = name;
-        return value;
-    }
+  /**
+   * Initialize based on an entityDecl node from a NekoDTD parsed DTD.
+   */
+  public
+  XmlEntityDecl(Ruby runtime, RubyClass klass, Node entDeclNode)
+  {
+    super(runtime, klass, entDeclNode);
+    entityType = RubyFixnum.newFixnum(runtime, XmlEntityDecl.INTERNAL_GENERAL);
+    name = external_id = system_id = content = runtime.getNil();
+  }
 
-    @Override
-    @JRubyMethod(name = "node_name=")
-    public IRubyObject node_name_set(ThreadContext context, IRubyObject name) {
-        throw context.runtime.newRuntimeError("cannot change name of DTD decl");
-    }
+  public
+  XmlEntityDecl(Ruby runtime, RubyClass klass, Node entDeclNode, IRubyObject[] argv)
+  {
+    super(runtime, klass, entDeclNode);
+    name = argv[0];
+    entityType = RubyFixnum.newFixnum(runtime, XmlEntityDecl.INTERNAL_GENERAL);
+    external_id = system_id = content = runtime.getNil();
 
-    @JRubyMethod
-    public IRubyObject content(ThreadContext context) {
-        IRubyObject value = getAttribute(context, "value");
-        if (value.isNil()) value = content;
-        return value;
+    if (argv.length > 1) { entityType = argv[1]; }
+    if (argv.length > 4) {
+      external_id = argv[2];
+      system_id = argv[3];
+      content = argv[4];
     }
+  }
 
-    // TODO: what is content vs. original_content?
-    @JRubyMethod
-    public IRubyObject original_content(ThreadContext context) {
-        return getAttribute(context, "value");
-    }
+  static XmlEntityDecl
+  create(ThreadContext context, Node entDeclNode)
+  {
+    return new XmlEntityDecl(context.runtime,
+                             getNokogiriClass(context.runtime, "Nokogiri::XML::EntityDecl"),
+                             entDeclNode
+                            );
+  }
 
-    @JRubyMethod
-    public IRubyObject system_id(ThreadContext context) {
-        IRubyObject value = getAttribute(context, "sysid");
-        if (value.isNil()) value = system_id;
-        return value;
-    }
+  // when entity is created by create_entity method
+  static XmlEntityDecl
+  create(ThreadContext context, Node entDeclNode, IRubyObject... argv)
+  {
+    return new XmlEntityDecl(context.runtime,
+                             getNokogiriClass(context.runtime, "Nokogiri::XML::EntityDecl"),
+                             entDeclNode, argv
+                            );
+  }
 
-    @JRubyMethod
-    public IRubyObject external_id(ThreadContext context) {
-        IRubyObject value = getAttribute(context, "pubid");
-        if (value.isNil()) value = external_id;
-        return value;
-    }
+  /**
+   * Returns the local part of the element name.
+   */
+  @Override
+  @JRubyMethod
+  public IRubyObject
+  node_name(ThreadContext context)
+  {
+    IRubyObject value = getAttribute(context, "name");
+    if (value.isNil()) { value = name; }
+    return value;
+  }
 
-    @JRubyMethod
-    public IRubyObject entity_type(ThreadContext context) {
-        return entityType;
-    }
+  @Override
+  @JRubyMethod(name = "node_name=")
+  public IRubyObject
+  node_name_set(ThreadContext context, IRubyObject name)
+  {
+    throw context.runtime.newRuntimeError("cannot change name of DTD decl");
+  }
+
+  @JRubyMethod
+  public IRubyObject
+  content(ThreadContext context)
+  {
+    IRubyObject value = getAttribute(context, "value");
+    if (value.isNil()) { value = content; }
+    return value;
+  }
+
+  // TODO: what is content vs. original_content?
+  @JRubyMethod
+  public IRubyObject
+  original_content(ThreadContext context)
+  {
+    return getAttribute(context, "value");
+  }
+
+  @JRubyMethod
+  public IRubyObject
+  system_id(ThreadContext context)
+  {
+    IRubyObject value = getAttribute(context, "sysid");
+    if (value.isNil()) { value = system_id; }
+    return value;
+  }
+
+  @JRubyMethod
+  public IRubyObject
+  external_id(ThreadContext context)
+  {
+    IRubyObject value = getAttribute(context, "pubid");
+    if (value.isNil()) { value = external_id; }
+    return value;
+  }
+
+  @JRubyMethod
+  public IRubyObject
+  entity_type(ThreadContext context)
+  {
+    return entityType;
+  }
 }