[gxml] Renamed old GXml.Node to new GXml.xNode
- From: Daniel Espinosa Ortiz <despinosa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gxml] Renamed old GXml.Node to new GXml.xNode
- Date: Tue, 14 Apr 2015 19:07:39 +0000 (UTC)
commit 58eab7fa9b72900da6a565bda6ae73f38129cd98
Author: Daniel Espinosa <esodan gmail com>
Date: Tue Apr 14 13:56:11 2015 -0500
Renamed old GXml.Node to new GXml.xNode
* All classes with interferences with new API interfaces
will be renamed
* Updated copyrights
* Added missing licenses for tests files
gxml/Serializable.vala | 54 +++++++-------
gxml/SerializableGeeArrayList.vala | 22 +++---
gxml/SerializableGeeDualKeyMap.vala | 22 +++---
gxml/SerializableGeeHashMap.vala | 22 +++---
gxml/SerializableGeeTreeMap.vala | 22 +++---
gxml/SerializableJson.vala | 18 ++--
gxml/SerializableObjectModel.vala | 32 ++++----
gxml/Serialization.vala | 22 +++---
gxml/libxml-Attr.vala | 14 ++--
gxml/libxml-BackedNode.vala | 28 ++++----
gxml/libxml-Document.vala | 34 ++++----
gxml/libxml-DocumentType.vala | 4 +-
gxml/libxml-Element.vala | 38 +++++-----
gxml/libxml-Entity.vala | 20 +++---
gxml/libxml-EntityReference.vala | 4 +-
gxml/libxml-Implementation.vala | 2 +-
gxml/libxml-NamedNodeMap.vala | 2 +-
gxml/libxml-NamespaceAttr.vala | 2 +-
gxml/libxml-Node.vala | 74 +++++++++---------
gxml/libxml-NodeList.vala | 92 +++++++++++-----------
gxml/libxml-Notation.vala | 2 +-
gxml/libxml-ProcessingInstruction.vala | 4 +-
test/AttrTest.vala | 29 +++++++-
test/DocumentTest.vala | 31 +++++++-
test/ElementTest.vala | 65 +++++++++++-----
test/NodeTest.vala | 121 ++++++++++++++++++------------
test/SerializableGeeArrayListTest.vala | 4 +-
test/SerializableGeeCollectionsTest.vala | 16 ++--
test/SerializableGeeDualKeyMapTest.vala | 4 +-
test/SerializableGeeHashMapTest.vala | 8 +-
test/SerializableGeeTreeMapTest.vala | 6 +-
test/SerializableObjectModelTest.vala | 30 ++++----
test/SerializableTest.vala | 8 +-
test/SerializationTest.vala | 29 +++++++-
test/gxml-performance.vala | 4 +-
35 files changed, 503 insertions(+), 386 deletions(-)
---
diff --git a/gxml/Serializable.vala b/gxml/Serializable.vala
index 4a66da4..6236eb4 100644
--- a/gxml/Serializable.vala
+++ b/gxml/Serializable.vala
@@ -1,7 +1,7 @@
/* -*- Mode: vala; indent-tabs-mode: nil; c-basic-offset: 2; tab-width: 2 -*- */
/* Serializable.vala
*
- * Copyright (C) 2013 Daniel Espinosa <esodan gmail com>
+ * Copyright (C) 2013-2015 Daniel Espinosa <esodan gmail com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -51,7 +51,7 @@ namespace GXml {
*/
public abstract HashTable<string,GLib.ParamSpec> ignored_serializable_properties { get; protected set; }
/**
- * Return false if you want to ignore unknown properties and { link GXml.Node}'s
+ * Return false if you want to ignore unknown properties and { link GXml.xNode}'s
* not in your class definition.
*
* Take care, disabling this feature you can lost data on serialization, because any unknown
@@ -59,10 +59,10 @@ namespace GXml {
*/
public abstract bool get_enable_unknown_serializable_property ();
/**
- * On deserialization stores any { link GXml.Node} not used on this
+ * On deserialization stores any { link GXml.xNode} not used on this
* object, but exists in current XML file.
*
- * Node's name is used as key to find stored { link GXml.Node}.
+ * Node's name is used as key to find stored { link GXml.xNode}.
*
* XML allows great flexibility, providing different ways to represent the same
* information. This is a problem when you try to deserialize them.
@@ -79,7 +79,7 @@ namespace GXml {
*
* This property is ignored on serialisation.
*/
- public abstract HashTable<string,GXml.Node> unknown_serializable_property { get; protected set; }
+ public abstract HashTable<string,GXml.xNode> unknown_serializable_property { get; protected set; }
/**
* Used to add content in an { link GXml.Element}.
@@ -152,7 +152,7 @@ namespace GXml {
*
* @param doc an { link GXml.Document} object to serialize to.
*/
- public abstract GXml.Node? serialize (GXml.Node node) throws GLib.Error;
+ public abstract GXml.xNode? serialize (GXml.xNode node) throws GLib.Error;
/**
* Serialize a property @prop on a { link GXml.Element}.
@@ -160,16 +160,16 @@ namespace GXml {
* This method is called recursivally by { link serialize} method over all properties
* to be serialized.
*/
- public abstract GXml.Node? serialize_property (GXml.Element element,
+ public abstract GXml.xNode? serialize_property (GXml.Element element,
GLib.ParamSpec prop)
throws GLib.Error;
/**
* Deserialize this object.
*
- * @param node { link GXml.Node} used to deserialize from.
+ * @param node { link GXml.xNode} used to deserialize from.
*/
- public abstract GXml.Node? deserialize (GXml.Node node)
+ public abstract GXml.xNode? deserialize (GXml.xNode node)
throws GLib.Error;
/**
* Handles deserializing individual properties.
@@ -177,10 +177,10 @@ namespace GXml {
* Interface method to handle deserialization of an
* individual property. The implementing class
* receives a description of the property and the
- * { link GXml.Node} that contains the content. The
+ * { link GXml.xNode} that contains the content. The
* implementing { link GXml.Serializable} object can extract
- * the data from the { link GXml.Node} and store it in its
- * property itself. Note that the { link GXml.Node} may be
+ * the data from the { link GXml.xNode} and store it in its
+ * property itself. Note that the { link GXml.xNode} may be
* as simple as a { link GXml.Text} that stores the data as a
* string.
*
@@ -188,52 +188,52 @@ namespace GXml {
* Use Serializable.get_property_value in order to allow derived classes to
* override the properties to serialize.
*
- * @param property_node the { link GXml.Node} encapsulating data to deserialize
+ * @param property_node the { link GXml.xNode} encapsulating data to deserialize
* @return `true` if the property was handled, `false` if { link GXml.Serialization} should handle it.
*/
- public abstract bool deserialize_property (GXml.Node property_node)
+ public abstract bool deserialize_property (GXml.xNode property_node)
throws GLib.Error;
/**
* Signal to serialize unknown properties. Any new node must be added to
* @param element before return the new @param node added.
*
- * @param element a { link GXml.Node} to add attribute or child nodes to
+ * @param element a { link GXml.xNode} to add attribute or child nodes to
* @param prop a { link GLib.ParamSpec} describing attribute to serialize
- * @param node set to the { link GXml.Node} representing this attribute
+ * @param node set to the { link GXml.xNode} representing this attribute
*/
- public signal void serialize_unknown_property (GXml.Node element,
+ public signal void serialize_unknown_property (GXml.xNode element,
ParamSpec prop,
- out GXml.Node node);
+ out GXml.xNode node);
/**
* Signal to serialize unknown properties. Any new node must be added to
* @param element before return the new @node added.
*
- * @param element a { link GXml.Node} to add attribute or child nodes to
+ * @param element a { link GXml.xNode} to add attribute or child nodes to
* @param prop a { link GLib.ParamSpec} describing attribute to serialize
- * @param node set to the { link GXml.Node} representing this attribute
+ * @param node set to the { link GXml.xNode} representing this attribute
*/
- public signal void serialize_unknown_property_type (GXml.Node element,
+ public signal void serialize_unknown_property_type (GXml.xNode element,
ParamSpec prop,
- out GXml.Node node);
+ out GXml.xNode node);
/**
* Signal to deserialize unknown properties.
*
- * @param node a { link GXml.Node} to get attribute from
+ * @param node a { link GXml.xNode} to get attribute from
* @param prop a { link GLib.ParamSpec} describing attribute to deserialize
*/
- public signal void deserialize_unknown_property (GXml.Node node,
+ public signal void deserialize_unknown_property (GXml.xNode node,
ParamSpec prop);
/**
* Signal to deserialize unknown properties' type.
*
- * @param node a { link GXml.Node} to get attribute from
+ * @param node a { link GXml.xNode} to get attribute from
* @param prop a { link GLib.ParamSpec} describing attribute to deserialize
*/
- public signal void deserialize_unknown_property_type (GXml.Node node,
+ public signal void deserialize_unknown_property_type (GXml.xNode node,
ParamSpec prop);
/**
@@ -317,7 +317,7 @@ namespace GXml {
get_class ().find_property("serialize_set_namespace"));
}
if (unknown_serializable_property == null) {
- unknown_serializable_property = new HashTable<string,GXml.Node> (str_hash, str_equal);
+ unknown_serializable_property = new HashTable<string,GXml.xNode> (str_hash, str_equal);
}
}
diff --git a/gxml/SerializableGeeArrayList.vala b/gxml/SerializableGeeArrayList.vala
index bd5ce0a..b05d089 100644
--- a/gxml/SerializableGeeArrayList.vala
+++ b/gxml/SerializableGeeArrayList.vala
@@ -1,7 +1,7 @@
/* -*- Mode: vala; indent-tabs-mode: nil; c-basic-offset: 2; tab-width: 2 -*- */
/* SerializableGeeTreeModel.vala
*
- * Copyright (C) 2013, 2014 Daniel Espinosa <esodan gmail com>
+ * Copyright (C) 2013-2015 Daniel Espinosa <esodan gmail com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -35,7 +35,7 @@ public class GXml.SerializableArrayList<G> : Gee.ArrayList<G>, Serializable, Ser
public string? serialized_xml_node_value { get; protected set; default=null; }
public string? serialize_set_namespace { get; set; default = null; }
- public GLib.HashTable<string,GXml.Node> unknown_serializable_property { get; protected set; }
+ public GLib.HashTable<string,GXml.xNode> unknown_serializable_property { get; protected set; }
public bool get_enable_unknown_serializable_property () { return false; }
public virtual bool serialize_use_xml_node_value () { return false; }
@@ -81,13 +81,13 @@ public class GXml.SerializableArrayList<G> : Gee.ArrayList<G>, Serializable, Ser
return false;
}
- public virtual GXml.Node? serialize (GXml.Node node)
+ public virtual GXml.xNode? serialize (GXml.xNode node)
throws GLib.Error
requires (node is Element)
{
return default_serialize (node);
}
- public GXml.Node? default_serialize (GXml.Node node)
+ public GXml.xNode? default_serialize (GXml.xNode node)
throws GLib.Error
requires (node is Element)
{
@@ -99,25 +99,25 @@ public class GXml.SerializableArrayList<G> : Gee.ArrayList<G>, Serializable, Ser
}
return node;
}
- public virtual GXml.Node? serialize_property (GXml.Element element,
+ public virtual GXml.xNode? serialize_property (GXml.Element element,
GLib.ParamSpec prop)
throws GLib.Error
{
return default_serialize_property (element, prop);
}
- public GXml.Node? default_serialize_property (GXml.Element element,
+ public GXml.xNode? default_serialize_property (GXml.Element element,
GLib.ParamSpec prop)
throws GLib.Error
{
return element;
}
- public virtual GXml.Node? deserialize (GXml.Node node)
+ public virtual GXml.xNode? deserialize (GXml.xNode node)
throws GLib.Error
requires (node_name () != null)
{
return default_deserialize (node);
}
- public GXml.Node? default_deserialize (GXml.Node node)
+ public GXml.xNode? default_deserialize (GXml.xNode node)
throws GLib.Error
{
if (!element_type.is_a (typeof (GXml.Serializable))) {
@@ -125,7 +125,7 @@ public class GXml.SerializableArrayList<G> : Gee.ArrayList<G>, Serializable, Ser
this.get_type ().name (), element_type.name ());
}
if (node is Element) {
- foreach (GXml.Node n in node.child_nodes) {
+ foreach (GXml.xNode n in node.child_nodes) {
if (n is Element) {
var obj = (Serializable) Object.new (element_type);
if (n.node_name == ((Serializable) obj).node_name ()) {
@@ -137,12 +137,12 @@ public class GXml.SerializableArrayList<G> : Gee.ArrayList<G>, Serializable, Ser
}
return node;
}
- public virtual bool deserialize_property (GXml.Node property_node)
+ public virtual bool deserialize_property (GXml.xNode property_node)
throws GLib.Error
{
return default_deserialize_property (property_node);
}
- public bool default_deserialize_property (GXml.Node property_node)
+ public bool default_deserialize_property (GXml.xNode property_node)
throws GLib.Error
{
return true;
diff --git a/gxml/SerializableGeeDualKeyMap.vala b/gxml/SerializableGeeDualKeyMap.vala
index bb6625c..99142a9 100644
--- a/gxml/SerializableGeeDualKeyMap.vala
+++ b/gxml/SerializableGeeDualKeyMap.vala
@@ -1,7 +1,7 @@
/* -*- Mode: vala; indent-tabs-mode: nil; c-basic-offset: 2; tab-width: 2 -*- */
/* SerializableGeeTreeModel.vala
*
- * Copyright (C) 2013 Daniel Espinosa <esodan gmail com>
+ * Copyright (C) 2013-2015 Daniel Espinosa <esodan gmail com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -116,7 +116,7 @@ public class GXml.SerializableDualKeyMap<P,S,V> : Object, Serializable, Serializ
public GLib.HashTable<string,GLib.ParamSpec> ignored_serializable_properties { get; protected set; }
public string? serialized_xml_node_value { get; protected set; default=null; }
public string? serialize_set_namespace { get; set; default = null; }
- public GLib.HashTable<string,GXml.Node> unknown_serializable_property { get; protected set; }
+ public GLib.HashTable<string,GXml.xNode> unknown_serializable_property { get; protected set; }
public virtual bool get_enable_unknown_serializable_property () { return false; }
public virtual bool serialize_use_xml_node_value () { return false; }
@@ -162,13 +162,13 @@ public class GXml.SerializableDualKeyMap<P,S,V> : Object, Serializable, Serializ
return false;
}
- public virtual GXml.Node? serialize (GXml.Node node)
+ public virtual GXml.xNode? serialize (GXml.xNode node)
throws GLib.Error
requires (node is Element)
{
return default_serialize (node);
}
- public GXml.Node? default_serialize (GXml.Node node)
+ public GXml.xNode? default_serialize (GXml.xNode node)
throws GLib.Error
requires (node is Element)
{
@@ -178,25 +178,25 @@ public class GXml.SerializableDualKeyMap<P,S,V> : Object, Serializable, Serializ
}
return node;
}
- public virtual GXml.Node? serialize_property (GXml.Element element,
+ public virtual GXml.xNode? serialize_property (GXml.Element element,
GLib.ParamSpec prop)
throws GLib.Error
{
return default_serialize_property (element, prop);
}
- public GXml.Node? default_serialize_property (GXml.Element element,
+ public GXml.xNode? default_serialize_property (GXml.Element element,
GLib.ParamSpec prop)
throws GLib.Error
{
return element;
}
- public virtual GXml.Node? deserialize (GXml.Node node)
+ public virtual GXml.xNode? deserialize (GXml.xNode node)
throws GLib.Error
requires (node_name () != null)
{
return default_deserialize (node);
}
- public GXml.Node? default_deserialize (GXml.Node node)
+ public GXml.xNode? default_deserialize (GXml.xNode node)
throws GLib.Error
requires (node is Element)
{
@@ -205,7 +205,7 @@ public class GXml.SerializableDualKeyMap<P,S,V> : Object, Serializable, Serializ
throw new SerializableError.UNSUPPORTED_TYPE_ERROR ("%s: Value type '%s' is unsupported",
this.get_type ().name (), value_type.name ());
}
- foreach (GXml.Node n in node.child_nodes) {
+ foreach (GXml.xNode n in node.child_nodes) {
if (n is Element) {
var obj = (SerializableMapDualKey<P,S>) Object.new (value_type);
if (n.node_name == ((Serializable) obj).node_name ()) {
@@ -216,12 +216,12 @@ public class GXml.SerializableDualKeyMap<P,S,V> : Object, Serializable, Serializ
}
return node;
}
- public virtual bool deserialize_property (GXml.Node property_node)
+ public virtual bool deserialize_property (GXml.xNode property_node)
throws GLib.Error
{
return default_deserialize_property (property_node);
}
- public bool default_deserialize_property (GXml.Node property_node)
+ public bool default_deserialize_property (GXml.xNode property_node)
throws GLib.Error
{
return true;
diff --git a/gxml/SerializableGeeHashMap.vala b/gxml/SerializableGeeHashMap.vala
index 398d238..c060bdb 100644
--- a/gxml/SerializableGeeHashMap.vala
+++ b/gxml/SerializableGeeHashMap.vala
@@ -1,7 +1,7 @@
/* -*- Mode: vala; indent-tabs-mode: nil; c-basic-offset: 2; tab-width: 2 -*- */
/* SerializableGeeTreeModel.vala
*
- * Copyright (C) 2013, 2014 Daniel Espinosa <esodan gmail com>
+ * Copyright (C) 2013-2015 Daniel Espinosa <esodan gmail com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -32,7 +32,7 @@ public class GXml.SerializableHashMap<K,V> : Gee.HashMap<K,V>, Serializable, Ser
public GLib.HashTable<string,GLib.ParamSpec> ignored_serializable_properties { get; protected set; }
public string? serialized_xml_node_value { get; protected set; default=null; }
public string? serialize_set_namespace { get; set; default = null; }
- public GLib.HashTable<string,GXml.Node> unknown_serializable_property { get; protected set; }
+ public GLib.HashTable<string,GXml.xNode> unknown_serializable_property { get; protected set; }
public virtual bool get_enable_unknown_serializable_property () { return false; }
public virtual bool serialize_use_xml_node_value () { return false; }
@@ -78,13 +78,13 @@ public class GXml.SerializableHashMap<K,V> : Gee.HashMap<K,V>, Serializable, Ser
return false;
}
- public virtual GXml.Node? serialize (GXml.Node node)
+ public virtual GXml.xNode? serialize (GXml.xNode node)
throws GLib.Error
requires (node is Element)
{
return default_serialize (node);
}
- public GXml.Node? default_serialize (GXml.Node node)
+ public GXml.xNode? default_serialize (GXml.xNode node)
throws GLib.Error
requires (node is Element)
{
@@ -95,25 +95,25 @@ public class GXml.SerializableHashMap<K,V> : Gee.HashMap<K,V>, Serializable, Ser
}
return node;
}
- public virtual GXml.Node? serialize_property (GXml.Element element,
+ public virtual GXml.xNode? serialize_property (GXml.Element element,
GLib.ParamSpec prop)
throws GLib.Error
{
return default_serialize_property (element, prop);
}
- public GXml.Node? default_serialize_property (GXml.Element element,
+ public GXml.xNode? default_serialize_property (GXml.Element element,
GLib.ParamSpec prop)
throws GLib.Error
{
return element;
}
- public virtual GXml.Node? deserialize (GXml.Node node)
+ public virtual GXml.xNode? deserialize (GXml.xNode node)
throws GLib.Error
requires (node_name () != null)
{
return default_deserialize (node);
}
- public GXml.Node? default_deserialize (GXml.Node node)
+ public GXml.xNode? default_deserialize (GXml.xNode node)
throws GLib.Error
{
if (!(value_type.is_a (typeof (GXml.Serializable)) &&
@@ -122,7 +122,7 @@ public class GXml.SerializableHashMap<K,V> : Gee.HashMap<K,V>, Serializable, Ser
this.get_type ().name (), value_type.name ());
}
if (node is Element) {
- foreach (GXml.Node n in node.child_nodes) {
+ foreach (GXml.xNode n in node.child_nodes) {
if (n is Element) {
#if DEBUG
stdout.printf (@"Node $(node.node_name) for type '$(get_type ().name ())'\n");
@@ -137,12 +137,12 @@ public class GXml.SerializableHashMap<K,V> : Gee.HashMap<K,V>, Serializable, Ser
}
return node;
}
- public virtual bool deserialize_property (GXml.Node property_node)
+ public virtual bool deserialize_property (GXml.xNode property_node)
throws GLib.Error
{
return default_deserialize_property (property_node);
}
- public bool default_deserialize_property (GXml.Node property_node)
+ public bool default_deserialize_property (GXml.xNode property_node)
throws GLib.Error
{
return true;
diff --git a/gxml/SerializableGeeTreeMap.vala b/gxml/SerializableGeeTreeMap.vala
index 74359da..b99394e 100644
--- a/gxml/SerializableGeeTreeMap.vala
+++ b/gxml/SerializableGeeTreeMap.vala
@@ -1,7 +1,7 @@
/* -*- Mode: vala; indent-tabs-mode: nil; c-basic-offset: 2; tab-width: 2 -*- */
/* SerializableGeeTreeModel.vala
*
- * Copyright (C) 2013, 2014 Daniel Espinosa <esodan gmail com>
+ * Copyright (C) 2013-2015 Daniel Espinosa <esodan gmail com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -32,7 +32,7 @@ public class GXml.SerializableTreeMap<K,V> : Gee.TreeMap<K,V>, Serializable, Ser
public GLib.HashTable<string,GLib.ParamSpec> ignored_serializable_properties { get; protected set; }
public string? serialized_xml_node_value { get; protected set; default=null; }
public string? serialize_set_namespace { get; set; default = null; }
- public GLib.HashTable<string,GXml.Node> unknown_serializable_property { get; protected set; }
+ public GLib.HashTable<string,GXml.xNode> unknown_serializable_property { get; protected set; }
public bool get_enable_unknown_serializable_property () { return false; }
public virtual bool serialize_use_xml_node_value () { return false; }
@@ -81,13 +81,13 @@ public class GXml.SerializableTreeMap<K,V> : Gee.TreeMap<K,V>, Serializable, Ser
return false;
}
- public virtual GXml.Node? serialize (GXml.Node node)
+ public virtual GXml.xNode? serialize (GXml.xNode node)
throws GLib.Error
requires (node is Element)
{
return default_serialize (node);
}
- public GXml.Node? default_serialize (GXml.Node node)
+ public GXml.xNode? default_serialize (GXml.xNode node)
throws GLib.Error
requires (node is Element)
{
@@ -98,25 +98,25 @@ public class GXml.SerializableTreeMap<K,V> : Gee.TreeMap<K,V>, Serializable, Ser
}
return node;
}
- public virtual GXml.Node? serialize_property (GXml.Element element,
+ public virtual GXml.xNode? serialize_property (GXml.Element element,
GLib.ParamSpec prop)
throws GLib.Error
{
return default_serialize_property (element, prop);
}
- public GXml.Node? default_serialize_property (GXml.Element element,
+ public GXml.xNode? default_serialize_property (GXml.Element element,
GLib.ParamSpec prop)
throws GLib.Error
{
return element;
}
- public virtual GXml.Node? deserialize (GXml.Node node)
+ public virtual GXml.xNode? deserialize (GXml.xNode node)
throws GLib.Error
requires (node_name () != null)
{
return default_deserialize (node);
}
- public GXml.Node? default_deserialize (GXml.Node node)
+ public GXml.xNode? default_deserialize (GXml.xNode node)
throws GLib.Error
{
if (!(value_type.is_a (typeof (GXml.Serializable)) &&
@@ -125,7 +125,7 @@ public class GXml.SerializableTreeMap<K,V> : Gee.TreeMap<K,V>, Serializable, Ser
this.get_type ().name (), value_type.name ());
}
if (node is Element) {
- foreach (GXml.Node n in node.child_nodes) {
+ foreach (GXml.xNode n in node.child_nodes) {
if (n is Element) {
#if DEBUG
stdout.printf (@"Node $(node.node_name) for type '$(get_type ().name ())'\n");
@@ -140,12 +140,12 @@ public class GXml.SerializableTreeMap<K,V> : Gee.TreeMap<K,V>, Serializable, Ser
}
return node;
}
- public virtual bool deserialize_property (GXml.Node property_node)
+ public virtual bool deserialize_property (GXml.xNode property_node)
throws GLib.Error
{
return default_deserialize_property (property_node);
}
- public bool default_deserialize_property (GXml.Node property_node)
+ public bool default_deserialize_property (GXml.xNode property_node)
throws GLib.Error
{
return true;
diff --git a/gxml/SerializableJson.vala b/gxml/SerializableJson.vala
index 0a7e293..bc5d473 100644
--- a/gxml/SerializableJson.vala
+++ b/gxml/SerializableJson.vala
@@ -2,7 +2,7 @@
/* Serialization.vala
*
* Copyright (C) 2012-2013 Richard Schwarting <aquarichy gmail com>
- * Copyright (C) 2013 Daniel Espinosa <esodan gmail com>
+ * Copyright (C) 2013-2015 Daniel Espinosa <esodan gmail com>
*
* This library is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -63,7 +63,7 @@ public class GXml.SerializableJson : GLib.Object, GXml.Serializable
/* Serializable Interface properties */
protected ParamSpec[] properties { get; set; }
public HashTable<string,GLib.ParamSpec> ignored_serializable_properties { get; protected set; }
- public HashTable<string,GXml.Node> unknown_serializable_property { get; protected set; }
+ public HashTable<string,GXml.xNode> unknown_serializable_property { get; protected set; }
public virtual bool get_enable_unknown_serializable_property () { return false; }
public string? serialized_xml_node_value { get; protected set; default = null; }
public string? serialize_set_namespace { get; set; default = null; }
@@ -116,7 +116,7 @@ public class GXml.SerializableJson : GLib.Object, GXml.Serializable
* Is up to you to add convenient Element node to a Document, in order to be
* used by serialize and add new <Object> tags per object to serialize.
*/
- public GXml.Node? serialize (GXml.Node node) throws GLib.Error
+ public GXml.xNode? serialize (GXml.xNode node) throws GLib.Error
{
Document doc;
Element root;
@@ -139,13 +139,13 @@ public class GXml.SerializableJson : GLib.Object, GXml.Serializable
return root;
}
- public virtual GXml.Node? serialize_property (Element element,
+ public virtual GXml.xNode? serialize_property (Element element,
GLib.ParamSpec prop)
throws GLib.Error
{
Type type;
Value val;
- GXml.Node value_node = null;
+ GXml.xNode value_node = null;
Element prop_node;
type = prop.value_type;
@@ -209,7 +209,7 @@ public class GXml.SerializableJson : GLib.Object, GXml.Serializable
return prop_node;
}
- public GXml.Node? deserialize (GXml.Node node) throws GLib.Error
+ public GXml.xNode? deserialize (GXml.xNode node) throws GLib.Error
{
Element obj_elem;
ParamSpec[] specs;
@@ -223,13 +223,13 @@ public class GXml.SerializableJson : GLib.Object, GXml.Serializable
specs = this.list_serializable_properties ();
- foreach (GXml.Node child_node in obj_elem.child_nodes) {
+ foreach (GXml.xNode child_node in obj_elem.child_nodes) {
deserialize_property (child_node);
}
return obj_elem;
}
- public virtual bool deserialize_property (GXml.Node property_node) throws GLib.Error
+ public virtual bool deserialize_property (GXml.xNode property_node) throws GLib.Error
{
//GLib.message ("At SerializableJson.deserialize_property");
if (property_node.node_name == "Property")
@@ -273,7 +273,7 @@ public class GXml.SerializableJson : GLib.Object, GXml.Serializable
}
else if (type.is_a (typeof (GLib.Object)))
{
- GXml.Node prop_elem_child;
+ GXml.xNode prop_elem_child;
Object property_object;
prop_elem_child = prop_elem.first_child;
diff --git a/gxml/SerializableObjectModel.vala b/gxml/SerializableObjectModel.vala
index c7f2e59..733b2f9 100644
--- a/gxml/SerializableObjectModel.vala
+++ b/gxml/SerializableObjectModel.vala
@@ -1,7 +1,7 @@
/* -*- Mode: vala; indent-tabs-mode: nil; c-basic-offset: 0; tab-width: 2 -*- */
/* ObjectModel.vala
*
- * Copyright (C) 2013, 2014 Daniel Espinosa <esodan gmail com>
+ * Copyright (C) 2013-2015 Daniel Espinosa <esodan gmail com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -41,7 +41,7 @@ public abstract class GXml.SerializableObjectModel : Object, Serializable
public string? serialized_xml_node_value { get; protected set; default=null; }
public string? serialize_set_namespace { get; set; default = null; }
public virtual bool get_enable_unknown_serializable_property () { return false; }
- public GLib.HashTable<string,GXml.Node> unknown_serializable_property { get; protected set; }
+ public GLib.HashTable<string,GXml.xNode> unknown_serializable_property { get; protected set; }
public virtual bool serialize_use_xml_node_value () { return false; }
public virtual bool property_use_nick () { return false; }
@@ -92,7 +92,7 @@ public abstract class GXml.SerializableObjectModel : Object, Serializable
return false;
}
- public virtual GXml.Node? serialize (GXml.Node node)
+ public virtual GXml.xNode? serialize (GXml.xNode node)
throws GLib.Error
requires (node_name () != null)
requires (node is Document || node is Element)
@@ -100,7 +100,7 @@ public abstract class GXml.SerializableObjectModel : Object, Serializable
return default_serialize (node);
}
- public GXml.Node? default_serialize (GXml.Node node) throws GLib.Error
+ public GXml.xNode? default_serialize (GXml.xNode node) throws GLib.Error
{
#if DEBUG
stdout.printf (@"$(get_type ().name ()): Serializing on node: $(node.node_name)\n");
@@ -121,15 +121,15 @@ public abstract class GXml.SerializableObjectModel : Object, Serializable
serialize_property (element, spec);
}
if (get_enable_unknown_serializable_property ()) {
- foreach (Node n in unknown_serializable_property.get_values ()) {
+ foreach (xNode n in unknown_serializable_property.get_values ()) {
if (n is Element) {
- var e = (Node) doc.create_element (n.node_name);
+ var e = (xNode) doc.create_element (n.node_name);
n.copy (ref e, true);
element.append_child (e);
}
if (n is Attr) {
element.set_attribute (n.node_name, n.node_value);
- var a = (Node) element.get_attribute_node (n.node_name);
+ var a = (xNode) element.get_attribute_node (n.node_name);
n.copy (ref a);
}
if (n is Text) {
@@ -153,13 +153,13 @@ public abstract class GXml.SerializableObjectModel : Object, Serializable
return element;
}
- public virtual GXml.Node? serialize_property (GXml.Element element,
+ public virtual GXml.xNode? serialize_property (GXml.Element element,
GLib.ParamSpec prop)
throws GLib.Error
{
return default_serialize_property (element, prop);
}
- public GXml.Node? default_serialize_property (GXml.Element element,
+ public GXml.xNode? default_serialize_property (GXml.Element element,
GLib.ParamSpec prop)
throws GLib.Error
{
@@ -193,7 +193,7 @@ public abstract class GXml.SerializableObjectModel : Object, Serializable
val = rval.dup_string ();
}
else {
- Node node = null;
+ xNode node = null;
this.serialize_unknown_property (element, prop, out node);
return node;
}
@@ -213,16 +213,16 @@ public abstract class GXml.SerializableObjectModel : Object, Serializable
}
else
attr.value = val;
- return (Node) attr;
+ return (xNode) attr;
}
- public virtual GXml.Node? deserialize (GXml.Node node)
+ public virtual GXml.xNode? deserialize (GXml.xNode node)
throws GLib.Error
requires (node_name () != null)
{
return default_deserialize (node);
}
- public GXml.Node? default_deserialize (GXml.Node node)
+ public GXml.xNode? default_deserialize (GXml.xNode node)
throws GLib.Error
{
Document doc;
@@ -282,7 +282,7 @@ public abstract class GXml.SerializableObjectModel : Object, Serializable
}
}
}
- foreach (Node n in element.child_nodes)
+ foreach (xNode n in element.child_nodes)
{
if (n is Text) {
if (serialize_use_xml_node_value ()) {
@@ -308,12 +308,12 @@ public abstract class GXml.SerializableObjectModel : Object, Serializable
return null;
}
- public virtual bool deserialize_property (GXml.Node property_node)
+ public virtual bool deserialize_property (GXml.xNode property_node)
throws GLib.Error
{
return default_deserialize_property (property_node);
}
- public bool default_deserialize_property (GXml.Node property_node)
+ public bool default_deserialize_property (GXml.xNode property_node)
throws GLib.Error
{
#if DEBUG
diff --git a/gxml/Serialization.vala b/gxml/Serialization.vala
index 2ac6685..22937cb 100644
--- a/gxml/Serialization.vala
+++ b/gxml/Serialization.vala
@@ -2,6 +2,7 @@
/* Serialization.vala
*
* Copyright (C) 2012-2013 Richard Schwarting <aquarichy gmail com>
+ * Copyright (C) 2015 Daniel Espinosa <esodan gmail com>
*
* This library is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -18,6 +19,7 @@
*
* Authors:
* Richard Schwarting <aquarichy gmail com>
+ * Daniel Espinosa <esodan gmail com>
*/
/* TODO: so it seems we can get property information from GObjectClass
@@ -74,7 +76,7 @@ namespace GXml {
/**
* Serializes and deserializes { link GLib.Object}s to and from
- * { link GXml.Node}.
+ * { link GXml.xNode}.
*
* Serialization can automatically serialize a variety of public
* properties. { link GLib.Object}s can also implement the
@@ -98,14 +100,14 @@ namespace GXml {
* { link GLib.Value} can transform into a string, and
* operates recursively.
*/
- private static GXml.Node serialize_property (GLib.Object object,
+ private static GXml.xNode serialize_property (GLib.Object object,
ParamSpec prop_spec,
GXml.Document doc)
throws GLib.Error
{
Type type;
Value value;
- GXml.Node value_node;
+ GXml.xNode value_node;
Serializable serializable = null;
if (object.get_type ().is_a (typeof (Serializable))) {
@@ -200,7 +202,7 @@ namespace GXml {
* The serialization process can be customised for an object
* by having the object implement the { link GXml.Serializable}
* interface, which allows direct control over the
- * conversation of individual properties into { link GXml.Node}s
+ * conversation of individual properties into { link GXml.xNode}s
* and the object's list of properties as used by
* { link GXml.Serialization}.
*
@@ -217,7 +219,7 @@ namespace GXml {
Element root;
ParamSpec[] prop_specs;
Element prop;
- GXml.Node value_prop = null;
+ GXml.xNode value_prop = null;
string oid;
Serialization.init_caches ();
@@ -301,7 +303,7 @@ namespace GXml {
if (GLib.Value.type_transformable (type, typeof (string))) {
Serializable.string_to_gvalue (prop_elem.content, ref val);
} else if (type.is_a (typeof (GLib.Object))) {
- GXml.Node prop_elem_child;
+ GXml.xNode prop_elem_child;
Object property_object;
prop_elem_child = prop_elem.first_child;
property_object = Serialization.deserialize_object_from_node
(prop_elem_child);
@@ -324,7 +326,7 @@ namespace GXml {
* some differing objects might have the same OID :( Need to
* find make it more unique than just the memory address. SEE ABOVE!!!!*/
private static HashTable<string,Object> deserialize_cache = null;
- private static HashTable<string,GXml.Node> serialize_cache = null;
+ private static HashTable<string,GXml.xNode> serialize_cache = null;
// public so that tests can call it
public static void clear_cache () { // TODO: rename to clear_caches, just changed back
temporarily to avoid API break for 0.3.2
if (Serialization.deserialize_cache != null)
@@ -338,7 +340,7 @@ namespace GXml {
Serialization.deserialize_cache = new HashTable<string,Object> (str_hash,
str_equal);
}
if (Serialization.serialize_cache == null) {
- Serialization.serialize_cache = new HashTable<string,GXml.Node> (str_hash,
str_equal);
+ Serialization.serialize_cache = new HashTable<string,GXml.xNode> (str_hash,
str_equal);
}
}
@@ -371,7 +373,7 @@ namespace GXml {
* This function must assume deserialize over non-Serializable objects
* because Serializable have its own method serialize/deserialize
*/
- internal static GLib.Object? deserialize_object_from_node (GXml.Node obj_node)
+ internal static GLib.Object? deserialize_object_from_node (GXml.xNode obj_node)
throws GLib.Error
{
Element obj_elem;
@@ -414,7 +416,7 @@ namespace GXml {
Serialization.deserialize_cache.set (oid, obj);
specs = obj_class.list_properties ();
- foreach (GXml.Node child_node in obj_elem.child_nodes) {
+ foreach (GXml.xNode child_node in obj_elem.child_nodes) {
if (child_node.node_name == "Property") {
Element prop_elem;
string pname;
diff --git a/gxml/libxml-Attr.vala b/gxml/libxml-Attr.vala
index b16f3dd..220f1f9 100644
--- a/gxml/libxml-Attr.vala
+++ b/gxml/libxml-Attr.vala
@@ -2,7 +2,7 @@
/* Attr.vala
*
* Copyright (C) 2011-2013 Richard Schwarting <aquarichy gmail com>
- * Copyright (C) 2011 Daniel Espinosa <esodan gmail com>
+ * Copyright (C) 2011,2015 Daniel Espinosa <esodan gmail com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -85,7 +85,7 @@ namespace GXml {
nice to use elem.node->get/set_prop (name[,value]) :S */
get {
this._node_value = "";
- foreach (Node child in this.child_nodes) {
+ foreach (xNode child in this.child_nodes) {
this._node_value += child.node_value;
// TODO: verify that Attr node's child types'
// node_values are sufficient for building the Attr's value.
@@ -94,7 +94,7 @@ namespace GXml {
}
internal set {
// TODO: consider adding an empty () method to NodeList
- foreach (Node child in this.child_nodes) {
+ foreach (xNode child in this.child_nodes) {
this.remove_child (child);
}
this.append_child (this.owner_document.create_text_node (value));
@@ -115,7 +115,7 @@ namespace GXml {
* belong to multiple Elements. As we have it implemented, each Attr
* can belong to 0 or 1 Elements only.
*/
- public override Node? parent_node {
+ public override xNode? parent_node {
get {
return null;
}
@@ -130,7 +130,7 @@ namespace GXml {
*
* URL: [[http://www.w3.org/2003/01/dom2-javadoc/org/w3c/dom/Attr.html]]
*/
- public override Node? previous_sibling {
+ public override xNode? previous_sibling {
get {
return null;
}
@@ -145,7 +145,7 @@ namespace GXml {
*
* URL: [[http://www.w3.org/2003/01/dom2-javadoc/org/w3c/dom/Attr.html]]
*/
- public override Node? next_sibling {
+ public override xNode? next_sibling {
get {
return null;
}
@@ -239,7 +239,7 @@ namespace GXml {
*
* @param deep paramenter have no effect.
*/
- public override bool copy (ref Node node, bool deep = false)
+ public override bool copy (ref xNode node, bool deep = false)
requires (node is Attr)
{
node.node_name = this.node_name;
diff --git a/gxml/libxml-BackedNode.vala b/gxml/libxml-BackedNode.vala
index 03f5189..a2ff91f 100644
--- a/gxml/libxml-BackedNode.vala
+++ b/gxml/libxml-BackedNode.vala
@@ -2,7 +2,7 @@
/* BackedNode.vala
*
* Copyright (C) 2011-2013 Richard Schwarting <aquarichy gmail com>
- * Copyright (C) 2011 Daniel Espinosa <esodan gmail com>
+ * Copyright (C) 2011,2015 Daniel Espinosa <esodan gmail com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -33,7 +33,7 @@ namespace GXml {
* This would normally be hidden, but Vala wants base classes
* to be at least as public as subclasses.
*/
- public class BackedNode : Node {
+ public class BackedNode : xNode {
/** Private properties */
internal Xml.Node *node;
@@ -211,7 +211,7 @@ namespace GXml {
/**
* { inheritDoc}
*/
- public override Node? parent_node {
+ public override xNode? parent_node {
get {
return this.owner_document.lookup_node (this.node->parent);
// TODO: is parent never null? parent is probably possible to be null, like
when you create a new element unattached
@@ -237,11 +237,11 @@ namespace GXml {
}
}
- private Node? _first_child;
+ private xNode? _first_child;
/**
* { inheritDoc}
*/
- public override Node? first_child {
+ public override xNode? first_child {
get {
_first_child = this.child_nodes.first ();
return _first_child;
@@ -250,11 +250,11 @@ namespace GXml {
}
}
- private Node? _last_child;
+ private xNode? _last_child;
/**
* { inheritDoc}
*/
- public override Node? last_child {
+ public override xNode? last_child {
get {
_last_child = this.child_nodes.last ();
return _last_child;
@@ -265,7 +265,7 @@ namespace GXml {
/**
* { inheritDoc}
*/
- public override Node? previous_sibling {
+ public override xNode? previous_sibling {
get {
return this.owner_document.lookup_node (this.node->prev);
}
@@ -275,7 +275,7 @@ namespace GXml {
/**
* { inheritDoc}
*/
- public override Node? next_sibling {
+ public override xNode? next_sibling {
get {
return this.owner_document.lookup_node (this.node->next);
}
@@ -290,27 +290,27 @@ namespace GXml {
/**
* { inheritDoc}
*/
- public override unowned Node? insert_before (Node new_child, Node? ref_child) {
+ public override unowned xNode? insert_before (xNode new_child, xNode? ref_child) {
return this.child_nodes.insert_before (new_child, ref_child);
}
/**
* { inheritDoc}
*/
- public override unowned Node? replace_child (Node new_child, Node old_child) {
+ public override unowned xNode? replace_child (xNode new_child, xNode old_child) {
return this.child_nodes.replace_child (new_child, old_child);
}
/**
* { inheritDoc}
*/
- public override unowned Node? remove_child (Node old_child) {
+ public override unowned xNode? remove_child (xNode old_child) {
return this.child_nodes.remove_child (old_child);
}
/**
* { inheritDoc}
*/
- public override unowned Node? append_child (Node new_child) {
+ public override unowned xNode? append_child (xNode new_child) {
if (new_child.owner_document != this.owner_document && new_child.get_type ().is_a
(typeof (GXml.BackedNode))) {
/* The point here is that a node from another document should
have a copy made to be integrated into this one, so we
@@ -332,7 +332,7 @@ namespace GXml {
/**
* { inheritDoc}
*/
- public override unowned Node? clone_node (bool deep) {
+ public override unowned xNode? clone_node (bool deep) {
return this.owner_document.copy_node (this, deep);
// TODO: add a better test, as we weren't realising this was just a stub; test for
memory usage too
}
diff --git a/gxml/libxml-Document.vala b/gxml/libxml-Document.vala
index b0c0707..6a04cc2 100644
--- a/gxml/libxml-Document.vala
+++ b/gxml/libxml-Document.vala
@@ -2,7 +2,7 @@
/* Document.vala
*
* Copyright (C) 2011-2013 Richard Schwarting <aquarichy gmail com>
- * Copyright (C) 2011 Daniel Espinosa <esodan gmail com>
+ * Copyright (C) 2011-2015 Daniel Espinosa <esodan gmail com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -24,7 +24,7 @@
/* TODO:
- * * later on, go over libxml2 docs for Tree and Node and Document, etc., and see if we're missing anything
significant
+ * * later on, go over libxml2 docs for Tree and xNode and Document, etc., and see if we're missing anything
significant
* * compare performance between libxml2 and GXml (should be a little different, but not too much)
*/
@@ -47,7 +47,7 @@ namespace GXml {
}
/**
- * Represents an XML Document as a tree of { link GXml.Node}s.
+ * Represents an XML Document as a tree of { link GXml.xNode}s.
*
* The Document has a root document element { link GXml.Element}.
* A Document's schema can be defined through its
@@ -56,17 +56,17 @@ namespace GXml {
* Version: DOM Level 1 Core<<BR>>
* URL: [[http://www.w3.org/TR/DOM-Level-1/level-one-core.html#i-Document]]
*/
- public class Document : Node {
+ public class Document : xNode {
/* *** Private properties *** */
/**
* This contains a map of Xml.Nodes that have been
- * accessed and the GXml Node we created to represent
- * them on-demand. That way, we don't create an Node
+ * accessed and the GXml xNode we created to represent
+ * them on-demand. That way, we don't create an xNode
* for EVERY node, even if the user never actually
* accesses it.
*/
- internal HashTable<Xml.Node*, Node> node_dict = new HashTable<Xml.Node*, Node>
(GLib.direct_hash, GLib.direct_equal);
+ internal HashTable<Xml.Node*, xNode> node_dict = new HashTable<Xml.Node*, xNode>
(GLib.direct_hash, GLib.direct_equal);
// We don't want want to use Node's Xml.Node or its dict
// internal HashTable<Xml.Attr*, Attr> attr_dict = new HashTable<Xml.Attr*, Attr> (null,
null);
@@ -95,8 +95,8 @@ namespace GXml {
return (Attr)this.lookup_node ((Xml.Node*)xmlattr);
}
- internal unowned Node? lookup_node (Xml.Node *xmlnode) {
- unowned Node domnode;
+ internal unowned xNode? lookup_node (Xml.Node *xmlnode) {
+ unowned xNode domnode;
if (xmlnode == null) {
return null; // TODO: consider throwing an error instead
@@ -196,7 +196,7 @@ namespace GXml {
}
/* A list of strong references to all GXml.Nodes that this Document has created */
- private List<GXml.Node> nodes_to_free = new List<GXml.Node> ();
+ private List<GXml.xNode> nodes_to_free = new List<GXml.xNode> ();
/* A list of references to Xml.Nodes that were created, and may require freeing */
private List<Xml.Node*> new_nodes = new List<Xml.Node*> ();
@@ -240,7 +240,7 @@ namespace GXml {
this ();
this.implementation = impl;
- Node root;
+ xNode root;
root = this.create_element (qualified_name); // TODO: we do not currently support
namespaces, but when we do, this new node will want one
this.append_child (root);
@@ -825,7 +825,7 @@ namespace GXml {
* Note that the list is live, updated as new elements
* are added to the document.
*
- * Unlike a { link GXml.Node} and its subclasses,
+ * Unlike a { link GXml.xNode} and its subclasses,
* { link GXml.NodeList} are not part of the document
* tree, and thus their memory is not managed for the
* user, so the user must explicitly free them.
@@ -907,7 +907,7 @@ namespace GXml {
*
* @return The removed node `old_child`; this should not be freed
*/
- public override unowned Node? replace_child (Node new_child, Node old_child) {
+ public override unowned xNode? replace_child (xNode new_child, xNode old_child) {
if (new_child.node_type == NodeType.ELEMENT ||
new_child.node_type == NodeType.DOCUMENT_TYPE) {
/* let append_child do it with its error handling, since
@@ -929,7 +929,7 @@ namespace GXml {
*
* @return The removed node `old_child`; this should not be freed
*/
- public override unowned Node? remove_child (Node old_child) {
+ public override unowned xNode? remove_child (xNode old_child) {
return this.child_nodes.remove_child (old_child);
}
@@ -948,7 +948,7 @@ namespace GXml {
*
* @return The newly inserted child; this should not be freed
*/
- public override unowned Node? insert_before (Node new_child, Node? ref_child) {
+ public override unowned xNode? insert_before (xNode new_child, xNode? ref_child) {
if (new_child.node_type == NodeType.ELEMENT ||
new_child.node_type == NodeType.DOCUMENT_TYPE) {
/* let append_child do it with its error handling, since
@@ -972,7 +972,7 @@ namespace GXml {
*
* @return The newly added child; this should not be freed
*/
- public override unowned Node? append_child (Node new_child) {
+ public override unowned xNode? append_child (xNode new_child) {
this.check_wrong_document (new_child);
this.check_read_only ();
@@ -1002,7 +1002,7 @@ namespace GXml {
return (xmldoc->children != null);
}
- public unowned Node copy_node (Node foreign_node, bool deep = true) {
+ public unowned xNode copy_node (xNode foreign_node, bool deep = true) {
Xml.Node *our_copy_xml = ((BackedNode)foreign_node).node->doc_copy (this.xmldoc, deep
? 1 : 0);
// TODO: do we need to append this to this.new_nodes? Do we need to append the
result to this.nodes_to_free? Test memory implications
return this.lookup_node (our_copy_xml); // inducing a GXmlNode
diff --git a/gxml/libxml-DocumentType.vala b/gxml/libxml-DocumentType.vala
index c42f971..e3471cd 100644
--- a/gxml/libxml-DocumentType.vala
+++ b/gxml/libxml-DocumentType.vala
@@ -2,7 +2,7 @@
/* DocumentType.vala
*
* Copyright (C) 2011-2013 Richard Schwarting <aquarichy gmail com>
- * Copyright (C) 2011 Daniel Espinosa <esodan gmail com>
+ * Copyright (C) 2011,2015 Daniel Espinosa <esodan gmail com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -29,7 +29,7 @@ namespace GXml {
*
* For more, see: [[http://www.w3.org/TR/DOM-Level-1/level-one-core.html#ID-412266927]]
*/
- public class DocumentType : Node {
+ public class DocumentType : xNode {
private Xml.Dtd *int_subset;
private Xml.Dtd *ext_subset;
diff --git a/gxml/libxml-Element.vala b/gxml/libxml-Element.vala
index e0291f3..9e792dc 100644
--- a/gxml/libxml-Element.vala
+++ b/gxml/libxml-Element.vala
@@ -2,7 +2,7 @@
/* Element.vala
*
* Copyright (C) 2011-2013 Richard Schwarting <aquarichy gmail com>
- * Copyright (C) 2011 Daniel Espinosa <esodan gmail com>
+ * Copyright (C) 2011,2015 Daniel Espinosa <esodan gmail com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -217,7 +217,7 @@ namespace GXml {
}
// TODO: consider making the life of TagNameNodeLists optional, and dead by default, at the
Document level
- private void check_add_tag_name (Element basenode, Node child) {
+ private void check_add_tag_name (Element basenode, xNode child) {
// TODO: make sure there aren't any other NodeTypes that could have elements as
children
if (child.node_type == NodeType.ELEMENT || child.node_type ==
NodeType.DOCUMENT_FRAGMENT) {
// the one we're examining is an element, and might need to be added
@@ -226,7 +226,7 @@ namespace GXml {
}
// if we're adding an element with descendants, or a document fragment, they
might contain nodes that should go into a tag name node list for an ancestor node
- foreach (Node grand_child in child.child_nodes) {
+ foreach (xNode grand_child in child.child_nodes) {
check_add_tag_name (basenode, grand_child);
}
}
@@ -236,14 +236,14 @@ namespace GXml {
* are elements. If they are, we check the basenode and its ancestors to see
* whether they're keeping that node in a TagNameNodeList, so we can remove it.
*/
- private void check_remove_tag_name (Element basenode, Node child) {
+ private void check_remove_tag_name (Element basenode, xNode child) {
// TODO: make sure there aren't any other NodeTypes that could have elements as
children
if (child.node_type == NodeType.ELEMENT) {
// the one we're examining is an element, and might need to be removed from a
tag name node list
basenode.on_remove_descendant_with_tag_name ((Element)child);
// if we're removing an element with descendants, it might contain nodes that
should also be removed from a tag name node list for an ancestor node
- foreach (Node grand_child in child.child_nodes) {
+ foreach (xNode grand_child in child.child_nodes) {
check_remove_tag_name (basenode, grand_child);
}
}
@@ -254,8 +254,8 @@ namespace GXml {
/**
* { inheritDoc}
*/
- public override unowned Node? insert_before (Node new_child, Node? ref_child) {
- unowned Node ret = base.insert_before (new_child, ref_child);
+ public override unowned xNode? insert_before (xNode new_child, xNode? ref_child) {
+ unowned xNode ret = base.insert_before (new_child, ref_child);
check_add_tag_name (this, new_child);
return ret;
}
@@ -263,9 +263,9 @@ namespace GXml {
/**
* { inheritDoc}
*/
- public override unowned Node? replace_child (Node new_child, Node old_child) {
+ public override unowned xNode? replace_child (xNode new_child, xNode old_child) {
check_remove_tag_name (this, old_child);
- unowned Node ret = base.replace_child (new_child, old_child);
+ unowned xNode ret = base.replace_child (new_child, old_child);
check_add_tag_name (this, new_child);
return ret;
}
@@ -273,17 +273,17 @@ namespace GXml {
/**
* { inheritDoc}
*/
- public override unowned Node? remove_child (Node old_child) {
+ public override unowned xNode? remove_child (xNode old_child) {
check_remove_tag_name (this, old_child);
- unowned Node ret = base.remove_child (old_child);
+ unowned xNode ret = base.remove_child (old_child);
return ret;
}
/**
* { inheritDoc}
*/
- public override unowned Node? append_child (Node new_child) {
- unowned Node ret = base.append_child (new_child);
+ public override unowned xNode? append_child (xNode new_child) {
+ unowned xNode ret = base.append_child (new_child);
check_add_tag_name (this, new_child);
return ret;
}
@@ -342,7 +342,7 @@ namespace GXml {
private void on_remove_descendant_with_tag_name (Element elem) {
foreach (TagNameNodeList list in tag_name_lists) {
if (elem.tag_name == list.tag_name) {
- foreach (Node tag_elem in list) {
+ foreach (xNode tag_elem in list) {
if (((Element)tag_elem) == elem) {
list.remove_child (tag_elem);
break;
@@ -374,7 +374,7 @@ namespace GXml {
*/
public NodeList get_elements_by_tag_name (string tag_name) {
TagNameNodeList tagged = new TagNameNodeList (tag_name, this, this.owner_document);
- //List<Node> tagged = new List<Node> ();
+ //List<xNode> tagged = new List<xNode> ();
Queue<Xml.Node*> tocheck = new Queue<Xml.Node*> ();
/* TODO: find out whether we are supposed to include this element,
@@ -413,7 +413,7 @@ namespace GXml {
// will be a problem, given that it will
// have a different .node_type
- foreach (Node child in this.child_nodes) {
+ foreach (xNode child in this.child_nodes) {
switch (child.node_type) {
case NodeType.ELEMENT:
((Element)child).normalize ();
@@ -468,7 +468,7 @@ namespace GXml {
* @param node: could be owned by other { link GXml.Document}.
* @param deep: copy child nodes if true.
*/
- public override bool copy (ref Node node, bool deep = false)
+ public override bool copy (ref xNode node, bool deep = false)
requires (node is Element)
{
node.node_name = this.node_name;
@@ -478,9 +478,9 @@ namespace GXml {
((Element) node).set_attribute (attr.node_name, attr.node_value);
}
if (has_child_nodes () && deep) {
- foreach (Node n in child_nodes) {
+ foreach (xNode n in child_nodes) {
if (n is Element) {
- var element = (Node) node.owner_document.create_element
(n.node_name);
+ var element = (xNode) node.owner_document.create_element
(n.node_name);
n.copy (ref element, true);
node.append_child ( element);
}
diff --git a/gxml/libxml-Entity.vala b/gxml/libxml-Entity.vala
index a7f3131..c50f318 100644
--- a/gxml/libxml-Entity.vala
+++ b/gxml/libxml-Entity.vala
@@ -2,7 +2,7 @@
/* Entity.vala
*
* Copyright (C) 2011-2013 Richard Schwarting <aquarichy gmail com>
- * Copyright (C) 2011 Daniel Espinosa <esodan gmail com>
+ * Copyright (C) 2011, 2015 Daniel Espinosa <esodan gmail com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -29,7 +29,7 @@ namespace GXml {
*
* For more, see: [[http://www.w3.org/TR/DOM-Level-1/level-one-core.html#ID-527DCFF2]]
*/
- public class Entity : Node {
+ public class Entity : xNode {
private Xml.Entity *entity;
/**
@@ -76,7 +76,7 @@ namespace GXml {
this.entity = entity;
}
- /* Public properties (Node-specific) */
+ /* Public properties (xNode-specific) */
public override string node_name {
get {
@@ -88,7 +88,7 @@ namespace GXml {
}
- public override Node? parent_node {
+ public override xNode? parent_node {
get {
return this.owner_document.doctype;
// TODO: could this be differen tfrom this.entity->parent?
@@ -108,23 +108,23 @@ namespace GXml {
}
}
- /* Public methods (Node-specific) */
- public override unowned Node? insert_before (Node new_child, Node? ref_child) {
+ /* Public methods (xNode-specific) */
+ public override unowned xNode? insert_before (xNode new_child, xNode? ref_child) {
return this.child_nodes.insert_before (new_child, ref_child);
}
- public override unowned Node? replace_child (Node new_child, Node old_child) {
+ public override unowned xNode? replace_child (xNode new_child, xNode old_child) {
return this.child_nodes.replace_child (new_child, old_child);
}
- public override unowned Node? remove_child (Node old_child) {
+ public override unowned xNode? remove_child (xNode old_child) {
return this.child_nodes.remove_child (old_child);
}
- public override unowned Node? append_child (Node new_child) {
+ public override unowned xNode? append_child (xNode new_child) {
return this.child_nodes.append_child (new_child);
}
public override bool has_child_nodes () {
return (this.child_nodes.length > 0);
}
- public override unowned Node? clone_node (bool deep) {
+ public override unowned xNode? clone_node (bool deep) {
GLib.warning ("Cloning of Entity not yet supported");
return this; // STUB
}
diff --git a/gxml/libxml-EntityReference.vala b/gxml/libxml-EntityReference.vala
index 49b77de..9b05555 100644
--- a/gxml/libxml-EntityReference.vala
+++ b/gxml/libxml-EntityReference.vala
@@ -2,7 +2,7 @@
/* EntityReference.vala
*
* Copyright (C) 2011-2013 Richard Schwarting <aquarichy gmail com>
- * Copyright (C) 2011 Daniel Espinosa <esodan gmail com>
+ * Copyright (C) 2011, 2015 Daniel Espinosa <esodan gmail com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -37,7 +37,7 @@ namespace GXml {
* The entity name, e.g. "apos", is stored as the EntityReference's `node_name`.
* For more, see: [[http://www.w3.org/TR/DOM-Level-1/level-one-core.html#ID-11C98490]]
*/
- public class EntityReference : Node {
+ public class EntityReference : xNode {
internal EntityReference (string refname, Document doc) {
// TODO: may want to handle refname differently
base (NodeType.ENTITY_REFERENCE, doc); // TODO: what should we pass up?
diff --git a/gxml/libxml-Implementation.vala b/gxml/libxml-Implementation.vala
index 7f22dc6..01456eb 100644
--- a/gxml/libxml-Implementation.vala
+++ b/gxml/libxml-Implementation.vala
@@ -2,7 +2,7 @@
/* Implementation.vala
*
* Copyright (C) 2011-2013 Richard Schwarting <aquarichy gmail com>
- * Copyright (C) 2011 Daniel Espinosa <esodan gmail com>
+ * Copyright (C) 2011,2015 Daniel Espinosa <esodan gmail com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/gxml/libxml-NamedNodeMap.vala b/gxml/libxml-NamedNodeMap.vala
index d38f771..09d75b0 100644
--- a/gxml/libxml-NamedNodeMap.vala
+++ b/gxml/libxml-NamedNodeMap.vala
@@ -2,7 +2,7 @@
/* Node.vala
*
* Copyright (C) 2011-2013 Richard Schwarting <aquarichy gmail com>
- * Copyright (C) 2011,2014 Daniel Espinosa <esodan gmail com>
+ * Copyright (C) 2011,2014-2015 Daniel Espinosa <esodan gmail com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/gxml/libxml-NamespaceAttr.vala b/gxml/libxml-NamespaceAttr.vala
index 759113e..e6a8cfc 100644
--- a/gxml/libxml-NamespaceAttr.vala
+++ b/gxml/libxml-NamespaceAttr.vala
@@ -30,7 +30,7 @@ namespace GXml {
* prefix=uri pairs that define namespaces for XML Elements
* and Attrs.
*/
- public class NamespaceAttr : Node {
+ public class NamespaceAttr : xNode {
/** Private properties */
private Xml.Ns *ns; // XPATH:TODO: do they extend us?
diff --git a/gxml/libxml-Node.vala b/gxml/libxml-Node.vala
index 0a0e324..f240689 100644
--- a/gxml/libxml-Node.vala
+++ b/gxml/libxml-Node.vala
@@ -1,8 +1,8 @@
/* -*- Mode: vala; indent-tabs-mode: t; c-basic-offset: 2; tab-width: 2 -*- */
-/* Node.vala
+/* xNode.vala
*
* Copyright (C) 2011-2013 Richard Schwarting <aquarichy gmail com>
- * Copyright (C) 2011 Daniel Espinosa <esodan gmail com>
+ * Copyright (C) 2011-2015 Daniel Espinosa <esodan gmail com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -26,29 +26,29 @@ namespace GXml {
/* TODO: consider adding public signals for new/deleted children */
/**
- * Represents an XML Node, the base class for most XML structures in
+ * Represents an XML xNode, the base class for most XML structures in
* the { link GXml.Document}'s tree.
*
- * { link GXml.Document}s are { link GXml.Node}s, and are
- * composed of a tree of { link GXml.Node}s.
+ * { link GXml.Document}s are { link GXml.xNode}s, and are
+ * composed of a tree of { link GXml.xNode}s.
*
* Version: DOM Level 1 Core<<BR>>
* URL: [[http://www.w3.org/TR/DOM-Level-1/level-one-core.html#ID-1950641247]]
*/
- public abstract class Node : GLib.Object {
+ public abstract class xNode : GLib.Object {
/* Constructors */
- internal Node (NodeType type, Document owner) {
+ internal xNode (NodeType type, Document owner) {
this.node_type = type;
this.owner_document = owner;
}
- internal Node.for_document () {
+ internal xNode.for_document () {
this.node_name = "#document";
this.node_type = NodeType.DOCUMENT;
}
/* Utility methods */
- internal void check_wrong_document (Node node) {
+ internal void check_wrong_document (xNode node) {
Document this_doc;
if (this.node_type == NodeType.DOCUMENT) {
@@ -58,7 +58,7 @@ namespace GXml {
}
if (this_doc != node.owner_document) {
- GXml.warning (DomException.WRONG_DOCUMENT, "Node tried to interact with this
document '%p' but belonged to document '%p'".printf (this_doc, node.owner_document));
+ GXml.warning (DomException.WRONG_DOCUMENT, "xNode tried to interact with this
document '%p' but belonged to document '%p'".printf (this_doc, node.owner_document));
}
}
@@ -87,7 +87,7 @@ namespace GXml {
// and instead returning empty collections
// No, probably don't want that, as nodes which don't
// support them really do just want to return null ala spec
- foreach (Node child in this.child_nodes) {
+ foreach (xNode child in this.child_nodes) {
message (" %s", child.node_name);
}
}
@@ -129,7 +129,7 @@ namespace GXml {
}
}
/**
- * Add a new namespace to this { link GXml.Node}
+ * Add a new namespace to this { link GXml.xNode}
*/
public virtual NamespaceAttr? add_namespace_attr (string uri, string prefix)
{
@@ -137,7 +137,7 @@ namespace GXml {
}
/**
- * Set namespace to this { link GXml.Node}
+ * Set namespace to this { link GXml.xNode}
*
* Returns: { link true} if namespace exists.
*/
@@ -202,7 +202,7 @@ namespace GXml {
}
/**
- * Stores the value of the Node. The nature of
+ * Stores the value of the xNode. The nature of
* node_value varies based on the type of node. This
* can be %NULL.
*
@@ -255,7 +255,7 @@ namespace GXml {
* Version: DOM Level 1 Core<<BR>>
* URL: [[http://www.w3.org/TR/REC-DOM-Level-1/level-one-core.html#ID-1060184317]]
*/
- public virtual Node? parent_node {
+ public virtual xNode? parent_node {
get { return null; }
internal set {}
}
@@ -267,7 +267,7 @@ namespace GXml {
/**
* List of child nodes to this node. These sometimes
* represent the value of a node as a tree of
- * { link GXml.Node}, whereas node_value represents
+ * { link GXml.xNode}, whereas node_value represents
* it as a string. This can be %NULL for node types
* that have no children.
*
@@ -298,7 +298,7 @@ namespace GXml {
* Version: DOM Level 1 Core<<BR>>
* URL: [[http://www.w3.org/TR/REC-DOM-Level-1/level-one-core.html#ID-169727388]]
*/
- public virtual Node? first_child {
+ public virtual xNode? first_child {
get { return null; }
internal set {}
}
@@ -313,7 +313,7 @@ namespace GXml {
* Version: DOM Level 1 Core<<BR>>
* URL: [[http://www.w3.org/TR/REC-DOM-Level-1/level-one-core.html#ID-61AD09FB]]
*/
- public virtual Node? last_child {
+ public virtual xNode? last_child {
get { return null; }
internal set {}
}
@@ -329,7 +329,7 @@ namespace GXml {
* Version: DOM Level 1 Core<<BR>>
* URL: [[http://www.w3.org/TR/REC-DOM-Level-1/level-one-core.html#ID-640FB3C8]]
*/
- public virtual Node? previous_sibling {
+ public virtual xNode? previous_sibling {
get { return null; }
internal set {}
}
@@ -345,7 +345,7 @@ namespace GXml {
* Version: DOM Level 1 Core<<BR>>
* URL: [[http://www.w3.org/TR/REC-DOM-Level-1/level-one-core.html#ID-6AC54C2F]]
*/
- public virtual Node? next_sibling {
+ public virtual xNode? next_sibling {
get { return null; }
internal set {}
}
@@ -354,7 +354,7 @@ namespace GXml {
* A { link GXml.NamedNodeMap} containing the { link GXml.Attr}
* attributes for this node. `attributes`
* actually only apply to { link GXml.Element}
- * nodes. For all other { link GXml.Node} subclasses,
+ * nodes. For all other { link GXml.xNode} subclasses,
* `attributes` is %NULL.
*
* Do not free this. It's memory will be released
@@ -377,7 +377,7 @@ namespace GXml {
*
* Do not free this unless you intend to free all
* memory owned by the { link GXml.Document}, including this
- * { link GXml.Node}.
+ * { link GXml.xNode}.
*
* Version: DOM Level 1 Core<<BR>>
* URL: [[http://www.w3.org/TR/REC-DOM-Level-1/level-one-core.html#node-ownerDoc]]
@@ -403,7 +403,7 @@ namespace GXml {
* Version: DOM Level 1 Core<<BR>>
* URL: [[http://www.w3.org/TR/REC-DOM-Level-1/level-one-core.html#method-insertBefore]]
*
- * @param new_child A new { link GXml.Node} that will become a child of the current one
+ * @param new_child A new { link GXml.xNode} that will become a child of the current one
* @param ref_child The child that { link new_child} will be placed ahead of
*
* @return { link new_child}, the node that has been
@@ -411,7 +411,7 @@ namespace GXml {
* released when the owning { link GXml.Document} is
* freed.
*/
- public virtual unowned Node? insert_before (Node new_child, Node? ref_child) {
+ public virtual unowned xNode? insert_before (xNode new_child, xNode? ref_child) {
return null;
}
@@ -421,50 +421,50 @@ namespace GXml {
* Version: DOM Level 1 Core<<BR>>
* URL: [[http://www.w3.org/TR/REC-DOM-Level-1/level-one-core.html#method-replaceChild]]
*
- * @param new_child A new { link GXml.Node} that will become a child of the current one
- * @param old_child A { link GXml.Node} that will be removed and replaced by { link new_child}
+ * @param new_child A new { link GXml.xNode} that will become a child of the current one
+ * @param old_child A { link GXml.xNode} that will be removed and replaced by { link
new_child}
*
* @return The removed node { link old_child}. Do not free it, its memory will be
* released when the owning { link GXml.Document} is
* freed.
*/
- public virtual unowned Node? replace_child (Node new_child, Node old_child) {
+ public virtual unowned xNode? replace_child (xNode new_child, xNode old_child) {
return null;
}
/**
* Removes { link old_child} from this node's list of children,
- * { link GXml.Node.child_nodes}.
+ * { link GXml.xNode.child_nodes}.
*
* Version: DOM Level 1 Core<<BR>>
* URL: [[http://www.w3.org/TR/REC-DOM-Level-1/level-one-core.html#method-removeChild]]
*
- * @param old_child The { link GXml.Node} child to remove from the current one
+ * @param old_child The { link GXml.xNode} child to remove from the current one
*
* @return The removed node { link old_child}. Do not free it, its memory will be
* released when the owning { link GXml.Document} is
* freed
*/
- public virtual unowned Node? remove_child (Node old_child) {
+ public virtual unowned xNode? remove_child (xNode old_child) {
return null;
}
/**
* Appends { link new_child} to the end of this node's list of children,
- * { link GXml.Node.child_nodes}.
+ * { link GXml.xNode.child_nodes}.
*
* Version: DOM Level 1 Core<<BR>>
*
* URL: [[http://www.w3.org/TR/REC-DOM-Level-1/level-one-core.html#method-appendChild]]
*
- * @param new_child A new { link GXml.Node} that will
+ * @param new_child A new { link GXml.xNode} that will
* become the last child of this current node
*
* @return The newly added child, { link new_child}. Do not free it, its memory will be
* released when the owning { link GXml.Document} is
* freed.
*/
- public virtual unowned Node? append_child (Node new_child) {
+ public virtual unowned xNode? append_child (xNode new_child) {
return null;
}
@@ -494,17 +494,17 @@ namespace GXml {
* free it, its memory will be released when the owning
* { link GXml.Document} is freed.
*/
- public virtual unowned Node? clone_node (bool deep) {
+ public virtual unowned xNode? clone_node (bool deep) {
return null;
}
/**
* Creates a copy of node's definition to @node.
*
- * @param node: a { link GXml.Node} to copy values to.
+ * @param node: a { link GXml.xNode} to copy values to.
* @param deep: { link true} when you want to copy child nodes too.
*/
- public virtual bool copy (ref Node node, bool deep = false) {
+ public virtual bool copy (ref xNode node, bool deep = false) {
return false;
}
@@ -525,7 +525,7 @@ namespace GXml {
* this.
*/
public virtual string to_string (bool format = false, int level = 0) {
- return "Node(%d:%s)".printf (this.node_type, this.node_name);
+ return "xNode(%d:%s)".printf (this.node_type, this.node_name);
}
}
}
diff --git a/gxml/libxml-NodeList.vala b/gxml/libxml-NodeList.vala
index 1efc7a8..27874b1 100644
--- a/gxml/libxml-NodeList.vala
+++ b/gxml/libxml-NodeList.vala
@@ -1,7 +1,7 @@
/* NodeList.vala
*
* Copyright (C) 2011-2013 Richard Schwarting <aquarichy gmail com>
- * Copyright (C) 2013 Daniel Espinosa <esodan gmail com>
+ * Copyright (C) 2013-2015 Daniel Espinosa <esodan gmail com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -26,9 +26,9 @@ using Gee;
namespace GXml {
/**
- * A live list used to store { link GXml.Node}s.
+ * A live list used to store { link GXml.xNode}s.
*
- * Usually contains the children of a { link GXml.Node}, or
+ * Usually contains the children of a { link GXml.xNode}, or
* the results of { link GXml.Element.get_elements_by_tag_name}.
* { link GXml.NodeList} implements both the DOM Level 1 Core API for
* a NodeList, as well as the { link GLib.List} API, to make
@@ -40,7 +40,7 @@ namespace GXml {
* Version: DOM Level 1 Core<<BR>>
* URL: [[http://www.w3.org/TR/REC-DOM-Level-1/level-one-core.html#ID-536297177]]
*/
- public interface NodeList : GLib.Object, Gee.Iterable<Node>, Gee.Collection<Node>
+ public interface NodeList : GLib.Object, Gee.Iterable<xNode>, Gee.Collection<xNode>
{
/* NOTE:
* children should define constructors like:
@@ -66,13 +66,13 @@ namespace GXml {
* Version: DOM Level 1 Core<<BR>>
* URL: [[http://www.w3.org/TR/REC-DOM-Level-1/level-one-core.html#method-item]]
*/
- public abstract Node item (ulong idx);
+ public abstract xNode item (ulong idx);
/* These exist to support management of a node's children */
- public abstract unowned Node? insert_before (Node new_child, Node? ref_child);
- public abstract unowned Node? replace_child (Node new_child, Node old_child);
- public abstract unowned Node? remove_child (Node old_child);
- public abstract unowned Node? append_child (Node new_child);
+ public abstract unowned xNode? insert_before (xNode new_child, xNode? ref_child);
+ public abstract unowned xNode? replace_child (xNode new_child, xNode old_child);
+ public abstract unowned xNode? remove_child (xNode old_child);
+ public abstract unowned xNode? append_child (xNode new_child);
/**
* Creates an XML string representation of the nodes in the list.
@@ -91,18 +91,18 @@ namespace GXml {
/**
* Retrieve the first node in the list. Like { link GLib.List.first}.
*/
- public abstract Node first ();
+ public abstract xNode first ();
/**
* Retrieve the last node in the list. Like { link GLib.List.last}.
*/
- public abstract Node last ();
+ public abstract xNode last ();
/**
* Obtain the n'th item in the list. Like { link GLib.List.nth}.
*
* @param n The index of the item to access
*/
- public abstract new Node @get (int n);
+ public abstract new xNode @get (int n);
}
}
@@ -112,7 +112,7 @@ namespace GXml {
* time, or get reconstructed-on-the-go?
*/
internal class TagNameNodeList : GXml.ArrayList { internal string tag_name;
- internal TagNameNodeList (string tag_name, Node root, Document owner) {
+ internal TagNameNodeList (string tag_name, xNode root, Document owner) {
base (root);
this.tag_name = tag_name;
}
@@ -121,7 +121,7 @@ namespace GXml {
// /* TODO: warning: this list should NOT be edited :(
// we need a new, better live AttrNodeList :| */
// internal class AttrNodeList : GListNodeList {
- // internal AttrNodeList (Node root, Document owner) {
+ // internal AttrNodeList (xNode root, Document owner) {
// base (root);
// base.nodes = root.attributes.get_values ();
// }
@@ -227,7 +227,7 @@ namespace GXml {
// TODO: Desperately want to extend List or implement relevant interfaces to make iterable
// TODO: remember that the order of interfaces that you're listing as implemented matters
- internal abstract class ChildNodeList : Gee.AbstractCollection<Node>, NodeList
+ internal abstract class ChildNodeList : Gee.AbstractCollection<xNode>, NodeList
{
/* TODO: must be live
if this reflects children of a node, then must always be current
@@ -249,14 +249,14 @@ namespace GXml {
private set { }
}
- public override bool add (Node item)
+ public override bool add (xNode item)
{
append_child (item);
return true;
}
public override void clear () {}
- public override bool contains (Node item) { return false; }
- public override bool remove (Node item) { return false; }
+ public override bool contains (xNode item) { return false; }
+ public override bool remove (xNode item) { return false; }
public override bool read_only { get { return true; } }
public override int size {
get {
@@ -273,25 +273,25 @@ namespace GXml {
return 0;
}
}
- public override Gee.Iterator<Node> iterator () {
+ public override Gee.Iterator<xNode> iterator () {
return new NodeListIterator (this);
}
- public override bool @foreach (ForallFunc<Node> func) {
+ public override bool @foreach (ForallFunc<xNode> func) {
return iterator ().foreach (func);
}
/** GNOME List conventions */
- public Node first () {
+ public xNode first () {
return this.owner.lookup_node (head);
}
- public Node last () {
+ public xNode last () {
Xml.Node *cur = head;
while (cur != null && cur->next != null) {
cur = cur->next;
}
return this.owner.lookup_node (cur); // TODO :check for nulls?
}
- public new Node @get (int n)
+ public new xNode @get (int n)
requires (head != null)
{
Xml.Node *cur = head;
@@ -302,10 +302,10 @@ namespace GXml {
}
return this.owner.lookup_node (cur);
}
- public Node item (ulong idx) { return get ((int) idx); }
+ public xNode item (ulong idx) { return get ((int) idx); }
/** Node's child methods, implemented here **/
- internal new unowned Node? insert_before (Node new_child, Node? ref_child) {
+ internal new unowned xNode? insert_before (xNode new_child, xNode? ref_child) {
Xml.Node *child = head;
if (ref_child == null) {
@@ -321,7 +321,7 @@ namespace GXml {
// TODO: provide a more useful description of ref_child, but there are so
many different types
} else {
if (new_child.node_type == NodeType.DOCUMENT_FRAGMENT) {
- foreach (Node new_grand_child in new_child.child_nodes) {
+ foreach (xNode new_grand_child in new_child.child_nodes) {
child->add_prev_sibling (((BackedNode)new_grand_child).node);
}
} else {
@@ -331,7 +331,7 @@ namespace GXml {
return new_child;
}
- internal new unowned Node? replace_child (Node new_child, Node old_child) {
+ internal new unowned xNode? replace_child (xNode new_child, xNode old_child) {
// TODO: verify that libxml2 already removes
// new_child first if it is found elsewhere in
// the tree.
@@ -361,20 +361,20 @@ namespace GXml {
return old_child;
}
- internal new unowned Node? remove_child (Node old_child) /* throws DomError */ {
+ internal new unowned xNode? remove_child (xNode old_child) /* throws DomError */ {
// TODO: verify that old_child is a valid child here and then unlink
((BackedNode)old_child).node->unlink (); // TODO: do we need to free libxml2 stuff
manually?
return old_child;
}
- internal virtual unowned Node? append_child (Node new_child) /* throws DomError */ {
+ internal virtual unowned xNode? append_child (xNode new_child) /* throws DomError */ {
// TODO: verify that libxml2 will first remove
// new_child if it already exists elsewhere in
// the tree.
if (new_child.node_type == NodeType.DOCUMENT_FRAGMENT) {
- foreach (Node grand_child in new_child.child_nodes) {
+ foreach (xNode grand_child in new_child.child_nodes) {
parent_as_xmlnode->add_child (((BackedNode)grand_child).node);
}
} else {
@@ -390,7 +390,7 @@ namespace GXml {
public string to_string (bool in_line = true) {
string str = "";
- foreach (Node node in this) {
+ foreach (xNode node in this) {
str += node.to_string ();
}
return str;
@@ -398,7 +398,7 @@ namespace GXml {
/* ** NodeListIterator ***/
- private class NodeListIterator : GLib.Object, Gee.Traversable<Node>, Gee.Iterator<Node>
+ private class NodeListIterator : GLib.Object, Gee.Traversable<xNode>, Gee.Iterator<xNode>
{
private weak Document doc;
private Xml.Node *cur;
@@ -412,7 +412,7 @@ namespace GXml {
this.doc = list.owner;
}
/* Gee.Iterator interface */
- public new Node @get () { return this.doc.lookup_node (this.cur); }
+ public new xNode @get () { return this.doc.lookup_node (this.cur); }
public bool has_next () { return head == null ? false : true; }
public bool next () {
if (has_next ()) {
@@ -427,7 +427,7 @@ namespace GXml {
public bool valid { get { return cur != null ? true : false; } }
/* Traversable interface */
- public new bool @foreach (Gee.ForallFunc<Node> f)
+ public new bool @foreach (Gee.ForallFunc<xNode> f)
{
if (next ())
return f (get ());
@@ -437,21 +437,21 @@ namespace GXml {
}
}
-internal class GXml.ArrayList : Gee.ArrayList<Node>, NodeList
+internal class GXml.ArrayList : Gee.ArrayList<GXml.xNode>, NodeList
{
- public GXml.Node root;
+ public GXml.xNode root;
public ulong length {
get { return size; }
private set {}
}
- public ArrayList (GXml.Node root)
+ public ArrayList (GXml.xNode root)
{
this.root = root;
}
- public unowned Node? insert_before (Node new_child, Node? ref_child)
+ public unowned xNode? insert_before (xNode new_child, xNode? ref_child)
{
int i = -1;
if (contains (ref_child)) {
@@ -462,7 +462,7 @@ internal class GXml.ArrayList : Gee.ArrayList<Node>, NodeList
return null;
}
- public unowned Node? replace_child (Node new_child, Node old_child)
+ public unowned xNode? replace_child (xNode new_child, xNode old_child)
{
if (contains (old_child)) {
int i = index_of (old_child);
@@ -473,17 +473,17 @@ internal class GXml.ArrayList : Gee.ArrayList<Node>, NodeList
return null;
}
- public unowned Node? remove_child (Node old_child)
+ public unowned xNode? remove_child (xNode old_child)
{
if (contains (old_child)) {
- unowned Node n = old_child;
+ unowned xNode n = old_child;
remove_at (index_of (old_child));
return n;
}
return null;
}
- public unowned Node? append_child (Node new_child)
+ public unowned xNode? append_child (xNode new_child)
{
add (new_child);
return new_child;
@@ -492,14 +492,14 @@ internal class GXml.ArrayList : Gee.ArrayList<Node>, NodeList
/**
* Retrieve the first node in the list. Like { link GLib.List.first}.
*/
- public Node first () { return first (); }
+ public xNode first () { return first (); }
/**
* Retrieve the last node in the list. Like { link GLib.List.last}.
*/
- public Node last () { return last (); }
+ public xNode last () { return last (); }
- public Node item (ulong idx)
+ public xNode item (ulong idx)
{
return @get((int) idx);
}
@@ -507,7 +507,7 @@ internal class GXml.ArrayList : Gee.ArrayList<Node>, NodeList
public string to_string (bool in_line)
{
string str = "";
- foreach (Node node in this) {
+ foreach (xNode node in this) {
str += node.to_string ();
}
diff --git a/gxml/libxml-Notation.vala b/gxml/libxml-Notation.vala
index 8697028..3e2ead2 100644
--- a/gxml/libxml-Notation.vala
+++ b/gxml/libxml-Notation.vala
@@ -32,7 +32,7 @@ namespace GXml {
* ProcessingInstruction targets.
* For more, see: [[http://www.w3.org/TR/DOM-Level-1/level-one-core.html#ID-5431D1B9]]
*/
- public class Notation : Node {
+ public class Notation : xNode {
// private Xml.Notation *notation; // TODO: wrap libxml's xmlNotation
/**
diff --git a/gxml/libxml-ProcessingInstruction.vala b/gxml/libxml-ProcessingInstruction.vala
index 46588f3..be8c970 100644
--- a/gxml/libxml-ProcessingInstruction.vala
+++ b/gxml/libxml-ProcessingInstruction.vala
@@ -2,7 +2,7 @@
/* ProcessingInstruction.vala
*
* Copyright (C) 2011-2013 Richard Schwarting <aquarichy gmail com>
- * Copyright (C) 2011 Daniel Espinosa <esodan gmail com>
+ * Copyright (C) 2011-2015 Daniel Espinosa <esodan gmail com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -40,7 +40,7 @@ namespace GXml {
* {{{<?pi_target processing instruction data?>}}}
* For more, see: [[http://www.w3.org/TR/DOM-Level-1/level-one-core.html#ID-1004215813]]
*/
- public class ProcessingInstruction : Node {
+ public class ProcessingInstruction : xNode {
internal ProcessingInstruction (string target, string data, Document doc) {
base (NodeType.PROCESSING_INSTRUCTION, doc); // TODO: want to pass a real Xml.Node* ?
this.target = target;
diff --git a/test/AttrTest.vala b/test/AttrTest.vala
index bba12cd..930cacd 100644
--- a/test/AttrTest.vala
+++ b/test/AttrTest.vala
@@ -1,4 +1,27 @@
/* -*- Mode: vala; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/* Notation.vala
+ *
+ * Copyright (C) 2011-2013 Richard Schwarting <aquarichy gmail com>
+ * Copyright (C) 2011-2015 Daniel Espinosa <esodan gmail com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ * Richard Schwarting <aquarichy gmail com>
+ * Daniel Espinosa <esodan gmail com>
+ */
+
using GXml;
/* TODO: add tests for g_warnings being set; apparently you can trap g_criticals and test error messages
with gtester */
@@ -6,7 +29,7 @@ class AttrTest : GXmlTest {
public static void add_tests () {
Test.add_func ("/gxml/element/namespace_uri", () => {
Document doc = new Document.from_string ("<Wands
xmlns:wands=\"http://mom.co.uk/wands\";><Wand price=\"43.56\" wands:core=\"dragon heart cord\"
wands:shell=\"oak\"/></Wands>");
- GXml.Node root = doc.document_element;
+ GXml.xNode root = doc.document_element;
Element node = (Element)root.child_nodes.item (0);
Attr core = node.get_attribute_node ("core");
@@ -19,7 +42,7 @@ class AttrTest : GXmlTest {
});
Test.add_func ("/gxml/element/prefix", () => {
Document doc = new Document.from_string ("<Wands
xmlns:wands=\"http://mom.co.uk/wands\";><Wand price=\"43.56\" wands:core=\"dragon heart cord\"
wands:shell=\"oak\"/></Wands>");
- GXml.Node root = doc.document_element;
+ GXml.xNode root = doc.document_element;
Element node = (Element)root.child_nodes.item (0);
Attr core = node.get_attribute_node ("core");
@@ -32,7 +55,7 @@ class AttrTest : GXmlTest {
});
Test.add_func ("/gxml/element/local_name", () => {
Document doc = new Document.from_string ("<Wands
xmlns:wands=\"http://mom.co.uk/wands\";><Wand price=\"43.56\" wands:core=\"dragon heart cord\"
wands:shell=\"oak\"/></Wands>");
- GXml.Node root = doc.document_element;
+ GXml.xNode root = doc.document_element;
Element node = (Element)root.child_nodes.item (0);
Attr core = node.get_attribute_node ("core");
diff --git a/test/DocumentTest.vala b/test/DocumentTest.vala
index 6b4fea6..ec0e5cf 100644
--- a/test/DocumentTest.vala
+++ b/test/DocumentTest.vala
@@ -1,4 +1,27 @@
/* -*- Mode: vala; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/* Notation.vala
+ *
+ * Copyright (C) 2011-2013 Richard Schwarting <aquarichy gmail com>
+ * Copyright (C) 2011-2015 Daniel Espinosa <esodan gmail com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ * Richard Schwarting <aquarichy gmail com>
+ * Daniel Espinosa <esodan gmail com>
+ */
+
using GXml;
class DocumentTest : GXmlTest {
@@ -107,7 +130,7 @@ class DocumentTest : GXmlTest {
Test.add_func ("/gxml/document/construct_from_string", () => {
string xml;
Document doc;
- GXml.Node root;
+ GXml.xNode root;
xml = "<Fruits><Apple></Apple><Orange></Orange></Fruits>";
doc = new Document.from_string (xml);
@@ -393,8 +416,8 @@ class DocumentTest : GXmlTest {
");
}
- public static void print_node (GXml.Node node) {
- List<GXml.Node> children = (List<GXml.Node>)node.child_nodes;
+ public static void print_node (GXml.xNode node) {
+ List<GXml.xNode> children = (List<GXml.xNode>)node.child_nodes;
if (node.node_type != 3)
GLib.stdout.printf ("<%s", node.node_name);
@@ -407,7 +430,7 @@ class DocumentTest : GXmlTest {
GLib.stdout.printf (">");
if (node.node_value != null)
GLib.stdout.printf ("%s", node.node_value);
- foreach (GXml.Node child in children) {
+ foreach (GXml.xNode child in children) {
// TODO: want a stringification method for Nodes?
print_node (child);
}
diff --git a/test/ElementTest.vala b/test/ElementTest.vala
index 025e1b2..e087683 100644
--- a/test/ElementTest.vala
+++ b/test/ElementTest.vala
@@ -1,4 +1,27 @@
/* -*- Mode: vala; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/* Notation.vala
+ *
+ * Copyright (C) 2011-2013 Richard Schwarting <aquarichy gmail com>
+ * Copyright (C) 2011-2015 Daniel Espinosa <esodan gmail com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ * Richard Schwarting <aquarichy gmail com>
+ * Daniel Espinosa <esodan gmail com>
+ */
+
using GXml;
// namespace GXml {
@@ -32,8 +55,8 @@ class ElementTest : GXmlTest {
xmlroot->add_child (xmlnode);
Document doc = new Document.from_libxml2 (xmldoc);
- GXml.Node root = doc.document_element;
- GXml.Node node = root.child_nodes.item (0);
+ GXml.xNode root = doc.document_element;
+ GXml.xNode node = root.child_nodes.item (0);
assert (node.namespace_uri == null);
assert (node.prefix == null);
@@ -46,16 +69,16 @@ class ElementTest : GXmlTest {
Test.add_func ("/gxml/element/namespace_uri", () => {
// TODO: wanted to use TestElement but CAN'T because Vala won't let me access
the internal constructor of Element?
Document doc = new Document.from_string ("<Potions><magic:Potion
xmlns:magic=\"http://hogwarts.co.uk/magic\";
xmlns:products=\"http://diagonalley.co.uk/products\"/></Potions>");
- GXml.Node root = doc.document_element;
- GXml.Node node = root.child_nodes.item (0);
+ GXml.xNode root = doc.document_element;
+ GXml.xNode node = root.child_nodes.item (0);
assert (node.namespace_uri == "http://hogwarts.co.uk/magic";);
});
Test.add_func ("/gxml/element/testing", () => {
// TODO: wanted to use TestElement but CAN'T because Vala won't let me access
the internal constructor of Element?
Document doc = new Document.from_string ("<Potions><magic:Potion
xmlns:magic=\"http://hogwarts.co.uk/magic\";
xmlns:products=\"http://diagonalley.co.uk/products\";><products:Ingredient /></magic:Potion></Potions>");
- GXml.Node root = doc.document_element;
- GXml.Node node = root.child_nodes.item (0);
+ GXml.xNode root = doc.document_element;
+ GXml.xNode node = root.child_nodes.item (0);
// root.dbg_inspect ();
// node.dbg_inspect ();
@@ -71,22 +94,22 @@ class ElementTest : GXmlTest {
});
Test.add_func ("/gxml/element/prefix", () => {
Document doc = new Document.from_string ("<Potions><magic:Potion
xmlns:magic=\"http://hogwarts.co.uk/magic\";
xmlns:products=\"http://diagonalley.co.uk/products\"/></Potions>");
- GXml.Node root = doc.document_element;
- GXml.Node node = root.child_nodes.item (0);
+ GXml.xNode root = doc.document_element;
+ GXml.xNode node = root.child_nodes.item (0);
assert (node.prefix == "magic");
});
Test.add_func ("/gxml/element/local_name", () => {
Document doc = new Document.from_string ("<Potions><magic:Potion
xmlns:magic=\"http://hogwarts.co.uk/magic\";
xmlns:products=\"http://diagonalley.co.uk/products\"/></Potions>");
- GXml.Node root = doc.document_element;
- GXml.Node node = root.child_nodes.item (0);
+ GXml.xNode root = doc.document_element;
+ GXml.xNode node = root.child_nodes.item (0);
assert (node.local_name == "Potion");
});
Test.add_func ("/gxml/element/namespace_definitions", () => {
Document doc = new Document.from_string ("<Potions><magic:Potion
xmlns:magic=\"http://hogwarts.co.uk/magic\";
xmlns:products=\"http://diagonalley.co.uk/products\"/></Potions>");
- GXml.Node root = doc.document_element;
- GXml.Node node = root.child_nodes.item (0);
+ GXml.xNode root = doc.document_element;
+ GXml.xNode node = root.child_nodes.item (0);
NodeList namespaces = node.namespace_definitions;
@@ -144,8 +167,8 @@ class ElementTest : GXmlTest {
string str;
Document doc = new Document.from_string ("<?xml version='1.0'
encoding='UTF-8'?><entry><link rel='http://schemas.google.com/contacts/2008/rel#photo'/></entry>");
- GXml.Node root = doc.document_element;
- foreach (GXml.Node child in root.child_nodes) {
+ GXml.xNode root = doc.document_element;
+ foreach (GXml.xNode child in root.child_nodes) {
attrs = child.attributes;
}
@@ -222,7 +245,7 @@ class ElementTest : GXmlTest {
Test.add_func ("/gxml/element/get_elements_by_tag_name", () => {
Document doc;
- GXml.Node root;
+ GXml.xNode root;
Element elem;
NodeList emails;
Element email;
@@ -290,10 +313,10 @@ class ElementTest : GXmlTest {
</A>";
doc = new Document.from_string (xml);
- GXml.Node a = doc.document_element;
- GXml.Node bs = a.child_nodes.item (3);
- GXml.Node b3 = bs.child_nodes.item (7);
- GXml.Node t1, t2;
+ GXml.xNode a = doc.document_element;
+ GXml.xNode bs = a.child_nodes.item (3);
+ GXml.xNode b3 = bs.child_nodes.item (7);
+ GXml.xNode t1, t2;
NodeList ts = ((Element)bs).get_elements_by_tag_name ("t");
assert (ts.length == 5);
@@ -307,8 +330,8 @@ class ElementTest : GXmlTest {
assert (ts.length == 7);
// Test situation where we add a node tree
- GXml.Node b4;
- GXml.Node d, d2;
+ GXml.xNode b4;
+ GXml.xNode d, d2;
b4 = doc.create_element ("B");
b4.append_child (doc.create_element ("t"));
diff --git a/test/NodeTest.vala b/test/NodeTest.vala
index 86ce766..4dd8b81 100644
--- a/test/NodeTest.vala
+++ b/test/NodeTest.vala
@@ -1,10 +1,33 @@
/* -*- Mode: vala; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/* Notation.vala
+ *
+ * Copyright (C) 2011-2013 Richard Schwarting <aquarichy gmail com>
+ * Copyright (C) 2011-2015 Daniel Espinosa <esodan gmail com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ * Richard Schwarting <aquarichy gmail com>
+ * Daniel Espinosa <esodan gmail com>
+ */
+
using GXml;
/* For testing, based on:
https://live.gnome.org/Vala/TestSample
- Using an Element subclass of GXml.Node to test Node.
+ Using an Element subclass of GXml.xNode to test Node.
*/
class NodeTest : GXmlTest {
@@ -14,7 +37,7 @@ class NodeTest : GXmlTest {
Test.add_func ("/gxml/domnode/node_name_get", () => {
// TODO: should Nodes never have a null name?
Document doc = get_doc ();
- GXml.Node node;
+ GXml.xNode node;
node = get_elem ("elemname", doc);
assert (node.node_name == "elemname");
@@ -55,7 +78,7 @@ class NodeTest : GXmlTest {
// TODO: implement commented-out types
Document doc = get_doc ();
- GXml.Node node;
+ GXml.xNode node;
node = get_elem ("a", doc);
assert (node.node_type == NodeType.ELEMENT);
@@ -99,7 +122,7 @@ class NodeTest : GXmlTest {
Document doc = get_doc ();
- GXml.Node node;
+ GXml.xNode node;
node = doc.create_element ("elem");
assert (node.node_value == null);
@@ -132,41 +155,41 @@ class NodeTest : GXmlTest {
/* TODO: figure out a solution.
Attr's node_value doesn't get used when elem is thought of
as a Node.
- GXml.Node wants to get it from Node's Xml.Node* node,
+ GXml.xNode wants to get it from Node's Xml.Node* node,
while Attr wants to get it from Attr's Xml.Attr* node. :( */
});
Test.add_func ("/gxml/domnode/parent_node", () => {
Document doc = get_doc ();
- GXml.Node parent = get_elem ("James", doc);
- GXml.Node child = get_elem ("Harry", doc);
+ GXml.xNode parent = get_elem ("James", doc);
+ GXml.xNode child = get_elem ("Harry", doc);
assert (child.parent_node == null);
parent.append_child (child);
assert (child.parent_node == parent);
- GXml.Node attr = doc.create_attribute ("a");
+ GXml.xNode attr = doc.create_attribute ("a");
assert (attr.parent_node == null);
assert (doc.parent_node == null);
// assert (document fragment's parent_node == null); // TODO
});
Test.add_func ("/gxml/domnode/child_nodes", () => {
Document doc = get_doc ();
- GXml.Node parent = get_elem ("Molly", doc);
+ GXml.xNode parent = get_elem ("Molly", doc);
if (parent == null) {
stdout.printf (@"Parent child Molly not created\n");
assert_not_reached ();
}
- GXml.Node child_0 = get_elem ("Percy", doc);
+ GXml.xNode child_0 = get_elem ("Percy", doc);
if (child_0 == null) {
stdout.printf (@"Child_0 Percy not created\n");
assert_not_reached ();
}
- GXml.Node child_1 = get_elem ("Ron", doc);
+ GXml.xNode child_1 = get_elem ("Ron", doc);
if (child_1 == null) {
stdout.printf (@"Child Ron not created\n");
assert_not_reached ();
}
- GXml.Node child_2 = get_elem ("Ginnie", doc);
+ GXml.xNode child_2 = get_elem ("Ginnie", doc);
if (child_2 == null) {
stdout.printf (@"Child Ginnie not created\n");
assert_not_reached ();
@@ -200,10 +223,10 @@ class NodeTest : GXmlTest {
});
Test.add_func ("/gxml/domnode/first_child", () => {
Document doc = get_doc ();
- GXml.Node parent = get_elem ("Molly", doc);
- GXml.Node child_0 = get_elem ("Percy", doc);
- GXml.Node child_1 = get_elem ("Ron", doc);
- GXml.Node child_2 = get_elem ("Ginnie", doc);
+ GXml.xNode parent = get_elem ("Molly", doc);
+ GXml.xNode child_0 = get_elem ("Percy", doc);
+ GXml.xNode child_1 = get_elem ("Ron", doc);
+ GXml.xNode child_2 = get_elem ("Ginnie", doc);
assert (parent.child_nodes.length == 0);
parent.append_child (child_0);
@@ -214,10 +237,10 @@ class NodeTest : GXmlTest {
});
Test.add_func ("/gxml/domnode/last_child", () => {
Document doc = get_doc ();
- GXml.Node parent = get_elem ("Molly", doc);
- GXml.Node child_0 = get_elem ("Percy", doc);
- GXml.Node child_1 = get_elem ("Ron", doc);
- GXml.Node child_2 = get_elem ("Ginnie", doc);
+ GXml.xNode parent = get_elem ("Molly", doc);
+ GXml.xNode child_0 = get_elem ("Percy", doc);
+ GXml.xNode child_1 = get_elem ("Ron", doc);
+ GXml.xNode child_2 = get_elem ("Ginnie", doc);
assert (parent.child_nodes.length == 0);
parent.append_child (child_0);
@@ -228,10 +251,10 @@ class NodeTest : GXmlTest {
});
Test.add_func ("/gxml/domnode/previous_sibling", () => {
Document doc = get_doc ();
- GXml.Node parent = get_elem ("Molly", doc);
- GXml.Node child_0 = get_elem ("Percy", doc);
- GXml.Node child_1 = get_elem ("Ron", doc);
- GXml.Node child_2 = get_elem ("Ginnie", doc);
+ GXml.xNode parent = get_elem ("Molly", doc);
+ GXml.xNode child_0 = get_elem ("Percy", doc);
+ GXml.xNode child_1 = get_elem ("Ron", doc);
+ GXml.xNode child_2 = get_elem ("Ginnie", doc);
assert (parent.child_nodes.length == 0);
parent.append_child (child_0);
@@ -244,10 +267,10 @@ class NodeTest : GXmlTest {
});
Test.add_func ("/gxml/domnode/next_sibling", () => {
Document doc = get_doc ();
- GXml.Node parent = get_elem ("Molly", doc);
- GXml.Node child_0 = get_elem ("Percy", doc);
- GXml.Node child_1 = get_elem ("Ron", doc);
- GXml.Node child_2 = get_elem ("Ginnie", doc);
+ GXml.xNode parent = get_elem ("Molly", doc);
+ GXml.xNode child_0 = get_elem ("Percy", doc);
+ GXml.xNode child_1 = get_elem ("Ron", doc);
+ GXml.xNode child_2 = get_elem ("Ginnie", doc);
assert (parent.child_nodes.length == 0);
parent.append_child (child_0);
@@ -260,8 +283,8 @@ class NodeTest : GXmlTest {
});
Test.add_func ("/gxml/domnode/attributes", () => {
Document doc = get_doc ();
- GXml.Node elem = get_elem ("Hogwarts", doc);
- GXml.Node attr = get_attr ("Potter", "Lily", doc);
+ GXml.xNode elem = get_elem ("Hogwarts", doc);
+ GXml.xNode attr = get_attr ("Potter", "Lily", doc);
assert (elem.attributes != null);
assert (attr.attributes == null);
@@ -272,17 +295,17 @@ class NodeTest : GXmlTest {
Test.add_func ("/gxml/domnode/owner_document", () => {
Document doc2 = get_doc ();
Document doc1 = get_doc ();
- GXml.Node elem = get_elem ("Malfoy", doc1);
+ GXml.xNode elem = get_elem ("Malfoy", doc1);
assert (elem.owner_document == doc1);
assert (elem.owner_document != doc2);
});
Test.add_func ("/gxml/domnode/insert_before", () => {
Document doc = get_doc ();
- GXml.Node parent = get_elem ("Molly", doc);
- GXml.Node child_0 = get_elem ("Percy", doc);
- GXml.Node child_1 = get_elem ("Ron", doc);
- GXml.Node child_2 = get_elem ("Ginnie", doc);
+ GXml.xNode parent = get_elem ("Molly", doc);
+ GXml.xNode child_0 = get_elem ("Percy", doc);
+ GXml.xNode child_1 = get_elem ("Ron", doc);
+ GXml.xNode child_2 = get_elem ("Ginnie", doc);
assert (parent.child_nodes.length == 0);
parent.append_child (child_2);
@@ -306,10 +329,10 @@ class NodeTest : GXmlTest {
// TODO: for this one, and others that include a ref_child, we want to test
passing an irrelevant ref child and a null ref child
Document doc = get_doc ();
- GXml.Node parent = get_elem ("Molly", doc);
- GXml.Node child_0 = get_elem ("Percy", doc);
- GXml.Node child_1 = get_elem ("Ron", doc);
- GXml.Node child_2 = get_elem ("Ginnie", doc);
+ GXml.xNode parent = get_elem ("Molly", doc);
+ GXml.xNode child_0 = get_elem ("Percy", doc);
+ GXml.xNode child_1 = get_elem ("Ron", doc);
+ GXml.xNode child_2 = get_elem ("Ginnie", doc);
assert (parent.child_nodes.length == 0);
parent.append_child (child_0);
@@ -329,10 +352,10 @@ class NodeTest : GXmlTest {
});
Test.add_func ("/gxml/domnode/remove_child", () => {
Document doc = get_doc ();
- GXml.Node parent = get_elem ("Molly", doc);
- GXml.Node child_0 = get_elem ("Percy", doc);
- GXml.Node child_1 = get_elem ("Ron", doc);
- GXml.Node child_2 = get_elem ("Ginnie", doc);
+ GXml.xNode parent = get_elem ("Molly", doc);
+ GXml.xNode child_0 = get_elem ("Percy", doc);
+ GXml.xNode child_1 = get_elem ("Ron", doc);
+ GXml.xNode child_2 = get_elem ("Ginnie", doc);
assert (parent.child_nodes.length == 0);
parent.append_child (child_0);
@@ -371,10 +394,10 @@ class NodeTest : GXmlTest {
});
Test.add_func ("/gxml/domnode/append_child", () => {
Document doc = get_doc ();
- GXml.Node parent = get_elem ("Molly", doc);
- GXml.Node child_0 = get_elem ("Percy", doc);
- GXml.Node child_1 = get_elem ("Ron", doc);
- GXml.Node child_2 = get_elem ("Ginnie", doc);
+ GXml.xNode parent = get_elem ("Molly", doc);
+ GXml.xNode child_0 = get_elem ("Percy", doc);
+ GXml.xNode child_1 = get_elem ("Ron", doc);
+ GXml.xNode child_2 = get_elem ("Ginnie", doc);
assert (parent.child_nodes.length == 0);
parent.append_child (child_0);
@@ -396,8 +419,8 @@ class NodeTest : GXmlTest {
});
Test.add_func ("/gxml/domnode/has_child_nodes", () => {
Document doc = get_doc ();
- GXml.Node parent = get_elem ("Molly", doc);
- GXml.Node child_0 = get_elem ("Percy", doc);
+ GXml.xNode parent = get_elem ("Molly", doc);
+ GXml.xNode child_0 = get_elem ("Percy", doc);
assert (parent.has_child_nodes () == false);
diff --git a/test/SerializableGeeArrayListTest.vala b/test/SerializableGeeArrayListTest.vala
index 82a5b62..deca85c 100644
--- a/test/SerializableGeeArrayListTest.vala
+++ b/test/SerializableGeeArrayListTest.vala
@@ -8,7 +8,7 @@
* Daniel Espinosa <esodan gmail com>
*
*
- * Copyright (c) 2013-2014 Daniel Espinosa
+ * Copyright (c) 2013-2015 Daniel Espinosa
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -82,7 +82,7 @@ class SerializableGeeArrayListTest : GXmlTest
}
bool found1 = false;
bool found2 = false;
- foreach (GXml.Node n in root.child_nodes) {
+ foreach (GXml.xNode n in root.child_nodes) {
if (n is Element && n.node_name == "aelement") {
var name = ((Element) n).get_attribute_node ("name");
if (name != null) {
diff --git a/test/SerializableGeeCollectionsTest.vala b/test/SerializableGeeCollectionsTest.vala
index 3022be0..da07b73 100644
--- a/test/SerializableGeeCollectionsTest.vala
+++ b/test/SerializableGeeCollectionsTest.vala
@@ -8,7 +8,7 @@
* Daniel Espinosa <esodan gmail com>
*
*
- * Copyright (c) 2013-2014 Daniel Espinosa
+ * Copyright (c) 2013-2015 Daniel Espinosa
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -386,12 +386,12 @@ class SerializableGeeCollectionsTest : GXmlTest
assert_not_reached ();
}
int i = 0;
- foreach (GXml.Node n in ndoc.document_element.child_nodes)
+ foreach (GXml.xNode n in ndoc.document_element.child_nodes)
{
i++;
if (n is Text) { if (n.node_value != "") assert_not_reached (); }
if (n.node_name == "ChargeZone") {
- foreach (GXml.Node cn in n.child_nodes)
+ foreach (GXml.xNode cn in n.child_nodes)
{
if (n is Text) { if (n.node_value != "") assert_not_reached (); }
@@ -491,7 +491,7 @@ class SerializableGeeCollectionsTest : GXmlTest
}
if (refaction.unknown_serializable_property.size () != 1) {
stdout.printf (@"ERROR: Refaction: Bad unknown properties/nodes number: found
$(refaction.unknown_serializable_property.size ())\n");
- foreach (GXml.Node unk in refaction.unknown_serializable_property.get_values ())
+ foreach (GXml.xNode unk in refaction.unknown_serializable_property.get_values ())
{
string unkv = "___NULL__";
if (unk.node_value != null)
@@ -507,7 +507,7 @@ class SerializableGeeCollectionsTest : GXmlTest
assert_not_reached ();
}
//stdout.printf (@"$doc\n");
- foreach (GXml.Node n in doc.document_element.child_nodes) {
+ foreach (GXml.xNode n in doc.document_element.child_nodes) {
if (n is Element) {
if (n.node_name == "ChargeZone") {
@@ -516,10 +516,10 @@ class SerializableGeeCollectionsTest : GXmlTest
bool unkfound = false;
bool tfound = false;
bool attrfound = false;
- foreach (GXml.Node sn in n.child_nodes) {
+ foreach (GXml.xNode sn in n.child_nodes) {
if (sn is Element) {
if (sn.node_name == "refaction") {
- foreach (GXml.Node rn in sn.child_nodes) {
+ foreach (GXml.xNode rn in sn.child_nodes) {
if (rn is Element) {
//stdout.printf (@"Refaction current node: '$(rn.node_name)'\n");
if (rn.node_name == "ship") {
@@ -537,7 +537,7 @@ class SerializableGeeCollectionsTest : GXmlTest
assert_not_reached ();
}
}
- foreach (GXml.Node shn in rn.child_nodes) {
+ foreach (GXml.xNode shn in rn.child_nodes) {
//stdout.printf (@"Refaction: Ship MegaTrench: Node: $(shn.node_name)\n");
if (shn is Text) {
tfound = true;
diff --git a/test/SerializableGeeDualKeyMapTest.vala b/test/SerializableGeeDualKeyMapTest.vala
index 01a0a8f..8e9621c 100644
--- a/test/SerializableGeeDualKeyMapTest.vala
+++ b/test/SerializableGeeDualKeyMapTest.vala
@@ -8,7 +8,7 @@
* Daniel Espinosa <esodan gmail com>
*
*
- * Copyright (c) 2013-2014 Daniel Espinosa
+ * Copyright (c) 2013-2015 Daniel Espinosa
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -156,7 +156,7 @@ class SerializableGeeDualKeyMapTest : GXmlTest
bool found4 = false;
int nodes = 0;
int i = 0;
- foreach (GXml.Node n in root.child_nodes) {
+ foreach (GXml.xNode n in root.child_nodes) {
nodes++;
if (n is Element && n.node_name == "spaces") {
i++;
diff --git a/test/SerializableGeeHashMapTest.vala b/test/SerializableGeeHashMapTest.vala
index ad48795..9ed7748 100644
--- a/test/SerializableGeeHashMapTest.vala
+++ b/test/SerializableGeeHashMapTest.vala
@@ -8,7 +8,7 @@
* Daniel Espinosa <esodan gmail com>
*
*
- * Copyright (c) 2013-2014 Daniel Espinosa
+ * Copyright (c) 2013-2015 Daniel Espinosa
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -121,7 +121,7 @@ class SerializableGeeHashMapTest : GXmlTest
}
bool found1 = false;
bool found2 = false;
- foreach (GXml.Node n in root.child_nodes) {
+ foreach (GXml.xNode n in root.child_nodes) {
if (n is Element && n.node_name == "space") {
var name = ((Element) n).get_attribute_node ("name");
if (name != null) {
@@ -129,7 +129,7 @@ class SerializableGeeHashMapTest : GXmlTest
if (name.node_value == "Small") found2 = true;
}
if (n.has_child_nodes ()) {
- foreach (GXml.Node nd in n.child_nodes) {
+ foreach (GXml.xNode nd in n.child_nodes) {
if (nd is Text) {
if (nd.node_value != "FAKE TEXT") {
stdout.printf (@"ERROR: node content don't much. Expected 'FAKE TEXT', got:
$(nd.node_value)\n$(doc)\n");
@@ -246,7 +246,7 @@ class SerializableGeeHashMapTest : GXmlTest
}
bool found1 = false;
bool found2 = false;
- foreach (GXml.Node n in root.child_nodes) {
+ foreach (GXml.xNode n in root.child_nodes) {
if (n is Element && n.node_name == "space") {
var name = ((Element) n).get_attribute_node ("name");
if (name != null) {
diff --git a/test/SerializableGeeTreeMapTest.vala b/test/SerializableGeeTreeMapTest.vala
index 87c2c61..5930fff 100644
--- a/test/SerializableGeeTreeMapTest.vala
+++ b/test/SerializableGeeTreeMapTest.vala
@@ -8,7 +8,7 @@
* Daniel Espinosa <esodan gmail com>
*
*
- * Copyright (c) 2013-2014 Daniel Espinosa
+ * Copyright (c) 2013-2015 Daniel Espinosa
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -111,7 +111,7 @@ class SerializableGeeTreeMapTest : GXmlTest
}
bool found1 = false;
bool found2 = false;
- foreach (GXml.Node n in root.child_nodes) {
+ foreach (GXml.xNode n in root.child_nodes) {
if (n is Element && n.node_name == "space") {
var name = ((Element) n).get_attribute_node ("name");
if (name != null) {
@@ -230,7 +230,7 @@ class SerializableGeeTreeMapTest : GXmlTest
}
bool found1 = false;
bool found2 = false;
- foreach (GXml.Node n in root.child_nodes) {
+ foreach (GXml.xNode n in root.child_nodes) {
if (n is Element && n.node_name == "space") {
var name = ((Element) n).get_attribute_node ("name");
if (name != null) {
diff --git a/test/SerializableObjectModelTest.vala b/test/SerializableObjectModelTest.vala
index fe5db06..6275ed4 100644
--- a/test/SerializableObjectModelTest.vala
+++ b/test/SerializableObjectModelTest.vala
@@ -8,7 +8,7 @@
* Daniel Espinosa <esodan gmail com>
*
*
- * Copyright (c) 2014 Daniel Espinosa
+ * Copyright (c) 2014-2015 Daniel Espinosa
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -148,7 +148,7 @@ public class Package : ObjectModel
public string unknown_to_string ()
{
string t = "";
- foreach (GXml.Node node in unknown_serializable_property.get_values ())
+ foreach (GXml.xNode node in unknown_serializable_property.get_values ())
{
t+= node.to_string () ;
}
@@ -237,22 +237,22 @@ class Configuration : ObjectModel
ignored_serializable_properties.set ("invalid",
get_class ().find_property("invalid"));
}
- public override GXml.Node? serialize (GXml.Node node) throws GLib.Error
+ public override GXml.xNode? serialize (GXml.xNode node) throws GLib.Error
{
var n = default_serialize (node);
n.add_namespace_attr ("http://www.gnome.org/gxml/0.4";, "om");
return n;
}
- public override GXml.Node? deserialize (GXml.Node node) throws GLib.Error
+ public override GXml.xNode? deserialize (GXml.xNode node) throws GLib.Error
{
//stdout.printf (@"CONFIGURATOR: Namespaces Check");
- GXml.Node n;
+ GXml.xNode n;
if (node is Document)
- n = (GXml.Node) (((GXml.Document) node).document_element);
+ n = (GXml.xNode) (((GXml.Document) node).document_element);
else
n = node;
- foreach (GXml.Node ns in n.namespace_definitions) {
+ foreach (GXml.xNode ns in n.namespace_definitions) {
//stdout.printf (@"Namespace = $(ns.node_value)");
if (ns.node_name == "om" && ns.node_value == "http://www.gnome.org/gxml/0.4";)
invalid = false;
@@ -534,7 +534,7 @@ class SerializableObjectModelTest : GXmlTest
bool com = false;
bool cus = false;
bool sal = false;
- foreach (GXml.Node n in element.child_nodes) {
+ foreach (GXml.xNode n in element.child_nodes) {
//stdout.printf (@"Found Element: $(n.node_name)");
if (n.node_name == "tag") {
//stdout.printf (@"Found: $(n.node_name)");
@@ -712,14 +712,14 @@ class SerializableObjectModelTest : GXmlTest
assert_not_reached ();
}
bool found = false;
- foreach (GXml.Node n in element.namespace_definitions)
+ foreach (GXml.xNode n in element.namespace_definitions)
{
if (n.node_name == "om" && n.node_value == "http://www.gnome.org/gxml/0.4";)
found = true;
}
if (!found) {
stdout.printf (@"CONFIGURATION: No namespace found:");
- foreach (GXml.Node n in element.namespace_definitions) {
+ foreach (GXml.xNode n in element.namespace_definitions) {
stdout.printf (@"CONFIGURATION: Defined Namespace:
$(n.node_name):$(n.node_value)");
}
assert_not_reached ();
@@ -740,7 +740,7 @@ class SerializableObjectModelTest : GXmlTest
configuration.deserialize (doc);
if (configuration.invalid == true) {
stdout.printf ("CONFIGURATION: deserialize is INVALID\n");
- foreach (GXml.Node n in doc.document_element.namespace_definitions) {
+ foreach (GXml.xNode n in doc.document_element.namespace_definitions) {
stdout.printf (@"CONFIGURATION: namespace: $(n.node_value)\n");
}
assert_not_reached ();
@@ -801,7 +801,7 @@ class SerializableObjectModelTest : GXmlTest
unknown_property.deserialize (doc);
if (unknown_property.unknown_serializable_property.size () != 4) {
stdout.printf (@"ERROR: UNKNOWN_ATTRIBUTE: size
$(unknown_property.unknown_serializable_property.size ().to_string ())\n");
- foreach (GXml.Node un in unknown_property.unknown_serializable_property.get_values
()) {
+ foreach (GXml.xNode un in unknown_property.unknown_serializable_property.get_values
()) {
string sv = "__NULL__";
if (un.node_value != null)
sv = un.node_value;
@@ -895,7 +895,7 @@ class SerializableObjectModelTest : GXmlTest
assert_not_reached ();
}
bool found = false;
- foreach (GXml.Node n in element.child_nodes) {
+ foreach (GXml.xNode n in element.child_nodes) {
if (n.node_name == "UnknownNode") {
found = true;
var direction = ((Element) n).get_attribute_node ("direction");
@@ -937,7 +937,7 @@ class SerializableObjectModelTest : GXmlTest
unknown_property.serialize (ndoc);
if (ndoc.document_element.child_nodes.size != 2) {
stdout.printf (@"ERROR: Root incorrect child node number: found
'$(doc.document_element.child_nodes.size)\n");
- foreach (GXml.Node rn in ndoc.document_element.child_nodes) {
+ foreach (GXml.xNode rn in ndoc.document_element.child_nodes) {
string nv = "__NULL__";
if (rn.node_value != null)
nv = rn.node_value;
@@ -946,7 +946,7 @@ class SerializableObjectModelTest : GXmlTest
stdout.printf (@"$(ndoc)\n");
assert_not_reached ();
}
- foreach (GXml.Node n in ndoc.document_element.child_nodes) {
+ foreach (GXml.xNode n in ndoc.document_element.child_nodes) {
if (n is Text) {
if (n.node_value != "TEXT") {
stdout.printf (@"ERROR: Unknown Text Element not set: found
'$(n.node_value)\n");
diff --git a/test/SerializableTest.vala b/test/SerializableTest.vala
index d694e59..cea32b1 100644
--- a/test/SerializableTest.vala
+++ b/test/SerializableTest.vala
@@ -9,7 +9,7 @@
* Daniel Espinosa <esodan gmail com>
*
* Copyright (C) 2011-2013 Richard Schwarting <aquarichy gmail com>
- * Copyright (c) 2013-2014 Daniel Espinosa <esodan gmail com>
+ * Copyright (c) 2013-2015 Daniel Espinosa <esodan gmail com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -104,13 +104,13 @@ public class SerializableCapsicum : GXml.SerializableJson {
Want an example using GBoxed too
Perhaps these shouldn't be object methods, perhaps they should be static?
Can't have static methods in an interface :(, right? */
- public void deserialize_unknown_property_type (GXml.Node element, ParamSpec prop)
+ public void deserialize_unknown_property_type (GXml.xNode element, ParamSpec prop)
{
GLib.Value outvalue = GLib.Value (typeof (int));
switch (prop.name) {
case "ratings":
this.ratings = new GLib.List<int> ();
- foreach (GXml.Node rating in element.child_nodes) {
+ foreach (GXml.xNode rating in element.child_nodes) {
int64.try_parse (((GXml.Element)rating).content, out outvalue);
this.ratings.append ((int)outvalue.get_int64 ());
}
@@ -120,7 +120,7 @@ public class SerializableCapsicum : GXml.SerializableJson {
assert_not_reached ();
}
}
- private void serialize_unknown_property_type (GXml.Node element, ParamSpec prop, out GXml.Node node)
+ private void serialize_unknown_property_type (GXml.xNode element, ParamSpec prop, out GXml.xNode node)
{
Document doc = element.owner_document;
switch (prop.name) {
diff --git a/test/SerializationTest.vala b/test/SerializationTest.vala
index f9c5aa3..89b04c3 100644
--- a/test/SerializationTest.vala
+++ b/test/SerializationTest.vala
@@ -1,4 +1,27 @@
-/* -*- Mode: vala; indent-tabs-mode: t; c-basic-offset: 2; tab-width: 2 -*- */
+/* -*- Mode: vala; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/* Notation.vala
+ *
+ * Copyright (C) 2011-2013 Richard Schwarting <aquarichy gmail com>
+ * Copyright (C) 2011-2015 Daniel Espinosa <esodan gmail com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ * Richard Schwarting <aquarichy gmail com>
+ * Daniel Espinosa <esodan gmail com>
+ */
+
using GXml;
using Gee;
@@ -294,7 +317,7 @@ class SerializationTest : GXmlTest {
Test.add_func ("/gxml/serialization/xml_serialize", () => {
Fruit fruit;
- GXml.Node fruit_xml;
+ GXml.xNode fruit_xml;
string expectation;
Regex regex;
@@ -567,7 +590,7 @@ class SerializationTest : GXmlTest {
/* NOTE: We expect this one to fail right now */
Fruit fruit;
- GXml.Node fruit_xml;
+ GXml.xNode fruit_xml;
string expectation;
Regex regex;
diff --git a/test/gxml-performance.vala b/test/gxml-performance.vala
index 5c79515..c43ec5d 100644
--- a/test/gxml-performance.vala
+++ b/test/gxml-performance.vala
@@ -1,7 +1,7 @@
/* -*- Mode: vala; indent-tabs-mode: nil; c-basic-offset: 2; tab-width: 2 -*- */
/* librescl
*
- * Copyright (C) 2013. 2014 Daniel Espinosa <esodan gmail com>
+ * Copyright (C) 2013-2015 Daniel Espinosa <esodan gmail com>
*
* librescl is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
@@ -83,7 +83,7 @@ public class Performance
time = Test.timer_elapsed ();
Test.minimized_result (time, "Load large document: %g seconds", time);
Test.timer_start ();
- foreach (GXml.Node n in ((GXml.Node)d.document_element).child_nodes) {
+ foreach (GXml.xNode n in ((GXml.xNode)d.document_element).child_nodes) {
if (n.node_name == "Book1") { /* Fake just to access the node */ }
}
time = Test.timer_elapsed ();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
