Fixed SD2-496: TODO task entries removed after building solution.

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

src/AddIns/DisplayBindings/XmlEditor/Project/Src/XmlView.cs

@@ -572,7 +572,7 @@ namespace ICSharpCode.XmlEditor
 		void ClearTasks()
 		{
 			if (HasTasks) {
-				TaskService.Clear();
+				TaskService.ClearExceptCommentTasks();
 			}
 		}
 		

src/AddIns/Misc/MbUnitPad/Project/Src/MbUnitPad.cs

@@ -93,7 +93,7 @@ namespace ICSharpCode.MbUnitPad
 		
 		public void RunTests()
 		{
-			TaskService.Clear();
+			TaskService.ClearExceptCommentTasks();
 			if (treeView.TypeTree.Nodes.Count == 0) {
 				treeView.TreePopulated += StartTestsAfterTreePopulation;
 				treeView.FinishTests += FinishTests;

src/Main/Base/Project/Src/Commands/BuildCommands.cs

@@ -20,7 +20,7 @@ namespace ICSharpCode.SharpDevelop.Project.Commands
 		public static void BeforeBuild()
 		{
 			TaskService.BuildMessageViewCategory.ClearText();
-			TaskService.Clear();
+			TaskService.ClearExceptCommentTasks();
 			ICSharpCode.SharpDevelop.Commands.SaveAllFiles.SaveAll();
 		}
 		

src/Main/Base/Project/Src/Services/Tasks/Task.cs

@@ -22,7 +22,7 @@ namespace ICSharpCode.Core
 		Comment,
 	}
 	
-	public class Task 
+	public class Task
 	{
 		string   description;
 		string   fileName;
@@ -48,12 +48,18 @@ namespace ICSharpCode.Core
 			}
 		}
 		
+		/// <summary>
+		/// The line number of the task. Zero-based (text editor coordinate)
+		/// </summary>
 		public int Line {
 			get {
 				return line;
 			}
 		}
 		
+		/// <summary>
+		/// The column number of the task. Zero-based (text editor coordinate)
+		/// </summary>
 		public int Column {
 			get {
 				return column;

src/Main/Base/Project/Src/Services/Tasks/TaskService.cs

@@ -17,7 +17,10 @@ namespace ICSharpCode.Core
 {
 	public class TaskService
 	{
-		static List<Task>          tasks                    = new List<Task>();
+		static List<Task> tasks = new List<Task>();
+		
+		static Dictionary<TaskType, int> taskCount = new Dictionary<TaskType, int>();
+		
 		static MessageViewCategory buildMessageViewCategory = new MessageViewCategory("Build", "${res:MainWindow.Windows.OutputWindow.BuildCategory}");
 		
 		public static MessageViewCategory BuildMessageViewCategory {
@@ -26,31 +29,24 @@ namespace ICSharpCode.Core
 			}
 		}
 		
-		public class TaskEnumerator {
-			public IEnumerator<Task> GetEnumerator()
-			{
-				foreach (Task task in tasks) {
-					if (task.TaskType != TaskType.Comment) {
-						yield return task;
-					}
-				}
-			}
-		}
-		
 		public static int TaskCount {
 			get {
 				return tasks.Count - GetCount(TaskType.Comment);
 			}
 		}
-		public static TaskEnumerator Tasks {
+		
+		public static IEnumerable<Task> Tasks {
 			get {
-				return new TaskEnumerator();
+				foreach (Task task in tasks) {
+					if (task.TaskType != TaskType.Comment) {
+						yield return task;
+					}
+				}
 			}
 		}
 		
-		public class CommentTaskEnumerator {
-			public IEnumerator<Task> GetEnumerator()
-			{
+		public static IEnumerable<Task> CommentTasks {
+			get {
 				foreach (Task task in tasks) {
 					if (task.TaskType == TaskType.Comment) {
 						yield return task;
@@ -58,13 +54,6 @@ namespace ICSharpCode.Core
 				}
 			}
 		}
-		public static CommentTaskEnumerator CommentTasks {
-			get {
-				return new CommentTaskEnumerator();
-			}
-		}
-		
-		static Dictionary<TaskType, int> taskCount = new Dictionary<TaskType, int>();
 		
 		public static int GetCount(TaskType type)
 		{
@@ -133,6 +122,15 @@ namespace ICSharpCode.Core
 			OnCleared(EventArgs.Empty);
 		}
 		
+		public static void ClearExceptCommentTasks()
+		{
+			List<Task> commentTasks = new List<Task>(CommentTasks);
+			Clear();
+			foreach (Task t in commentTasks) {
+				Add(t);
+			}
+		}
+		
 		public static void Add(Task task)
 		{
 			tasks.Add(task);
@@ -167,8 +165,8 @@ namespace ICSharpCode.Core
 			foreach (Tag tag in tagComments) {
 				newTasks.Add(new Task(fileName,
 				                      tag.Key + tag.CommentString,
-				                      tag.Region.BeginColumn,
-				                      tag.Region.BeginLine,
+				                      tag.Region.BeginColumn - 1,
+				                      tag.Region.BeginLine - 1,
 				                      TaskType.Comment));
 			}
 			List<Task> oldTasks = new List<Task>();