GNOME.org
 

[gxml] Serializable.unknown_serializable_property ported to GXml.Node

commit 7307074218667c7697f9fed332c46dd195bb4610
Author: Daniel Espinosa <esodan gmail com>
Date:   Thu Apr 30 17:10:51 2015 -0500

    Serializable.unknown_serializable_property ported to GXml.Node
    
    * Documentation updates
    * More SerializableObjectModel ports to GXml.Element/Document
    * Test cases updates

 gxml/Serializable.vala                   |   24 ++++++++++++------------
 gxml/SerializableJson.vala               |   12 ++++++------
 gxml/SerializableObjectModel.vala        |   14 +++++++-------
 test/SerializableGeeCollectionsTest.vala |    8 ++++----
 test/SerializableObjectModelTest.vala    |   10 +++++-----
 test/SerializableTest.vala               |    2 +-
 6 files changed, 35 insertions(+), 35 deletions(-)
---
diff --git a/gxml/Serializable.vala b/gxml/Serializable.vala
index aee2983..1a38452 100644
--- a/gxml/Serializable.vala
+++ b/gxml/Serializable.vala
@@ -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.xNode}'s
+    * Return false if you want to ignore unknown properties and { link GXml.Node}'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.xNode} not used on this
+     * On deserialization stores any { link GXml.Node} not used on this
      * object, but exists in current XML file.
      * 
-     * Node's name is used as key to find stored { link GXml.xNode}.
+     * Node's name is used as key to find stored { link GXml.Node}.
      * 
      * 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.xNode>    unknown_serializable_property { get; protected set; }
+    public abstract HashTable<string,GXml.Node>    unknown_serializable_property { get; protected set; }
 
     /**
      * Used to add content in an { link GXml.Element}.
@@ -168,7 +168,7 @@ namespace GXml {
     /**
      * Deserialize this object.
      * 
-     * @param node { link GXml.xNode} used to deserialize from.
+     * @param node { link GXml.Node} used to deserialize from.
      */
     public abstract GXml.Node? deserialize (GXml.Node node)
                                       throws GLib.Error;
@@ -189,7 +189,7 @@ 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.xNode} encapsulating data to deserialize
+     * @param property_node the { link GXml.Node} 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)
@@ -211,18 +211,18 @@ namespace GXml {
      * 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.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_type (GXml.Node element,
                                                         ParamSpec prop,
-                                                        out GXml.xNode node);
+                                                        out GXml.Node node);
 
     /**
      * Signal to deserialize unknown properties.
      *
-     * @param node a { link GXml.xNode} to get attribute from
+     * @param node a { link GXml.Node} to get attribute from
      * @param prop a { link GLib.ParamSpec} describing attribute to deserialize
      */
     public signal void deserialize_unknown_property (GXml.Node node,
@@ -231,7 +231,7 @@ namespace GXml {
     /**
      * Signal to deserialize unknown properties' type.
      *
-     * @param node a { link GXml.xNode} to get attribute from
+     * @param node a { link GXml.Node} to get attribute from
      * @param prop a { link GLib.ParamSpec} describing attribute to deserialize
      */
     public signal void deserialize_unknown_property_type (GXml.Node node,
@@ -318,7 +318,7 @@ namespace GXml {
                                              get_class ().find_property("serialize_set_namespace"));
       }
       if (unknown_serializable_property == null) {
-        unknown_serializable_property = new HashTable<string,GXml.xNode> (str_hash, str_equal);
+        unknown_serializable_property = new HashTable<string,GXml.Node> (str_hash, str_equal);
       }
     }
 
diff --git a/gxml/SerializableJson.vala b/gxml/SerializableJson.vala
index 40ebf80..e3af274 100644
--- a/gxml/SerializableJson.vala
+++ b/gxml/SerializableJson.vala
@@ -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.xNode>    unknown_serializable_property { get; protected set; }
+  public HashTable<string,GXml.Node>    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 virtual bool set_namespace (GXml.Node node) { return true; }
@@ -147,7 +147,7 @@ public class GXml.SerializableJson : GLib.Object, GXml.Serializable
     xElement element = (xElement) node;
     Type type;
     Value val;
-    GXml.xNode value_node = null;
+    GXml.Node value_node = null;
     xElement prop_node;
 
     type = prop.value_type;
@@ -169,7 +169,7 @@ public class GXml.SerializableJson : GLib.Object, GXml.Serializable
       val = Value (typeof (int));
       this.get_property_value (prop, ref val);
       value_node = doc.create_text_node ("%d".printf (val.get_int ()));
-      prop_node.append_child (value_node);
+      prop_node.childs.add (value_node);
       return prop_node;
     } 
     else if (Value.type_transformable (type, typeof (string))) 
