Some call forwarders removed

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

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

@@ -341,14 +341,14 @@ namespace DebuggerLibrary
 		public SourcecodeSegment NextStatement { 
 			get {
 				if (!IsDebugging) return null;
-				return CurrentProcess.NextStatement;
+				return CurrentProcess.CurrentThread.CurrentFunction.NextStatement;
 			}
 		}
 
 		public VariableCollection LocalVariables { 
 			get {
 				if (!IsDebugging) return VariableCollection.Empty;
-				return CurrentProcess.LocalVariables;
+				return CurrentProcess.CurrentThread.CurrentFunction.GetLocalVariables();
 			}
 		}
 
@@ -359,17 +359,17 @@ namespace DebuggerLibrary
 
 		public void StepInto()
 		{
-			CurrentProcess.StepInto();
+			CurrentProcess.CurrentThread.CurrentFunction.StepInto();
 		}
 
 		public void StepOver()
 		{
-			CurrentProcess.StepOver();
+			CurrentProcess.CurrentThread.CurrentFunction.StepOver();
 		}
 
 		public void StepOut()
 		{
-			CurrentProcess.StepOut();
+			CurrentProcess.CurrentThread.CurrentFunction.StepOut();
 		}
 
 		public void Continue()

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

@@ -44,7 +44,7 @@ namespace DebuggerLibrary
 				message = runtimeVariableException.SubVariables["_message"].Value.ToString();
 			}
 			try {
-				location = thread.NextStatement;
+				location = thread.CurrentFunction.NextStatement;
 			} catch (NextStatementNotAviableException) {
 				location = new SourcecodeSegment();
 			}

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

@@ -60,31 +60,6 @@ namespace DebuggerLibrary
 				mainThread = value;
 			}
 		}
-
-		public SourcecodeSegment NextStatement { 
-			get{
-				try {
-					return CurrentThread.NextStatement; 
-				} catch (CurrentThreadNotAviableException) {
-					System.Diagnostics.Debug.Fail("Unable to get NextStatement. CurrentThreadNotAviableException");
-					throw new NextStatementNotAviableException();
-				}
-			} 
-		}
-
-		public VariableCollection LocalVariables { 
-			get{
-				Thread thread;
-				try {
-					thread = CurrentThread;
-				} 
-				catch (CurrentThreadNotAviableException) {
-					//System.Diagnostics.Debug.Fail("Unable to get LocalVariables. CurrentThreadNotAviableException");
-					return new VariableCollection ();
-				}
-				return thread.LocalVariables;
-			} 
-		}
 		
 		static public Process CreateProcess(NDebugger debugger, string filename, string workingDirectory, string arguments)
 		{
@@ -147,33 +122,6 @@ namespace DebuggerLibrary
 			debugger.OnIsProcessRunningChanged();
 		}
 
-		public void StepInto()
-		{
-			try {
-				CurrentThread.StepInto();
-			} catch (CurrentThreadNotAviableException) {
-				System.Diagnostics.Debug.Fail("Unable to prerform step. CurrentThreadNotAviableException");
-			}
-		}
-
-		public void StepOver()
-		{
-			try {
-				CurrentThread.StepOver();
-			} catch (CurrentThreadNotAviableException) {
-				System.Diagnostics.Debug.Fail("Unable to prerform step. CurrentThreadNotAviableException");
-			}
-		}
-
-		public void StepOut()
-		{
-			try {
-				CurrentThread.StepOut();
-			} catch (CurrentThreadNotAviableException) {
-				System.Diagnostics.Debug.Fail("Unable to prerform step. CurrentThreadNotAviableException");
-			}
-		}
-
 		public void Continue()
 		{
 			if (IsProcessRunning) {

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

@@ -194,49 +194,5 @@ namespace DebuggerLibrary
 				return new Function(debugger, corFrame);
 			}
 		}
-		
-		public void StepInto()
-		{
-			try {
-				CurrentFunction.StepInto();
-			} catch (CurrentFunctionNotAviableException) {
-				System.Diagnostics.Debug.Fail("Unable to prerform step. CurrentFunctionNotAviableException");
-			}
-		}		
-
-		public void StepOver()
-		{
-			try {
-				CurrentFunction.StepOver();
-			} catch (CurrentFunctionNotAviableException) {
-				System.Diagnostics.Debug.Fail("Unable to prerform step. CurrentFunctionNotAviableException");
-			}
-		}
-
-		public void StepOut()
-		{
-			try {
-				CurrentFunction.StepOut();
-			} catch (CurrentFunctionNotAviableException) {
-				System.Diagnostics.Debug.Fail("Unable to prerform step. CurrentFunctionNotAviableException");
-			}
-		}
-		
-		public SourcecodeSegment NextStatement {
-			get {	
-				return CurrentFunction.NextStatement;	
-			}
-		}
-		
-		public VariableCollection LocalVariables { 
-			get {
-				try {
-					return CurrentFunction.GetVariables();	
-				} catch (NotAviableException exception) {
-					System.Diagnostics.Debug.Fail("Unable to get LocalVariables." + exception.ToString());
-					return new VariableCollection();
-				}
-			}
-		}
 	}
 }