All events inherit from DebuggerEventArgs

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

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

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

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

@@ -106,7 +106,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
 		{
             loadedModulesList.Items.Clear();
             foreach(Module m in debuggerCore.Modules) {
-                AddModule(this, new ModuleEventArgs(m));
+                AddModule(this, new ModuleEventArgs(debuggerCore, m));
             }
 		}
 

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

@@ -103,7 +103,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
 		void RefreshList()
 		{
             if (debugger.IsDebugging && debugger.IsProcessRunning == false) {
-                debuggerService_OnDebuggingPaused(this, new DebuggingPausedEventArgs(PausedReason.StepComplete));
+                debuggerService_OnDebuggingPaused(this, new DebuggingPausedEventArgs(debuggerCore, PausedReason.StepComplete));
             }
 		}
 
@@ -152,12 +152,12 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
  				RefreshVariable(var);
  				
  				if (var is PropertyVariable) {
- 					((PropertyVariable)var).ValueEvaluated += new EventHandler(PropertyEvaluated);
+ 					((PropertyVariable)var).ValueEvaluated += new DebuggerEventHandler(PropertyEvaluated);
  				}
 			}           
 		}
 		
-		void PropertyEvaluated (object sender, EventArgs args)
+		void PropertyEvaluated (object sender, DebuggerEventArgs args)
 		{
 			RefreshVariable((Variable)sender);
 		}		

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

@@ -148,7 +148,7 @@ namespace ICSharpCode.SharpDevelop.Gui.Pads
 		private void RefreshList()
 		{
 			foreach (Thread t in debuggerCore.Threads) {
-				RefreshThread(this, new ThreadEventArgs(t));
+				RefreshThread(this, new ThreadEventArgs(debuggerCore, t));
 			}
 		}
 	}

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

@@ -61,7 +61,7 @@ namespace DebuggerLibrary
 		internal void OnBreakpointStateChanged()
 		{
 			if (BreakpointStateChanged != null)
-				BreakpointStateChanged(this, new BreakpointEventArgs(this));
+				BreakpointStateChanged(this, new BreakpointEventArgs(debugger, this));
 		}
 
 		public event BreakpointEventHandler BreakpointHit;
@@ -69,7 +69,7 @@ namespace DebuggerLibrary
 		internal void OnBreakpointHit()
 		{
 			if (BreakpointHit != null)
-				BreakpointHit(this, new BreakpointEventArgs(this));
+				BreakpointHit(this, new BreakpointEventArgs(debugger, this));
 		}
 
 		internal Breakpoint(NDebugger debugger, SourcecodeSegment sourcecodeSegment, bool enabled)

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

@@ -9,7 +9,7 @@ namespace DebuggerLibrary
 	public delegate void BreakpointEventHandler (object sender, BreakpointEventArgs e);
 	
 	[Serializable]
-	public class BreakpointEventArgs : System.EventArgs 
+	public class BreakpointEventArgs : DebuggerEventArgs
 	{
 		Breakpoint breakpoint;
 		
@@ -19,7 +19,7 @@ namespace DebuggerLibrary
 			}
 		}
 		
-		public BreakpointEventArgs(Breakpoint breakpoint)
+		public BreakpointEventArgs(NDebugger debugger, Breakpoint breakpoint): base(debugger)
 		{
 			this.breakpoint = breakpoint;
 		}

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

