[gxml] Ported Serializable.serialize_unknown_property to GXml.Node
- From: Daniel Espinosa Ortiz <despinosa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gxml] Ported Serializable.serialize_unknown_property to GXml.Node
- Date: Wed, 29 Apr 2015 15:17:10 +0000 (UTC)
commit d8e051c94b5faa19dd2ca52ff49dde982040c50d
Author: Daniel Espinosa <esodan gmail com>
Date: Wed Apr 29 10:07:42 2015 -0500
Ported Serializable.serialize_unknown_property to GXml.Node
gxml/Serializable.vala | 14 +++++++-------
gxml/SerializableObjectModel.vala | 9 +++++----
test/SerializableObjectModelTest.vala | 4 ++--
3 files changed, 14 insertions(+), 13 deletions(-)
---
diff --git a/gxml/Serializable.vala b/gxml/Serializable.vala
index 3138662..a85065c 100644
--- a/gxml/Serializable.vala
+++ b/gxml/Serializable.vala
@@ -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.xNode} that contains the content. The
+ * { link GXml.Node} that contains the content. The
* implementing { link GXml.Serializable} object can extract
- * the data from the { link GXml.xNode} and store it in its
- * property itself. Note that the { link GXml.xNode} may be
+ * the data from the { link GXml.Node} and store it in its
+ * property itself. Note that the { link GXml.Node} may be
* as simple as a { link GXml.Text} that stores the data as a
* string.
*
@@ -198,13 +198,13 @@ namespace GXml {
* 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.xNode} to add attribute or child nodes to
+ * @param element a { link GXml.Node} to add attribute or child nodes to
* @param prop a { link GLib.ParamSpec} describing attribute to serialize
- * @param node set to the { link GXml.xNode} representing this attribute
+ * @param node set to the { link GXml.Node} representing this attribute
*/
- public signal void serialize_unknown_property (GXml.xNode element,
+ public signal void serialize_unknown_property (GXml.Node element,
ParamSpec prop,
- out GXml.xNode node);
+ out GXml.Node node);
/**
* Signal to serialize unknown properties. Any new node must be added to
diff --git a/gxml/SerializableObjectModel.vala b/gxml/SerializableObjectModel.vala
index e12eaa1..d1682a7 100644
--- a/gxml/SerializableObjectModel.vala
+++ b/gxml/SerializableObjectModel.vala
@@ -158,13 +158,14 @@ public abstract class GXml.SerializableObjectModel : Object, Serializable
throws GLib.Error
{
if (element is xElement)
- return default_serialize_property ((xElement) element, prop);
+ return default_serialize_property ((GXml.Element) element, prop);
return null;
}
- public GXml.xNode? default_serialize_property (GXml.xElement element,
+ public GXml.Node? default_serialize_property (GXml.Element oelement,
GLib.ParamSpec prop)
throws GLib.Error
{
+ xElement element = (xElement) oelement;
if (prop.value_type.is_a (typeof (Serializable)))
{
var v = Value (typeof (Object));
@@ -195,7 +196,7 @@ public abstract class GXml.SerializableObjectModel : Object, Serializable
val = rval.dup_string ();
}
else {
- xNode node = null;
+ Node node = null;
this.serialize_unknown_property (element, prop, out node);
return node;
}
@@ -215,7 +216,7 @@ public abstract class GXml.SerializableObjectModel : Object, Serializable
}
else
attr.value = val;
- return (xNode) attr;
+ return attr;
}
public virtual GXml.Node? deserialize (GXml.Node node)
diff --git a/test/SerializableObjectModelTest.vala b/test/SerializableObjectModelTest.vala
index 674105e..630c4cd 100644
--- a/test/SerializableObjectModelTest.vala
+++ b/test/SerializableObjectModelTest.vala
@@ -131,9 +131,9 @@ public class Package : ObjectModel
{
for (int i = 0; i < tags.length; i++) {
var str = tags.index (i);
- node = (xElement) element.owner_document.create_element ("tag");
+ node = (xElement) element.document.create_element ("tag");
((xElement) node).content = str;
- element.append_child (node);
+ element.childs.add (node);
}
}
});
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]