[gxml] Changed Serializable.serialize() to GXml.Node
- From: Daniel Espinosa Ortiz <despinosa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gxml] Changed Serializable.serialize() to GXml.Node
- Date: Fri, 17 Apr 2015 20:53:14 +0000 (UTC)
commit daf8f06b45e1961873f9fc34549a8afa027bfdf7
Author: Daniel Espinosa <esodan gmail com>
Date: Fri Apr 17 15:51:29 2015 -0500
Changed Serializable.serialize() to GXml.Node
* SerializeObjectModel.serialize() require to convert to use
only GXml.Node, GXml.Document and GXml.Element
gxml/Serializable.vala | 2 +-
gxml/SerializableGeeArrayList.vala | 4 ++--
gxml/SerializableGeeDualKeyMap.vala | 4 ++--
gxml/SerializableGeeHashMap.vala | 4 ++--
gxml/SerializableGeeTreeMap.vala | 4 ++--
gxml/SerializableJson.vala | 6 +++---
gxml/SerializableObjectModel.vala | 6 +++---
test/SerializableObjectModelTest.vala | 6 +++---
8 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/gxml/Serializable.vala b/gxml/Serializable.vala
index 87d27ec..5028eba 100644
--- a/gxml/Serializable.vala
+++ b/gxml/Serializable.vala
@@ -152,7 +152,7 @@ namespace GXml {
*
* @param doc an { link GXml.Document} object to serialize to.
*/
- public abstract GXml.xNode? serialize (GXml.xNode node) throws GLib.Error;
+ public abstract GXml.Node? serialize (GXml.Node node) throws GLib.Error;
/**
* Serialize a property @prop on a { link GXml.xElement}.
diff --git a/gxml/SerializableGeeArrayList.vala b/gxml/SerializableGeeArrayList.vala
index a6a51bb..645fcda 100644
--- a/gxml/SerializableGeeArrayList.vala
+++ b/gxml/SerializableGeeArrayList.vala
@@ -81,13 +81,13 @@ public class GXml.SerializableArrayList<G> : Gee.ArrayList<G>, Serializable, Ser
return false;
}
- public virtual GXml.xNode? serialize (GXml.xNode node)
+ public virtual GXml.Node? serialize (GXml.Node node)
throws GLib.Error
requires (node is xElement)
{
return default_serialize (node);
}
- public GXml.xNode? default_serialize (GXml.xNode node)
+ public GXml.Node? default_serialize (GXml.Node node)
throws GLib.Error
requires (node is xElement)
{
diff --git a/gxml/SerializableGeeDualKeyMap.vala b/gxml/SerializableGeeDualKeyMap.vala
index ce5dede..eae37d9 100644
--- a/gxml/SerializableGeeDualKeyMap.vala
+++ b/gxml/SerializableGeeDualKeyMap.vala
@@ -162,13 +162,13 @@ public class GXml.SerializableDualKeyMap<P,S,V> : Object, Serializable, Serializ
return false;
}
- public virtual GXml.xNode? serialize (GXml.xNode node)
+ public virtual GXml.Node? serialize (GXml.Node node)
throws GLib.Error
requires (node is xElement)
{
return default_serialize (node);
}
- public GXml.xNode? default_serialize (GXml.xNode node)
+ public GXml.Node? default_serialize (GXml.Node node)
throws GLib.Error
requires (node is xElement)
{
diff --git a/gxml/SerializableGeeHashMap.vala b/gxml/SerializableGeeHashMap.vala
index 7b2ebef..aaba248 100644
--- a/gxml/SerializableGeeHashMap.vala
+++ b/gxml/SerializableGeeHashMap.vala
@@ -78,13 +78,13 @@ public class GXml.SerializableHashMap<K,V> : Gee.HashMap<K,V>, Serializable, Ser
return false;
}
- public virtual GXml.xNode? serialize (GXml.xNode node)
+ public virtual GXml.Node? serialize (GXml.Node node)
throws GLib.Error
requires (node is xElement)
{
return default_serialize (node);
}
- public GXml.xNode? default_serialize (GXml.xNode node)
+ public GXml.Node? default_serialize (GXml.Node node)
throws GLib.Error
requires (node is xElement)
{
diff --git a/gxml/SerializableGeeTreeMap.vala b/gxml/SerializableGeeTreeMap.vala
index 6008d02..d28f2bd 100644
--- a/gxml/SerializableGeeTreeMap.vala
+++ b/gxml/SerializableGeeTreeMap.vala
@@ -81,13 +81,13 @@ public class GXml.SerializableTreeMap<K,V> : Gee.TreeMap<K,V>, Serializable, Ser
return false;
}
- public virtual GXml.xNode? serialize (GXml.xNode node)
+ public virtual GXml.Node? serialize (GXml.Node node)
throws GLib.Error
requires (node is xElement)
{
return default_serialize (node);
}
- public GXml.xNode? default_serialize (GXml.xNode node)
+ public GXml.Node? default_serialize (GXml.Node node)
throws GLib.Error
requires (node is xElement)
{
diff --git a/gxml/SerializableJson.vala b/gxml/SerializableJson.vala
index bc4c48f..cbc4d1b 100644
--- a/gxml/SerializableJson.vala
+++ b/gxml/SerializableJson.vala
@@ -116,7 +116,7 @@ public class GXml.SerializableJson : GLib.Object, GXml.Serializable
* Is up to you to add convenient xElement node to a xDocument, in order to be
* used by serialize and add new <Object> tags per object to serialize.
*/
- public GXml.xNode? serialize (GXml.xNode node) throws GLib.Error
+ public GXml.Node? serialize (GXml.Node node) throws GLib.Error
{
xDocument doc;
xElement root;
@@ -126,7 +126,7 @@ public class GXml.SerializableJson : GLib.Object, GXml.Serializable
if (node is xDocument)
doc = (xDocument) node;
else
- doc = node.owner_document;
+ doc = (xDocument) node.document;
root = (xElement) doc.create_element ("Object");
doc.append_child (root);
@@ -153,7 +153,7 @@ public class GXml.SerializableJson : GLib.Object, GXml.Serializable
if (type.is_a (typeof (Serializable))) {
val = Value (type);
this.get_property_value (prop, ref val);
- return ((Serializable) val.get_object ()).serialize (element);
+ return (xNode)((Serializable) val.get_object ()).serialize (element);
}
var doc = element.owner_document;
diff --git a/gxml/SerializableObjectModel.vala b/gxml/SerializableObjectModel.vala
index 6f4a608..46691c4 100644
--- a/gxml/SerializableObjectModel.vala
+++ b/gxml/SerializableObjectModel.vala
@@ -92,12 +92,12 @@ public abstract class GXml.SerializableObjectModel : Object, Serializable
return false;
}
- public virtual GXml.xNode? serialize (GXml.xNode node)
+ public virtual GXml.Node? serialize (GXml.Node node)
throws GLib.Error
requires (node_name () != null)
requires (node is xDocument || node is xElement)
{
- return default_serialize (node);
+ return default_serialize ((xNode)node);
}
public GXml.xNode? default_serialize (GXml.xNode node) throws GLib.Error
@@ -169,7 +169,7 @@ public abstract class GXml.SerializableObjectModel : Object, Serializable
get_property (prop.name, ref v);
var obj = (Serializable) v.get_object ();
if (obj != null)
- return obj.serialize (element);
+ return (xNode)obj.serialize (element);
}
Value oval;
if (prop.value_type.is_a (Type.ENUM))
diff --git a/test/SerializableObjectModelTest.vala b/test/SerializableObjectModelTest.vala
index 824a785..0f927e8 100644
--- a/test/SerializableObjectModelTest.vala
+++ b/test/SerializableObjectModelTest.vala
@@ -237,11 +237,11 @@ class Configuration : ObjectModel
ignored_serializable_properties.set ("invalid",
get_class ().find_property("invalid"));
}
- public override GXml.xNode? serialize (GXml.xNode node) throws GLib.Error
+ public override GXml.Node? serialize (GXml.Node node) throws GLib.Error
{
- var n = default_serialize (node);
+ var n = (xNode) default_serialize ((xNode)node);
n.add_namespace_attr ("http://www.gnome.org/gxml/0.4", "om");
- return n;
+ return (GXml.Node)n;
}
public override GXml.xNode? deserialize (GXml.xNode node) throws GLib.Error
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]