[Dotgnu-pnet-commits] CVS: pnetlib/System Uri.cs, 1.42, 1.43 UriHostNameType.cs, 1.1, 1.2

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnetlib/System
In directory subversions:/tmp/cvs-serv29339/System

Modified Files:
        Uri.cs UriHostNameType.cs 
Log Message:


Missing functionality.


Index: Uri.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System/Uri.cs,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -r1.42 -r1.43
*** Uri.cs      28 Aug 2003 03:12:20 -0000      1.42
--- Uri.cs      13 Sep 2003 10:20:30 -0000      1.43
***************
*** 8,11 ****
--- 8,12 ----
   * Contributions by Rich Baumann <address@hidden>
   * Contributions by Gopal V <address@hidden>
+  * Contributions by Rhys Weatherley <address@hidden>
   *
   * This program is free software; you can redistribute it and/or modify
***************
*** 31,39 ****
--- 32,46 ----
  using System.Net.Sockets;
  using System.Collections;
+ using System.Runtime.Serialization;
  
  namespace System
  {
  
+ #if CONFIG_SERIALIZATION
+ [Serializable]
+ public class Uri : MarshalByRefObject, ISerializable
+ #else
  public class Uri : MarshalByRefObject
+ #endif
  {
  
***************
*** 188,191 ****
--- 195,206 ----
        }
  
+ #if CONFIG_SERIALIZATION
+       protected Uri(SerializationInfo info, StreamingContext context)
+               : this(info.GetString("AbsoluteUri"), true)
+       {
+               // Nothing to do here.
+       }
+ #endif
+ 
        private Uri()
        {
***************
*** 380,387 ****
        }
  
-       [TODO]
        protected virtual void CheckSecurity()
        {
!                throw new NotImplementedException("CheckSecurity");
        }
  
--- 395,401 ----
        }
  
        protected virtual void CheckSecurity()
        {
!                // Nothing to do here.
        }
  
***************
*** 1026,1029 ****
--- 1040,1065 ----
                return false;
        }
+ 
+       // Determine if this is an UNC path.
+       public bool IsUnc
+       {
+               get
+               {
+                       // We don't support UNC paths at present.
+                       return false;
+               }
+       }
+ 
+ #if CONFIG_SERIALIZATION
+ 
+       // Serialize this URI object.
+       void ISerializable.GetObjectData(SerializationInfo serializationInfo,
+                                                                        
StreamingContext streamingContext)
+       {
+               serializationInfo.AddValue("AbsoluteUri", AbsoluteUri);
+       }
+ 
+ #endif
+ 
  }
  }//namespace

Index: UriHostNameType.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System/UriHostNameType.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** UriHostNameType.cs  7 Apr 2002 09:21:15 -0000       1.1
--- UriHostNameType.cs  13 Sep 2003 10:20:30 -0000      1.2
***************
*** 2,6 ****
   * UriHostNameType.cs - Implementation of the "System.UriHostNameType" class.
   *
!  * Copyright (C) 2002  Southern Storm Software, Pty Ltd.
   *
   * This program is free software, you can redistribute it and/or modify
--- 2,6 ----
   * UriHostNameType.cs - Implementation of the "System.UriHostNameType" class.
   *
!  * Copyright (C) 2003  Southern Storm Software, Pty Ltd.
   *
   * This program is free software, you can redistribute it and/or modify
***************
*** 24,31 ****
  public enum UriHostNameType
  {
!       Dns = 2,
!       IPv4 = 3,
!       IPv6 = 4,
!       Unknown = 0     
  }; // enum UriHostNameType
  
--- 24,33 ----
  public enum UriHostNameType
  {
!       Unknown = 0,
!       Basic   = 1,
!       Dns             = 2,
!       IPv4    = 3,
!       IPv6    = 4,
! 
  }; // enum UriHostNameType