@@ -23,28 +23,28 @@ namespace DebuggerLibrary
 		protected virtual void OnBreakpointAdded(Breakpoint breakpoint)
 		{
 			if (BreakpointAdded != null) {
-				BreakpointAdded(this, new BreakpointEventArgs(breakpoint));
+				BreakpointAdded(this, new BreakpointEventArgs(this, breakpoint));
 			}
 		}
 
 		protected virtual void OnBreakpointRemoved(Breakpoint breakpoint)
 		{
 			if (BreakpointRemoved != null) {
-				BreakpointRemoved(this, new BreakpointEventArgs(breakpoint));
+				BreakpointRemoved(this, new BreakpointEventArgs(this, breakpoint));
 			}
 		}
 
 		protected virtual void OnBreakpointStateChanged(object sender, BreakpointEventArgs e)
 		{
 			if (BreakpointStateChanged != null) {
-				BreakpointStateChanged(this, new BreakpointEventArgs(e.Breakpoint));
+				BreakpointStateChanged(this, new BreakpointEventArgs(this, e.Breakpoint));
 			}
 		}
 
 		protected virtual void OnBreakpointHit(object sender, BreakpointEventArgs e)
 		{
 			if (BreakpointHit != null) {
-				BreakpointHit(this, new BreakpointEventArgs(e.Breakpoint));
+				BreakpointHit(this, new BreakpointEventArgs(this, e.Breakpoint));
 			}
 		}
 

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/DebuggerEvents/DebuggerEventHandler.cs

@@ -9,8 +9,19 @@ namespace DebuggerLibrary
 	public delegate void DebuggerEventHandler (object sender, DebuggerEventArgs e);
 	
 	[Serializable]
-	public class DebuggerEventArgs : System.EventArgs 
+	public class DebuggerEventArgs : EventArgs 
 	{
-		// Some parameters are expected in the furture
+		NDebugger debugger;
+
+		public NDebugger Debugger {
+			get {
+				return debugger;
+			}
+		}
+
+		public DebuggerEventArgs(NDebugger debugger)
+		{
+			this.debugger = debugger;
+		}
 	}
 }

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/DebuggerEvents/DebuggingIsResumingEventHandler.cs

@@ -9,7 +9,7 @@ namespace DebuggerLibrary
 	public delegate void DebuggingIsResumingEventHandler (object sender, DebuggingIsResumingEventArgs e);
 	
 	[Serializable]
-	public class DebuggingIsResumingEventArgs : System.EventArgs 
+	public class DebuggingIsResumingEventArgs : DebuggerEventArgs
 	{
 		bool abort;
 		
@@ -22,7 +22,7 @@ namespace DebuggerLibrary
 			}
 		}
 		
-		public DebuggingIsResumingEventArgs()
+		public DebuggingIsResumingEventArgs(NDebugger debugger): base(debugger)
 		{
 			this.abort = false;
 		}

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/DebuggerEvents/DebuggingPausedEventHandler.cs

@@ -9,7 +9,7 @@ namespace DebuggerLibrary
 	public delegate void DebuggingPausedEventHandler (object sender, DebuggingPausedEventArgs e);
 	
 	[Serializable]
-	public class DebuggingPausedEventArgs : System.EventArgs 
+	public class DebuggingPausedEventArgs : DebuggerEventArgs
 	{
 		PausedReason reason;
 
@@ -38,7 +38,7 @@ namespace DebuggerLibrary
 			resumeDebugging = true;
 		}
 		
-		public DebuggingPausedEventArgs(PausedReason reason)
+		public DebuggingPausedEventArgs(NDebugger debugger, PausedReason reason): base(debugger)
 		{
 			this.reason = reason;
 		}

src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/DebuggerEvents/MessageEventHandler.cs

@@ -9,7 +9,7 @@ namespace DebuggerLibrary
 	public delegate void MessageEventHandler (object sender, MessageEventArgs e);
 	
 	[Serializable]
-	public class MessageEventArgs : System.EventArgs 
+	public class MessageEventArgs : DebuggerEventArgs
 	{
 		string message;
 		
@@ -19,7 +19,7 @@ namespace DebuggerLibrary
 			}
 		}
 		
-		public MessageEventArgs(string message)
+		public MessageEventArgs(NDebugger debugger, string message): base(debugger)
 		{
 			this.message = message;
 		}

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

@@ -195,7 +195,7 @@ namespace DebuggerLibrary
 			EnterCallback("EvalComplete", pThread);
 			
 			if (CorDebugEvalCompleted != null) {
-				CorDebugEvalCompleted(this, new CorDebugEvalEventArgs(eval));
+				CorDebugEvalCompleted(this, new CorDebugEvalEventArgs(debugger, eval));
 			}
 			
 			ExitCallback_Paused(PausedReason.EvalComplete);

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

