Added public property Debugger to debugger objects. 'debugger' parameter of many constructors inferred from other parameters.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@736 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/BreakPointsPad.cs

@@ -106,7 +106,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
 			breakpointsList.BeginUpdate();
 			breakpointsList.Items.Clear();
 			foreach(Debugger.Breakpoint b in debuggerCore.Breakpoints) {
-				AddBreakpoint(new BreakpointEventArgs(debuggerCore, b));
+				AddBreakpoint(new BreakpointEventArgs(b));
 			}
 			breakpointsList.EndUpdate();
 			breakpointsList.ItemCheck += new ItemCheckEventHandler(BreakpointsListItemCheck);
@@ -171,7 +171,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
 		{
 			breakpointsList.BeginUpdate();
 			foreach(Debugger.Breakpoint b in debuggerCore.Breakpoints)
-				RefreshBreakpoint(this, new BreakpointEventArgs(debuggerCore, b));
+				RefreshBreakpoint(this, new BreakpointEventArgs(b));
 			breakpointsList.EndUpdate();
 		}
 	}

src/AddIns/Misc/Debugger/Debugger.AddIn/Project/Src/Pads/LoadedModulesPad.cs

@@ -1,4 +1,4 @@
-// <file>
+// <file>
 //     <copyright see="prj:///doc/copyright.txt">2002-2005 AlphaSierraPapa</copyright>
 //     <license see="prj:///doc/license.txt">GNU General Public License</license>
 //     <owner name="David Srbecký" email="dsrbecky@gmail.com"/>
@@ -106,7 +106,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
 		{
             loadedModulesList.Items.Clear();
             foreach(Module m in debuggerCore.Modules) {
-                AddModule(this, new ModuleEventArgs(debuggerCore, m));
+                AddModule(this, new ModuleEventArgs(m));
             }
 		}
 

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Breakpoints/Breakpoint.cs

@@ -25,6 +25,12 @@ namespace Debugger
 		ICorDebugFunctionBreakpoint corBreakpoint;
 		IntPtr pBreakpoint;
 		
+		public NDebugger Debugger {
+			get {
+				return debugger;
+			}
+		}
+		
 		public SourcecodeSegment SourcecodeSegment {
 			get {
 				return sourcecodeSegment;
@@ -64,7 +70,7 @@ namespace Debugger
 		internal void OnBreakpointStateChanged()
 		{
 			if (BreakpointStateChanged != null)
-				BreakpointStateChanged(this, new BreakpointEventArgs(debugger, this));
+				BreakpointStateChanged(this, new BreakpointEventArgs(this));
 		}
 
 		public event EventHandler<BreakpointEventArgs> BreakpointHit;
@@ -72,7 +78,7 @@ namespace Debugger
 		internal void OnBreakpointHit()
 		{
 			if (BreakpointHit != null)
-				BreakpointHit(this, new BreakpointEventArgs(debugger, this));
+				BreakpointHit(this, new BreakpointEventArgs(this));
 		}
 
 		internal Breakpoint(NDebugger debugger, SourcecodeSegment sourcecodeSegment, bool enabled)

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Breakpoints/BreakpointEventArgs.cs

@@ -1,4 +1,4 @@
-// <file>
+// <file>
 //     <copyright see="prj:///doc/copyright.txt">2002-2005 AlphaSierraPapa</copyright>
 //     <license see="prj:///doc/license.txt">GNU General Public License</license>
 //     <owner name="David Srbecký" email="dsrbecky@gmail.com"/>
@@ -20,7 +20,7 @@ namespace Debugger
 			}
 		}
 		
-		public BreakpointEventArgs(NDebugger debugger, Breakpoint breakpoint): base(debugger)
+		public BreakpointEventArgs(Breakpoint breakpoint): base(breakpoint.Debugger)
 		{
 			this.breakpoint = breakpoint;
 		}

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Breakpoints/NDebugger-Breakpoints.cs

