xmpp-vala/core+libdino: concurrency + nullity improvements

1 files changed, 40 insertions, 11 deletions

diff --git a/xmpp-vala/src/core/stanza_attribute.vala b/xmpp-vala/src/core/stanza_attribute.vala
index e6887f33..26e63f80 100644
--- a/xmpp-vala/src/core/stanza_attribute.vala
+++ b/xmpp-vala/src/core/stanza_attribute.vala
@@ -1,7 +1,18 @@
 namespace Xmpp.Core {
+
 public class StanzaAttribute : StanzaEntry {
 
-    public StanzaAttribute() {}
+    internal const string ATTRIBUTE_STRING_FORMAT = "{%s}:%s='%s'";
+    internal const string ATTRIBUTE_STRING_NO_NS_FORMAT = "%s='%s'";
+    internal const string ATTRIBUTE_STRING_ANSI_FORMAT = ANSI_COLOR_GRAY+"{%s}:"+ANSI_COLOR_END+"%s="+ANSI_COLOR_GREEN+"'%s'"+ANSI_COLOR_END;
+    internal const string ATTRIBUTE_STRING_ANSI_NO_NS_FORMAT = "%s="+ANSI_COLOR_GREEN+"'%s'"+ANSI_COLOR_END;
+    internal const string ATTRIBUTE_XML_FORMAT = "%s:%s='%s'";
+    internal const string ATTRIBUTE_XML_NO_NS_FORMAT = "%s='%s'";
+    internal const string ATTRIBUTE_XML_ANSI_FORMAT = "%s:%s="+ANSI_COLOR_GREEN+"'%s'"+ANSI_COLOR_END;
+    internal const string ATTRIBUTE_XML_ANSI_NO_NS_FORMAT = "%s="+ANSI_COLOR_GREEN+"'%s'"+ANSI_COLOR_END;
+
+    internal StanzaAttribute() {
+    }
 
     public StanzaAttribute.build(string ns_uri, string name, string val) {
         this.ns_uri = ns_uri;
@@ -9,29 +20,47 @@ public class StanzaAttribute : StanzaEntry {
         this.val = val;
     }
 
-    public string to_string() {
-        if (ns_uri == null) {
-            return @"$name='$val'";
+    internal string printf(string fmt, bool no_ns = false, string? ns_name = null) {
+        if (no_ns) {
+            return fmt.printf(name, (!)val);
         } else {
-            return @"{$ns_uri}:$name='$val'";
+            if (ns_name == null) {
+                return fmt.printf((!)ns_uri, name, (!)val);
+            } else {
+                return fmt.printf((!)ns_name, name, (!)val);
+            }
         }
     }
 
+    public string to_string() {
+        return printf(ATTRIBUTE_STRING_FORMAT);
+    }
+
     public string to_ansi_string(bool hide_ns = false) {
-        if (ns_uri == null || hide_ns) {
-            return @"$name=$ANSI_COLOR_GREEN'$val'$ANSI_COLOR_END";
+        if (hide_ns) {
+            return printf(ATTRIBUTE_STRING_ANSI_NO_NS_FORMAT, true);
         } else {
-            return @"$ANSI_COLOR_GRAY{$ns_uri}:$ANSI_COLOR_END$name=$ANSI_COLOR_GREEN'$val'$ANSI_COLOR_END";
+            return printf(ATTRIBUTE_STRING_ANSI_FORMAT);
         }
     }
 
-    public string to_xml(NamespaceState? state_) throws XmlError {
+    public string to_xml(NamespaceState? state_ = null) throws XmlError {
         NamespaceState state = state_ ?? new NamespaceState();
         if (ns_uri == state.current_ns_uri || (ns_uri == XMLNS_URI && name == "xmlns")) {
-            return @"$name='$val'";
+            return printf(ATTRIBUTE_XML_NO_NS_FORMAT, true);
         } else {
-            return "%s:%s='%s'".printf (state.find_name (ns_uri), name, val);
+            return printf(ATTRIBUTE_XML_FORMAT, false, state.find_name((!)ns_uri));
+        }
+    }
+
+    public string to_ansi_xml(NamespaceState? state_ = null) throws XmlError {
+        NamespaceState state = state_ ?? new NamespaceState();
+        if (ns_uri == state.current_ns_uri || (ns_uri == XMLNS_URI && name == "xmlns")) {
+            return printf(ATTRIBUTE_XML_ANSI_NO_NS_FORMAT, true);
+        } else {
+            return printf(ATTRIBUTE_XML_ANSI_FORMAT, false, state.find_name((!)ns_uri));
         }
     }
 }
+
 }