[Monodevelop-patches-list] r2132 - in trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor: . CodeCompletion Commands Gui/Dialogs InsightWindow Search Search/DocumentIterator
commit-watcher at mono-cvs.ximian.com
commit-watcher at mono-cvs.ximian.com
Thu Jan 13 19:29:19 EST 2005
Author: lluis
Date: 2005-01-13 19:29:19 -0500 (Thu, 13 Jan 2005)
New Revision: 2132
Modified:
trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog
trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CodeCompletionDataProvider.cs
trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CommentCompletionDataProvider.cs
trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CompletionListWindow.cs
trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CompletionWindow.cs
trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/ICompletionDataProvider.cs
trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/TemplateCompletionDataProvider.cs
trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Commands/SearchCommands.cs
trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ExportProjectToHtmlDialog.cs
trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/InsightWindow/IInsightDataProvider.cs
trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/InsightWindow/IndexerInsightDataProvider.cs
trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/InsightWindow/InsightWindow.cs
trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/InsightWindow/MethodInsightDataProvider.cs
trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/AllOpenDocumentIterator.cs
trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/CurrentDocumentIterator.cs
trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/DirectoryDocumentIterator.cs
trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/EditorDocumentInformation.cs
trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/WholeProjectDocumentIterator.cs
trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/SearchReplaceManager.cs
Log:
2005-01-11 Lluis Sanchez Gual <lluis at novell.com>
* Gui/Dialogs/ExportProjectToHtmlDialog.cs:
* InsightWindow/MethodInsightDataProvider.cs:
* InsightWindow/InsightWindow.cs:
* InsightWindow/IInsightDataProvider.cs:
* InsightWindow/IndexerInsightDataProvider.cs:
* CodeCompletion/CompletionListWindow.cs
* CodeCompletion/CompletionWindow.cs:
* CodeCompletion/CommentCompletionDataProvider.cs:
* CodeCompletion/ICompletionDataProvider.cs:
* CodeCompletion/CodeCompletionDataProvider.cs:
* CodeCompletion/TemplateCompletionDataProvider.cs:
* Search/DocumentIterator/WholeProjectDocumentIterator.cs:
Follow architecture changes.
Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog 2005-01-14 00:28:44 UTC (rev 2131)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/ChangeLog 2005-01-14 00:29:19 UTC (rev 2132)
@@ -1,3 +1,19 @@
+2005-01-11 Lluis Sanchez Gual <lluis at novell.com>
+
+ * Gui/Dialogs/ExportProjectToHtmlDialog.cs:
+ * InsightWindow/MethodInsightDataProvider.cs:
+ * InsightWindow/InsightWindow.cs:
+ * InsightWindow/IInsightDataProvider.cs:
+ * InsightWindow/IndexerInsightDataProvider.cs:
+ * CodeCompletion/CompletionListWindow.cs
+ * CodeCompletion/CompletionWindow.cs:
+ * CodeCompletion/CommentCompletionDataProvider.cs:
+ * CodeCompletion/ICompletionDataProvider.cs:
+ * CodeCompletion/CodeCompletionDataProvider.cs:
+ * CodeCompletion/TemplateCompletionDataProvider.cs:
+ * Search/DocumentIterator/WholeProjectDocumentIterator.cs:
+ Follow architecture changes.
+
2004-12-14 Todd Berman <tberman at off.net>
* Gui/SourceEditorDisplayBinding.cs: Finish off some code to detect
Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CodeCompletionDataProvider.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CodeCompletionDataProvider.cs 2005-01-14 00:28:44 UTC (rev 2131)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CodeCompletionDataProvider.cs 2005-01-14 00:29:19 UTC (rev 2132)
@@ -54,7 +54,7 @@
ArrayList completionData = null;
- public ICompletionData[] GenerateCompletionData(IProject project, string fileName, SourceEditorView textArea, char charTyped, TextMark triggerMark)
+ public ICompletionData[] GenerateCompletionData(Project project, string fileName, SourceEditorView textArea, char charTyped, TextMark triggerMark)
{
completionData = new ArrayList();
this.fileName = fileName;
Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CommentCompletionDataProvider.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CommentCompletionDataProvider.cs 2005-01-14 00:28:44 UTC (rev 2131)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CommentCompletionDataProvider.cs 2005-01-14 00:29:19 UTC (rev 2132)
@@ -63,7 +63,7 @@
return row >= region.BeginLine && (row <= region.EndLine || region.EndLine == -1);
}
- public ICompletionData[] GenerateCompletionData (IProject project, string fileName, SourceEditorView textArea, char charTyped, Gtk.TextMark triggerMark)
+ public ICompletionData[] GenerateCompletionData (Project project, string fileName, SourceEditorView textArea, char charTyped, Gtk.TextMark triggerMark)
{
/*caretLineNumber = textArea.Caret.Line;
caretColumn = textArea.Caret.Column;
Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CompletionListWindow.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CompletionListWindow.cs 2005-01-14 00:28:44 UTC (rev 2131)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CompletionListWindow.cs 2005-01-14 00:29:19 UTC (rev 2132)
@@ -12,7 +12,7 @@
public class CompletionListWindow : ListWindow, IListDataProvider
{
string fileName;
- IProject project;
+ Project project;
SourceEditorView control;
TextMark triggeringMark;
ICompletionData[] completionData;
Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CompletionWindow.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CompletionWindow.cs 2005-01-14 00:28:44 UTC (rev 2131)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/CompletionWindow.cs 2005-01-14 00:29:19 UTC (rev 2132)
@@ -30,7 +30,7 @@
int num_in = 0;
DeclarationViewWindow declarationviewwindow = new DeclarationViewWindow ();
string fileName;
- IProject project;
+ Project project;
static CompletionWindow wnd;
Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/ICompletionDataProvider.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/ICompletionDataProvider.cs 2005-01-14 00:28:44 UTC (rev 2131)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/ICompletionDataProvider.cs 2005-01-14 00:29:19 UTC (rev 2132)
@@ -17,6 +17,6 @@
namespace MonoDevelop.SourceEditor.CodeCompletion {
public interface ICompletionDataProvider {
- ICompletionData[] GenerateCompletionData(IProject project, string fileName, SourceEditorView textArea, char charTyped, Gtk.TextMark mark);
+ ICompletionData[] GenerateCompletionData(Project project, string fileName, SourceEditorView textArea, char charTyped, Gtk.TextMark mark);
}
}
Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/TemplateCompletionDataProvider.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/TemplateCompletionDataProvider.cs 2005-01-14 00:28:44 UTC (rev 2131)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/CodeCompletion/TemplateCompletionDataProvider.cs 2005-01-14 00:29:19 UTC (rev 2132)
@@ -27,7 +27,7 @@
}
}
- public ICompletionData[] GenerateCompletionData(IProject project, string fileName, SourceEditorView textArea, char charTyped, Gtk.TextMark triggerMark)
+ public ICompletionData[] GenerateCompletionData(Project project, string fileName, SourceEditorView textArea, char charTyped, Gtk.TextMark triggerMark)
{
CodeTemplateGroup templateGroup = CodeTemplateLoader.GetTemplateGroupPerFilename(fileName);
if (templateGroup == null) {
Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Commands/SearchCommands.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Commands/SearchCommands.cs 2005-01-14 00:28:44 UTC (rev 2131)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Commands/SearchCommands.cs 2005-01-14 00:29:19 UTC (rev 2132)
@@ -23,7 +23,7 @@
using MonoDevelop.Gui.Dialogs;
using MonoDevelop.Gui;
using MonoDevelop.SourceEditor.Gui;
-using SourceEditor = MonoDevelop.SourceEditor.Gui.SourceEditor;
+using SourceEditor_ = MonoDevelop.SourceEditor.Gui.SourceEditor;
namespace MonoDevelop.DefaultEditor.Commands
{
@@ -56,7 +56,7 @@
if (window != null && window.ViewContent is SourceEditorDisplayBindingWrapper)
{
- SourceEditor editor = (SourceEditor) ((SourceEditorDisplayBindingWrapper)window.ViewContent).Control;
+ SourceEditor_ editor = (SourceEditor_) ((SourceEditorDisplayBindingWrapper)window.ViewContent).Control;
string selectedText = editor.Buffer.GetSelectedText ();
if (selectedText != null && selectedText.Length > 0)
@@ -120,7 +120,7 @@
IWorkbenchWindow window = WorkbenchSingleton.Workbench.ActiveWorkbenchWindow;
if (window != null && window.ViewContent is SourceEditorDisplayBindingWrapper)
{
- SourceEditor editor = (SourceEditor) ((SourceEditorDisplayBindingWrapper)window.ViewContent).Control;
+ SourceEditor_ editor = (SourceEditor_) ((SourceEditorDisplayBindingWrapper)window.ViewContent).Control;
string selectedText = editor.Buffer.GetSelectedText ();
if (selectedText != null && selectedText.Length > 0)
SearchReplaceInFilesManager.SearchOptions.SearchPattern = selectedText.Split ('\n')[0];
Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ExportProjectToHtmlDialog.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ExportProjectToHtmlDialog.cs 2005-01-14 00:28:44 UTC (rev 2131)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Gui/Dialogs/ExportProjectToHtmlDialog.cs 2005-01-14 00:29:19 UTC (rev 2132)
@@ -38,7 +38,7 @@
FileUtilityService fileUtilityService = (FileUtilityService) ServiceManager.GetService(typeof(FileUtilityService));
IconService iconService = (IconService) ServiceManager.GetService(typeof(IconService));
- IProject project;
+ Project project;
int filesExported = 0;
int FilesExported
@@ -57,7 +57,7 @@
cancelButton.Clicked += new EventHandler (StopThread);
}
- public ExportProjectToHtmlDialog (IProject project)
+ public ExportProjectToHtmlDialog (Project project)
{
PropertyService propertyService = (PropertyService) ServiceManager.GetService (typeof (PropertyService));
this.project = project;
Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/InsightWindow/IInsightDataProvider.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/InsightWindow/IInsightDataProvider.cs 2005-01-14 00:28:44 UTC (rev 2131)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/InsightWindow/IInsightDataProvider.cs 2005-01-14 00:29:19 UTC (rev 2132)
@@ -17,7 +17,7 @@
{
public interface IInsightDataProvider
{
- void SetupDataProvider(IProject project, string fileName, SourceEditorView textArea);
+ void SetupDataProvider(Project project, string fileName, SourceEditorView textArea);
bool CaretOffsetChanged();
bool CharTyped();
Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/InsightWindow/IndexerInsightDataProvider.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/InsightWindow/IndexerInsightDataProvider.cs 2005-01-14 00:28:44 UTC (rev 2131)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/InsightWindow/IndexerInsightDataProvider.cs 2005-01-14 00:29:19 UTC (rev 2132)
@@ -47,7 +47,7 @@
}
int initialOffset;
- public void SetupDataProvider(IProject project, string fileName, SourceEditorView textArea)
+ public void SetupDataProvider(Project project, string fileName, SourceEditorView textArea)
{
this.fileName = fileName;
this.textArea = textArea;
Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/InsightWindow/InsightWindow.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/InsightWindow/InsightWindow.cs 2005-01-14 00:28:44 UTC (rev 2131)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/InsightWindow/InsightWindow.cs 2005-01-14 00:29:19 UTC (rev 2132)
@@ -30,7 +30,7 @@
Gtk.Label max;
string description;
string fileName;
- IProject project;
+ Project project;
StringParserService StringParserService = (StringParserService)ServiceManager.GetService (typeof (StringParserService));
@@ -114,7 +114,7 @@
type = RegisterGType (typeof (InsightWindow));
}
- public InsightWindow(SourceEditorView control, IProject project, string fileName) : base (type)
+ public InsightWindow(SourceEditorView control, Project project, string fileName) : base (type)
{
this.control = control;
this.fileName = fileName;
Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/InsightWindow/MethodInsightDataProvider.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/InsightWindow/MethodInsightDataProvider.cs 2005-01-14 00:28:44 UTC (rev 2131)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/InsightWindow/MethodInsightDataProvider.cs 2005-01-14 00:29:19 UTC (rev 2132)
@@ -50,7 +50,7 @@
}
int initialOffset;
- public void SetupDataProvider(IProject project, string fileName, SourceEditorView textArea)
+ public void SetupDataProvider(Project project, string fileName, SourceEditorView textArea)
{
this.fileName = fileName;
this.textArea = textArea;
Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/AllOpenDocumentIterator.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/AllOpenDocumentIterator.cs 2005-01-14 00:28:44 UTC (rev 2131)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/AllOpenDocumentIterator.cs 2005-01-14 00:29:19 UTC (rev 2132)
@@ -12,7 +12,7 @@
using MonoDevelop.TextEditor;
using MonoDevelop.SourceEditor.Gui;
-using SourceEditor = MonoDevelop.SourceEditor.Gui.SourceEditor;
+using SourceEditor_ = MonoDevelop.SourceEditor.Gui.SourceEditor;
namespace MonoDevelop.TextEditor.Document
{
@@ -45,7 +45,7 @@
if (!SearchReplaceUtilities.IsTextAreaSelected) {
return null;
}
- SourceEditor document = (SourceEditor) (((SourceEditorDisplayBindingWrapper)WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent).Control);
+ SourceEditor_ document = (SourceEditor_) (((SourceEditorDisplayBindingWrapper)WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent).Control);
return new EditorDocumentInformation(document,
CurrentFileName);
}
Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/CurrentDocumentIterator.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/CurrentDocumentIterator.cs 2005-01-14 00:28:44 UTC (rev 2131)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/CurrentDocumentIterator.cs 2005-01-14 00:29:19 UTC (rev 2132)
@@ -12,14 +12,14 @@
using MonoDevelop.TextEditor;
using MonoDevelop.SourceEditor.Gui;
-using SourceEditor = MonoDevelop.SourceEditor.Gui.SourceEditor;
+using SourceEditor_ = MonoDevelop.SourceEditor.Gui.SourceEditor;
namespace MonoDevelop.TextEditor.Document
{
public class CurrentDocumentIterator : IDocumentIterator
{
bool didRead = false;
- SourceEditor curDocument = null;
+ SourceEditor_ curDocument = null;
public CurrentDocumentIterator()
{
@@ -43,7 +43,7 @@
if (!SearchReplaceUtilities.IsTextAreaSelected) {
return null;
}
- curDocument = ((SourceEditor) ((SourceEditorDisplayBindingWrapper)WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent).Control);
+ curDocument = ((SourceEditor_) ((SourceEditorDisplayBindingWrapper)WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent).Control);
return new EditorDocumentInformation(curDocument, CurrentFileName);
}
}
Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/DirectoryDocumentIterator.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/DirectoryDocumentIterator.cs 2005-01-14 00:28:44 UTC (rev 2131)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/DirectoryDocumentIterator.cs 2005-01-14 00:29:19 UTC (rev 2132)
@@ -17,7 +17,7 @@
using MonoDevelop.TextEditor;
using MonoDevelop.SourceEditor.Gui;
-using SourceEditor = MonoDevelop.SourceEditor.Gui.SourceEditor;
+using SourceEditor_ = MonoDevelop.SourceEditor.Gui.SourceEditor;
namespace MonoDevelop.TextEditor.Document
{
@@ -58,7 +58,7 @@
++curIndex;
return Current;
}
- SourceEditor document;
+ SourceEditor_ document;
string fileName = files[curIndex].ToString();
return new FileDocumentInformation(fileName, 0);
}
Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/EditorDocumentInformation.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/EditorDocumentInformation.cs 2005-01-14 00:28:44 UTC (rev 2131)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/EditorDocumentInformation.cs 2005-01-14 00:29:19 UTC (rev 2132)
@@ -12,18 +12,18 @@
using MonoDevelop.Gui;
using MonoDevelop.SourceEditor.Gui;
-using SourceEditor = MonoDevelop.SourceEditor.Gui.SourceEditor;
+using SourceEditor_ = MonoDevelop.SourceEditor.Gui.SourceEditor;
namespace MonoDevelop.TextEditor.Document
{
public class EditorDocumentInformation: IDocumentInformation
{
- SourceEditor document;
+ SourceEditor_ document;
SourceEditorBuffer textBuffer;
string fileName;
int currentOffset;
- public EditorDocumentInformation (SourceEditor document, string fileName)
+ public EditorDocumentInformation (SourceEditor_ document, string fileName)
{
this.document = document;
this.textBuffer = document.Buffer;
Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/WholeProjectDocumentIterator.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/WholeProjectDocumentIterator.cs 2005-01-14 00:28:44 UTC (rev 2131)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/DocumentIterator/WholeProjectDocumentIterator.cs 2005-01-14 00:29:19 UTC (rev 2132)
@@ -16,7 +16,7 @@
using MonoDevelop.TextEditor;
using MonoDevelop.SourceEditor.Gui;
-using SourceEditor = MonoDevelop.SourceEditor.Gui.SourceEditor;
+using SourceEditor_ = MonoDevelop.SourceEditor.Gui.SourceEditor;
namespace MonoDevelop.TextEditor.Document
{
@@ -49,13 +49,13 @@
++curIndex;
return Current;
}
- SourceEditor document;
+ SourceEditor_ document;
string fileName = files[curIndex].ToString();
foreach (IViewContent content in WorkbenchSingleton.Workbench.ViewContentCollection) {
// WINDOWS DEPENDENCY : ToUpper
if (content.ContentName != null &&
content.ContentName.ToUpper() == fileName.ToUpper()) {
- document = (SourceEditor) (((SourceEditorDisplayBindingWrapper)content).Control);
+ document = (SourceEditor_) (((SourceEditorDisplayBindingWrapper)content).Control);
return new EditorDocumentInformation(document, fileName);
}
}
@@ -78,7 +78,7 @@
}
- void AddFiles(IProject project)
+ void AddFiles(Project project)
{
foreach (ProjectFile file in project.ProjectFiles) {
if (file.BuildAction == BuildAction.Compile &&
@@ -91,10 +91,10 @@
void AddFiles(Combine combine)
{
foreach (CombineEntry entry in combine.Entries) {
- if (entry is ProjectCombineEntry) {
- AddFiles(((ProjectCombineEntry)entry).Project);
- } else {
- AddFiles(((CombineCombineEntry)entry).Combine);
+ if (entry is Project) {
+ AddFiles ((Project)entry);
+ } else if (entry is Combine) {
+ AddFiles ((Combine)entry);
}
}
}
Modified: trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/SearchReplaceManager.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/SearchReplaceManager.cs 2005-01-14 00:28:44 UTC (rev 2131)
+++ trunk/MonoDevelop/Core/src/AddIns/DisplayBindings/SourceEditor/Search/SearchReplaceManager.cs 2005-01-14 00:29:19 UTC (rev 2132)
@@ -17,7 +17,7 @@
using MonoDevelop.TextEditor;
using MonoDevelop.SourceEditor.Gui;
-using SourceEditor = MonoDevelop.SourceEditor.Gui.SourceEditor;
+using SourceEditor_ = MonoDevelop.SourceEditor.Gui.SourceEditor;
namespace MonoDevelop.TextEditor.Document
{
@@ -73,7 +73,7 @@
public static void Replace()
{
if (WorkbenchSingleton.Workbench.ActiveWorkbenchWindow != null) {
- SourceEditor textarea = (SourceEditor) ((SourceEditorDisplayBindingWrapper)WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent).Control;
+ SourceEditor_ textarea = (SourceEditor_) ((SourceEditorDisplayBindingWrapper)WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent).Control;
string text = textarea.Buffer.GetSelectedText ();
if (text.ToLower () == SearchOptions.SearchPattern.ToLower ()) {
int offset = textarea.Buffer.GetLowerSelectionBounds ();
@@ -90,9 +90,9 @@
public static void MarkAll()
{
- SourceEditor textArea = null;
+ SourceEditor_ textArea = null;
if (WorkbenchSingleton.Workbench.ActiveWorkbenchWindow != null) {
- textArea = (SourceEditor) ((SourceEditorDisplayBindingWrapper)WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent).Control;
+ textArea = (SourceEditor_) ((SourceEditorDisplayBindingWrapper)WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent).Control;
textArea.Buffer.PlaceCursor (textArea.Buffer.GetIterAtMark (textArea.Buffer.InsertMark));
}
find.Reset();
@@ -122,9 +122,9 @@
public static void ReplaceAll()
{
- SourceEditor textArea = null;
+ SourceEditor_ textArea = null;
if (WorkbenchSingleton.Workbench.ActiveWorkbenchWindow != null) {
- textArea = (SourceEditor) ((SourceEditorDisplayBindingWrapper)WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent).Control;
+ textArea = (SourceEditor_) ((SourceEditorDisplayBindingWrapper)WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent).Control;
textArea.Buffer.PlaceCursor (textArea.Buffer.GetIterAtMark (textArea.Buffer.InsertMark));
}
find.Reset();
@@ -161,7 +161,7 @@
if (find.DocumentIterator.CurrentFileName != lastResult.FileName)
find.Reset ();
else {
- SourceEditor textArea = OpenTextArea(lastResult.FileName);
+ SourceEditor_ textArea = OpenTextArea(lastResult.FileName);
if (lastResult != null && textArea.Buffer.GetIterAtMark (textArea.Buffer.InsertMark).Offset != lastResult.Offset + lastResult.Length) {
find.Reset();
}
@@ -177,7 +177,7 @@
MessageService.ShowMessage (GettextCatalog.GetString ("Not Found"));
find.Reset();
} else {
- SourceEditor textArea = OpenTextArea(result.FileName);
+ SourceEditor_ textArea = OpenTextArea(result.FileName);
int startPos = Math.Min(textArea.Buffer.Text.Length, Math.Max(0, result.Offset));
int endPos = Math.Min(textArea.Buffer.Text.Length, startPos + result.Length);
@@ -189,7 +189,7 @@
lastResult = result;
}
- static SourceEditor OpenTextArea(string fileName)
+ static SourceEditor_ OpenTextArea(string fileName)
{
if (fileName != null) {
IFileService fileService = (IFileService)MonoDevelop.Core.Services.ServiceManager.GetService(typeof(IFileService));
@@ -200,7 +200,7 @@
while (Gtk.Application.EventsPending ())
Gtk.Application.RunIteration ();
- return (SourceEditor) ((SourceEditorDisplayBindingWrapper)WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent).Control;
+ return (SourceEditor_) ((SourceEditorDisplayBindingWrapper)WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.ViewContent).Control;
}
}
}
More information about the Monodevelop-patches-list
mailing list