String.Split(char[],int,StringSplitOptions) should remove empty entries while

[mono.git] / mcs / class / corlib / System / OperatingSystem.cs

diff --git a/mcs/class/corlib/System/OperatingSystem.cs b/mcs/class/corlib/System/OperatingSystem.cs
index 7c5c84fc55070400bc4cefd98e0746e674b94b50..1684631210e75dd000a3302b8b664c75d595f443 100644 (file)
--- a/mcs/class/corlib/System/OperatingSystem.cs
+++ b/mcs/class/corlib/System/OperatingSystem.cs
@@ -5,18 +5,47 @@
 //   Jim Richardson (develop@wtfo-guru.com)
 //
 // (C) 2001 Moonlight Enterprises, All Rights Reserved
+// Copyright (C) 2004, 2006 Novell, Inc (http://www.novell.com)
 //
+// 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.Runtime.InteropServices;
+using System.Runtime.Serialization;
 
-namespace System
-{
-       /// <summary>
-       /// Class representing a specific operating system version for a specific platform
-       /// </summary>
+namespace System {
+
+#if NET_2_0
+       [ComVisible (true)]
+#endif
        [Serializable]
        public sealed class OperatingSystem : ICloneable
+#if NET_2_0
+               , ISerializable
+#endif
        {
-               private System.PlatformID itsPlatform;
-               private Version itsVersion;
+               private System.PlatformID _platform;
+               private Version _version;
+#if NET_2_0
+               private string _servicePack = String.Empty;
+#endif
 
                public OperatingSystem (PlatformID platform, Version version)
                {
@@ -24,32 +53,51 @@ namespace System
                                throw new ArgumentNullException ("version");
                        }
 
-                       itsPlatform = platform;
-                       itsVersion = version;
+                       _platform = platform;
+                       _version = version;
                }
 
                public PlatformID Platform {
                        get {
-                               return itsPlatform;
+                               return _platform;
                        }
                }
 
                public Version Version {
                        get {
-                               return itsVersion;
+                               return _version;
                        }
                }
 
+#if NET_2_0
+               public string ServicePack {
+                       get { return _servicePack; }
+               }
+
+               public string VersionString {
+                       get { return ToString (); }
+               }
+#endif
+
                public object Clone ()
                {
-                       return new OperatingSystem (itsPlatform, itsVersion);
+                       return new OperatingSystem (_platform, _version);
                }
 
+#if NET_2_0
+               public void GetObjectData (SerializationInfo info, StreamingContext context)
+               {
+                       info.AddValue ("_platform", _platform);
+                       info.AddValue ("_version", _version);
+                       info.AddValue ("_servicePack", _servicePack);
+               }
+#endif
+
                public override string ToString ()
                {
                        string str;
 
-                       switch ((int) itsPlatform) {
+                       switch ((int) _platform) {
                        case (int) System.PlatformID.Win32NT:
                                str = "Microsoft Windows NT";
                                break;
@@ -64,7 +112,8 @@ namespace System
                                str = "Microsoft Windows CE";
                                break;
 #endif
-                       case 128 /* PlatformID.Unix */:
+                       case 4: /* PlatformID.Unix */
+                       case 128: /* reported for 1.1 mono */
                                str = "Unix";
                                break;
                        default:
@@ -72,7 +121,7 @@ namespace System
                                break;
                        }
 
-                       return str + " " + itsVersion.ToString();
+                       return str + " " + _version.ToString();
                }
        }
 }