@@ -1,4 +1,4 @@
-// <file>
+// <file>
 //     <copyright see="prj:///doc/copyright.txt">2002-2005 AlphaSierraPapa</copyright>
 //     <license see="prj:///doc/license.txt">GNU General Public License</license>
 //     <owner name="David Srbecký" email="dsrbecky@gmail.com"/>
@@ -26,28 +26,28 @@ namespace Debugger
 		protected virtual void OnBreakpointAdded(Breakpoint breakpoint)
 		{
 			if (BreakpointAdded != null) {
-				BreakpointAdded(this, new BreakpointEventArgs(this, breakpoint));
+				BreakpointAdded(this, new BreakpointEventArgs(breakpoint));
 			}
 		}
 
 		protected virtual void OnBreakpointRemoved(Breakpoint breakpoint)
 		{
 			if (BreakpointRemoved != null) {
-				BreakpointRemoved(this, new BreakpointEventArgs(this, breakpoint));
+				BreakpointRemoved(this, new BreakpointEventArgs(breakpoint));
 			}
 		}
 
 		protected virtual void OnBreakpointStateChanged(object sender, BreakpointEventArgs e)
 		{
 			if (BreakpointStateChanged != null) {
-				BreakpointStateChanged(this, new BreakpointEventArgs(this, e.Breakpoint));
+				BreakpointStateChanged(this, new BreakpointEventArgs(e.Breakpoint));
 			}
 		}
 
 		protected virtual void OnBreakpointHit(object sender, BreakpointEventArgs e)
 		{
 			if (BreakpointHit != null) {
-				BreakpointHit(this, new BreakpointEventArgs(this, e.Breakpoint));
+				BreakpointHit(this, new BreakpointEventArgs(e.Breakpoint));
 			}
 		}
 

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Internal/ManagedCallback.cs

@@ -27,6 +27,12 @@ namespace Debugger
 		
 		Process callingProcess;
 		Thread callingThread;
