Initial update to OpenSim 0.8.2.1 source code.

1 files changed, 50 insertions, 45 deletions

diff --git a/OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs b/OpenSim/Framework/DOMap.cs
index 1e8c33e..f5b650b 100644
--- a/OpenSim/Framework/Communications/XMPP/XmppMessageStanza.cs
+++ b/OpenSim/Framework/DOMap.cs
@@ -25,69 +25,74 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Xml;
+using System.Xml.Schema;
 using System.Xml.Serialization;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
 
-namespace OpenSim.Framework.Communications.XMPP
+namespace OpenSim.Framework
 {
     /// <summary>
-    /// Message types.
+    /// This class stores and retrieves dynamic objects.
     /// </summary>
-    public enum XmppMessageType
+    /// <remarks>
+    /// Experimental - DO NOT USE.  Does not yet have namespace support.
+    /// </remarks>
+    public class DOMap
     {
-        [XmlEnum("chat")] chat,
-        [XmlEnum("error")] error,
-        [XmlEnum("groupchat")] groupchat,
-        [XmlEnum("headline")] headline,
-        [XmlEnum("normal")] normal,
-    }
-
-    /// <summary>
-    /// Message body.
-    /// </summary>
-    public class XmppMessageBody
-    {
-        [XmlText]
-        public string Text;
-
-        public XmppMessageBody()
+        private IDictionary<string, object> m_map;
+        
+        public void Add(string ns, string objName, object dynObj)
         {
-        }
+            DAMap.ValidateNamespace(ns);
 
-        public XmppMessageBody(string message)
-        {
-            Text = message;
+            lock (this)
+            {
+                if (m_map == null)
+                    m_map = new Dictionary<string, object>();
+
+                m_map.Add(objName, dynObj);
+            }
         }
 
-        new public string ToString()
+        public bool ContainsKey(string key)
         {
-            return Text;
+            return Get(key) != null;
         }
-    }
 
-    [XmlRoot("message")]
-    public class XmppMessageStanza: XmppStanza
-    {
         /// <summary>
-        /// IQ type: one of set, get, result, error
+        /// Get a dynamic object
         /// </summary>
-        [XmlAttribute("type")]
-        public XmppMessageType MessageType;
-
-        // [XmlAttribute("error")]
-        // public XmppError Error;
-
-        [XmlElement("body")]
-        public XmppMessageBody Body;
-
-        public XmppMessageStanza() : base()
+        /// <remarks>
+        /// Not providing an index method so that users can't casually overwrite each other's objects.
+        /// </remarks>
+        /// <param name='key'></param>
+        public object Get(string key)
         {
+            lock (this)
+            {
+                if (m_map == null)
+                    return null;
+                else
+                    return m_map[key];
+            }
         }
 
-        public XmppMessageStanza(string fromJid, string toJid, XmppMessageType mType, string message) :
-            base(fromJid, toJid)
+        public bool Remove(string key)
         {
-            MessageType = mType;
-            Body = new XmppMessageBody(message);
+            lock (this)
+            {
+                if (m_map == null)
+                    return false;
+                else
+                    return m_map.Remove(key);
+            }
         }
     }
-}
+}
\ No newline at end of file