GNOME.org
 

[gxml] Renamed Property implementations: removed Gom prefix

commit 10ad8f4688f085be2518a2d6e4ac5303039a126b
Author: Daniel Espinosa <esodan gmail com>
Date:   Fri Jul 5 23:39:48 2019 -0500

    Renamed Property implementations: removed Gom prefix

 gxml/BaseCollection.vala    |  4 +--
 gxml/Collections.vala       | 10 +++----
 gxml/DomDocument.vala       |  8 +++---
 gxml/DomElement.vala        | 20 ++++++-------
 gxml/Element.vala           |  2 +-
 gxml/HashMap.vala           | 12 ++++----
 gxml/HashPairedMap.vala     |  4 +--
 gxml/Object.vala            |  6 ++--
 gxml/Property.vala          | 70 ++++++++++++++++++++++-----------------------
 gxml/XsdSchema.vala         |  2 +-
 test/ElementTest.vala       |  2 +-
 test/SerializationTest.vala | 26 ++++++++---------
 test/XsdSchemaTest.vala     |  2 +-
 13 files changed, 84 insertions(+), 84 deletions(-)
---
diff --git a/gxml/BaseCollection.vala b/gxml/BaseCollection.vala
index 7e08d46..1184451 100644
--- a/gxml/BaseCollection.vala
+++ b/gxml/BaseCollection.vala
@@ -1,5 +1,5 @@
 /* -*- Mode: vala; indent-tabs-mode: nil; c-basic-offset: 2; tab-width: 2 -*- */
-/* GomBaseCollection.vala
+/* BaseCollection.vala
  *
  * Copyright (C) 2016  Daniel Espinosa <esodan gmail com>
  *
@@ -107,7 +107,7 @@ public abstract class GXml.BaseCollection : GLib.Object, Traversable<DomElement>
   }
 
   /**
-   * Adds an {@link DomElement} of type {@link GomObject} as a child of
+   * Adds an {@link DomElement} of type {@link GXml.Object} as a child of
    * {@link element}.
    *
    * Object is always added as a child of {@link element}
diff --git a/gxml/Collections.vala b/gxml/Collections.vala
index 65bf7ce..d3e8f99 100644
--- a/gxml/Collections.vala
+++ b/gxml/Collections.vala
@@ -46,11 +46,11 @@ public interface GXml.Collection : GLib.Object
    * A {@link GLib.Type} of {@link DomElement} child objects of {@link element},
    * which could be contained in this collection.
    *
-   * Type should be an {@link GomObject}.
+   * Type should be an {@link GXml.Object}.
    */
   public abstract Type items_type { get; construct set; }
   /**
-   * Search and add references to all {@link GomObject} nodes as child of
+   * Search and add references to all {@link GXml.Object} nodes as child of
    * {@link element} with same, case insensitive, name of {@link items_name}
    */
   public abstract void search () throws GLib.Error;
