[gxml] ArrayList: renamed from GomArrayList



commit cabc8f8b42f11187aab3db0b81163f7a3dc653df
Author: Daniel Espinosa <esodan gmail com>
Date:   Fri Jul 5 14:32:02 2019 -0500

    ArrayList: renamed from GomArrayList

 gxml/{GomArrayList.vala => ArrayList.vala} | 2 +-
 gxml/GomSchema.vala                        | 4 ++--
 gxml/Node.vala                             | 4 ++--
 gxml/XHashMapAttr.vala                     | 2 +-
 gxml/XListChildren.vala                    | 2 +-
 gxml/meson.build                           | 2 +-
 test/GomSerializationTest.vala             | 6 +++---
 7 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/gxml/GomArrayList.vala b/gxml/ArrayList.vala
similarity index 96%
rename from gxml/GomArrayList.vala
rename to gxml/ArrayList.vala
index 80f0d1c..8f62cbd 100644
--- a/gxml/GomArrayList.vala
+++ b/gxml/ArrayList.vala
@@ -43,7 +43,7 @@ using Gee;
  *   }
  * }}}
  */
-public class GXml.GomArrayList : GXml.BaseCollection, GXml.List {
+public class GXml.ArrayList : GXml.BaseCollection, GXml.List {
   public override bool validate_append (int index, DomElement element) throws GLib.Error {
 #if DEBUG
     GLib.message ("Adding node:"+element.node_name);
diff --git a/gxml/GomSchema.vala b/gxml/GomSchema.vala
index 21f7883..8af24cd 100644
--- a/gxml/GomSchema.vala
+++ b/gxml/GomSchema.vala
@@ -256,9 +256,9 @@ public class GXml.GomXsdBaseAttribute : GomElement  {
 public class GXml.GomXsdAttribute : GomXsdBaseAttribute {}
 public class GXml.GomXsdAttributeGroup : GomXsdBaseAttribute {}
 
-public class GXml.GomXsdList : GomArrayList {
+public class GXml.GomXsdList : ArrayList {
   public new int length {
-    get { return (this as GomArrayList).length; }
+    get { return (this as ArrayList).length; }
   }
   public void remove (int index) {
     try { element.remove_child (element.child_nodes.item (index)); }
diff --git a/gxml/Node.vala b/gxml/Node.vala
index eaa07f8..783ea3d 100644
--- a/gxml/Node.vala
+++ b/gxml/Node.vala
@@ -115,7 +115,7 @@ public class GXml.Node : Object,
       if (_parent == null) return null;
       if (_parent.child_nodes == null) return null;
       if (_parent.child_nodes.length == 0) return null;
-      var pos = (_parent.child_nodes as ArrayList<DomNode>).index_of (this);
+      var pos = (_parent.child_nodes as Gee.ArrayList<DomNode>).index_of (this);
       if (pos == 0) return null;
       if ((pos - 1) > 0 && (pos - 1) < _parent.child_nodes.size)
         return _parent.child_nodes[pos - 1];
@@ -127,7 +127,7 @@ public class GXml.Node : Object,
       if (_parent == null) return null;
       if (_parent.child_nodes == null) return null;
       if (_parent.child_nodes.length == 0) return null;
-      var pos = (_parent.child_nodes as ArrayList<DomNode>).index_of (this);
+      var pos = (_parent.child_nodes as Gee.ArrayList<DomNode>).index_of (this);
       if (pos == 0) return null;
       if ((pos + 1) > 0 && (pos + 1) < _parent.child_nodes.size)
         return _parent.child_nodes[pos + 1];
diff --git a/gxml/XHashMapAttr.vala b/gxml/XHashMapAttr.vala
index c1bfce7..7ea162a 100644
--- a/gxml/XHashMapAttr.vala
+++ b/gxml/XHashMapAttr.vala
@@ -151,7 +151,7 @@ public class GXml.XHashMapAttr : Gee.AbstractMap<string,GXml.XNode>,
   }
   public override Gee.Collection<GXml.XNode> values {
     owned get {
-      var l = new ArrayList<GXml.XNode> ();
+      var l = new Gee.ArrayList<GXml.XNode> ();
       var p = _node->properties;
       while (p != null) {
         l.add (new XAttribute (_doc, p));
diff --git a/gxml/XListChildren.vala b/gxml/XListChildren.vala
index ad211d8..58478fb 100644
--- a/gxml/XListChildren.vala
+++ b/gxml/XListChildren.vala
@@ -91,7 +91,7 @@ public class GXml.XListChildren : AbstractBidirList<GXml.DomNode>,
    */
   public override void @set (int index, GXml.DomNode item) {}
   public override Gee.List<GXml.DomNode>? slice (int start, int stop) {
-    var l = new ArrayList<GXml.DomNode> ();
+    var l = new Gee.ArrayList<GXml.DomNode> ();
     if (_node == null) return l;
     var n = _node->children;
     int i = 0;
diff --git a/gxml/meson.build b/gxml/meson.build
index 9c7bd37..0dfc724 100644
--- a/gxml/meson.build
+++ b/gxml/meson.build
@@ -36,6 +36,7 @@ configure_file(output : 'config.h',
 
 
 valasources = files ([
+       'ArrayList.vala',
        'Collections.vala',
        'CssSelectorParser.vala',
        'DomAttr.vala',
@@ -50,7 +51,6 @@ valasources = files ([
        'DomRange.vala',
        'Enumeration.vala',
        'Event.vala',
-       'GomArrayList.vala',
        'GomAttr.vala',
        'GomBaseCollection.vala',
        'GomDocument.vala',
diff --git a/test/GomSerializationTest.vala b/test/GomSerializationTest.vala
index f768313..fe0c6fd 100644
--- a/test/GomSerializationTest.vala
+++ b/test/GomSerializationTest.vala
@@ -105,7 +105,7 @@ class GomAuthor : GomElement
   public GomName name { get; set; }
   public GomEmail email { get; set; }
   construct { try { initialize ("Author"); } catch { assert_not_reached (); } }
-  public class Array : GomArrayList {
+  public class Array : GXml.ArrayList {
     construct { try { initialize (typeof (GomAuthor)); }
     catch { assert_not_reached (); } }
   }
@@ -179,7 +179,7 @@ class GomBook : GomElement
   construct {
     try { initialize ("Book"); } catch { assert_not_reached (); }
   }
-  public class Array : GomArrayList {
+  public class Array : GXml.ArrayList {
     construct {
       try { initialize (typeof (GomBook)); }
       catch { assert_not_reached (); }
@@ -421,7 +421,7 @@ class GomSerializationTest : GXmlTest  {
     }
   }
 
-  public class Registers : GomArrayList {
+  public class Registers : GXml.ArrayList {
     construct {
       try { initialize (typeof (BookRegister)); }
       catch { assert_not_reached (); }


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