+		
+		public NDebugger Debugger {
+			get {
+				return debugger;
+			}
+		}
 
 		public ManagedCallback(NDebugger debugger)
 		{
@@ -203,7 +209,7 @@ namespace Debugger
 			// this will also remove the eval form PendingEvals collection
 			Eval eval = debugger.GetEval(corEval);
 			if (eval != null) {
-				eval.OnEvalComplete(new EvalEventArgs(debugger, eval));
+				eval.OnEvalComplete(new EvalEventArgs(eval));
 			}
 			
 			if (debugger.PendingEvals.Count > 0) {

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Internal/ManagedCallbackProxy.cs

@@ -28,9 +28,15 @@ namespace Debugger
 		ManagedCallback realCallback;
 		MTA2STA mta2sta;
 		
-		public ManagedCallbackProxy(NDebugger debugger, ManagedCallback realCallback)
+		public NDebugger Debugger {
+			get {
+				return debugger;
+			}
+		}
+		
+		public ManagedCallbackProxy(ManagedCallback realCallback)
 		{
-			this.debugger = debugger;
+			this.debugger = realCallback.Debugger;
 			this.realCallback = realCallback;
 			mta2sta = new MTA2STA();
 		}

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/NDebugger.cs

@@ -91,7 +91,7 @@ namespace Debugger
 			NativeMethods.CreateDebuggingInterfaceFromVersion(3, version, out corDebug);
 			
 			managedCallback = new ManagedCallback(this);
-			managedCallbackProxy = new ManagedCallbackProxy(this, managedCallback);
+			managedCallbackProxy = new ManagedCallbackProxy(managedCallback);
 			
 			corDebug.Initialize();
 			corDebug.SetManagedHandler(managedCallbackProxy);

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Modules/Module.cs

@@ -1,4 +1,4 @@
-// <file>
+// <file>
 //     <copyright see="prj:///doc/copyright.txt">2002-2005 AlphaSierraPapa</copyright>
 //     <license see="prj:///doc/license.txt">GNU General Public License</license>
 //     <owner name="David Srbecký" email="dsrbecky@gmail.com"/>
@@ -16,6 +16,8 @@ namespace Debugger
 {
 	public class Module: RemotingObjectBase, IDisposable
 	{
+		NDebugger debugger;
+		
 		string fullPath;
 		ulong  baseAdress;
 		int    isDynamic;
@@ -26,6 +28,12 @@ namespace Debugger
 		ISymbolReader symReader;
 		IMetaDataImport metaDataInterface;
 		
+		public NDebugger Debugger {
+			get {
+				return debugger;
+			}
+		}
+		
 		internal MetaData MetaData {
 			get {
 				return new MetaData(metaDataInterface);
@@ -106,8 +114,10 @@ namespace Debugger
 			}
 		}
 		
-		internal Module(ICorDebugModule pModule)
+		internal Module(NDebugger debugger, ICorDebugModule pModule)
 		{
+			this.debugger = debugger;
+			
 			corModule = pModule;
 			
 			pModule.GetBaseAddress(out baseAdress);

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Modules/ModuleEventArgs.cs

@@ -1,4 +1,4 @@
-// <file>
+// <file>
 //     <copyright see="prj:///doc/copyright.txt">2002-2005 AlphaSierraPapa</copyright>
 //     <license see="prj:///doc/license.txt">GNU General Public License</license>
 //     <owner name="David Srbecký" email="dsrbecky@gmail.com"/>
@@ -20,7 +20,7 @@ namespace Debugger
 			}
 		}
 		
-		public ModuleEventArgs(NDebugger debugger, Module module): base(debugger)
+		public ModuleEventArgs(Module module): base(module.Debugger)
 		{
 			this.module = module;
 		}

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Modules/NDebugger-Modules.cs

@@ -1,4 +1,4 @@
-// <file>
+// <file>
 //     <copyright see="prj:///doc/copyright.txt">2002-2005 AlphaSierraPapa</copyright>
 //     <license see="prj:///doc/license.txt">GNU General Public License</license>
 //     <owner name="David Srbecký" email="dsrbecky@gmail.com"/>
@@ -24,14 +24,14 @@ namespace Debugger
 		protected void OnModuleLoaded(Module module)
 		{
 			if (ModuleLoaded != null) {
-				ModuleLoaded(this, new ModuleEventArgs(this, module));
+				ModuleLoaded(this, new ModuleEventArgs(module));
 			}
 		}
 
 		protected void OnModuleUnloaded(Module module)
 		{
 			if (ModuleUnloaded != null) {
-				ModuleUnloaded(this, new ModuleEventArgs(this, module));
+				ModuleUnloaded(this, new ModuleEventArgs(module));
 			}
 		}
 
@@ -73,7 +73,7 @@ namespace Debugger
 
 		internal void AddModule(ICorDebugModule corModule)
 		{
-			AddModule(new Module(corModule));
+			AddModule(new Module(this, corModule));
 		}
 
 		internal void RemoveModule(Module module)

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Exception.cs

@@ -1,4 +1,4 @@
-// <file>
+// <file>
 //     <copyright see="prj:///doc/copyright.txt">2002-2005 AlphaSierraPapa</copyright>
 //     <license see="prj:///doc/license.txt">GNU General Public License</license>
 //     <owner name="David Srbecký" email="dsrbecky@gmail.com"/>
@@ -28,11 +28,17 @@ namespace Debugger
 		string            callstack;
 		string            type;
 		string            message;
-	
+		
-		internal Exception(NDebugger debugger, Thread thread)
+		public NDebugger Debugger {
+			get {
+				return debugger;
+			}
+		}
+		
+		internal Exception(Thread thread)
 		{
 			creationTime = DateTime.Now;
-			this.debugger = debugger;
+			this.debugger = thread.Debugger;
 			this.thread = thread;
 			thread.CorThread.GetCurrentException(out corValue);
 			exceptionType = thread.CurrentExceptionType;

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Function.cs

@@ -26,6 +26,12 @@ namespace Debugger
 		ICorDebugFunction corFunction;
 
 		MethodProps methodProps;
+		
+		public NDebugger Debugger {
+			get {
+				return debugger;
+			}
+		}
 
 		public string Name { 
 			get { 
@@ -449,7 +455,7 @@ namespace Debugger
 					}
 					Eval eval = new Eval(debugger, evalCorFunction, evalArgs);
 					debugger.AddEval(eval);
-					properties.Add(new PropertyVariable(debugger, eval, method.Name.Remove(0, 4)));
+					properties.Add(new PropertyVariable(eval, method.Name.Remove(0, 4)));
 				}
 			}
 

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/NDebugger-Processes.cs

@@ -1,4 +1,4 @@
-// <file>
+// <file>
 //     <copyright see="prj:///doc/copyright.txt">2002-2005 AlphaSierraPapa</copyright>
 //     <license see="prj:///doc/license.txt">GNU General Public License</license>
 //     <owner name="David Srbecký" email="dsrbecky@gmail.com"/>
@@ -50,14 +50,14 @@ namespace Debugger
 		protected virtual void OnProcessStarted(Process process)
 		{
 			if (ProcessStarted != null) {
-				ProcessStarted(this, new ProcessEventArgs(this, process));
+				ProcessStarted(this, new ProcessEventArgs(process));
 			}
 		}
 
 		protected virtual void OnProcessExited(Process process)
 		{
 			if (ProcessExited != null) {
-				ProcessExited(this, new ProcessEventArgs(this, process));
+				ProcessExited(this, new ProcessEventArgs(process));
 			}
 		}
 	}

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/NDebugger-Threads.cs

@@ -1,4 +1,4 @@
-// <file>
+// <file>
 //     <copyright see="prj:///doc/copyright.txt">2002-2005 AlphaSierraPapa</copyright>
 //     <license see="prj:///doc/license.txt">GNU General Public License</license>
 //     <owner name="David Srbecký" email="dsrbecky@gmail.com"/>
@@ -23,21 +23,21 @@ namespace Debugger
 		protected void OnThreadStarted(Thread thread)
 		{
 			if (ThreadStarted != null) {
-				ThreadStarted(this, new ThreadEventArgs(this, thread));
+				ThreadStarted(this, new ThreadEventArgs(thread));
 			}
 		}
 
 		protected void OnThreadExited(Thread thread)
 		{
 			if (ThreadExited != null) {
-				ThreadExited(this, new ThreadEventArgs(this, thread));
+				ThreadExited(this, new ThreadEventArgs(thread));
 			}
 		}
 
 		protected void OnThreadStateChanged(object sender, ThreadEventArgs e)
 		{
 			if (ThreadStateChanged != null) {
-				ThreadStateChanged(this, new ThreadEventArgs(this, e.Thread));
+				ThreadStateChanged(this, new ThreadEventArgs(e.Thread));
 			}
 		}
 

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Process.cs

@@ -1,4 +1,4 @@
-// <file>
+// <file>
 //     <copyright see="prj:///doc/copyright.txt">2002-2005 AlphaSierraPapa</copyright>
 //     <license see="prj:///doc/license.txt">GNU General Public License</license>
 //     <owner name="David Srbecký" email="dsrbecky@gmail.com"/>
@@ -23,6 +23,12 @@ namespace Debugger
 
 		Thread currentThread;
 		bool isProcessRunning = true;
+		
+		public NDebugger Debugger {
+			get {
+				return debugger;
+			}
+		}
 
 		internal Process(NDebugger debugger, ICorDebugProcess corProcess)
 		{

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/ProcessEventArgs.cs

@@ -1,4 +1,4 @@
-// <file>
+// <file>
 //     <copyright see="prj:///doc/copyright.txt">2002-2005 AlphaSierraPapa</copyright>
 //     <license see="prj:///doc/license.txt">GNU General Public License</license>
 //     <owner name="David Srbecký" email="dsrbecky@gmail.com"/>
@@ -20,7 +20,7 @@ namespace Debugger
 			}
 		}
 
-		public ProcessEventArgs(NDebugger debugger, Process process): base(debugger)
+		public ProcessEventArgs(Process process): base(process.Debugger)
 		{
 			this.process = process;
 		}

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/Thread.cs

@@ -33,6 +33,12 @@ namespace Debugger
 		bool hasBeenLoaded = false;
 
 		Function currentFunction;
+		
+		public NDebugger Debugger {
+			get {
+				return debugger;
+			}
+		}
 
 		internal bool HasBeenLoaded {
 			get {
@@ -169,7 +175,7 @@ namespace Debugger
 		protected void OnThreadStateChanged()
 		{
 			if (ThreadStateChanged != null)
-				ThreadStateChanged(this, new ThreadEventArgs(debugger, this));
+				ThreadStateChanged(this, new ThreadEventArgs(this));
 		}
 
 
@@ -181,7 +187,7 @@ namespace Debugger
 
 		public Exception CurrentException {
 			get {
-				return new Exception(debugger, this);
+				return new Exception(this);
 			}
 		}
 

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Threads/ThreadEventArgs.cs

@@ -1,4 +1,4 @@
-// <file>
+// <file>
 //     <copyright see="prj:///doc/copyright.txt">2002-2005 AlphaSierraPapa</copyright>
 //     <license see="prj:///doc/license.txt">GNU General Public License</license>
 //     <owner name="David Srbecký" email="dsrbecky@gmail.com"/>
@@ -20,7 +20,7 @@ namespace Debugger
 			}
 		}
 		
-		public ThreadEventArgs(NDebugger debugger, Thread thread): base(debugger)
+		public ThreadEventArgs(Thread thread): base(thread.Debugger)
 		{
 			this.thread = thread;
 		}

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Evals/Eval.cs

@@ -33,6 +33,12 @@ namespace Debugger
 		public event EventHandler<EvalEventArgs> EvalStarted;
 		public event EventHandler<EvalEventArgs> EvalComplete;
 		
+		public NDebugger Debugger {
+			get {
+				return debugger;
+			}
+		}
+		
 		/// <summary>
 		/// True if the evaluation has been completed.
 		/// </summary>
@@ -92,7 +98,7 @@ namespace Debugger
 			
 			evaluating = true;
 			
-			OnEvalStarted(new EvalEventArgs(debugger, this));
+			OnEvalStarted(new EvalEventArgs(this));
 			
 			return true;
 		}

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Evals/EvalEventArgs.cs

