[gxml] Removed unused objects from SerializableCollection implementations
- From: Daniel Espinosa Ortiz <despinosa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gxml] Removed unused objects from SerializableCollection implementations
- Date: Wed, 24 Feb 2016 19:48:17 +0000 (UTC)
commit cac13d660823ab51442417b0376d137633d2f673
Author: Daniel Espinosa <esodan gmail com>
Date: Tue Feb 23 21:13:16 2016 -0600
Removed unused objects from SerializableCollection implementations
gxml/SerializableContainer.vala | 7 +++++++
gxml/SerializableGeeArrayList.vala | 4 ++--
gxml/SerializableGeeDualKeyMap.vala | 6 ++----
gxml/SerializableGeeHashMap.vala | 6 ++----
gxml/SerializableGeeTreeMap.vala | 6 ++----
5 files changed, 15 insertions(+), 14 deletions(-)
---
diff --git a/gxml/SerializableContainer.vala b/gxml/SerializableContainer.vala
index 379ed18..ba4451e 100644
--- a/gxml/SerializableContainer.vala
+++ b/gxml/SerializableContainer.vala
@@ -46,6 +46,13 @@ public abstract class GXml.SerializableContainer : SerializableObjectModel
public interface GXml.SerializableCollection : Object, Gee.Traversable<Serializable>, Serializable
{
/**
+ * Returns true if the collection should be deserialized from a { link GXml.Node}'s children
+ * when { link GXml.Serializable.deserialize} is called. For large collection of nodes
+ * this could impact in performance; return false and use { link
GXml.SerializableCollection.deserialize_children}
+ * when you need to deserialize all nodes to access them.
+ */
+ //public abstract bool deserialize_proceed ();
+ /**
* Returns true if the collection was deserialized from a { link GXml.Node}'s children.
*/
public abstract bool deserialized ();
diff --git a/gxml/SerializableGeeArrayList.vala b/gxml/SerializableGeeArrayList.vala
index ccf35f8..159c62d 100644
--- a/gxml/SerializableGeeArrayList.vala
+++ b/gxml/SerializableGeeArrayList.vala
@@ -45,13 +45,13 @@ public class GXml.SerializableArrayList<G> : Gee.ArrayList<G>, Serializable, Ser
public Gee.Map<string,GXml.Attribute> unknown_serializable_properties
{
owned get {
- return (Gee.Map<string,GXml.Attribute>) _unknown_serializable_property.ref ();
+ return new HashMap<string,GXml.Attribute> ();
}
}
public Gee.Collection<GXml.Node> unknown_serializable_nodes
{
owned get {
- return (Gee.Collection<GXml.Node>) _unknown_serializable_nodes.ref ();
+ return new ArrayList<GXml.Node> ();
}
}
protected ParamSpec[] properties { get; set; }
diff --git a/gxml/SerializableGeeDualKeyMap.vala b/gxml/SerializableGeeDualKeyMap.vala
index afc6ca8..caf9ac5 100644
--- a/gxml/SerializableGeeDualKeyMap.vala
+++ b/gxml/SerializableGeeDualKeyMap.vala
@@ -122,18 +122,16 @@ public class GXml.SerializableDualKeyMap<P,S,V> : Object, Gee.Traversable <V>, S
storage = new Gee.HashMultiMap<P,HashMap<S,V>> ();
}
// Serializable Interface
- Gee.HashMap<string,GXml.Attribute> _unknown_serializable_property = new Gee.HashMap<string,GXml.Attribute>
();
- Gee.ArrayList<GXml.Node> _unknown_serializable_nodes = new Gee.ArrayList<GXml.Node> ();
public Gee.Map<string,GXml.Attribute> unknown_serializable_properties
{
owned get {
- return (Gee.Map<string,GXml.Attribute>) _unknown_serializable_property.ref ();
+ return new Gee.HashMap<string,GXml.Attribute> ();
}
}
public Gee.Collection<GXml.Node> unknown_serializable_nodes
{
owned get {
- return (Gee.Collection<GXml.Node>) _unknown_serializable_nodes.ref ();
+ return new Gee.ArrayList<GXml.Node> ();
}
}
protected ParamSpec[] properties { get; set; }
diff --git a/gxml/SerializableGeeHashMap.vala b/gxml/SerializableGeeHashMap.vala
index 63441aa..83ea4ad 100644
--- a/gxml/SerializableGeeHashMap.vala
+++ b/gxml/SerializableGeeHashMap.vala
@@ -28,8 +28,6 @@ using GXml;
*/
public class GXml.SerializableHashMap<K,V> : Gee.HashMap<K,V>, Serializable, SerializableCollection
{
- Gee.HashMap<string,GXml.Attribute> _unknown_serializable_property = new Gee.HashMap<string,GXml.Attribute>
();
- Gee.ArrayList<GXml.Node> _unknown_serializable_nodes = new Gee.ArrayList<GXml.Node> ();
GXml.Node _node;
// SerializableCollection interface
@@ -45,13 +43,13 @@ public class GXml.SerializableHashMap<K,V> : Gee.HashMap<K,V>, Serializable, Ser
public Gee.Map<string,GXml.Attribute> unknown_serializable_properties
{
owned get {
- return (Gee.Map<string,GXml.Attribute>) _unknown_serializable_property.ref ();
+ return new Gee.HashMap<string,GXml.Attribute> ();
}
}
public Gee.Collection<GXml.Node> unknown_serializable_nodes
{
owned get {
- return (Gee.Collection<GXml.Node>) _unknown_serializable_nodes.ref ();
+ return new Gee.ArrayList<GXml.Node> ();
}
}
protected ParamSpec[] properties { get; set; }
diff --git a/gxml/SerializableGeeTreeMap.vala b/gxml/SerializableGeeTreeMap.vala
index 02586d3..8920cba 100644
--- a/gxml/SerializableGeeTreeMap.vala
+++ b/gxml/SerializableGeeTreeMap.vala
@@ -28,8 +28,6 @@ using GXml;
*/
public class GXml.SerializableTreeMap<K,V> : Gee.TreeMap<K,V>, Serializable, SerializableCollection
{
- Gee.HashMap<string,GXml.Attribute> _unknown_serializable_property = new Gee.HashMap<string,GXml.Attribute>
();
- Gee.ArrayList<GXml.Node> _unknown_serializable_nodes = new Gee.ArrayList<GXml.Node> ();
GXml.Node _node;
// SerializableCollection interface
@@ -43,13 +41,13 @@ public class GXml.SerializableTreeMap<K,V> : Gee.TreeMap<K,V>, Serializable, Ser
public Gee.Map<string,GXml.Attribute> unknown_serializable_properties
{
owned get {
- return (Gee.Map<string,GXml.Attribute>) _unknown_serializable_property.ref ();
+ return new Gee.HashMap<string,GXml.Attribute> ();
}
}
public Gee.Collection<GXml.Node> unknown_serializable_nodes
{
owned get {
- return (Gee.Collection<GXml.Node>) _unknown_serializable_nodes.ref ();
+ return new Gee.ArrayList<GXml.Node> ();
}
}
protected ParamSpec[] properties { get; set; }
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]