From 61c32269703b65d58dbf569c3bc7c552bc95cfea Mon Sep 17 00:00:00 2001 From: Lluis Sanchez Date: Wed, 4 Apr 2007 16:09:32 +0000 Subject: * Mono.Addins/ExtensionContext.cs, Mono.Addins/AddinSessionService.cs, Makefile.am, Mono.Addins.Description/AddinDescription.cs, Mono.Addins.Description/ExtensionPoint.cs, Mono.Addins.Database/AddinUpdateData.cs, Mono.Addins.Database/AddinDatabase.cs: Use ISO-1 compliant c# only. * Mono.Addins.Description/Condition.cs, Mono.Addins.Description/ConditionCollection.cs: Removed unused files. svn path=/trunk/mono-addins/; revision=75396 --- .../Mono.Addins.Description/AddinDescription.cs | 34 +++++++--------------- 1 file changed, 10 insertions(+), 24 deletions(-) (limited to 'Mono.Addins/Mono.Addins.Description/AddinDescription.cs') diff --git a/Mono.Addins/Mono.Addins.Description/AddinDescription.cs b/Mono.Addins/Mono.Addins.Description/AddinDescription.cs index e811bc6..c18288d 100644 --- a/Mono.Addins/Mono.Addins.Description/AddinDescription.cs +++ b/Mono.Addins/Mono.Addins.Description/AddinDescription.cs @@ -375,32 +375,18 @@ namespace Mono.Addins.Description extensionPoints.SaveXml (elem); } - public static void Check (string fileName) - { - Read (fileName, true); - } - - public static AddinDescription Read (string fileName) - { - return Read (fileName, false); - } - - public static AddinDescription Read (Stream stream, string basePath) - { - return Read (stream, basePath, false); - } - - public static AddinDescription Read (string configFile, bool check) + + public static AddinDescription Read (string configFile) { AddinDescription config; using (Stream s = File.OpenRead (configFile)) { - config = Read (s, Path.GetDirectoryName (configFile), check); + config = Read (s, Path.GetDirectoryName (configFile)); } config.configFile = configFile; return config; } - public static AddinDescription Read (Stream stream, string basePath, bool check) + public static AddinDescription Read (Stream stream, string basePath) { AddinDescription config = new AddinDescription (); @@ -427,12 +413,6 @@ namespace Mono.Addins.Description config.basePath = elem.GetAttribute ("basePath"); config.isroot = elem.GetAttribute ("isroot") == "true" || elem.GetAttribute ("isroot") == "yes"; - foreach (string file in config.AllFiles) { - string asmFile = Path.Combine (basePath, file); - if (check && !File.Exists (asmFile)) - throw new InvalidOperationException ("The file '" + file + "' is referenced in the configuration file but it was not found in package."); - } - return config; } @@ -503,6 +483,12 @@ namespace Mono.Addins.Description errors.Add ("Attribute 'id' can't be empty for global node sets."); } + foreach (string file in AllFiles) { + string asmFile = Path.Combine (BasePath, file); + if (!File.Exists (asmFile)) + errors.Add ("The file '" + file + "' referenced in the manifest could not be found."); + } + return errors; } -- cgit v1.2.3