@@ -132,9 +132,9 @@ public interface GXml.List : GLib.Object, Collection, Traversable<DomElement>, I
 
 /**
  * Inteface to be implemented by {@link GXml.Collection} derived classes
- * in order to provide a string to be used in {@link GomHashMap} as key.
+ * in order to provide a string to be used in {@link GXml.HashMap} as key.
  *
- * If {@link GomHashMap} has set its {@link GomHashMap.attribute_key}
+ * If {@link GXml.HashMap} has set its {@link GXml.HashMap.attribute_key}
  * its value has precedence over this method.
  */
 public interface GXml.MappeableElement : GLib.Object, DomElement {
@@ -218,7 +218,7 @@ public interface GXml.PairedMap : GLib.Object, GXml.Collection, Traversable<DomE
  * Inteface to beimplemented by {@link GXml.Collection} derived classes
  * in order to provide a string to be used in {@link GomHashThreeMap} as key.
  *
- * If {@link GomHashMap} has set its {@link GomHashMap.attribute_key}
+ * If {@link GXml.HashMap} has set its {@link GXml.HashMap.attribute_key}
  * its value has precedence over this method.
  */
 public interface GXml.MappeableElementThreeKey : GLib.Object, DomElement {
diff --git a/gxml/DomDocument.vala b/gxml/DomDocument.vala
index 2f7d741..55004b1 100644
--- a/gxml/DomDocument.vala
+++ b/gxml/DomDocument.vala
@@ -108,7 +108,7 @@ public interface GXml.DomDocument : GLib.Object,
   }
   /**
    * Creates an {@link GLib.InputStream} to write a string representation
-   * in XML of {@link GomDocument}
+   * in XML of {@link GXml.Document}
    */
   public virtual InputStream create_stream () throws GLib.Error {
     Parser parser = get_xml_parser ();
@@ -116,7 +116,7 @@ public interface GXml.DomDocument : GLib.Object,
   }
   /**
    * Creates an {@link GLib.InputStream} to write a string representation
-   * in XML of {@link GomDocument}
+   * in XML of {@link GXml.Document}
    */
   public virtual async InputStream create_stream_async (Cancellable? cancellable = null) throws GLib.Error {
     Parser parser = get_xml_parser ();
@@ -124,7 +124,7 @@ public interface GXml.DomDocument : GLib.Object,
     return yield parser.create_stream_async ();
   }
   /**
-   * Serialize {@link GomDocument} to a string.
+   * Serialize {@link GXml.Document} to a string.
    */
   public virtual string write_string (Cancellable? cancellable = null) throws GLib.Error {
     Parser parser = get_xml_parser ();
@@ -132,7 +132,7 @@ public interface GXml.DomDocument : GLib.Object,
     return parser.write_string ();
   }
   /**
-   * Serialize {@link GomDocument} to a string.
+   * Serialize {@link GXml.Document} to a string.
    */
   public virtual async string write_string_async (Cancellable? cancellable = null) throws GLib.Error
   {
diff --git a/gxml/DomElement.vala b/gxml/DomElement.vala
index 8fb9d98..12424e4 100644
--- a/gxml/DomElement.vala
+++ b/gxml/DomElement.vala
@@ -86,40 +86,40 @@ public interface GXml.DomElement : GLib.Object,
     yield this.read_from_file_async (File.new_for_uri (uri));
   }
   /**
-   * Parses an XML file, deserializing it over {@link GomElement}.
+   * Parses an XML file, deserializing it over {@link GXml.Element}.
    */
   public virtual void read_from_file (GLib.File f,
                       GLib.Cancellable? cancellable = null) throws GLib.Error {}
   /**
-   * Parses asinchronically an XML file, deserializing it over {@link GomElement}.
+   * Parses asinchronically an XML file, deserializing it over {@link GXml.Element}.
    */
   public virtual async void read_from_file_async (GLib.File f,
                       GLib.Cancellable? cancellable = null) throws GLib.Error {}
   /**
-   * Parses an XML over a {@link GLib.InputStream}, deserializing it over {@link GomElement}.
+   * Parses an XML over a {@link GLib.InputStream}, deserializing it over {@link GXml.Element}.
    */
   public virtual void read_from_stream (GLib.InputStream istream,
                       GLib.Cancellable? cancellable = null) throws GLib.Error {}
   /**
-   * Parses asynchronically an XML over a {@link GLib.InputStream}, deserializing it over {@link GomElement}.
+   * Parses asynchronically an XML over a {@link GLib.InputStream}, deserializing it over {@link 
GXml.Element}.
    */
   public virtual async void read_from_stream_async (GLib.InputStream istream,
                       GLib.Cancellable? cancellable = null) throws GLib.Error {}
   /**
-   * Parses an XML string, deserializing it over {@link GomElement}.
+   * Parses an XML string, deserializing it over {@link GXml.Element}.
    */
   public virtual void read_from_string (string str, Cancellable? cancellable = null) throws GLib.Error {}
   /**
-   * Parses an XML string, deserializing it over {@link GomElement}.
+   * Parses an XML string, deserializing it over {@link GXml.Element}.
    */
   public virtual async void read_from_string_async (string str,
                       Cancellable? cancellable = null) throws GLib.Error {}
   /**
-   * Serialize {@link GomElement} to a string.
+   * Serialize {@link GXml.Element} to a string.
    */
   public virtual string write_string (Cancellable? cancellable = null) throws GLib.Error { return ""; }
   /**
-   * Serialize asinchronically {@link GomElement} to a string.
+   * Serialize asinchronically {@link GXml.Element} to a string.
    */
   public virtual async string write_string_async (Cancellable? cancellable = null) throws GLib.Error { 
return ""; }
   /**
@@ -148,14 +148,14 @@ public interface GXml.DomElement : GLib.Object,
   }
   /**
    * Creates an {@link GLib.InputStream} to write a string representation
-   * in XML of {@link GomElement} using node's {@link GomDocument}
+   * in XML of {@link GXml.Element} using node's {@link GomDocument}
    */
   public virtual InputStream create_stream () throws GLib.Error {
     return this.owner_document.create_stream ();
   }
   /**
    * Creates an {@link GLib.InputStream} to write a string representation
-   * in XML of {@link GomElement} using node's {@link GomDocument}
+   * in XML of {@link GXml.Element} using node's {@link GomDocument}
    */
   public virtual async InputStream create_stream_async (Cancellable? cancellable = null) throws GLib.Error {
     return yield this.owner_document.create_stream_async ();
diff --git a/gxml/Element.vala b/gxml/Element.vala
index 2ced641..2cab03f 100644
--- a/gxml/Element.vala
+++ b/gxml/Element.vala
@@ -274,7 +274,7 @@ public class GXml.Element : GXml.Node,
   public string? prefix { owned get { return _prefix; } }
   /**
    * Derived classes should define it at construction time, using
-   * {@link GomNode._local_name} field. This is the node's name.
+   * {@link GXml.Node._local_name} field. This is the node's name.
    */
   public string local_name {
     owned get {
diff --git a/gxml/HashMap.vala b/gxml/HashMap.vala
index efc44a8..fde08d9 100644
--- a/gxml/HashMap.vala
+++ b/gxml/HashMap.vala
@@ -1,6 +1,6 @@
 /* -*- Mode: vala; indent-tabs-mode: nil; c-basic-offset: 2; tab-width: 2 -*- */
 /*
- * GomHashMap.vala
+ * GXml.HashMap.vala
  *
  * Copyright (C) 2016  Daniel Espinosa <esodan gmail com>
  *
@@ -31,7 +31,7 @@ using Gee;
  * keeps it as a child node of actual {@link Collection.element}.
  *
  * If {@link GXml.Element} to be added is of type {@link Collection.items_type}
- * and implements {@link MappeableElement}, you should set {@link GomHashMap.attribute_key}
+ * and implements {@link MappeableElement}, you should set {@link GXml.HashMap.attribute_key}
  * to null in order to use returned value of {@link MappeableElement.get_map_key}
  * as key.
  *
@@ -40,7 +40,7 @@ using Gee;
  *    [Description (nick="::Name")]
  *    public string name { get; set; }
  *   }
- *   public class YourList : GomHashMap {
+ *   public class YourList : GXml.HashMap {
  *    construct {
  *      try { initialize_with_key (typeof (YourObject),"Name"); }
  *      catch (GLib.Error e) {
@@ -70,7 +70,7 @@ public class GXml.HashMap : GXml.BaseCollection, GXml.Map {
     get { return _attribute_key; } construct set { _attribute_key = value; }
   }
   /**
-   * Convenient function to initialize a {@link GomHashMap} collection, using
+   * Convenient function to initialize a {@link GXml.HashMap} collection, using
    * given element, items' type and name.
    */
   public void initialize_element_with_key (GXml.Element element,
@@ -83,7 +83,7 @@ public class GXml.HashMap : GXml.BaseCollection, GXml.Map {
   }
 
   /**
-   * Convenient function to initialize a {@link GomHashMap} collection, using
+   * Convenient function to initialize a {@link GXml.HashMap} collection, using
    * given element, items' type and name.
    *
    * Using this method at construction time of derived classes.
@@ -121,7 +121,7 @@ public class GXml.HashMap : GXml.BaseCollection, GXml.Map {
     return l;
   }
   /**
-   * Validates if given element has a {@link GomHashMap.attribute_key} set,
+   * Validates if given element has a {@link GXml.HashMap.attribute_key} set,
    * if so adds a new key pointing to given index and returns true.
    *
    * Attribute should be a valid {@link DomElement} attribute or
diff --git a/gxml/HashPairedMap.vala b/gxml/HashPairedMap.vala
index f7752d7..07e94ce 100644
--- a/gxml/HashPairedMap.vala
+++ b/gxml/HashPairedMap.vala
@@ -91,7 +91,7 @@ public class GXml.HashPairedMap : GXml.BaseCollection, GXml.PairedMap {
     get { return _attribute_secondary_key; } construct set { _attribute_secondary_key = value; }
   }
   /**
-   * Convenient function to initialize a {@link GomHashMap} collection, using
+   * Convenient function to initialize a {@link GXml.HashMap} collection, using
    * given element, items' type and name.
    */
   public void initialize_element_with_keys (GXml.Element element,
@@ -106,7 +106,7 @@ public class GXml.HashPairedMap : GXml.BaseCollection, GXml.PairedMap {
   }
 
   /**
-   * Convenient function to initialize a {@link GomHashMap} collection, using
+   * Convenient function to initialize a {@link GXml.HashMap} collection, using
    * given element, items' type and name.
    *
    * Using this method at construction time of derived classes.
diff --git a/gxml/Object.vala b/gxml/Object.vala
index ef518bc..60fa48b 100644
--- a/gxml/Object.vala
+++ b/gxml/Object.vala
@@ -72,7 +72,7 @@ public interface GXml.Object : GLib.Object,
     return null;
   }
   /**
-   * Returns a {@link GomObject} or a {@link Collection} property's
+   * Returns a {@link GXml.Object} or a {@link Collection} property's
    * {@link GLib.ParamSpec} based on given name. This method is
    * case insensitive.
    *
@@ -373,10 +373,10 @@ public interface GXml.Object : GLib.Object,
    * If Object's property has been set, this method overwrite it.
    *
    * {{{
-   * class NodeA : GomObject {
+   * class NodeA : GXml.Object {
    *   construct { try { initialize ("NodeA"); } catch { warning ("Can't initialize); }
    * }
-   * class NodeB : GomObject {
+   * class NodeB : GXml.Object {
    *   public NodeA node { get; set; }
    * }
    *
diff --git a/gxml/Property.vala b/gxml/Property.vala
index 75dc770..f73a95e 100644
--- a/gxml/Property.vala
+++ b/gxml/Property.vala
@@ -22,7 +22,7 @@
 
 
 /**
- * An interface for {@link GomObject}'s properties translated to
+ * An interface for {@link GXml.Object}'s properties translated to
  * {@link DomElement} attributes. If object is instantiated it is
  * written, if not is just ingnored.
  */
@@ -42,7 +42,7 @@ public interface GXml.Property : GLib.Object
 }
 
 /**
- * Base class for properties implementing {@link GomProperty} interface.
+ * Base class for properties implementing {@link Property} interface.
  */
 public abstract class GXml.BaseProperty : GLib.Object, GXml.Property {
   /**
@@ -56,10 +56,10 @@ public abstract class GXml.BaseProperty : GLib.Object, GXml.Property {
 }
 
 /**
- * Convenient class to handle {@link GomElement}'s attributes
+ * Convenient class to handle {@link Element}'s attributes
  * using validated string using Regular Expressions.
  */
-public class GXml.GomString : GXml.BaseProperty {
+public class GXml.String : GXml.BaseProperty {
   protected string _value = "";
   public override string? value {
     owned get {
@@ -70,16 +70,16 @@ public class GXml.GomString : GXml.BaseProperty {
         _value = value;
     }
   }
-  public GomString.with_string (string str) {
+  public String.with_string (string str) {
     _value = str;
   }
 }
 
 /**
- * Convenient class to handle a {@link GomElement}'s attribute
+ * Convenient class to handle a {@link Element}'s attribute
  * using a list of pre-defined and unmutable values.
  */
-public class GXml.GomArrayString : GXml.BaseProperty {
+public class GXml.ArrayString : GXml.BaseProperty {
   protected string _value = "";
   protected string[] _values = null;
   public unowned string[] get_values () {
@@ -137,11 +137,11 @@ public class GXml.GomArrayString : GXml.BaseProperty {
 
 
 /**
- * Convenient class to handle a {@link GomElement}'s attribute
+ * Convenient class to handle a {@link Element}'s attribute
  * using a list of pre-defined and unmutable values, taken from
  * an {@link IXsdSimpleType} definition
  */
-public class GXml.GomXsdArrayString : GomArrayString {
+public class GXml.XsdArrayString : ArrayString {
   protected GLib.File _source = null;
   protected string _simple_type = null;
   /**
@@ -164,7 +164,7 @@ public class GXml.GomXsdArrayString : GomArrayString {
   }
   /**
    * Load list of strings from a {@link GLib.File}, parsing using an
-   * {@link GomXsdSchema} object and searching for {@link IXsdSimpleType}
+   * {@link XsdSchema} object and searching for {@link IXsdSimpleType}
    * definition with name {@link simple_type}.
    */
   public void load () throws GLib.Error {
@@ -216,12 +216,12 @@ public class GXml.GomXsdArrayString : GomArrayString {
 }
 
 /**
- * Convenient class to handle {@link GomElement}'s attributes
+ * Convenient class to handle {@link Element}'s attributes
  * using double pressition floats as sources of values.
  *
  * Property is represented as a string.
  */
-public class GXml.GomDouble : GXml.BaseProperty {
+public class GXml.Double : GXml.BaseProperty {
   protected double _value = 0.0;
   public override string? value {
     owned get {
@@ -233,7 +233,7 @@ public class GXml.GomDouble : GXml.BaseProperty {
     }
   }
   /**
-   * Set number of decimals to write out as {@link GomElement}'s property.
+   * Set number of decimals to write out as {@link Element}'s property.
    * Default is 4.
    */
   public uint decimals { get; set; default = 4; }
@@ -248,12 +248,12 @@ public class GXml.GomDouble : GXml.BaseProperty {
 }
 
 /**
- * Convenient class to handle {@link GomElement}'s attributes
+ * Convenient class to handle {@link Element}'s attributes
  * using floats as sources of values.
  *
  * Property is represented as a string.
  */
-public class GXml.GomFloat : GomDouble {
+public class GXml.Float : Double {
   /**
    * Retrive current value.
    */
@@ -266,12 +266,12 @@ public class GXml.GomFloat : GomDouble {
 
 
 /**
- * Convenient class to handle {@link GomElement}'s attributes
+ * Convenient class to handle {@link Element}'s attributes
  * using a integers as sources of values.
  *
  * Property is represented as a string.
  */
-public class GXml.GomInt : GXml.BaseProperty {
+public class GXml.Int : GXml.BaseProperty {
   protected int _value = 0;
   public override string? value {
     owned get {
@@ -292,12 +292,12 @@ public class GXml.GomInt : GXml.BaseProperty {
 }
 
 /**
- * Convenient class to handle {@link GomElement}'s attributes
+ * Convenient class to handle {@link Element}'s attributes
  * using a boolean ('true' and 'false') as sources of values.
  *
  * Property is represented as a string, using 'true' or 'false'.
  */
-public class GXml.GomBoolean : GXml.BaseProperty {
+public class GXml.Boolean : GXml.BaseProperty {
   protected bool _value = false;
   public override string? value {
     owned get {
@@ -318,13 +318,13 @@ public class GXml.GomBoolean : GXml.BaseProperty {
 }
 
 /**
- * Convenient class to handle {@link GomElement}'s attributes
+ * Convenient class to handle {@link Element}'s attributes
  * using a {@link GLib.Type.ENUM} as a source of values.
  *
  * Enumeration is represented as a string, using its name, independent of
  * value possition in enumeration.
  */
-public class GXml.GomEnum : GXml.BaseProperty {
+public class GXml.Enum : GXml.BaseProperty {
   protected int _value = 0;
   protected Type _enum_type;
   public override string? value {
@@ -369,13 +369,13 @@ public class GXml.GomEnum : GXml.BaseProperty {
 }
 
 /**
- * Convenient class to handle {@link GomElement}'s attributes
+ * Convenient class to handle {@link Element}'s attributes
  * using a {@link GLib.Date} as sources of values.
  *
  * Property is represented as a string using a %Y-%m-%d format
  */
-public class GXml.GomDate : GXml.BaseProperty {
-  protected Date _value = Date ();
+public class GXml.Date : GXml.BaseProperty {
+  protected GLib.Date _value = GLib.Date ();
   public override string? value {
     owned get {
       if (!_value.valid ()) return null;
@@ -384,7 +384,7 @@ public class GXml.GomDate : GXml.BaseProperty {
       return (string) fr;
     }
     set {
-      _value = Date ();
+      _value = GLib.Date ();
       if ("-" in value) {
         string[] dp = value.split ("-");
         if (dp.length == 3) {
@@ -406,25 +406,25 @@ public class GXml.GomDate : GXml.BaseProperty {
   /**
    * Retrives current value.
    */
-  public Date get_date () { return _value; }
+  public GLib.Date get_date () { return _value; }
   /**
    * Sets current value.
    */
-  public void set_date (Date date) { _value = date; }
+  public void set_date (GLib.Date date) { _value = date; }
 }
 
 /**
- * Convenient class to handle {@link GomElement}'s attributes
+ * Convenient class to handle {@link Element}'s attributes
  * using a {@link GLib.DateTime} as sources of values.
  *
  * Timestamp is considered in local time.
  *
- * Property is represented as a string using a {@link GomDateTime.format}
- * and {@link GLib.DateTime.format} method. If {@link GomDateTime.format}
+ * Property is represented as a string using a {@link DateTime.format}
+ * and {@link GLib.DateTime.format} method. If {@link DateTime.format}
  * is not set '%FT%T' format is used by default.
  */
-public class GXml.GomDateTime : GXml.BaseProperty {
-  protected DateTime _value = null;
+public class GXml.DateTime : GXml.BaseProperty {
+  protected GLib.DateTime _value = null;
   public string format { get; set; }
   public override string? value {
     owned get {
@@ -437,7 +437,7 @@ public class GXml.GomDateTime : GXml.BaseProperty {
     set {
       var tv = TimeVal ();
       if (tv.from_iso8601 (value)) {
-        _value = new DateTime.from_timeval_local (tv);
+        _value = new GLib.DateTime.from_timeval_local (tv);
       } else
         warning (_("Invalid timestamp for property: "+value));
     }
@@ -445,9 +445,9 @@ public class GXml.GomDateTime : GXml.BaseProperty {
   /**
    * Retrives current value.
    */
-  public DateTime get_datetime () { return _value; }
+  public GLib.DateTime get_datetime () { return _value; }
   /**
    * Sets current value.
    */
-  public void set_datetime (DateTime dt) { _value = dt; }
+  public void set_datetime (GLib.DateTime dt) { _value = dt; }
 }
diff --git a/gxml/XsdSchema.vala b/gxml/XsdSchema.vala
index 3c5acc4..abec94b 100644
--- a/gxml/XsdSchema.vala
+++ b/gxml/XsdSchema.vala
@@ -106,7 +106,7 @@ public class GXml.XsdTypeRestrictionWhiteSpace: XsdTypeRestrictionDef {
                               IXsdSchema.SCHEMA_NAMESPACE_PREFIX,
                               IXsdTypeRestrictionWhiteSpace.SCHEMA_NODE_NAME);
   }
-  public class Fixed : GomBoolean {}
+  public class Fixed : GXml.Boolean {}
 }
 public class GXml.XsdTypeRestrictionPattern : XsdTypeRestrictionDef {}
 public class GXml.XsdTypeRestrictionAssertion : XsdTypeRestrictionDef {}
diff --git a/test/ElementTest.vala b/test/ElementTest.vala
index 8769128..b7b4ee3 100644
--- a/test/ElementTest.vala
+++ b/test/ElementTest.vala
@@ -79,7 +79,7 @@ class GXml.ElementTest : GXmlTest  {
                public Property pq { get; set; }
                construct { initialize ("Top"); }
        }
-       public class GProperty : GomString, Property {}
+       public class GProperty : GXml.String, Property {}
        public class GTop : GXml.Element {
                public NoInstantiatable inst { get; set; }
                public Instantiatable inst_i {
diff --git a/test/SerializationTest.vala b/test/SerializationTest.vala
index 00550e0..5633f36 100644
--- a/test/SerializationTest.vala
+++ b/test/SerializationTest.vala
@@ -260,9 +260,9 @@ class SerializationTest : GXmlTest  {
     [Description (nick="::Month")]
     public Month month { get; set; }
     [Description (nick="::PayDate")]
-    public GomDate pay_date { get; set; }
+    public GXml.Date pay_date { get; set; }
     [Description (nick="::Timestamp")]
-    public GomDateTime timestamp { get; set; }
+    public GXml.DateTime timestamp { get; set; }
     construct { try { initialize ("Taxes"); } catch { assert_not_reached (); } }
     public string to_string () {
       var parser = new XParser (this);
@@ -499,17 +499,17 @@ class SerializationTest : GXmlTest  {
       AC,
       DC
     }
-    public class On : GomBoolean {}
-    public class Torque : GomDouble {}
-    public class Speed : GomFloat {}
-    public class TensionType : GomEnum {
+    public class On : GXml.Boolean {}
+    public class Torque : GXml.Double {}
+    public class Speed : GXml.Float {}
+    public class TensionType : GXml.Enum {
       construct {
         try { initialize_enum (typeof (TensionTypeEnum)); }
         catch { assert_not_reached (); }
       }
     }
-    public class Tension : GomInt {}
-    public class Model : GomArrayString {
+    public class Tension : GXml.Int {}
+    public class Model : GXml.ArrayString {
       construct {
         initialize_strings ({"MODEL1","MODEL2"});
       }
@@ -590,8 +590,8 @@ class SerializationTest : GXmlTest  {
       assert ("monthRate=\"0\"" in s);
       assert ("Month=\"january\"" in s);
       assert ("TaxFree=\"false\"" in s);
-      t.pay_date = new GomDate ();
-      var d = Date ();
+      t.pay_date = new GXml.Date ();
+      var d = GLib.Date ();
       d.set_dmy ((DateDay) 1, (DateMonth) 2, (DateYear) 2017);
       assert (d.valid ());
       assert (t.pay_date != null);
@@ -610,7 +610,7 @@ class SerializationTest : GXmlTest  {
       s = t.to_string ();
       assert (s != null);
       assert ("PayDate=\"2075-03-17\"" in s);
-      var gd = new GomDate ();
+      var gd = new GXml.Date ();
       gd.value = "2076-03-17";
       assert (gd.get_date ().valid ());
       assert (gd.value == "2076-03-17");
@@ -648,8 +648,8 @@ class SerializationTest : GXmlTest  {
       assert ("monthRate=\"0\"" in s);
       assert ("Month=\"january\"" in s);
       assert ("TaxFree=\"false\"" in s);
-      t.timestamp = new GomDateTime ();
-      var d = new DateTime.local (2017,2,10,14,14,20.345);
+      t.timestamp = new GXml.DateTime ();
+      var d = new GLib.DateTime.local (2017,2,10,14,14,20.345);
 #if DEBUG
       s = t.to_string ();
       assert (s != null);
diff --git a/test/XsdSchemaTest.vala b/test/XsdSchemaTest.vala
index 3499a77..5d6ffdc 100644
--- a/test/XsdSchemaTest.vala
+++ b/test/XsdSchemaTest.vala
@@ -63,7 +63,7 @@ class GomSchemaTest : GXmlTest  {
                        try {
                                var f = GLib.File.new_for_path (GXmlTestConfig.TEST_DIR+"/schema-test.xsd");
                                assert (f.query_exists ());
-                               var ars = new GomXsdArrayString ();
+                               var ars = new GXml.XsdArrayString ();
                                ars.simple_type = "MethodCode";
                                ars.source = f;
                                ars.load ();
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]