diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Debugger.Core.csproj b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Debugger.Core.csproj index 5d5633068e..106265e450 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Debugger.Core.csproj +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Debugger.Core.csproj @@ -50,12 +50,9 @@ - - - @@ -66,12 +63,6 @@ - - - - - - @@ -385,7 +376,6 @@ - diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Eval.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Eval.cs index 18fa080190..8cc9e7ea22 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Eval.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Eval.cs @@ -258,4 +258,26 @@ namespace Debugger } } } + + /// + /// Provides data related to evalution events + /// + [Serializable] + public class EvalEventArgs : ProcessEventArgs + { + Eval eval; + + /// The evaluation that caused the event + public Eval Eval { + get { + return eval; + } + } + + /// Initializes a new instance of the class + public EvalEventArgs(Eval eval): base(eval.Process) + { + this.eval = eval; + } + } } diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Module.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Module.cs index 8dd6d597ea..47329a4dc2 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Module.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Module.cs @@ -158,4 +158,21 @@ namespace Debugger return string.Format("{0}", this.Filename); } } + + [Serializable] + public class ModuleEventArgs : ProcessEventArgs + { + Module module; + + public Module Module { + get { + return module; + } + } + + public ModuleEventArgs(Module module): base(module.Process) + { + this.module = module; + } + } } diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/NDebugger.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/NDebugger.cs index 51f9aa36a7..9848a711cd 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/NDebugger.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/NDebugger.cs @@ -155,4 +155,59 @@ namespace Debugger return process; } } + + [Serializable] + public class DebuggerEventArgs : EventArgs + { + NDebugger debugger; + + public NDebugger Debugger { + get { + return debugger; + } + } + + public DebuggerEventArgs(NDebugger debugger) + { + this.debugger = debugger; + } + } + + [Serializable] + public class MessageEventArgs : ProcessEventArgs + { + int level; + string message; + string category; + + public int Level { + get { + return level; + } + } + + public string Message { + get { + return message; + } + } + + public string Category { + get { + return category; + } + } + + public MessageEventArgs(Process process, string message): this(process, 0, message, String.Empty) + { + this.message = message; + } + + public MessageEventArgs(Process process, int level, string message, string category): base(process) + { + this.level = level; + this.message = message; + this.category = category; + } + } } diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Process.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Process.cs index 029aa9d464..0cf2f27c8c 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Process.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Process.cs @@ -240,4 +240,22 @@ namespace Debugger } } } + + [Serializable] + public class ProcessEventArgs: DebuggerEventArgs + { + Process process; + + [Debugger.Tests.Ignore] + public Process Process { + get { + return process; + } + } + + public ProcessEventArgs(Process process): base(process == null ? null : process.Debugger) + { + this.process = process; + } + } } diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/ProcessEventArgs.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/ProcessEventArgs.cs deleted file mode 100644 index b3e5296f21..0000000000 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/ProcessEventArgs.cs +++ /dev/null @@ -1,29 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; - -namespace Debugger -{ - [Serializable] - public class ProcessEventArgs: DebuggerEventArgs - { - Process process; - - [Debugger.Tests.Ignore] - public Process Process { - get { - return process; - } - } - - public ProcessEventArgs(Process process): base(process == null ? null : process.Debugger) - { - this.process = process; - } - } -} diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Stepper.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Stepper.cs index 0e86ccf0f4..4ed8e21e26 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Stepper.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Stepper.cs @@ -117,4 +117,21 @@ namespace Debugger return string.Format("{0} in {1} pause={2} \"{3}\"", Operation, StackFrame.ToString(), PauseWhenComplete, name); } } + + [Serializable] + public class StepperEventArgs: ProcessEventArgs + { + Stepper stepper; + + public Stepper Stepper { + get { + return stepper; + } + } + + public StepperEventArgs(Stepper stepper): base(stepper.Process) + { + this.stepper = stepper; + } + } } diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/StepperEventArgs.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/StepperEventArgs.cs deleted file mode 100644 index 57a3b056d9..0000000000 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/StepperEventArgs.cs +++ /dev/null @@ -1,28 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; - -namespace Debugger -{ - [Serializable] - public class StepperEventArgs: ProcessEventArgs - { - Stepper stepper; - - public Stepper Stepper { - get { - return stepper; - } - } - - public StepperEventArgs(Stepper stepper): base(stepper.Process) - { - this.stepper = stepper; - } - } -} diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Thread.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Thread.cs index 49c425dbb8..0a4ad42819 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Thread.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/Thread.cs @@ -335,4 +335,22 @@ namespace Debugger } } } + + [Serializable] + public class ThreadEventArgs : ProcessEventArgs + { + Thread thread; + + [Debugger.Tests.Ignore] + public Thread Thread { + get { + return thread; + } + } + + public ThreadEventArgs(Thread thread): base(thread.Process) + { + this.thread = thread; + } + } } diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/ThreadEventArgs.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/ThreadEventArgs.cs deleted file mode 100644 index 9b320a073e..0000000000 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Control/ThreadEventArgs.cs +++ /dev/null @@ -1,29 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; - -namespace Debugger -{ - [Serializable] - public class ThreadEventArgs : ProcessEventArgs - { - Thread thread; - - [Debugger.Tests.Ignore] - public Thread Thread { - get { - return thread; - } - } - - public ThreadEventArgs(Thread thread): base(thread.Process) - { - this.thread = thread; - } - } -} diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Breakpoint.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Breakpoint.cs index 837d48673d..f90cbbaf6a 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Breakpoint.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Breakpoint.cs @@ -120,4 +120,21 @@ namespace Debugger return true; } } + + [Serializable] + public class BreakpointEventArgs : DebuggerEventArgs + { + Breakpoint breakpoint; + + public Breakpoint Breakpoint { + get { + return breakpoint; + } + } + + public BreakpointEventArgs(Breakpoint breakpoint): base(breakpoint.Debugger) + { + this.breakpoint = breakpoint; + } + } } diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Exception.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Exception.cs index 2b37f15e10..5626545f8d 100644 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Exception.cs +++ b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/Debugger/Exception.cs @@ -92,4 +92,30 @@ namespace Debugger } } } + + public class ExceptionEventArgs: ProcessEventArgs + { + bool @continue; + Exception exception; + + public bool Continue { + get { + return @continue; + } + set { + @continue = value; + } + } + + public Exception Exception { + get { + return exception; + } + } + + public ExceptionEventArgs(Process process, Exception exception):base(process) + { + this.exception = exception; + } + } } diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/EventArgs/BreakpointEventArgs.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/EventArgs/BreakpointEventArgs.cs deleted file mode 100644 index 1863585a54..0000000000 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/EventArgs/BreakpointEventArgs.cs +++ /dev/null @@ -1,28 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; - -namespace Debugger -{ - [Serializable] - public class BreakpointEventArgs : DebuggerEventArgs - { - Breakpoint breakpoint; - - public Breakpoint Breakpoint { - get { - return breakpoint; - } - } - - public BreakpointEventArgs(Breakpoint breakpoint): base(breakpoint.Debugger) - { - this.breakpoint = breakpoint; - } - } -} diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/EventArgs/DebuggerEventArgs.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/EventArgs/DebuggerEventArgs.cs deleted file mode 100644 index f60665ce2b..0000000000 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/EventArgs/DebuggerEventArgs.cs +++ /dev/null @@ -1,28 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; - -namespace Debugger -{ - [Serializable] - public class DebuggerEventArgs : EventArgs - { - NDebugger debugger; - - public NDebugger Debugger { - get { - return debugger; - } - } - - public DebuggerEventArgs(NDebugger debugger) - { - this.debugger = debugger; - } - } -} diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/EventArgs/EvalEventArgs.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/EventArgs/EvalEventArgs.cs deleted file mode 100644 index a760dfe3f5..0000000000 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/EventArgs/EvalEventArgs.cs +++ /dev/null @@ -1,33 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; - -namespace Debugger -{ - /// - /// Provides data related to evalution events - /// - [Serializable] - public class EvalEventArgs : ProcessEventArgs - { - Eval eval; - - /// The evaluation that caused the event - public Eval Eval { - get { - return eval; - } - } - - /// Initializes a new instance of the class - public EvalEventArgs(Eval eval): base(eval.Process) - { - this.eval = eval; - } - } -} diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/EventArgs/ExceptionEventArgs.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/EventArgs/ExceptionEventArgs.cs deleted file mode 100644 index bf13a38e84..0000000000 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/EventArgs/ExceptionEventArgs.cs +++ /dev/null @@ -1,37 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; - -namespace Debugger -{ - public class ExceptionEventArgs: ProcessEventArgs - { - bool @continue; - Exception exception; - - public bool Continue { - get { - return @continue; - } - set { - @continue = value; - } - } - - public Exception Exception { - get { - return exception; - } - } - - public ExceptionEventArgs(Process process, Exception exception):base(process) - { - this.exception = exception; - } - } -} diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/EventArgs/MessageEventArgs.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/EventArgs/MessageEventArgs.cs deleted file mode 100644 index 0b41aec00b..0000000000 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/EventArgs/MessageEventArgs.cs +++ /dev/null @@ -1,49 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; - -namespace Debugger -{ - [Serializable] - public class MessageEventArgs : ProcessEventArgs - { - int level; - string message; - string category; - - public int Level { - get { - return level; - } - } - - public string Message { - get { - return message; - } - } - - public string Category { - get { - return category; - } - } - - public MessageEventArgs(Process process, string message): this(process, 0, message, String.Empty) - { - this.message = message; - } - - public MessageEventArgs(Process process, int level, string message, string category): base(process) - { - this.level = level; - this.message = message; - this.category = category; - } - } -} diff --git a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/EventArgs/ModuleEventArgs.cs b/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/EventArgs/ModuleEventArgs.cs deleted file mode 100644 index b3e5d61f10..0000000000 --- a/src/AddIns/Misc/Debugger/Debugger.Core/Project/Src/EventArgs/ModuleEventArgs.cs +++ /dev/null @@ -1,28 +0,0 @@ -// -// -// -// -// $Revision$ -// - -using System; - -namespace Debugger -{ - [Serializable] - public class ModuleEventArgs : ProcessEventArgs - { - Module module; - - public Module Module { - get { - return module; - } - } - - public ModuleEventArgs(Module module): base(module.Process) - { - this.module = module; - } - } -}