Merge pull request #1304 from slluis/mac-proxy-autoconfig

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

diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.MetadataServices/MetaData.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.MetadataServices/MetaData.cs
index 77838459651be309d6c6c9f88bdb294c14c17920..703b97fd8281f8a2b078e7c9cb9e5693e08b3a02 100644 (file)
--- a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.MetadataServices/MetaData.cs
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.MetadataServices/MetaData.cs
@@ -35,10 +35,8 @@ using System.Text;
 using System.Xml;
 using System.Reflection;
 using System.Net;
-#if !TARGET_JVM
 using System.CodeDom.Compiler;
 using Microsoft.CSharp;
-#endif
 
 namespace System.Runtime.Remoting.MetadataServices
 {
@@ -56,7 +54,6 @@ namespace System.Runtime.Remoting.MetadataServices
                {
                }
 
-#if !TARGET_JVM
                [MonoTODO ("strong name")]
                public static void ConvertCodeSourceFileToAssemblyFile (
                                   string codePath,
@@ -133,44 +130,43 @@ namespace System.Runtime.Remoting.MetadataServices
                        memStream.Position = 0;
                        cg.GenerateCode (clientProxy, outputDirectory, memStream, outCodeStreamList, proxyUrl, proxyNamespace);
                }
-#endif
 
-               public static void ConvertTypesToSchemaToFile (ServiceType[] servicetypes, SdlType sdltype, string path)
+               public static void ConvertTypesToSchemaToFile (ServiceType [] types, SdlType sdlType, string path)
                {
                        FileStream fs = new FileStream (path, FileMode.Create, FileAccess.Write);
-                       ConvertTypesToSchemaToStream (servicetypes, sdltype, fs);
+                       ConvertTypesToSchemaToStream (types, sdlType, fs);
                        fs.Close ();
                }
 
-               public static void ConvertTypesToSchemaToFile (Type[] types, SdlType sdltype, string path)
+               public static void ConvertTypesToSchemaToFile (Type [] types, SdlType sdlType, string path)
                {
                        FileStream fs = new FileStream (path, FileMode.Create, FileAccess.Write);
-                       ConvertTypesToSchemaToStream (types, sdltype, fs);
+                       ConvertTypesToSchemaToStream (types, sdlType, fs);
                        fs.Close ();
                }
 
-               public static void ConvertTypesToSchemaToStream (Type[] types, SdlType sdltype, Stream stream)
+               public static void ConvertTypesToSchemaToStream (Type [] types, SdlType sdlType, Stream outputStream)
                {
                        ServiceType[] st = new ServiceType [types.Length];
                        for (int n=0; n<types.Length; n++)
                                st [n] = new ServiceType (types[n]);
-                               
-                       ConvertTypesToSchemaToStream (st, sdltype, stream);
+
+                       ConvertTypesToSchemaToStream (st, sdlType, outputStream);
                }
 
-               public static void ConvertTypesToSchemaToStream (ServiceType[] servicetypes, SdlType sdltype, Stream stream)
+               public static void ConvertTypesToSchemaToStream (ServiceType [] serviceTypes, SdlType sdlType, Stream outputStream)
                {
                        MetaDataExporter exporter = new MetaDataExporter ();
                        MemoryStream memStream = new MemoryStream ();
                        
                        StreamWriter sw = new StreamWriter (memStream);
                        XmlTextWriter tw = new XmlTextWriter (sw);
-                       
-                       exporter.ExportTypes (servicetypes, sdltype, tw);
+
+                       exporter.ExportTypes (serviceTypes, sdlType, tw);
                        tw.Flush ();
                        
                        memStream.Position = 0;
-                       CopyStream (memStream, stream);
+                       CopyStream (memStream, outputStream);
                }
                
                public static void RetrieveSchemaFromUrlToFile (string url, string path)