[gxml] Ported Serializable.deserialize_property to GXml.Node



commit eb3262f9b0ad21e6455b8a923877bcada3f758da
Author: Daniel Espinosa <esodan gmail com>
Date:   Wed Apr 29 09:59:35 2015 -0500

    Ported Serializable.deserialize_property to GXml.Node

 gxml/Serializable.vala              |    2 +-
 gxml/SerializableGeeArrayList.vala  |    4 ++--
 gxml/SerializableGeeDualKeyMap.vala |    4 ++--
 gxml/SerializableGeeHashMap.vala    |    4 ++--
 gxml/SerializableGeeTreeMap.vala    |    4 ++--
 gxml/SerializableJson.vala          |    5 ++++-
 gxml/SerializableObjectModel.vala   |    6 ++++--
 7 files changed, 17 insertions(+), 12 deletions(-)
---
diff --git a/gxml/Serializable.vala b/gxml/Serializable.vala
index b467ea6..3138662 100644
--- a/gxml/Serializable.vala
+++ b/gxml/Serializable.vala
@@ -191,7 +191,7 @@ namespace GXml {
      * @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.xNode property_node)
+    public abstract bool deserialize_property (GXml.Node property_node)
                                               throws GLib.Error;
 
     /**
diff --git a/gxml/SerializableGeeArrayList.vala b/gxml/SerializableGeeArrayList.vala
index 40b4f2f..8ecd6fb 100644
--- a/gxml/SerializableGeeArrayList.vala
+++ b/gxml/SerializableGeeArrayList.vala
@@ -137,12 +137,12 @@ public class GXml.SerializableArrayList<G> : Gee.ArrayList<G>, Serializable, Ser
     }
     return node;
   }
-  public virtual bool deserialize_property (GXml.xNode property_node)
+  public virtual bool deserialize_property (GXml.Node property_node)
                                             throws GLib.Error
   {
     return default_deserialize_property (property_node);
   }
-  public bool default_deserialize_property (GXml.xNode property_node)
+  public bool default_deserialize_property (GXml.Node property_node)
                                             throws GLib.Error
   {
     return true;
diff --git a/gxml/SerializableGeeDualKeyMap.vala b/gxml/SerializableGeeDualKeyMap.vala
index ded1fd7..5aea3db 100644
--- a/gxml/SerializableGeeDualKeyMap.vala
+++ b/gxml/SerializableGeeDualKeyMap.vala
@@ -216,12 +216,12 @@ public class GXml.SerializableDualKeyMap<P,S,V> : Object, Serializable, Serializ
     }
     return node;
   }
-  public virtual bool deserialize_property (GXml.xNode property_node)
+  public virtual bool deserialize_property (GXml.Node property_node)
                                             throws GLib.Error
   {
     return default_deserialize_property (property_node);
   }
-  public bool default_deserialize_property (GXml.xNode property_node)
+  public bool default_deserialize_property (GXml.Node property_node)
                                             throws GLib.Error
   {
     return true;
diff --git a/gxml/SerializableGeeHashMap.vala b/gxml/SerializableGeeHashMap.vala
index d2ae994..50d24e9 100644
--- a/gxml/SerializableGeeHashMap.vala
+++ b/gxml/SerializableGeeHashMap.vala
@@ -137,12 +137,12 @@ public class GXml.SerializableHashMap<K,V> : Gee.HashMap<K,V>, Serializable, Ser
     }
     return node;
   }
-  public virtual bool deserialize_property (GXml.xNode property_node)
+  public virtual bool deserialize_property (GXml.Node property_node)
                                             throws GLib.Error
   {
     return default_deserialize_property (property_node);
   }
-  public bool default_deserialize_property (GXml.xNode property_node)
+  public bool default_deserialize_property (GXml.Node property_node)
                                             throws GLib.Error
   {
     return true;
diff --git a/gxml/SerializableGeeTreeMap.vala b/gxml/SerializableGeeTreeMap.vala
index e1b2a0f..e3b5369 100644
--- a/gxml/SerializableGeeTreeMap.vala
+++ b/gxml/SerializableGeeTreeMap.vala
@@ -140,12 +140,12 @@ public class GXml.SerializableTreeMap<K,V> : Gee.TreeMap<K,V>, Serializable, Ser
     }
     return node;
   }
-  public virtual bool deserialize_property (GXml.xNode property_node)
+  public virtual bool deserialize_property (GXml.Node property_node)
                                             throws GLib.Error
   {
     return default_deserialize_property (property_node);
   }
-  public bool default_deserialize_property (GXml.xNode property_node)
+  public bool default_deserialize_property (GXml.Node property_node)
                                             throws GLib.Error
   {
     return true;
diff --git a/gxml/SerializableJson.vala b/gxml/SerializableJson.vala
index 18960ae..01f67ec 100644
--- a/gxml/SerializableJson.vala
+++ b/gxml/SerializableJson.vala
@@ -232,8 +232,11 @@ public class GXml.SerializableJson : GLib.Object, GXml.Serializable
     return obj_elem;
   }
 
-  public virtual bool deserialize_property (GXml.xNode property_node) throws GLib.Error
+  public virtual bool deserialize_property (GXml.Node nproperty)
+    throws GLib.Error
+    requires (nproperty is xNode)
   {
+    xNode property_node = (xNode) nproperty;
     //GLib.message ("At SerializableJson.deserialize_property");
     if (property_node.node_name == "Property")
     {
diff --git a/gxml/SerializableObjectModel.vala b/gxml/SerializableObjectModel.vala
index d6debde..e12eaa1 100644
--- a/gxml/SerializableObjectModel.vala
+++ b/gxml/SerializableObjectModel.vala
@@ -310,14 +310,16 @@ public abstract class GXml.SerializableObjectModel : Object, Serializable
     return null;
   }
 
-  public virtual bool deserialize_property (GXml.xNode property_node)
+  public virtual bool deserialize_property (GXml.Node property_node)
                                             throws GLib.Error
   {
     return default_deserialize_property (property_node);
   }
-  public bool default_deserialize_property (GXml.xNode property_node)
+  public bool default_deserialize_property (GXml.Node nproperty)
                                             throws GLib.Error
+                                            requires (nproperty is xNode)
   {
+    xNode property_node = (xNode) nproperty;
 #if DEBUG
     stdout.printf (@"Deserialize Property Node: $(property_node.node_name)\n");
 #endif


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]