[gxml] Make more SerializableValueList methods virtual and exposed values Gee.List<string>



commit a8f3f35834461a2b155c8e3f65492094f0a5cf87
Author: Daniel Espinosa <esodan gmail com>
Date:   Fri Oct 16 19:10:22 2015 -0500

    Make more SerializableValueList methods virtual and exposed values Gee.List<string>

 configure.ac                                |    2 +-
 gxml/SerializableValueList.vala             |   12 +++++++-----
 test/SerializablePropertyValueListTest.vala |    4 ++--
 3 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 50f074f..8407a92 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@
 # Release Version
 m4_define([project_major_version], [0])
 m4_define([project_minor_version], [7])
-m4_define([project_micro_version], [2])
+m4_define([project_micro_version], [3])
 m4_define([project_nano_version], [0])
 
 # LT_VERSION
diff --git a/gxml/SerializableValueList.vala b/gxml/SerializableValueList.vala
index fd332f4..145a4ee 100644
--- a/gxml/SerializableValueList.vala
+++ b/gxml/SerializableValueList.vala
@@ -32,7 +32,9 @@ public class GXml.SerializableValueList : SerializableObjectModel, SerializableP
 {
   private string _val = null;
   private string _name = null;
-  private ArrayList<string> _values = null;
+  public ArrayList<string> _values = null;
+  public virtual Gee.List<string> get_values () { return _values; }
+  public virtual void set_values (Gee.List<string> vals) { _values.add_all (vals); }
   public SerializableValueList (string name) { _name = name; }
   /**
    * Add a list of string values to select from.
@@ -48,7 +50,7 @@ public class GXml.SerializableValueList : SerializableObjectModel, SerializableP
    * Get the string value at a given index. This operation does not change
    * the actual value.
    */
-  public string? get_value_at (int index)
+  public virtual string? get_value_at (int index)
   {
     if (_values == null) return null;
     if (index < 0 || index >= _values.size) return null;
@@ -57,21 +59,21 @@ public class GXml.SerializableValueList : SerializableObjectModel, SerializableP
   /**
    * Sets value to the one at a given position.
    */
-  public void select_value_at (int index)
+  public virtual void select_value_at (int index)
   {
     _val = get_value_at (index);
   }
   /**
    * Get an array of string values in list.
    */
-  public virtual string[] get_values () {
+  public virtual string[] get_values_array () {
     if (_values == null) return {""};
     return _values.to_array ();
   }
   /**
    * Checks if the actual value is in the values list.
    */
-  public bool is_value ()
+  public virtual bool is_value ()
   {
     if (_values == null) return false;
     foreach (string s in _values) {
diff --git a/test/SerializablePropertyValueListTest.vala b/test/SerializablePropertyValueListTest.vala
index 7b74acb..f0bac3b 100644
--- a/test/SerializablePropertyValueListTest.vala
+++ b/test/SerializablePropertyValueListTest.vala
@@ -113,8 +113,8 @@ class SerializablePropertyValueListTest : GXmlTest {
         var vl = new ValueList ();
         vl.deserialize (doc1);
         assert (vl.values.get_serializable_property_value () == "Temp1");
-        assert (vl.values.get_values () != null);
-        assert (vl.values.get_values ().length == 1);
+        assert (vl.values.get_values_array () != null);
+        assert (vl.values.get_values_array ().length == 1);
         assert (vl.values.is_value () == false);
         vl.values.add_values ({"Temp1"});
         assert (vl.values.is_value () == true);


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