← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/monodevelop/oneiric

« back to all changes in this revision

Viewing changes to src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/CommentTasksView.cs

  • Committer: Bazaar Package Importer
  • Author(s): Jo Shields
  • Date: 2011-06-27 17:03:13 UTC
  • mto: (1.8.1 upstream)
  • mto: This revision was merged to the branch mainline in revision 54.
  • Revision ID: james.westby@ubuntu.com-20110627170313-6cvz3s19x6e9hqe9
Import upstream version 2.5.92+dfsg

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/CommentTasksView.cs
138
138
                                comments.EndTaskUpdates ();
139
139
                        }
140
140
 
141
 
                        comments.TasksAdded += (TaskEventHandler) DispatchService.GuiDispatch (new TaskEventHandler (GeneratedTaskAdded));
142
 
                        comments.TasksRemoved += (TaskEventHandler) DispatchService.GuiDispatch (new TaskEventHandler (GeneratedTaskRemoved));
 
141
                        comments.TasksAdded += DispatchService.GuiDispatch<TaskEventHandler> (GeneratedTaskAdded);
 
142
                        comments.TasksRemoved += DispatchService.GuiDispatch<TaskEventHandler> (GeneratedTaskRemoved);
143
143
 
144
 
                        PropertyService.PropertyChanged += (EventHandler<PropertyChangedEventArgs>) DispatchService.GuiDispatch (new EventHandler<PropertyChangedEventArgs> (OnPropertyUpdated));
 
144
                        PropertyService.PropertyChanged += DispatchService.GuiDispatch<EventHandler<PropertyChangedEventArgs>> (OnPropertyUpdated);
145
145
                        
146
146
                        CreateMenu ();
147
147
                        
254
254
                                                        desc = tag.Key + ": " + desc;
255
255
                                        }
256
256
                                        
257
 
                                        Task t = new Task (fileName, desc, tag.Region.Start.Column - 1, tag.Region.Start.Line,
 
257
                                        Task t = new Task (fileName, desc, tag.Region.Start.Column, tag.Region.Start.Line,
258
258
                                                           TaskSeverity.Information, priorities[tag.Key], wob);
259
259
                                        newTasks.Add (t);
260
260
                                }
475
475
                {
476
476
                        Task task = SelectedTask;
477
477
                        if (task != null && ! String.IsNullOrEmpty (task.FileName)) {
478
 
                                Document doc = IdeApp.Workbench.OpenDocument (task.FileName, Math.Max (1, task.Line), Math.Max (1, task.Column), true);
 
478
                                Document doc = IdeApp.Workbench.OpenDocument (task.FileName, Math.Max (1, task.Line), Math.Max (1, task.Column));
479
479
                                if (doc != null && doc.HasProject && doc.Project is DotNetProject) {
480
 
                                        string[] commentTags = TextEditor.GetCommentTags (doc.FileName);
 
480
                                        string[] commentTags = doc.CommentTags;
481
481
                                        if (commentTags != null && commentTags.Length == 1) {
482
 
                                                string line = doc.TextEditor.GetLineText (task.Line);
 
482
                                                string line = doc.Editor.GetLineText (task.Line);
483
483
                                                int index = line.IndexOf (commentTags[0]);
484
484
                                                if (index != -1) {
485
 
                                                        doc.TextEditor.JumpTo (task.Line, task.Column);
 
485
                                                        doc.Editor.SetCaretTo (task.Line, task.Column);
486
486
                                                        line = line.Substring (0, index);
487
 
                                                        doc.TextEditor.ReplaceLine (task.Line, line);
 
487
                                                        var ls = doc.Editor.Document.GetLine (task.Line);
 
488
                                                        doc.Editor.Replace (ls.Offset, ls.EditableLength, line);
488
489
                                                        comments.Remove (task);
489
490
                                                }
490
491
                                        }