@@ -26,7 +26,7 @@ namespace Debugger
 			}
 		}
 		
-		public EvalEventArgs(NDebugger debugger, Eval eval): base(debugger)
+		public EvalEventArgs(Eval eval): base(eval.Debugger)
 		{
 			this.eval = eval;
 		}

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Evals/NDebugger-Evals.cs

@@ -62,7 +62,7 @@ namespace Debugger
 			
 			eval.EvalComplete += EvalComplete;
 			
-			OnEvalAdded(new EvalEventArgs(this, eval));
+			OnEvalAdded(new EvalEventArgs(eval));
 			
 			return eval;
 		}

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/PropertyVariable.cs

@@ -17,7 +17,7 @@ namespace Debugger
 		
 		public event EventHandler<DebuggerEventArgs> ValueEvaluated;
 		
-		internal PropertyVariable(NDebugger debugger, Eval eval, string name):base(debugger, null, name)
+		internal PropertyVariable(Eval eval, string name):base(eval.Debugger, null, name)
 		{
 			this.eval = eval;
 			eval.EvalStarted += EvalStarted;

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Variables/Variable.cs

@@ -23,6 +23,12 @@ namespace Debugger
 		
 		public event EventHandler<VariableEventArgs> ValueChanged;
 		
+		public NDebugger Debugger {
+			get {
+				return debugger;
+			}
+		}
+		
 		protected virtual void OnValueChanged(VariableEventArgs e)
 		{
 			if (ValueChanged != null) {
@@ -30,12 +36,6 @@ namespace Debugger
 			}
 		}
 		
-		public NDebugger Debugger {
-			get {
-				return debugger;
-			}
-		}
-		
 		public string Name { 
 			get{ 
 				return name;