From a122dc1a84ae260cd1f5da0ae9b46f2229d1a278 Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Tue, 27 Oct 2009 19:11:27 +0000 Subject: [PATCH] Replace FileUtility.Combine with Path.Combine. git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@5187 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../Misc/HtmlHelp2/Project/Configuration/AssemblyInfo.cs | 1 - src/Main/Base/Project/Src/Internal/ExternalTool/ToolLoader.cs | 2 +- .../Base/Project/Src/Internal/Templates/File/FileTemplate.cs | 2 +- .../Project/Src/Internal/Templates/Project/ProjectTemplate.cs | 4 ++-- .../Base/Project/Src/Internal/Templates/StandardHeaders.cs | 2 +- .../Src/Internal/Templates/TemplateCategorySortOrderFile.cs | 4 ++-- src/Main/Base/Project/Src/Internal/Templates/TextTemplate.cs | 3 ++- .../Base/Project/Src/Services/Language/LanguageService.cs | 2 +- src/Main/Core/Project/Src/AddInTree/CoreStartup.cs | 2 +- src/Main/Core/Project/Src/Services/FileUtility/FileUtility.cs | 1 + .../Project/Src/Services/PropertyService/PropertyService.cs | 2 +- .../Configuration/AssemblyInfo.cs | 1 - 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/AddIns/Misc/HtmlHelp2/Project/Configuration/AssemblyInfo.cs b/src/AddIns/Misc/HtmlHelp2/Project/Configuration/AssemblyInfo.cs index e1ddd50525..a9ccc131af 100644 --- a/src/AddIns/Misc/HtmlHelp2/Project/Configuration/AssemblyInfo.cs +++ b/src/AddIns/Misc/HtmlHelp2/Project/Configuration/AssemblyInfo.cs @@ -21,4 +21,3 @@ using System.Security.Permissions; [assembly: AssemblyCulture("")] [assembly: System.CLSCompliant(false)] -[assembly: SecurityPermission(SecurityAction.RequestMinimum, Execution = true)] diff --git a/src/Main/Base/Project/Src/Internal/ExternalTool/ToolLoader.cs b/src/Main/Base/Project/Src/Internal/ExternalTool/ToolLoader.cs index 130934971c..9f2aefe47d 100644 --- a/src/Main/Base/Project/Src/Internal/ExternalTool/ToolLoader.cs +++ b/src/Main/Base/Project/Src/Internal/ExternalTool/ToolLoader.cs @@ -83,7 +83,7 @@ namespace ICSharpCode.SharpDevelop.Internal.ExternalTool static ToolLoader() { if (!LoadToolsFromStream(Path.Combine(PropertyService.ConfigDirectory, TOOLFILE))) { - if (!LoadToolsFromStream(FileUtility.Combine(PropertyService.DataDirectory, "options", TOOLFILE))) { + if (!LoadToolsFromStream(Path.Combine(PropertyService.DataDirectory, "options", TOOLFILE))) { MessageService.ShowWarning("${res:Internal.ExternalTool.CantLoadToolConfigWarining}"); } } diff --git a/src/Main/Base/Project/Src/Internal/Templates/File/FileTemplate.cs b/src/Main/Base/Project/Src/Internal/Templates/File/FileTemplate.cs index fe90ba71fc..d8bcfcb711 100644 --- a/src/Main/Base/Project/Src/Internal/Templates/File/FileTemplate.cs +++ b/src/Main/Base/Project/Src/Internal/Templates/File/FileTemplate.cs @@ -290,7 +290,7 @@ namespace ICSharpCode.SharpDevelop.Internal.Templates public static void UpdateTemplates() { - string dataTemplateDir = FileUtility.Combine(PropertyService.DataDirectory, "templates", "file"); + string dataTemplateDir = Path.Combine(PropertyService.DataDirectory, "templates", "file"); List files = FileUtility.SearchDirectory(dataTemplateDir, "*.xft"); foreach (string templateDirectory in AddInTree.BuildItems(ProjectTemplate.TemplatePath, null, false)) { if (!Directory.Exists(templateDirectory)) 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 c365e359fd..0861a801cf 100644 --- a/src/Main/Base/Project/Src/Internal/Templates/Project/ProjectTemplate.cs +++ b/src/Main/Base/Project/Src/Internal/Templates/Project/ProjectTemplate.cs @@ -249,7 +249,7 @@ namespace ICSharpCode.SharpDevelop.Internal.Templates string fileName = el.GetAttribute("filename"); return projectCreateInformation => { string parsedFileName = StringParser.Parse(fileName, new string[,] { {"ProjectName", projectCreateInformation.ProjectName} }); - string path = FileUtility.Combine(projectCreateInformation.ProjectBasePath, parsedFileName); + string path = Path.Combine(projectCreateInformation.ProjectBasePath, parsedFileName); FileService.OpenFile(path); }; } else { @@ -343,7 +343,7 @@ namespace ICSharpCode.SharpDevelop.Internal.Templates public static void UpdateTemplates() { projectTemplates = new List(); - string dataTemplateDir = FileUtility.Combine(PropertyService.DataDirectory, "templates", "project"); + string dataTemplateDir = Path.Combine(PropertyService.DataDirectory, "templates", "project"); List files = FileUtility.SearchDirectory(dataTemplateDir, "*.xpt"); foreach (string templateDirectory in AddInTree.BuildItems(TemplatePath, null, false)) { files.AddRange(FileUtility.SearchDirectory(templateDirectory, "*.xpt")); diff --git a/src/Main/Base/Project/Src/Internal/Templates/StandardHeaders.cs b/src/Main/Base/Project/Src/Internal/Templates/StandardHeaders.cs index 640b3b667e..872e693c06 100644 --- a/src/Main/Base/Project/Src/Internal/Templates/StandardHeaders.cs +++ b/src/Main/Base/Project/Src/Internal/Templates/StandardHeaders.cs @@ -76,7 +76,7 @@ namespace ICSharpCode.SharpDevelop.Internal.Templates { if (!LoadHeaders(Path.Combine(PropertyService.ConfigDirectory, TemplateFileName))) { - if (!LoadHeaders(FileUtility.Combine(PropertyService.DataDirectory, "options", TemplateFileName))) { + if (!LoadHeaders(Path.Combine(PropertyService.DataDirectory, "options", TemplateFileName))) { MessageService.ShowWarning("Can not load standard headers"); } } diff --git a/src/Main/Base/Project/Src/Internal/Templates/TemplateCategorySortOrderFile.cs b/src/Main/Base/Project/Src/Internal/Templates/TemplateCategorySortOrderFile.cs index 48899c353b..e84c30cc96 100644 --- a/src/Main/Base/Project/Src/Internal/Templates/TemplateCategorySortOrderFile.cs +++ b/src/Main/Base/Project/Src/Internal/Templates/TemplateCategorySortOrderFile.cs @@ -118,7 +118,7 @@ namespace ICSharpCode.SharpDevelop.Internal.Templates static void ReadProjectCategorySortOrderFiles() { projectCategorySortOrderFiles = new List(); - string dataTemplateDir = FileUtility.Combine(PropertyService.DataDirectory, "templates", "project"); + string dataTemplateDir = Path.Combine(PropertyService.DataDirectory, "templates", "project"); List files = FileUtility.SearchDirectory(dataTemplateDir, ProjectCategorySortOrderFileName); foreach (string templateDirectory in AddInTree.BuildItems(ProjectTemplate.TemplatePath, null, false)) { files.AddRange(FileUtility.SearchDirectory(templateDirectory, ProjectCategorySortOrderFileName)); @@ -135,7 +135,7 @@ namespace ICSharpCode.SharpDevelop.Internal.Templates static void ReadFileCategorySortOrderFiles() { fileCategorySortOrderFiles = new List(); - string dataTemplateDir = FileUtility.Combine(PropertyService.DataDirectory, "templates", "file"); + string dataTemplateDir = Path.Combine(PropertyService.DataDirectory, "templates", "file"); List files = FileUtility.SearchDirectory(dataTemplateDir, FileCategorySortOrderFileName); foreach (string templateDirectory in AddInTree.BuildItems(ProjectTemplate.TemplatePath, null, false)) { files.AddRange(FileUtility.SearchDirectory(templateDirectory, FileCategorySortOrderFileName)); diff --git a/src/Main/Base/Project/Src/Internal/Templates/TextTemplate.cs b/src/Main/Base/Project/Src/Internal/Templates/TextTemplate.cs index 15e21cfa62..3111246154 100644 --- a/src/Main/Base/Project/Src/Internal/Templates/TextTemplate.cs +++ b/src/Main/Base/Project/Src/Internal/Templates/TextTemplate.cs @@ -7,6 +7,7 @@ using System; using System.Collections.Generic; +using System.IO; using System.Xml; using ICSharpCode.Core; @@ -78,7 +79,7 @@ namespace ICSharpCode.SharpDevelop.Internal.Templates static TextTemplate() { - List files = FileUtility.SearchDirectory(FileUtility.Combine(PropertyService.DataDirectory, "options", "textlib"), "*.xml"); + List files = FileUtility.SearchDirectory(Path.Combine(PropertyService.DataDirectory, "options", "textlib"), "*.xml"); foreach (string file in files) { LoadTextTemplate(file); } diff --git a/src/Main/Base/Project/Src/Services/Language/LanguageService.cs b/src/Main/Base/Project/Src/Services/Language/LanguageService.cs index 6d13d04d2e..8a058c482c 100644 --- a/src/Main/Base/Project/Src/Services/Language/LanguageService.cs +++ b/src/Main/Base/Project/Src/Services/Language/LanguageService.cs @@ -18,7 +18,7 @@ namespace ICSharpCode.SharpDevelop { public static class LanguageService { - static string languagePath = FileUtility.Combine(PropertyService.DataDirectory, "resources", "languages"); + static string languagePath = Path.Combine(PropertyService.DataDirectory, "resources", "languages"); static ImageList languageImageList = null; static ArrayList languages = null; diff --git a/src/Main/Core/Project/Src/AddInTree/CoreStartup.cs b/src/Main/Core/Project/Src/AddInTree/CoreStartup.cs index 06d7069812..7d42a45c11 100644 --- a/src/Main/Core/Project/Src/AddInTree/CoreStartup.cs +++ b/src/Main/Core/Project/Src/AddInTree/CoreStartup.cs @@ -205,7 +205,7 @@ namespace ICSharpCode.Core dataDirectory ?? Path.Combine(FileUtility.ApplicationRootPath, "data"), propertiesName); PropertyService.Load(); - ResourceService.InitializeService(FileUtility.Combine(PropertyService.DataDirectory, "resources")); + ResourceService.InitializeService(Path.Combine(PropertyService.DataDirectory, "resources")); StringParser.RegisterStringTagProvider(new AppNameProvider { appName = applicationName }); } diff --git a/src/Main/Core/Project/Src/Services/FileUtility/FileUtility.cs b/src/Main/Core/Project/Src/Services/FileUtility/FileUtility.cs index 67a3de6e83..4ed8949f0f 100644 --- a/src/Main/Core/Project/Src/Services/FileUtility/FileUtility.cs +++ b/src/Main/Core/Project/Src/Services/FileUtility/FileUtility.cs @@ -146,6 +146,7 @@ namespace ICSharpCode.Core #endregion + [Obsolete("Use System.IO.Path.Combine instead")] public static string Combine(params string[] paths) { if (paths == null || paths.Length == 0) { diff --git a/src/Main/Core/Project/Src/Services/PropertyService/PropertyService.cs b/src/Main/Core/Project/Src/Services/PropertyService/PropertyService.cs index cdb20a33d5..af34de6bd8 100644 --- a/src/Main/Core/Project/Src/Services/PropertyService/PropertyService.cs +++ b/src/Main/Core/Project/Src/Services/PropertyService/PropertyService.cs @@ -83,7 +83,7 @@ namespace ICSharpCode.Core } if (!LoadPropertiesFromStream(Path.Combine(configDirectory, propertyFileName))) { - LoadPropertiesFromStream(FileUtility.Combine(DataDirectory, "options", propertyFileName)); + LoadPropertiesFromStream(Path.Combine(DataDirectory, "options", propertyFileName)); } } diff --git a/src/Main/ICSharpCode.SharpDevelop.Sda/Configuration/AssemblyInfo.cs b/src/Main/ICSharpCode.SharpDevelop.Sda/Configuration/AssemblyInfo.cs index 3ba4f0ded4..f6231f635c 100644 --- a/src/Main/ICSharpCode.SharpDevelop.Sda/Configuration/AssemblyInfo.cs +++ b/src/Main/ICSharpCode.SharpDevelop.Sda/Configuration/AssemblyInfo.cs @@ -21,4 +21,3 @@ using System.Security.Permissions; [assembly: AssemblyConfiguration("")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: SecurityPermission(SecurityAction.RequestMinimum, Unrestricted=true)]