@@ -182,12 +182,12 @@ public class GXml.SerializableJson : GLib.Object, GXml.Serializable
       string str = t.get_string ();
       if (str == null) str = "";
       value_node = doc.create_text_node (str);
-      prop_node.append_child (value_node);
+      prop_node.childs.add (value_node);
       return prop_node;
     }
     else if (type == typeof (GLib.Type)) {
       value_node = doc.create_text_node (type.name ());
-      prop_node.append_child (value_node);
+      prop_node.childs.add (value_node);
       return prop_node;
     }
     else if (type.is_a (typeof (GLib.Object))
@@ -204,7 +204,7 @@ public class GXml.SerializableJson : GLib.Object, GXml.Serializable
       // FIXME: This is not correct! May is time to remove Serialization and SerializableJson
       GXml.Node.copy (value_doc, value_node, value_doc.document_element, true);
       //value_node = doc.copy_node (value_doc.document_element);
-      prop_node.append_child (value_node);
+      prop_node.childs.add (value_node);
       return prop_node;
     }
     //GLib.message ("DEBUG: serialing unknown property type '%s' of object '%s'", prop.name, this.get_type 
().name ());
diff --git a/gxml/SerializableObjectModel.vala b/gxml/SerializableObjectModel.vala
index 4d847fb..c5463a5 100644
--- a/gxml/SerializableObjectModel.vala
+++ b/gxml/SerializableObjectModel.vala
@@ -40,7 +40,7 @@ public abstract class GXml.SerializableObjectModel : Object, Serializable
   public GLib.HashTable<string,GLib.ParamSpec> ignored_serializable_properties { get; protected set; }
   public string? serialized_xml_node_value { get; protected set; default=null; }
   public virtual bool get_enable_unknown_serializable_property () { return false; }
-  public GLib.HashTable<string,GXml.xNode> unknown_serializable_property { get; protected set; }
+  public GLib.HashTable<string,GXml.Node> unknown_serializable_property { get; protected set; }
 
   public virtual bool serialize_use_xml_node_value () { return false; }
   public virtual bool property_use_nick () { return false; }
@@ -95,7 +95,7 @@ public abstract class GXml.SerializableObjectModel : Object, Serializable
   public virtual GXml.Node? serialize (GXml.Node node)
                        throws GLib.Error
                        requires (node_name () != null)
-                       requires (node is xDocument || node is GXml.Element)
+                       requires (node is GXml.Document || node is GXml.Element)
   {
     return default_serialize (node);
   }
@@ -217,7 +217,7 @@ public abstract class GXml.SerializableObjectModel : Object, Serializable
                                     throws GLib.Error
                                     requires (node_name () != null)
   {
-    return default_deserialize ((xNode) node);
+    return default_deserialize (node);
   }
   public GXml.xNode? default_deserialize (GXml.Node node)
                                     throws GLib.Error
@@ -249,7 +249,7 @@ public abstract class GXml.SerializableObjectModel : Object, Serializable
 #endif
     foreach (GXml.Node attr in ((xElement)element).attributes.get_values ())
     {
-      deserialize_property ((xNode)attr);
+      deserialize_property (attr);
     }
 #if DEBUG
     stdout.printf (@"Elements Nodes in Node: $(element.name)\n");
