2007-09-05 Atsushi Enomoto <atsushi@ximian.com>

	* EventLog.cs, EventLogImpl.cs, LocalFileEventLog.cs, NullEventLog.cs,
	  Win32EventLog.cs : added missing members, will be left unsupported
	  in non-Win32 impl and left unimplemented in Win32.
	* CounterCreationDataCollection.cs : in 2.0 OnValidate() is overriden
	  instad of OnInsert().
	* Process.cs : removed StandardErrorEncoding and
	  StandardOutputEncoding. They do not exist anymore.


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

1 files changed, 2 insertions, 34 deletions

diff --git a/mcs/class/System/System.Diagnostics/Process.cs b/mcs/class/System/System.Diagnostics/Process.cs
index 6233d1bc787..fb11799c35a 100644
--- a/mcs/class/System/System.Diagnostics/Process.cs
+++ b/mcs/class/System/System.Diagnostics/Process.cs
@@ -82,10 +82,6 @@ namespace System.Diagnostics {
 		EventHandler exited_event;
 		IntPtr stdout_rd;
 		IntPtr stderr_rd;
-#if NET_2_0
-		Encoding stdout_encoding;
-		Encoding stderr_encoding;
-#endif
 		
 		/* Private constructor called from other methods */
 		private Process(IntPtr handle, int id) {
@@ -1081,10 +1077,8 @@ namespace System.Diagnostics {
 			}
 
 #if NET_2_0
-			// TODO: which ones has precedence? The one from startInfo or the one set using
-			// the Process instance properties?
-			Encoding stdoutEncoding = startInfo.StandardOutputEncoding ?? process.StandardOutputEncoding;
-			Encoding stderrEncoding = startInfo.StandardErrorEncoding ?? process.StandardErrorEncoding;
+			Encoding stdoutEncoding = startInfo.StandardOutputEncoding ?? ConsoleEncoding.OutputEncoding;
+			Encoding stderrEncoding = startInfo.StandardErrorEncoding ?? ConsoleEncoding.OutputEncoding;
 #else
 			Encoding stdoutEncoding = ConsoleEncoding.OutputEncoding;
 			Encoding stderrEncoding = ConsoleEncoding.OutputEncoding;
@@ -1579,32 +1573,6 @@ namespace System.Diagnostics {
 			synchronizingObject.BeginInvoke (exited_event, args);
 		}
 
-#if NET_2_0
-		public Encoding StandardOutputEncoding {
-			get {
-				if (stdout_encoding != null) {
-					return stdout_encoding;
-				}
-				return ConsoleEncoding.OutputEncoding;
-			}
-			set {
-				stdout_encoding = value; // if null, we'll use the default
-			}
-		}
-
-		public Encoding StandardErrorEncoding {
-			get {
-				if (stderr_encoding != null) {
-					return stderr_encoding;
-				}
-				return ConsoleEncoding.OutputEncoding;
-			}
-			set {
-				stderr_encoding = value; // if null, we'll use the default
-			}
-		}
-#endif
-
 		class ProcessWaitHandle : WaitHandle
 		{
 			public ProcessWaitHandle (IntPtr handle)