Merge pull request #495 from nicolas-raoul/fix-for-issue2907-with-no-formatting-changes

[mono.git] / mcs / class / System.XML / System.Xml.Serialization / XmlTypeMapping.cs

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlTypeMapping.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlTypeMapping.cs
index fbef2b3d6819b080d9ac79abc471ac481b06f0db..2b0f8bd829d2768ed76993523618639fae3e1f0c 100644 (file)
--- a/mcs/class/System.XML/System.Xml.Serialization/XmlTypeMapping.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlTypeMapping.cs
@@ -107,10 +107,15 @@ namespace System.Xml.Serialization
 
                internal string XmlTypeNamespace
                {
-                       get { return xmlTypeNamespace; }
+                       get { return xmlTypeNamespace ?? string.Empty; }
                        set { xmlTypeNamespace = value; }
                }
 
+               internal bool HasXmlTypeNamespace
+               {
+                       get { return xmlTypeNamespace != null; }
+               }
+
                internal ArrayList DerivedTypes
                {
                        get { return _derivedTypes; }
@@ -170,9 +175,9 @@ namespace System.Xml.Serialization
 
                internal XmlTypeMapping GetRealElementMap (string name, string ens)
                {
-                       if (xmlType == name && xmlTypeNamespace == ens) return this;
+                       if (xmlType == name && XmlTypeNamespace == ens) return this;
                        foreach (XmlTypeMapping map in _derivedTypes)
-                               if (map.xmlType == name && map.xmlTypeNamespace == ens) return map;
+                               if (map.xmlType == name && map.XmlTypeNamespace == ens) return map;
                        
                        return null;
                }
@@ -246,14 +251,15 @@ namespace System.Xml.Serialization
                                return;
                        }
 #endif
-                       IXmlSerializable serializable = (IXmlSerializable)Activator.CreateInstance (typeData.Type, true);
 #if NET_2_0 && !MOONLIGHT
+                       IXmlSerializable serializable = (IXmlSerializable)Activator.CreateInstance (typeData.Type, true);
                        try {
                                _schema = serializable.GetSchema();
                        } catch (Exception) {
                                // LAMESPEC: .NET has a bad exception catch and swallows it silently.
                        }
 #else
+                       IXmlSerializable serializable = (IXmlSerializable)Activator.CreateInstance (typeData.Type);
                        _schema = serializable.GetSchema();
 #endif
 #if !MOONLIGHT
@@ -302,9 +308,14 @@ namespace System.Xml.Serialization
                XmlTypeMapMember _returnMember;
                bool _ignoreMemberNamespace;
                bool _canBeSimpleType = true;
+               bool? _isOrderDependentMap;
 
                public void AddMember (XmlTypeMapMember member)
                {
+                       // If GlobalIndex has not been set, set it now
+                       if (member.GlobalIndex == -1)
+                               member.GlobalIndex = _allMembers.Count;
+                       
                        _allMembers.Add (member);
                        
                        if (!(member.DefaultValue is System.DBNull) && member.DefaultValue != null) {
@@ -319,7 +330,7 @@ namespace System.Xml.Serialization
                        {
                                XmlTypeMapMemberAttribute atm = (XmlTypeMapMemberAttribute)member;
                                if (_attributeMembers == null) _attributeMembers = new Hashtable();
-                               string key = BuildKey (atm.AttributeName, atm.Namespace);
+                               string key = BuildKey (atm.AttributeName, atm.Namespace, -1);
                                if (_attributeMembers.ContainsKey (key))
                                        throw new InvalidOperationException ("The XML attribute named '" + atm.AttributeName + "' from namespace '" + atm.Namespace + "' is already present in the current scope. Use XML attributes to specify another XML name or namespace for the attribute.");
                                member.Index = _attributeMembers.Count;
@@ -364,7 +375,7 @@ namespace System.Xml.Serialization
                        ICollection elemsInfo = ((XmlTypeMapMemberElement)member).ElementInfo;
                        foreach (XmlTypeMapElementInfo elem in elemsInfo)
                        {
-                               string key = BuildKey (elem.ElementName, elem.Namespace);
+                               string key = BuildKey (elem.ElementName, elem.Namespace, elem.ExplicitOrder);
                                if (_elements.ContainsKey (key)) 
                                        throw new InvalidOperationException ("The XML element named '" + elem.ElementName + "' from namespace '" + elem.Namespace + "' is already present in the current scope. Use XML attributes to specify another XML name or namespace for the element.");
                                _elements.Add (key, elem);
@@ -386,13 +397,24 @@ namespace System.Xml.Serialization
                public XmlTypeMapMemberAttribute GetAttribute (string name, string ns)
                {
                        if (_attributeMembers == null) return null;
-                       return (XmlTypeMapMemberAttribute)_attributeMembers [BuildKey(name,ns)];
+                       return (XmlTypeMapMemberAttribute)_attributeMembers [BuildKey (name,ns, -1)];
                }
 
-               public XmlTypeMapElementInfo GetElement (string name, string ns)
+               public XmlTypeMapElementInfo GetElement (string name, string ns, int order)
                {
                        if (_elements == null) return null;
-                       return (XmlTypeMapElementInfo)_elements [BuildKey(name,ns)];
+                       return (XmlTypeMapElementInfo)_elements [BuildKey (name,ns, order)];
+               }
+
+               public XmlTypeMapElementInfo GetElement(string name, string ns)
+               {
+                       if (_elements == null) return null;
+
+                       foreach (XmlTypeMapElementInfo info in _elements.Values)
+                               if (info.ElementName == name && info.Namespace == ns)
+                                       return info;
+
+                       return null;
                }
                
                public XmlTypeMapElementInfo GetElement (int index)
@@ -410,14 +432,15 @@ namespace System.Xml.Serialization
                                        _elementsByIndex [mem.Index] = (XmlTypeMapElementInfo) mem.ElementInfo [0];
                                }
                        }
-                       
+                       if (index >= _elementMembers.Count)
+                               return null;
                        return _elementsByIndex [index];
                }
                
-               private string BuildKey (string name, string ns)
+               private string BuildKey (string name, string ns, int explicitOrder)
                {
                        if (_ignoreMemberNamespace) return name;
-                       else return name + " / " + ns;
+                       else return name + " / " + ns + (explicitOrder < 0 ? "" : "/" + explicitOrder);
                }
                
                public ICollection AllElementInfos
@@ -432,6 +455,20 @@ namespace System.Xml.Serialization
                        set { _ignoreMemberNamespace = value; }
                }
 
+               public bool IsOrderDependentMap {
+                       get {
+                               if (_isOrderDependentMap == null) {
+                                       _isOrderDependentMap = false;
+                                       foreach (XmlTypeMapElementInfo ei in _elements.Values)
+                                               if (ei.ExplicitOrder >= 0) {
+                                                       _isOrderDependentMap = true;
+                                                       break;
+                                               }
+                               }
+                               return (bool) _isOrderDependentMap;
+                       }
+               }
+
                public XmlTypeMapMember FindMember (string name)
                {
                        for (int n=0; n<_allMembers.Count; n++)