@@ -290,7 +290,7 @@ public abstract class GXml.SerializableObjectModel : Object, Serializable
           } else {
             if (get_enable_unknown_serializable_property ()) {
               if (n.value._chomp () == n.value && n.value != "")
-                unknown_serializable_property.set (n.name,(xNode) n);
+                unknown_serializable_property.set (n.name, n);
             }
           }
         }
@@ -298,7 +298,7 @@ public abstract class GXml.SerializableObjectModel : Object, Serializable
 #if DEBUG
             stdout.printf (@"$(get_type ().name ()): DESERIALIZING ELEMENT '$(n.name)'\n");
 #endif
-          deserialize_property ((xNode)n);
+          deserialize_property (n);
         }
       }
     }
@@ -312,7 +312,7 @@ public abstract class GXml.SerializableObjectModel : Object, Serializable
   }
   public bool default_deserialize_property (GXml.Node nproperty)
                                             throws GLib.Error
-                                            requires (nproperty is xNode)
+                                            requires (nproperty is Node)
   {
     xNode property_node = (xNode) nproperty;
 #if DEBUG
diff --git a/test/SerializableGeeCollectionsTest.vala b/test/SerializableGeeCollectionsTest.vala
index ad1d0ae..775ddea 100644
--- a/test/SerializableGeeCollectionsTest.vala
+++ b/test/SerializableGeeCollectionsTest.vala
@@ -491,12 +491,12 @@ 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.xNode unk in refaction.unknown_serializable_property.get_values ())
+          foreach (GXml.Node unk in refaction.unknown_serializable_property.get_values ())
           {
             string unkv = "___NULL__";
-            if (unk.node_value != null)
-              unkv = unk.node_value;
-            stdout.printf (@"Unknown Node: $(unk.node_name) / value: '$(unkv)'");
+            if (unk.value != null)
+              unkv = unk.value;
+            stdout.printf (@"Unknown Node: $(unk.name) / value: '$(unkv)'");
           }
           assert_not_reached ();
         }
diff --git a/test/SerializableObjectModelTest.vala b/test/SerializableObjectModelTest.vala
index c48f461..be6b324 100644
--- a/test/SerializableObjectModelTest.vala
+++ b/test/SerializableObjectModelTest.vala
@@ -148,7 +148,7 @@ public class Package : ObjectModel
   public string unknown_to_string ()
   {
     string t = "";
-    foreach (GXml.xNode node in unknown_serializable_property.get_values ())
+    foreach (GXml.Node node in unknown_serializable_property.get_values ())
     {
       t+= node.to_string () ;
     }
@@ -819,11 +819,11 @@ 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.xNode un in unknown_property.unknown_serializable_property.get_values 
()) {
+                         foreach (GXml.Node un in unknown_property.unknown_serializable_property.get_values 
()) {
                            string sv = "__NULL__";
-                           if (un.node_value != null)
-                             sv = un.node_value;
-                           stdout.printf (@"Saved unknown property: $(un.node_name) / '$(sv)'\n");
+                           if (un.value != null)
+                             sv = un.value;
+                           stdout.printf (@"Saved unknown property: $(un.name) / '$(sv)'\n");
                          }
                          assert_not_reached ();
                        }
diff --git a/test/SerializableTest.vala b/test/SerializableTest.vala
index a4dda94..d5ae259 100644
--- a/test/SerializableTest.vala
+++ b/test/SerializableTest.vala
@@ -121,7 +121,7 @@ public class SerializableCapsicum : GXml.SerializableJson {
                        assert_not_reached ();
                }
        }
-       private void serialize_unknown_property_type (GXml.Node elem, ParamSpec prop, out GXml.xNode node)
+       private void serialize_unknown_property_type (GXml.Node elem, ParamSpec prop, out GXml.Node node)
        {
                xElement element = (xElement) elem;
                xDocument doc = element.owner_document;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]