2005-01-31 Zoltan Varga <vargaz@freemail.hu>

[mono.git] / mcs / class / System.Runtime.Remoting / System.Runtime.Remoting.MetadataServices / MetaDataExporter.cs

diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.MetadataServices/MetaDataExporter.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.MetadataServices/MetaDataExporter.cs
index 2d7dc80d29d8c4fc9300fb81fe9c5591c51aaa02..a23d2a0d725550cd5e8e1afdd18faa36d1920aba 100644 (file)
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.MetadataServices/MetaDataExporter.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.MetadataServices/MetaDataExporter.cs
@@ -7,6 +7,27 @@
 // (C) 2003 Novell, Inc
 //
 
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
 using System.Collections;
 using System.IO;
 using System.Text;
@@ -377,7 +398,7 @@ namespace System.Runtime.Remoting.MetadataServices
                {
                        tw.WriteStartElement ("simpleType", MetaData.SchemaNamespace);
                        tw.WriteAttributeString ("name", GetXmlType (type));
-                       tw.WriteAttributeString ("suds", "enumType", MetaData.SudsNamespace, GetQualifiedXmlType (tw, type.UnderlyingSystemType, null));
+                       tw.WriteAttributeString ("suds", "enumType", MetaData.SudsNamespace, GetQualifiedXmlType (tw, EnumToUnderlying (type), null));
                        tw.WriteStartElement ("restriction", MetaData.SchemaNamespace);
                        tw.WriteAttributeString ("base", "xsd:string");
                        
@@ -538,7 +559,6 @@ namespace System.Runtime.Remoting.MetadataServices
                
                void FindTypes (ServiceType[] servicetypes, Hashtable dataTypes, ArrayList services)
                {
-                       Hashtable types = new Hashtable ();
                        ArrayList mbrTypes = new ArrayList();
                        
                        foreach (ServiceType st in servicetypes)
@@ -645,6 +665,38 @@ namespace System.Runtime.Remoting.MetadataServices
                                
                        return null;
                }
+               
+               //
+               // This is needed, because enumerations from assemblies
+               // do not report their underlyingtype, but they report
+               // themselves
+               //
+               public static Type EnumToUnderlying (Type t)
+               {
+                       TypeCode tc = Type.GetTypeCode (t);
+       
+                       switch (tc){
+                       case TypeCode.Boolean:
+                               return typeof (bool);
+                       case TypeCode.Byte:
+                               return typeof (byte);
+                       case TypeCode.SByte:
+                               return typeof (sbyte);
+                       case TypeCode.Int16:
+                               return typeof (short);
+                       case TypeCode.UInt16:
+                               return typeof (ushort);
+                       case TypeCode.Int32:
+                               return typeof (int);
+                       case TypeCode.UInt32:
+                               return typeof (uint);
+                       case TypeCode.Int64:
+                               return typeof (long);
+                       case TypeCode.UInt64:
+                               return typeof (ulong);
+                       }
+                       throw new Exception ("Unhandled typecode in enum " + tc + " from " + t.AssemblyQualifiedName);
+               }
        }
        
        class SchemaInfo