@@ -24,7 +24,7 @@ namespace DebuggerLibrary
 
 		ApartmentState requiredApartmentState;
 
-		EvalQueue evalQueue = new EvalQueue();
+		EvalQueue evalQueue;
 
 		internal EvalQueue EvalQueue {
 			get { 
@@ -97,7 +97,7 @@ namespace DebuggerLibrary
 			
 			currentProcess = null;
 
-			evalQueue = new EvalQueue();
+			evalQueue = new EvalQueue(this);
 			
 			GC.Collect(GC.MaxGeneration);
 			GC.WaitForPendingFinalizers();
@@ -114,8 +114,8 @@ namespace DebuggerLibrary
 		{
 			TraceMessage ("Debugger event: OnDebuggingPaused(" + reason.ToString() + ")");
 			if (DebuggingPaused != null) {
-				DebuggingPausedEventArgs args = new DebuggingPausedEventArgs(reason);
-				DebuggingPaused(null, args);
+				DebuggingPausedEventArgs args = new DebuggingPausedEventArgs(this, reason);
+				DebuggingPaused(this, args);
 				if (args.ResumeDebugging) {
 					Continue();
 				}
@@ -130,8 +130,8 @@ namespace DebuggerLibrary
 			if (DebuggingIsResuming != null) {
 				TraceMessage ("Debugger event: OnDebuggingIsResuming(" + abort.ToString() + ")");
 				foreach(Delegate d in DebuggingIsResuming.GetInvocationList()) {
-					DebuggingIsResumingEventArgs eventHandler = new DebuggingIsResumingEventArgs();
-					d.DynamicInvoke(new object[] {null, eventHandler});
+					DebuggingIsResumingEventArgs eventHandler = new DebuggingIsResumingEventArgs(this);
+					d.DynamicInvoke(new object[] {this, eventHandler});
 					if (eventHandler.Abort == true) {
 						abort = true;
 						break;
@@ -147,7 +147,7 @@ namespace DebuggerLibrary
 		{
 			TraceMessage ("Debugger event: OnDebuggingResumed()");
 			if (DebuggingResumed != null) {
-				DebuggingResumed(null, new DebuggerEventArgs());
+				DebuggingResumed(this, new DebuggerEventArgs(this));
 			}
 		}
 
@@ -158,7 +158,7 @@ namespace DebuggerLibrary
 		{
 			TraceMessage ("Debugger event: OnIsProcessRunningChanged()");
 			if (IsProcessRunningChanged != null) {
-				IsProcessRunningChanged(null, new DebuggerEventArgs());
+				IsProcessRunningChanged(this, new DebuggerEventArgs(this));
 			}
 		}
 
@@ -169,7 +169,7 @@ namespace DebuggerLibrary
 		{
 			TraceMessage ("Debugger event: OnIsDebuggingChanged()");
 			if (IsDebuggingChanged != null) {
-				IsDebuggingChanged(null, new DebuggerEventArgs());
+				IsDebuggingChanged(this, new DebuggerEventArgs(this));
 			}
 		}
 
@@ -182,7 +182,7 @@ namespace DebuggerLibrary
 		{
 			TraceMessage ("Debugger event: OnLogMessage(\"" + message + "\")");
 			if (LogMessage != null) {
-				LogMessage(null, new MessageEventArgs(message));
+				LogMessage(this, new MessageEventArgs(this, message));
 			}
 		}
 
@@ -194,7 +194,7 @@ namespace DebuggerLibrary
 		protected internal virtual void OnDebuggerTraceMessage(string message)
 		{
 			if (DebuggerTraceMessage != null) {
-				DebuggerTraceMessage(null, new MessageEventArgs(message));
+				DebuggerTraceMessage(this, new MessageEventArgs(this, message));
 			}
 		}
 

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

@@ -9,7 +9,7 @@ namespace DebuggerLibrary
 	public delegate void ModuleEventHandler (object sender, ModuleEventArgs e);
 	
 	[Serializable]
-	public class ModuleEventArgs : System.EventArgs 
+	public class ModuleEventArgs : DebuggerEventArgs
 	{
 		Module module;
 		
@@ -19,7 +19,7 @@ namespace DebuggerLibrary
 			}
 		}
 		
-		public ModuleEventArgs(Module module)
+		public ModuleEventArgs(NDebugger debugger, Module module): base(debugger)
 		{
 			this.module = module;
 		}

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

@@ -21,14 +21,14 @@ namespace DebuggerLibrary
 		protected void OnModuleLoaded(Module module)
 		{
 			if (ModuleLoaded != null) {
-				ModuleLoaded(this, new ModuleEventArgs(module));
+				ModuleLoaded(this, new ModuleEventArgs(this, module));
 			}
 		}
 
 		protected void OnModuleUnloaded(Module module)
 		{
 			if (ModuleUnloaded != null) {
-				ModuleUnloaded(this, new ModuleEventArgs(module));
+				ModuleUnloaded(this, new ModuleEventArgs(this, module));
 			}
 		}
 

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

@@ -57,14 +57,14 @@ namespace DebuggerLibrary
 		protected virtual void OnProcessStarted(Process process)
 		{
 			if (ProcessStarted != null) {
-				ProcessStarted(this, new ProcessEventArgs(process));
+				ProcessStarted(this, new ProcessEventArgs(this, process));
 			}
 		}
 
 		protected virtual void OnProcessExited(Process process)
 		{
 			if (ProcessExited != null) {
-				ProcessExited(this, new ProcessEventArgs(process));
+				ProcessExited(this, new ProcessEventArgs(this, process));
 			}
 		}
 	}

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

@@ -20,21 +20,21 @@ namespace DebuggerLibrary
 		protected void OnThreadStarted(Thread thread)
 		{
 			if (ThreadStarted != null) {
-				ThreadStarted(this, new ThreadEventArgs(thread));
+				ThreadStarted(this, new ThreadEventArgs(this, thread));
 			}
 		}
 
 		protected void OnThreadExited(Thread thread)
 		{
 			if (ThreadExited != null) {
-				ThreadExited(this, new ThreadEventArgs(thread));
+				ThreadExited(this, new ThreadEventArgs(this, thread));
 			}
 		}
 
 		protected void OnThreadStateChanged(object sender, ThreadEventArgs e)
 		{
 			if (ThreadStateChanged != null) {
-				ThreadStateChanged(this, new ThreadEventArgs(e.Thread));
+				ThreadStateChanged(this, new ThreadEventArgs(this, e.Thread));
 			}
 		}
 

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

@@ -9,7 +9,7 @@ namespace DebuggerLibrary
 	public delegate void ProcessEventHandler (object sender, ProcessEventArgs args);
 
 	[Serializable]
-	public class ProcessEventArgs: EventArgs
+	public class ProcessEventArgs: DebuggerEventArgs
 	{
 		Process process;
 
@@ -19,7 +19,7 @@ namespace DebuggerLibrary
 			}
 		}
 
-		public ProcessEventArgs(Process process)
+		public ProcessEventArgs(NDebugger debugger, Process process): base(debugger)
 		{
 			this.process = process;
 		}

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

@@ -133,7 +133,7 @@ namespace DebuggerLibrary
 		protected void OnThreadStateChanged()
 		{
 			if (ThreadStateChanged != null)
-				ThreadStateChanged(this, new ThreadEventArgs(this));
+				ThreadStateChanged(this, new ThreadEventArgs(debugger, this));
 		}
 
 

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

@@ -9,7 +9,7 @@ namespace DebuggerLibrary
 	public delegate void ThreadEventHandler (object sender, ThreadEventArgs e);
 	
 	[Serializable]
-	public class ThreadEventArgs : System.EventArgs 
+	public class ThreadEventArgs : DebuggerEventArgs
 	{
 		Thread thread;
 		
@@ -19,7 +19,7 @@ namespace DebuggerLibrary
 			}
 		}
 		
-		public ThreadEventArgs(Thread thread)
+		public ThreadEventArgs(NDebugger debugger, Thread thread): base(debugger)
 		{
 			this.thread = thread;
 		}

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

@@ -9,7 +9,7 @@ namespace DebuggerLibrary
 {	
 	delegate void CorDebugEvalEventHandler (object sender, CorDebugEvalEventArgs e);
 	
-	class CorDebugEvalEventArgs : System.EventArgs 
+	class CorDebugEvalEventArgs : DebuggerEventArgs
 	{
 		ICorDebugEval corDebugEval;
 		
@@ -19,7 +19,7 @@ namespace DebuggerLibrary
 			}
 		}
 		
-		public CorDebugEvalEventArgs(ICorDebugEval corDebugEval)
+		public CorDebugEvalEventArgs(NDebugger debugger, ICorDebugEval corDebugEval): base(debugger)
 		{
 			this.corDebugEval = corDebugEval;
 		}

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

@@ -20,9 +20,9 @@ namespace DebuggerLibrary
 		ICorDebugValue[]  args;
 		bool              complete = false;
 		
-		public event EventHandler EvalComplete;
+		public event DebuggerEventHandler EvalComplete;
 
-		protected virtual void OnEvalComplete(EventArgs e) 
+		protected virtual void OnEvalComplete(DebuggerEventArgs e) 
 		{
 			if (EvalComplete != null) {
 				EvalComplete(this, e);
@@ -77,7 +77,7 @@ namespace DebuggerLibrary
 		{
 			if (e.CorDebugEval == corEval) {
 				complete = true;
-				OnEvalComplete(EventArgs.Empty);
+				OnEvalComplete(new DebuggerEventArgs(debugger));
 			}
 		}
 	}

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

@@ -13,9 +13,16 @@ namespace DebuggerLibrary
 {
 	class EvalQueue
 	{
+		NDebugger debugger;
+
 		ArrayList waitingEvals = new ArrayList();
 		
-		public event EventHandler AllEvalsComplete;
+		public event DebuggerEventHandler AllEvalsComplete;
+
+		public EvalQueue(NDebugger debugger)
+		{
+			this.debugger = debugger;
+		}
 		
 		public void AddEval(Eval eval)
 		{
@@ -40,7 +47,7 @@ namespace DebuggerLibrary
 			
 			if (waitingEvals.Count == 0) {
 				if (AllEvalsComplete != null) {
-					AllEvalsComplete(null, EventArgs.Empty);
+					AllEvalsComplete(this, new DebuggerEventArgs(debugger));
 				}
 			}
 		}

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

@@ -12,12 +12,12 @@ namespace DebuggerLibrary
 	{
 		Eval           eval;
 		Variable       currentValue;
-		public event EventHandler ValueEvaluated;
+		public event DebuggerEventHandler ValueEvaluated;
 		
 		internal PropertyVariable(NDebugger debugger, Eval eval, string name):base(debugger, null, name)
 		{
 			this.eval = eval;
-			eval.EvalComplete += new EventHandler(EvalComplete);
+			eval.EvalComplete += new DebuggerEventHandler(EvalComplete);
 		}
 		
 		public bool IsEvaluated {
@@ -70,7 +70,7 @@ namespace DebuggerLibrary
 			eval.AsyncPerformEval();
 		}
 		
-		void EvalComplete(object sender, EventArgs args)
+		void EvalComplete(object sender, DebuggerEventArgs args)
 		{
 			currentValue = VariableFactory.CreateVariable(debugger, eval.GetResult(), Name);
 			OnValueEvaluated();
@@ -79,7 +79,7 @@ namespace DebuggerLibrary
 		protected void OnValueEvaluated()
 		{
 			if (ValueEvaluated != null) {
-				ValueEvaluated(this, EventArgs.Empty);
+				ValueEvaluated(this, new DebuggerEventArgs(debugger));
 			}
 		}
 	}