From 2087328303dd64218e8c74954546cc670cf4b053 Mon Sep 17 00:00:00 2001 From: Siegfried Pammer Date: Wed, 10 Aug 2011 21:29:02 +0200 Subject: [PATCH] removed calls to obsolete StringParser.Parse overload --- .../AddIn/Src/Commands/FindReferences.cs | 6 +++--- .../Analysis/UnitTesting/Src/TestResultTask.cs | 3 +-- .../DesignerLoader/NRefactoryDesignerLoader.cs | 10 ++-------- .../Project/Src/Gui/AddComponentsDialog.cs | 2 +- .../Commands/TextEditorContextMenuBuilder.cs | 7 +++++-- .../Src/Gui/UnusedResourceKeysViewContent.cs | 8 ++++++-- .../Engine/SearchReplaceInFilesManager.cs | 2 +- .../Project/Engine/SearchReplaceManager.cs | 8 +++++--- .../Project/Gui/SearchRootNode.cs | 6 ++++-- .../Src/Commands/AutostartCommands.cs | 3 ++- .../Src/Commands/ProjectBrowserCommands.cs | 4 ++-- .../CodeCompletionItemProvider.cs | 2 +- .../Project/Src/Gui/Dialogs/NewFileDialog.cs | 2 +- .../OptionPanels/ProjectOptions/CreateKey.cs | 2 +- .../Src/Gui/Dialogs/SharpDevelopAboutPanels.cs | 2 +- src/Main/Base/Project/Src/Gui/Pads/FileScout.cs | 6 ++++-- .../Commands/FolderNodeCommands.cs | 2 +- .../TreeNodes/AbstractProjectBrowserTreeNode.cs | 2 +- .../Templates/Project/ProjectDescriptor.cs | 8 ++++---- .../Templates/Project/ProjectTemplate.cs | 2 +- .../Templates/Project/SolutionDescriptor.cs | 4 +--- .../Src/Project/Converter/LanguageConverter.cs | 10 ++++------ .../Src/Services/File/FileChangeWatcher.cs | 5 ++++- .../Project/Src/Services/File/FileService.cs | 4 ++-- .../Services/ParserService/DomHostCallback.cs | 2 +- .../CompileModifiedProjectsOnly.cs | 2 +- .../Services/ProjectService/ProjectService.cs | 6 +++--- .../ContextActions/ContextActionsHelper.cs | 7 +++++-- .../FindReferencesAndRenameHelper.cs | 17 ++++++++--------- .../Src/Services/StatusBar/StatusBarService.cs | 9 ++++----- .../Src/Services/StringParser/StringParser.cs | 1 + src/Main/Core/Test/StringParserTests.cs | 2 +- 32 files changed, 82 insertions(+), 74 deletions(-) diff --git a/src/AddIns/Analysis/Profiler/Frontend/AddIn/Src/Commands/FindReferences.cs b/src/AddIns/Analysis/Profiler/Frontend/AddIn/Src/Commands/FindReferences.cs index 08d532e627..84e570fd70 100644 --- a/src/AddIns/Analysis/Profiler/Frontend/AddIn/Src/Commands/FindReferences.cs +++ b/src/AddIns/Analysis/Profiler/Frontend/AddIn/Src/Commands/FindReferences.cs @@ -35,9 +35,9 @@ namespace ICSharpCode.Profiler.AddIn.Commands string memberName = member.DeclaringType.Name + "." + member.Name; using (AsynchronousWaitDialog monitor = AsynchronousWaitDialog.ShowWaitDialog("${res:SharpDevelop.Refactoring.FindReferences}")) { - FindReferencesAndRenameHelper.ShowAsSearchResults(StringParser.Parse("${res:SharpDevelop.Refactoring.ReferencesTo}", - new string[,] {{ "Name", memberName }}), - RefactoringService.FindReferences(member, monitor)); + FindReferencesAndRenameHelper.ShowAsSearchResults( + StringParser.Parse("${res:SharpDevelop.Refactoring.ReferencesTo}", new StringTagPair("Name", memberName)), + RefactoringService.FindReferences(member, monitor)); } } } diff --git a/src/AddIns/Analysis/UnitTesting/Src/TestResultTask.cs b/src/AddIns/Analysis/UnitTesting/Src/TestResultTask.cs index aa38db452a..af7b957434 100644 --- a/src/AddIns/Analysis/UnitTesting/Src/TestResultTask.cs +++ b/src/AddIns/Analysis/UnitTesting/Src/TestResultTask.cs @@ -69,8 +69,7 @@ namespace ICSharpCode.UnitTesting static string GetTestResultMessageFromResource(TestResult result, string stringResource) { - string [,] customTags = new string[,] {{"TestCase", result.Name}}; - return StringParser.Parse(stringResource, customTags); + return StringParser.Parse(stringResource, new StringTagPair("TestCase", result.Name)); } /// diff --git a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerLoader/NRefactoryDesignerLoader.cs b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerLoader/NRefactoryDesignerLoader.cs index 6ee3cd3247..750b1238e0 100644 --- a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerLoader/NRefactoryDesignerLoader.cs +++ b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/DesignerLoader/NRefactoryDesignerLoader.cs @@ -87,16 +87,10 @@ namespace ICSharpCode.FormsDesigner const string missingReferenceMessage = "Your project is missing a reference to '${Name}' - please add it using 'Project > Add Reference'."; if (formClass.ProjectContent.GetClass("System.Drawing.Point", 0) == null) { - throw new FormsDesignerLoadException( - StringParser.Parse( - missingReferenceMessage, new string[,] {{ "Name" , "System.Drawing"}} - )); + throw new FormsDesignerLoadException(StringParser.Parse(missingReferenceMessage, new StringTagPair("Name", "System.Drawing"))); } if (formClass.ProjectContent.GetClass("System.Windows.Forms.Form", 0) == null) { - throw new FormsDesignerLoadException( - StringParser.Parse( - missingReferenceMessage, new string[,] {{ "Name" , "System.Windows.Forms"}} - )); + throw new FormsDesignerLoadException(StringParser.Parse(missingReferenceMessage, new StringTagPair("Name" , "System.Windows.Forms"))); } List> compilationUnits = new List>(); diff --git a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/AddComponentsDialog.cs b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/AddComponentsDialog.cs index cf64355bdb..f6db85ed48 100644 --- a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/AddComponentsDialog.cs +++ b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/Gui/AddComponentsDialog.cs @@ -68,7 +68,7 @@ namespace ICSharpCode.FormsDesigner.Gui if (lastAssembly != null) { name = lastAssembly.FullName; } - ClearComponentsList(StringParser.Parse("${res:ICSharpCode.SharpDevelop.FormDesigner.Gui.AddSidebarComponents.NoComponentsFound}", new string[,] {{"Name", name}})); + ClearComponentsList(StringParser.Parse("${res:ICSharpCode.SharpDevelop.FormDesigner.Gui.AddSidebarComponents.NoComponentsFound}", new StringTagPair("Name", name))); } } componentListView.EndUpdate(); diff --git a/src/AddIns/Misc/ResourceToolkit/Project/Src/Commands/TextEditorContextMenuBuilder.cs b/src/AddIns/Misc/ResourceToolkit/Project/Src/Commands/TextEditorContextMenuBuilder.cs index f152ed3393..f106f6b847 100644 --- a/src/AddIns/Misc/ResourceToolkit/Project/Src/Commands/TextEditorContextMenuBuilder.cs +++ b/src/AddIns/Misc/ResourceToolkit/Project/Src/Commands/TextEditorContextMenuBuilder.cs @@ -139,8 +139,11 @@ namespace Hornung.ResourceToolkit.Commands // Allow the menu to close Application.DoEvents(); using(AsynchronousWaitDialog monitor = AsynchronousWaitDialog.ShowWaitDialog(ResourceService.GetString("SharpDevelop.Refactoring.FindReferences"))) { - FindReferencesAndRenameHelper.ShowAsSearchResults(StringParser.Parse("${res:Hornung.ResourceToolkit.ReferencesToResource}", new string[,] { {"ResourceFileName", System.IO.Path.GetFileName(result.FileName)}, {"ResourceKey", result.Key} }), - ResourceRefactoringService.FindReferences(result.FileName, result.Key, monitor)); + FindReferencesAndRenameHelper.ShowAsSearchResults( + StringParser.Parse("${res:Hornung.ResourceToolkit.ReferencesToResource}", + new StringTagPair("ResourceFileName", System.IO.Path.GetFileName(result.FileName)), + new StringTagPair("ResourceKey", result.Key)), + ResourceRefactoringService.FindReferences(result.FileName, result.Key, monitor)); } } diff --git a/src/AddIns/Misc/ResourceToolkit/Project/Src/Gui/UnusedResourceKeysViewContent.cs b/src/AddIns/Misc/ResourceToolkit/Project/Src/Gui/UnusedResourceKeysViewContent.cs index 631720dcd5..5c333cf291 100644 --- a/src/AddIns/Misc/ResourceToolkit/Project/Src/Gui/UnusedResourceKeysViewContent.cs +++ b/src/AddIns/Misc/ResourceToolkit/Project/Src/Gui/UnusedResourceKeysViewContent.cs @@ -329,9 +329,13 @@ namespace Hornung.ResourceToolkit.Gui bool ok; if (this.ListView.SelectedItems.Count == 1) { - ok = MessageService.AskQuestion(StringParser.Parse("${res:Hornung.ResourceToolkit.DeleteSingleResourceKeyQuestion}", new string[,] { {"Key", this.ListView.SelectedItems[0].SubItems[1].Text}, {"FileName", this.ListView.SelectedItems[0].Group.Header} })); + ok = MessageService.AskQuestion( + StringParser.Parse("${res:Hornung.ResourceToolkit.DeleteSingleResourceKeyQuestion}", + new StringTagPair("Key", this.ListView.SelectedItems[0].SubItems[1].Text), + new StringTagPair("FileName", this.ListView.SelectedItems[0].Group.Header)) + ); } else { - ok = MessageService.AskQuestion(StringParser.Parse("${res:Hornung.ResourceToolkit.DeleteAllSelectedResourceKeysQuestion}", new string[,] { {"Count", this.ListView.SelectedItems.Count.ToString(CultureInfo.CurrentCulture)} })); + ok = MessageService.AskQuestion(StringParser.Parse("${res:Hornung.ResourceToolkit.DeleteAllSelectedResourceKeysQuestion}", new StringTagPair("Count", this.ListView.SelectedItems.Count.ToString(CultureInfo.CurrentCulture)))); } if (ok) { diff --git a/src/AddIns/Misc/SearchAndReplace/Project/Engine/SearchReplaceInFilesManager.cs b/src/AddIns/Misc/SearchAndReplace/Project/Engine/SearchReplaceInFilesManager.cs index ad63bd825d..6a58abc05f 100644 --- a/src/AddIns/Misc/SearchAndReplace/Project/Engine/SearchReplaceInFilesManager.cs +++ b/src/AddIns/Misc/SearchAndReplace/Project/Engine/SearchReplaceInFilesManager.cs @@ -47,7 +47,7 @@ namespace SearchAndReplace public static void ShowSearchResults(string pattern, List results) { string title = StringParser.Parse("${res:MainWindow.Windows.SearchResultPanel.OccurrencesOf}", - new string[,] {{ "Pattern", pattern }}); + new StringTagPair("Pattern", pattern)); SearchResultsPad.Instance.ShowSearchResults(title, results); SearchResultsPad.Instance.BringToFront(); } diff --git a/src/AddIns/Misc/SearchAndReplace/Project/Engine/SearchReplaceManager.cs b/src/AddIns/Misc/SearchAndReplace/Project/Engine/SearchReplaceManager.cs index f038f48cee..9ac0de602f 100644 --- a/src/AddIns/Misc/SearchAndReplace/Project/Engine/SearchReplaceManager.cs +++ b/src/AddIns/Misc/SearchAndReplace/Project/Engine/SearchReplaceManager.cs @@ -160,7 +160,7 @@ namespace SearchAndReplace ShowNotFoundMessage(monitor); } else { if (monitor != null) monitor.ShowingDialog = true; - MessageService.ShowMessage(StringParser.Parse("${res:ICSharpCode.TextEditor.Document.SearchReplaceManager.MarkAllDone}", new string[,]{{ "Count", count.ToString() }}), + MessageService.ShowMessage(StringParser.Parse("${res:ICSharpCode.TextEditor.Document.SearchReplaceManager.MarkAllDone}",new StringTagPair("Count", count.ToString())), "${res:Global.FinishedCaptionText}"); if (monitor != null) monitor.ShowingDialog = false; } @@ -172,8 +172,10 @@ namespace SearchAndReplace ShowNotFoundMessage(monitor); } else { if (monitor != null) monitor.ShowingDialog = true; - MessageService.ShowMessage(StringParser.Parse("${res:ICSharpCode.TextEditor.Document.SearchReplaceManager.ReplaceAllDone}", new string[,]{{ "Count", count.ToString() }}), - "${res:Global.FinishedCaptionText}"); + MessageService.ShowMessage( + StringParser.Parse("${res:ICSharpCode.TextEditor.Document.SearchReplaceManager.ReplaceAllDone}", + new StringTagPair("Count", count.ToString())), + "${res:Global.FinishedCaptionText}"); if (monitor != null) monitor.ShowingDialog = false; } } diff --git a/src/AddIns/Misc/SearchAndReplace/Project/Gui/SearchRootNode.cs b/src/AddIns/Misc/SearchAndReplace/Project/Gui/SearchRootNode.cs index 462a5c8620..0a3db6b5cf 100644 --- a/src/AddIns/Misc/SearchAndReplace/Project/Gui/SearchRootNode.cs +++ b/src/AddIns/Misc/SearchAndReplace/Project/Gui/SearchRootNode.cs @@ -65,7 +65,8 @@ namespace SearchAndReplace if (count == 1) { return StringParser.Parse("${res:MainWindow.Windows.SearchResultPanel.OneOccurrence}"); } else { - return StringParser.Parse("${res:MainWindow.Windows.SearchResultPanel.OccurrencesCount}", new string[,] {{"Count", count.ToString()}}); + return StringParser.Parse("${res:MainWindow.Windows.SearchResultPanel.OccurrencesCount}", + new StringTagPair("Count", count.ToString())); } } @@ -74,7 +75,8 @@ namespace SearchAndReplace if (count == 1) { return StringParser.Parse("${res:MainWindow.Windows.SearchResultPanel.OneFile}"); } else { - return StringParser.Parse("${res:MainWindow.Windows.SearchResultPanel.FileCount}", new string[,] {{"Count", count.ToString()}}); + return StringParser.Parse("${res:MainWindow.Windows.SearchResultPanel.FileCount}", + new StringTagPair("Count", count.ToString())); } } } diff --git a/src/AddIns/VersionControl/SubversionAddIn/Src/Commands/AutostartCommands.cs b/src/AddIns/VersionControl/SubversionAddIn/Src/Commands/AutostartCommands.cs index fc4250aa12..0209324cd5 100644 --- a/src/AddIns/VersionControl/SubversionAddIn/Src/Commands/AutostartCommands.cs +++ b/src/AddIns/VersionControl/SubversionAddIn/Src/Commands/AutostartCommands.cs @@ -235,7 +235,8 @@ namespace ICSharpCode.Svn.Commands || ex.IsKnownError(KnownError.CannotDeleteFileNotUnderVersionControl)) { if (MessageService.ShowCustomDialog("${res:AddIns.Subversion.DeleteDirectory}", - StringParser.Parse("${res:AddIns.Subversion.ErrorDelete}:\n", new string[,] { { "File", fullName } }) + + StringParser.Parse("${res:AddIns.Subversion.ErrorDelete}:\n", + new StringTagPair("File", fullName)) + ex.Message, 0, 1, "${res:AddIns.Subversion.ForceDelete}", "${res:Global.CancelButtonText}") == 0) diff --git a/src/AddIns/VersionControl/SubversionAddIn/Src/Commands/ProjectBrowserCommands.cs b/src/AddIns/VersionControl/SubversionAddIn/Src/Commands/ProjectBrowserCommands.cs index d34ca2e52f..4d51b035a5 100644 --- a/src/AddIns/VersionControl/SubversionAddIn/Src/Commands/ProjectBrowserCommands.cs +++ b/src/AddIns/VersionControl/SubversionAddIn/Src/Commands/ProjectBrowserCommands.cs @@ -149,9 +149,9 @@ namespace ICSharpCode.Svn.Commands // if at least one project was changed: if (MessageService.ShowCustomDialog( MessageService.DefaultMessageBoxTitle, - "${res:AddIns.Subversion.ReloadSolutionAfterProjectChanges}", + "${res:ICSharpCode.SharpDevelop.Project.SolutionAlteredExternallyMessage}", 0, 1, - "${res:AddIns.Subversion.ReloadSolution}", "${res:AddIns.Subversion.KeepOldSolution}") + "${res:ICSharpCode.SharpDevelop.Project.ReloadSolution}", "${res:ICSharpCode.SharpDevelop.Project.KeepOldSolution}") == 0) { ProjectService.LoadSolution(solution.FileName); diff --git a/src/Main/Base/Project/Src/Editor/CodeCompletion/CodeCompletionItemProvider.cs b/src/Main/Base/Project/Src/Editor/CodeCompletion/CodeCompletionItemProvider.cs index 7355567520..5300029a51 100644 --- a/src/Main/Base/Project/Src/Editor/CodeCompletion/CodeCompletionItemProvider.cs +++ b/src/Main/Base/Project/Src/Editor/CodeCompletion/CodeCompletionItemProvider.cs @@ -396,7 +396,7 @@ namespace ICSharpCode.SharpDevelop.Editor.CodeCompletion descriptionCreated = true; if (Overloads > 1) { description += Environment.NewLine + - StringParser.Parse("${res:ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor.CodeCompletionData.OverloadsCounter}", new string[,] {{"NumOverloads", this.Overloads.ToString()}}); + StringParser.Parse("${res:ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor.CodeCompletionData.OverloadsCounter}", new StringTagPair("NumOverloads", this.Overloads.ToString())); } string entityDoc = entity.Documentation; if (!string.IsNullOrEmpty(entityDoc)) { diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/NewFileDialog.cs b/src/Main/Base/Project/Src/Gui/Dialogs/NewFileDialog.cs index 534267bfa4..f201e5abd4 100644 --- a/src/Main/Base/Project/Src/Gui/Dialogs/NewFileDialog.cs +++ b/src/Main/Base/Project/Src/Gui/Dialogs/NewFileDialog.cs @@ -460,7 +460,7 @@ namespace ICSharpCode.SharpDevelop.Gui || fileName.IndexOf(Path.AltDirectorySeparatorChar) >= 0 || fileName.IndexOf(Path.DirectorySeparatorChar) >= 0) { - MessageService.ShowError(StringParser.Parse("${res:ICSharpCode.SharpDevelop.Commands.SaveFile.InvalidFileNameError}", new string[,] {{"FileName", fileName}})); + MessageService.ShowError(StringParser.Parse("${res:ICSharpCode.SharpDevelop.Commands.SaveFile.InvalidFileNameError}", new StringTagPair("FileName", fileName))); return; } if (Path.GetExtension(fileName).Length == 0) { diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/CreateKey.cs b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/CreateKey.cs index a43acb4881..599dba17cf 100644 --- a/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/CreateKey.cs +++ b/src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/CreateKey.cs @@ -67,7 +67,7 @@ namespace ICSharpCode.SharpDevelop.Gui.OptionPanels { if (File.Exists(keyPath)) { string question = "${res:ICSharpCode.SharpDevelop.Internal.Templates.ProjectDescriptor.OverwriteQuestion}"; - question = StringParser.Parse(question, new string[,] {{"fileNames", keyPath}}); + question = StringParser.Parse(question, new StringTagPair("fileNames", keyPath)); if (!MessageService.AskQuestion(question, "${res:ICSharpCode.SharpDevelop.Internal.Templates.ProjectDescriptor.OverwriteQuestion.InfoName}")) { return false; } diff --git a/src/Main/Base/Project/Src/Gui/Dialogs/SharpDevelopAboutPanels.cs b/src/Main/Base/Project/Src/Gui/Dialogs/SharpDevelopAboutPanels.cs index aaa42bab99..48b30c0a99 100644 --- a/src/Main/Base/Project/Src/Gui/Dialogs/SharpDevelopAboutPanels.cs +++ b/src/Main/Base/Project/Src/Gui/Dialogs/SharpDevelopAboutPanels.cs @@ -95,7 +95,7 @@ namespace ICSharpCode.SharpDevelop.Gui public static string LicenseSentence { get { return StringParser.Parse("${res:Dialog.About.License}", - new string[,] {{"License", "GNU Lesser General Public License"}}); + new StringTagPair("License", "GNU Lesser General Public License")); } } diff --git a/src/Main/Base/Project/Src/Gui/Pads/FileScout.cs b/src/Main/Base/Project/Src/Gui/Pads/FileScout.cs index be63e8b965..43ecbc6e7f 100644 --- a/src/Main/Base/Project/Src/Gui/Pads/FileScout.cs +++ b/src/Main/Base/Project/Src/Gui/Pads/FileScout.cs @@ -228,8 +228,10 @@ namespace ICSharpCode.SharpDevelop.Gui fileName = fileItem.FullName; break; } - if (MessageService.AskQuestion(StringParser.Parse("${res:ProjectComponent.ContextMenu.Delete.Question}", new string[,] {{"FileName", fileName}}), - "${Global.Delete}")) { + if (MessageService.AskQuestion( + StringParser.Parse("${res:ProjectComponent.ContextMenu.Delete.Question}", + new StringTagPair("FileName", fileName)), + "${Global.Delete}")) { foreach(FileListItem fileItem in SelectedItems) { try { diff --git a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/Commands/FolderNodeCommands.cs b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/Commands/FolderNodeCommands.cs index 228950aa27..6d6e1e1840 100644 --- a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/Commands/FolderNodeCommands.cs +++ b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/Commands/FolderNodeCommands.cs @@ -26,7 +26,7 @@ namespace ICSharpCode.SharpDevelop.Project.Commands { if (caption == null) caption = "${res:ProjectComponent.ContextMenu.AddExistingFiles.ReplaceExistingFile.Title}"; - string text = StringParser.Parse("${res:ProjectComponent.ContextMenu.AddExistingFiles.ReplaceExistingFile}", new string[,] {{"FileName", fileName}}); + string text = StringParser.Parse("${res:ProjectComponent.ContextMenu.AddExistingFiles.ReplaceExistingFile}", new StringTagPair("FileName", fileName)); if (replacingMultiple) { return (ReplaceExistingFile) MessageService.ShowCustomDialog(caption, text, diff --git a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/AbstractProjectBrowserTreeNode.cs b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/AbstractProjectBrowserTreeNode.cs index 979319eaac..2b20ab8bc2 100644 --- a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/AbstractProjectBrowserTreeNode.cs +++ b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/AbstractProjectBrowserTreeNode.cs @@ -158,7 +158,7 @@ namespace ICSharpCode.SharpDevelop.Project protected string GetQuestionText(string question) { - return StringParser.Parse(question, new string[,] {{"FileName", Text}}); + return StringParser.Parse(question, new StringTagPair("FileName", Text)); } public virtual AbstractProjectBrowserTreeNode GetNodeByRelativePath(string relativePath) diff --git a/src/Main/Base/Project/Src/Internal/Templates/Project/ProjectDescriptor.cs b/src/Main/Base/Project/Src/Internal/Templates/Project/ProjectDescriptor.cs index b5e73ec36c..af4891a447 100644 --- a/src/Main/Base/Project/Src/Internal/Templates/Project/ProjectDescriptor.cs +++ b/src/Main/Base/Project/Src/Internal/Templates/Project/ProjectDescriptor.cs @@ -329,7 +329,7 @@ namespace ICSharpCode.SharpDevelop.Internal.Templates StringBuilder existingFileNames = new StringBuilder(); foreach (FileDescriptionTemplate file in files) { - string fileName = Path.Combine(projectCreateInformation.ProjectBasePath, StringParser.Parse(file.Name, new string[,] { { "ProjectName", projectCreateInformation.ProjectName } })); + string fileName = Path.Combine(projectCreateInformation.ProjectBasePath, StringParser.Parse(file.Name, new StringTagPair("ProjectName", projectCreateInformation.ProjectName))); if (File.Exists(fileName)) { @@ -356,7 +356,7 @@ namespace ICSharpCode.SharpDevelop.Internal.Templates #region Copy files to target directory foreach (FileDescriptionTemplate file in files) { - string fileName = Path.Combine(projectCreateInformation.ProjectBasePath, StringParser.Parse(file.Name, new string[,] { { "ProjectName", projectCreateInformation.ProjectName } })); + string fileName = Path.Combine(projectCreateInformation.ProjectBasePath, StringParser.Parse(file.Name, new StringTagPair("ProjectName", projectCreateInformation.ProjectName))); if (File.Exists(fileName) && !overwriteFiles) { continue; @@ -373,7 +373,7 @@ namespace ICSharpCode.SharpDevelop.Internal.Templates } else { // Textual content StreamWriter sr = new StreamWriter(File.Create(fileName), ParserService.DefaultFileEncoding); - string fileContent = StringParser.Parse(file.Content, new string[,] { { "ProjectName", projectCreateInformation.ProjectName }, { "FileName", fileName } }); + string fileContent = StringParser.Parse(file.Content, new StringTagPair("ProjectName", projectCreateInformation.ProjectName), new StringTagPair("FileName", fileName)); fileContent = StringParser.Parse(fileContent); if (EditorControlService.GlobalOptions.IndentationString != "\t") { fileContent = fileContent.Replace("\t", EditorControlService.GlobalOptions.IndentationString); @@ -470,7 +470,7 @@ namespace ICSharpCode.SharpDevelop.Internal.Templates if (project is IProjectItemListProvider) { foreach (FileDescriptionTemplate file in files) { - string fileName = Path.Combine(projectCreateInformation.ProjectBasePath, StringParser.Parse(file.Name, new string[,] { { "ProjectName", projectCreateInformation.ProjectName } })); + string fileName = Path.Combine(projectCreateInformation.ProjectBasePath, StringParser.Parse(file.Name, new StringTagPair("ProjectName", projectCreateInformation.ProjectName))); FileProjectItem projectFile = new FileProjectItem(project, project.GetDefaultItemType(fileName)); projectFile.Include = FileUtility.GetRelativePath(project.Directory, fileName); diff --git a/src/Main/Base/Project/Src/Internal/Templates/Project/ProjectTemplate.cs b/src/Main/Base/Project/Src/Internal/Templates/Project/ProjectTemplate.cs index 2e8d75c0e7..eb1c53508b 100644 --- a/src/Main/Base/Project/Src/Internal/Templates/Project/ProjectTemplate.cs +++ b/src/Main/Base/Project/Src/Internal/Templates/Project/ProjectTemplate.cs @@ -244,7 +244,7 @@ namespace ICSharpCode.SharpDevelop.Internal.Templates if (el.HasAttribute("filename")) { string fileName = el.GetAttribute("filename"); return projectCreateInformation => { - string parsedFileName = StringParser.Parse(fileName, new string[,] { {"ProjectName", projectCreateInformation.ProjectName} }); + string parsedFileName = StringParser.Parse(fileName, new StringTagPair("ProjectName", projectCreateInformation.ProjectName)); string path = Path.Combine(projectCreateInformation.ProjectBasePath, parsedFileName); FileService.OpenFile(path); }; diff --git a/src/Main/Base/Project/Src/Internal/Templates/Project/SolutionDescriptor.cs b/src/Main/Base/Project/Src/Internal/Templates/Project/SolutionDescriptor.cs index f72d24ec49..187c9f0e71 100644 --- a/src/Main/Base/Project/Src/Internal/Templates/Project/SolutionDescriptor.cs +++ b/src/Main/Base/Project/Src/Internal/Templates/Project/SolutionDescriptor.cs @@ -106,9 +106,7 @@ namespace ICSharpCode.SharpDevelop.Internal.Templates projectCreateInformation.SolutionPath = oldSolutionPath; projectCreateInformation.ProjectBasePath = oldProjectPath; - string newSolutionName = StringParser.Parse(name, new string[,] { - {"ProjectName", projectCreateInformation.SolutionName} - }); + string newSolutionName = StringParser.Parse(name, new StringTagPair("ProjectName", projectCreateInformation.SolutionName)); string solutionLocation = Path.Combine(projectCreateInformation.SolutionPath, newSolutionName + ".sln"); diff --git a/src/Main/Base/Project/Src/Project/Converter/LanguageConverter.cs b/src/Main/Base/Project/Src/Project/Converter/LanguageConverter.cs index 824ca178e9..58811bd807 100644 --- a/src/Main/Base/Project/Src/Project/Converter/LanguageConverter.cs +++ b/src/Main/Base/Project/Src/Project/Converter/LanguageConverter.cs @@ -229,9 +229,9 @@ namespace ICSharpCode.SharpDevelop.Project.Converter if (p.Errors.Count > 0) { conversionLog.AppendLine(); conversionLog.AppendLine(StringParser.Parse("${res:ICSharpCode.SharpDevelop.Commands.Convert.IsNotConverted}", - new string[,] {{"FileName", sourceItem.FileName}})); + new StringTagPair("FileName", sourceItem.FileName))); conversionLog.AppendLine(StringParser.Parse("${res:ICSharpCode.SharpDevelop.Commands.Convert.ParserErrorCount}", - new string[,] {{"ErrorCount", p.Errors.Count.ToString()}})); + new StringTagPair("ErrorCount", p.Errors.Count.ToString()))); conversionLog.AppendLine(p.Errors.ErrorOutput); base.ConvertFile(sourceItem, targetItem); return; @@ -250,10 +250,8 @@ namespace ICSharpCode.SharpDevelop.Project.Converter if (outputVisitor.Errors.Count > 0) { conversionLog.AppendLine(); conversionLog.AppendLine(StringParser.Parse("${res:ICSharpCode.SharpDevelop.Commands.Convert.ConverterErrorCount}", - new string[,] { - {"FileName", sourceItem.FileName}, - {"ErrorCount", outputVisitor.Errors.Count.ToString()} - })); + new StringTagPair("FileName", sourceItem.FileName), + new StringTagPair("ErrorCount", outputVisitor.Errors.Count.ToString()))); conversionLog.AppendLine(outputVisitor.Errors.ErrorOutput); } diff --git a/src/Main/Base/Project/Src/Services/File/FileChangeWatcher.cs b/src/Main/Base/Project/Src/Services/File/FileChangeWatcher.cs index 7dd94fe26f..5d87d5309c 100644 --- a/src/Main/Base/Project/Src/Services/File/FileChangeWatcher.cs +++ b/src/Main/Base/Project/Src/Services/File/FileChangeWatcher.cs @@ -219,7 +219,10 @@ namespace ICSharpCode.SharpDevelop if (!System.IO.File.Exists(fileName)) return; - string message = StringParser.Parse("${res:ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor.TextEditorDisplayBinding.FileAlteredMessage}", new string[,] {{"File", Path.GetFullPath(fileName)}}); + string message = StringParser.Parse( + "${res:ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor.TextEditorDisplayBinding.FileAlteredMessage}", + new StringTagPair("File", Path.GetFullPath(fileName)) + ); if ((AutoLoadExternalChangesOption && file.IsDirty == false) || MessageService.AskQuestion(message, StringParser.Parse("${res:MainWindow.DialogName}"))) { diff --git a/src/Main/Base/Project/Src/Services/File/FileService.cs b/src/Main/Base/Project/Src/Services/File/FileService.cs index f3f115975f..1018253a8d 100644 --- a/src/Main/Base/Project/Src/Services/File/FileService.cs +++ b/src/Main/Base/Project/Src/Services/File/FileService.cs @@ -177,7 +177,7 @@ namespace ICSharpCode.SharpDevelop { if (FileUtility.IsValidPath(path)) return true; - MessageService.ShowMessage(StringParser.Parse("${res:ICSharpCode.SharpDevelop.Commands.SaveFile.InvalidFileNameError}", new string[,] {{"FileName", path}})); + MessageService.ShowMessage(StringParser.Parse("${res:ICSharpCode.SharpDevelop.Commands.SaveFile.InvalidFileNameError}", new StringTagPair("FileName", path))); return false; } @@ -189,7 +189,7 @@ namespace ICSharpCode.SharpDevelop { if (FileUtility.IsValidDirectoryEntryName(name)) return true; - MessageService.ShowMessage(StringParser.Parse("${res:ICSharpCode.SharpDevelop.Commands.SaveFile.InvalidFileNameError}", new string[,] {{"FileName", name}})); + MessageService.ShowMessage(StringParser.Parse("${res:ICSharpCode.SharpDevelop.Commands.SaveFile.InvalidFileNameError}", new StringTagPair("FileName", name))); return false; } diff --git a/src/Main/Base/Project/Src/Services/ParserService/DomHostCallback.cs b/src/Main/Base/Project/Src/Services/ParserService/DomHostCallback.cs index 2169059fd3..6db914665c 100644 --- a/src/Main/Base/Project/Src/Services/ParserService/DomHostCallback.cs +++ b/src/Main/Base/Project/Src/Services/ParserService/DomHostCallback.cs @@ -42,7 +42,7 @@ namespace ICSharpCode.SharpDevelop TaskService.BuildMessageViewCategory.AppendText( StringParser.Parse( "${res:ICSharpCode.SharpDevelop.ErrorLoadingCodeCompletionInformation}", - new string[,] { {"Assembly", include}, {"Filename", fileName}} + new StringTagPair("Assembly", include), new StringTagPair("Filename", fileName) ) + "\r\n" + message + "\r\n" ); } diff --git a/src/Main/Base/Project/Src/Services/ProjectService/CompileModifiedProjectsOnly.cs b/src/Main/Base/Project/Src/Services/ProjectService/CompileModifiedProjectsOnly.cs index cd6d610a6f..ed5b8f1a7b 100644 --- a/src/Main/Base/Project/Src/Services/ProjectService/CompileModifiedProjectsOnly.cs +++ b/src/Main/Base/Project/Src/Services/ProjectService/CompileModifiedProjectsOnly.cs @@ -263,7 +263,7 @@ namespace ICSharpCode.SharpDevelop.Project if (lastCompilationPass != null) { feedbackSink.ReportMessage( StringParser.Parse("${res:MainWindow.CompilerMessages.SkipProjectNoChanges}", - new string[,] {{ "Name", p.Name }}) + new StringTagPair("Name", p.Name)) ); feedbackSink.Done(true); } else { diff --git a/src/Main/Base/Project/Src/Services/ProjectService/ProjectService.cs b/src/Main/Base/Project/Src/Services/ProjectService/ProjectService.cs index 09ab6250ad..b0c378655b 100644 --- a/src/Main/Base/Project/Src/Services/ProjectService/ProjectService.cs +++ b/src/Main/Base/Project/Src/Services/ProjectService/ProjectService.cs @@ -110,7 +110,7 @@ namespace ICSharpCode.SharpDevelop.Project if (loader != null) { loader.Load(fileName); } else { - MessageService.ShowError(StringParser.Parse("${res:ICSharpCode.SharpDevelop.Commands.OpenCombine.InvalidProjectOrCombine}", new string[,] {{"FileName", fileName}})); + MessageService.ShowError(StringParser.Parse("${res:ICSharpCode.SharpDevelop.Commands.OpenCombine.InvalidProjectOrCombine}", new StringTagPair("FileName", fileName))); } } @@ -348,7 +348,7 @@ namespace ICSharpCode.SharpDevelop.Project } } if (found == false) { - string[,] parseArgs = {{"SolutionName", Path.GetFileName(solutionFile)}, {"ProjectName", Path.GetFileName(fileName)}}; + var parseArgs = new[] { new StringTagPair("SolutionName", Path.GetFileName(solutionFile)), new StringTagPair("ProjectName", Path.GetFileName(fileName))}; int res = MessageService.ShowCustomDialog(MessageService.ProductName, StringParser.Parse("${res:ICSharpCode.SharpDevelop.Commands.OpenCombine.SolutionDoesNotContainProject}", parseArgs), 0, 2, @@ -391,7 +391,7 @@ namespace ICSharpCode.SharpDevelop.Project return; } } else { - MessageService.ShowError(StringParser.Parse("${res:ICSharpCode.SharpDevelop.Commands.OpenCombine.InvalidProjectOrCombine}", new string[,] {{"FileName", fileName}})); + MessageService.ShowError(StringParser.Parse("${res:ICSharpCode.SharpDevelop.Commands.OpenCombine.InvalidProjectOrCombine}", new StringTagPair("FileName", fileName))); return; } solution.AddFolder(project); diff --git a/src/Main/Base/Project/Src/Services/RefactoringService/ContextActions/ContextActionsHelper.cs b/src/Main/Base/Project/Src/Services/RefactoringService/ContextActions/ContextActionsHelper.cs index 6b20fa942a..1f2c6fb22b 100644 --- a/src/Main/Base/Project/Src/Services/RefactoringService/ContextActions/ContextActionsHelper.cs +++ b/src/Main/Base/Project/Src/Services/RefactoringService/ContextActions/ContextActionsHelper.cs @@ -37,8 +37,11 @@ namespace ICSharpCode.SharpDevelop.Refactoring public static ContextActionsPopup MakePopupWithOverrides(IMember member) { var derivedClassesTree = RefactoringService.FindDerivedClassesTree(member.DeclaringType); - var popupViewModel = new ContextActionsViewModel { Title = MenuService.ConvertLabel(StringParser.Parse( - "${res:SharpDevelop.Refactoring.OverridesOf}", new string[,] {{ "Name", member.FullyQualifiedName }}))}; + var popupViewModel = new ContextActionsViewModel { + Title = MenuService.ConvertLabel(StringParser.Parse( + "${res:SharpDevelop.Refactoring.OverridesOf}", + new StringTagPair("Name", member.FullyQualifiedName)) + )}; popupViewModel.Actions = new OverridesPopupTreeViewModelBuilder(member).BuildTreeViewModel(derivedClassesTree); return new ContextActionsPopup { Actions = popupViewModel, Symbol = member }; } diff --git a/src/Main/Base/Project/Src/Services/RefactoringService/FindReferencesAndRenameHelper.cs b/src/Main/Base/Project/Src/Services/RefactoringService/FindReferencesAndRenameHelper.cs index 5e036978fb..f22efbcda3 100644 --- a/src/Main/Base/Project/Src/Services/RefactoringService/FindReferencesAndRenameHelper.cs +++ b/src/Main/Base/Project/Src/Services/RefactoringService/FindReferencesAndRenameHelper.cs @@ -524,21 +524,20 @@ namespace ICSharpCode.SharpDevelop.Refactoring public static void RunFindReferences(IMember member) { string memberName = member.DeclaringType.Name + "." + member.Name; - using (AsynchronousWaitDialog monitor = AsynchronousWaitDialog.ShowWaitDialog("${res:SharpDevelop.Refactoring.FindReferences}", true)) - { - FindReferencesAndRenameHelper.ShowAsSearchResults(StringParser.Parse("${res:SharpDevelop.Refactoring.ReferencesTo}", - new string[,] {{ "Name", memberName }}), - RefactoringService.FindReferences(member, monitor)); + using (AsynchronousWaitDialog monitor = AsynchronousWaitDialog.ShowWaitDialog("${res:SharpDevelop.Refactoring.FindReferences}", true)) { + FindReferencesAndRenameHelper.ShowAsSearchResults( + StringParser.Parse("${res:SharpDevelop.Refactoring.ReferencesTo}", + new StringTagPair("Name", memberName)), + RefactoringService.FindReferences(member, monitor)); } } public static void RunFindReferences(IClass c) { - using (AsynchronousWaitDialog monitor = AsynchronousWaitDialog.ShowWaitDialog("${res:SharpDevelop.Refactoring.FindReferences}", true)) - { + using (AsynchronousWaitDialog monitor = AsynchronousWaitDialog.ShowWaitDialog("${res:SharpDevelop.Refactoring.FindReferences}", true)) { FindReferencesAndRenameHelper.ShowAsSearchResults( StringParser.Parse("${res:SharpDevelop.Refactoring.ReferencesTo}", - new string[,] {{ "Name", c.Name }}), + new StringTagPair("Name", c.Name)), RefactoringService.FindReferences(c, monitor) ); } @@ -548,7 +547,7 @@ namespace ICSharpCode.SharpDevelop.Refactoring { FindReferencesAndRenameHelper.ShowAsSearchResults( StringParser.Parse("${res:SharpDevelop.Refactoring.ReferencesTo}", - new string[,] {{ "Name", local.VariableName }}), + new StringTagPair("Name", local.VariableName)), RefactoringService.FindReferences(local, null) ); } diff --git a/src/Main/Base/Project/Src/Services/StatusBar/StatusBarService.cs b/src/Main/Base/Project/Src/Services/StatusBar/StatusBarService.cs index cf6500e675..37ff00af0b 100644 --- a/src/Main/Base/Project/Src/Services/StatusBar/StatusBarService.cs +++ b/src/Main/Base/Project/Src/Services/StatusBar/StatusBarService.cs @@ -72,11 +72,10 @@ namespace ICSharpCode.SharpDevelop.Gui { statusBar.CursorStatusBarPanel.Content = StringParser.Parse( "${res:StatusBarService.CursorStatusBarPanelText}", - new string[,] { - {"Line", String.Format("{0,-10}", y)}, - {"Column", String.Format("{0,-5}", x)}, - {"Character", String.Format("{0,-5}", charOffset)} - }); + new StringTagPair("Line", String.Format("{0,-10}", y)), + new StringTagPair("Column", String.Format("{0,-5}", x)), + new StringTagPair("Character", String.Format("{0,-5}", charOffset)) + ); } public void SetInsertMode(bool insertMode) diff --git a/src/Main/Core/Project/Src/Services/StringParser/StringParser.cs b/src/Main/Core/Project/Src/Services/StringParser/StringParser.cs index 0dbf7121e6..d2acec8711 100644 --- a/src/Main/Core/Project/Src/Services/StringParser/StringParser.cs +++ b/src/Main/Core/Project/Src/Services/StringParser/StringParser.cs @@ -132,6 +132,7 @@ namespace ICSharpCode.Core /// /// For new code, please use the overload taking StringTagPair[]! /// + [Obsolete("Please use the overload taking StringTagPair[]!")] public static string Parse(string input, string[,] customTags) { if (customTags == null) diff --git a/src/Main/Core/Test/StringParserTests.cs b/src/Main/Core/Test/StringParserTests.cs index 03129ad8b7..735b8ddb1f 100644 --- a/src/Main/Core/Test/StringParserTests.cs +++ b/src/Main/Core/Test/StringParserTests.cs @@ -43,7 +43,7 @@ namespace ICSharpCode.Core.Tests [Test] public void CustomInput() { - Assert.AreEqual("12", StringParser.Parse("${a}${b}", new string[,] {{"a", "1"}, {"b", "2"}})); + Assert.AreEqual("12", StringParser.Parse("${a}${b}", new StringTagPair("a", "1"), new StringTagPair("b", "2"))); } [Test]