In .:

2010-04-05  Sebastien Pouliot  <sebastien@ximian.com>

	* moonlight_raw_System.Net.dll.sources: Move InternalWebRequest
	StreamWrapper.cs back to System.Windows.dll

In System.Net:
2010-04-05  Sebastien Pouliot  <sebastien@ximian.com>

	* InternalWebResponseStreamWrapper.cs: Move back to
	System.Windows.dll

svn path=/trunk/mcs/; revision=154790

diff --git a/mcs/class/System.Net/ChangeLog b/mcs/class/System.Net/ChangeLog
index 7da7dd94bd6e2fd27e7d86f9cf6eb9e918a7e0cc..0420c306fbbc10979ba48696921a62a1b0390c0e 100644 (file)
--- a/mcs/class/System.Net/ChangeLog
+++ b/mcs/class/System.Net/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-05  Sebastien Pouliot  <sebastien@ximian.com>
+
+       * moonlight_raw_System.Net.dll.sources: Move InternalWebRequest
+       StreamWrapper.cs back to System.Windows.dll
+
 2010-03-16  Jb Evain  <jbevain@novell.com>
 
        * net_2_1_*.dll.sources: rename to moonlight_*.dll.sources.

diff --git a/mcs/class/System.Net/System.Net/ChangeLog b/mcs/class/System.Net/System.Net/ChangeLog
index fc157453b8bcc99aeb63af497758029c661245ba..12b23c13a2f8c02cd0f35515dbbb4e2c97792070 100644 (file)
--- a/mcs/class/System.Net/System.Net/ChangeLog
+++ b/mcs/class/System.Net/System.Net/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-05  Sebastien Pouliot  <sebastien@ximian.com>
+
+       * InternalWebResponseStreamWrapper.cs: Move back to 
+       System.Windows.dll
+
 2010-03-19  Sebastien Pouliot  <sebastien@ximian.com>
 
        * HttpWebRequest_2_1.cs: AllowWriteStreamBuffering getter/setter

diff --git a/mcs/class/System.Net/System.Net/InternalWebResponseStreamWrapper.cs b/mcs/class/System.Net/System.Net/InternalWebResponseStreamWrapper.cs
deleted file mode 100644 (file)
index 00d44fa..0000000
--- a/mcs/class/System.Net/System.Net/InternalWebResponseStreamWrapper.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * InternalWebResponseStreamWrapper.cs.
- *
- * Contact:
- *   Moonlight List (moonlight-list@lists.ximian.com)
- *
- * Copyright 2008,2010 Novell, Inc. (http://www.novell.com)
- *
- * See the LICENSE file included with the distribution for details.
- * 
- */
-
-using System.IO;
-
-namespace System.Net {
-
-       // simply a read-only wrapper around a stream + a no-op Close
-       internal sealed class InternalWebResponseStreamWrapper : Stream {
-
-               private Stream stream;
-               
-               internal InternalWebResponseStreamWrapper (Stream s)
-               {
-                       stream = s;
-               }
-
-               public override bool CanRead {
-                       get {
-                                return stream.CanRead;
-                       }
-               }
-
-               public override bool CanSeek {
-                       get {
-                                return stream.CanSeek;
-                       }
-               }
-
-               public override bool CanWrite {
-                       get {
-                                return false;
-                       }
-               }
-
-               public override long Length {
-                       get {
-                                return stream.Length;
-                       }
-               }
-
-               public override long Position {
-                       get {
-                                return stream.Position;
-                       }
-                       set {
-                               stream.Position = value;
-                       }
-               }
-
-               public override void Flush ()
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public override void Close ()
-               {
-                       // We cannot call "stream.Close" on a memory stream since it deletes the data
-               }
-
-               public override void SetLength (long value)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public override int Read (byte [] buffer, int offset, int count)
-               {
-                       return stream.Read (buffer, offset, count);
-               }
-
-               public override void Write (byte [] buffer, int offset, int count)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public override void WriteByte (byte value)
-               {
-                       throw new NotSupportedException ();
-               }
-
-               public override long Seek (long offset, SeekOrigin origin)
-               {
-                       return stream.Seek (offset, origin);
-               }
-
-               internal Stream InnerStream {
-                       get { return stream; }
-               }
-       }
-}
-

diff --git a/mcs/class/System.Net/moonlight_raw_System.Net.dll.sources b/mcs/class/System.Net/moonlight_raw_System.Net.dll.sources
index 85566a02931b4d313ea074c67eeaadaa372e2680..5acfd81cb8648830911dcf321c83df473c272a3a 100644 (file)
--- a/mcs/class/System.Net/moonlight_raw_System.Net.dll.sources
+++ b/mcs/class/System.Net/moonlight_raw_System.Net.dll.sources
@@ -3,7 +3,6 @@ System.Net/Dns_2_1.cs
 System.Net/HttpWebRequest_2_1.cs
 System.Net/HttpWebResponse_2_1.cs
 System.Net/InternalWebRequestStreamWrapper.cs
-System.Net/InternalWebResponseStreamWrapper.cs
 System.Net/WebExceptionStatus_2_1.cs
 System.Net/WebHeaderCollection_2_1.cs
 System.Net/WebClient_2_1.cs