From 1388d953dc16504753aedd96e9ecb6b1fc2a9d6e Mon Sep 17 00:00:00 2001 From: alcexhim Date: Tue, 8 Sep 2015 09:13:37 -0400 Subject: [PATCH] Get the XML file extension from the preliminary configuration --- .../UniversalEditor.UserInterface.WindowsForms/Editor.cs | 3 ++- .../Libraries/UniversalEditor.Essential/Common/Reflection.cs | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CSharp/V5/Engines/WindowsForms/Libraries/UniversalEditor.UserInterface.WindowsForms/Editor.cs b/CSharp/V5/Engines/WindowsForms/Libraries/UniversalEditor.UserInterface.WindowsForms/Editor.cs index f748dd6f..aec37327 100644 --- a/CSharp/V5/Engines/WindowsForms/Libraries/UniversalEditor.UserInterface.WindowsForms/Editor.cs +++ b/CSharp/V5/Engines/WindowsForms/Libraries/UniversalEditor.UserInterface.WindowsForms/Editor.cs @@ -162,9 +162,10 @@ namespace UniversalEditor.UserInterface.WindowsForms "Configuration" }); + // FIXME: refactor this into a single XML configuration file loader at the beginning of engine launch if (System.IO.Directory.Exists(configurationPath)) { - string[] fileNames = System.IO.Directory.GetFiles(configurationPath, "*.uexml"); + string[] fileNames = System.IO.Directory.GetFiles(configurationPath, System.Configuration.ConfigurationManager.AppSettings["UniversalEditor.Configuration.ConfigurationFileNameFilter"]); XMLPropertyListDataFormat xmpl = new XMLPropertyListDataFormat(); foreach (string fileName in fileNames) diff --git a/CSharp/V5/Libraries/UniversalEditor.Essential/Common/Reflection.cs b/CSharp/V5/Libraries/UniversalEditor.Essential/Common/Reflection.cs index be56a591..4ba3234e 100644 --- a/CSharp/V5/Libraries/UniversalEditor.Essential/Common/Reflection.cs +++ b/CSharp/V5/Libraries/UniversalEditor.Essential/Common/Reflection.cs @@ -175,6 +175,7 @@ namespace UniversalEditor.Common return dfr2.Priority.CompareTo(dfr1.Priority); } + // FIXME: refactor this into a single XML configuration file loader at the beginning of engine launch private static void InitializeFromXML(ref List listObjectModels, ref List listDataFormats, ref List listProjectTypes, ref List listDocumentTemplates, ref List listProjectTemplates) { System.Collections.Specialized.StringCollection paths = new System.Collections.Specialized.StringCollection(); @@ -183,7 +184,7 @@ namespace UniversalEditor.Common foreach (string path in paths) { string[] XMLFileNames = null; - XMLFileNames = System.IO.Directory.GetFiles(path, "*.uexml", System.IO.SearchOption.AllDirectories); + XMLFileNames = System.IO.Directory.GetFiles(path, System.Configuration.ConfigurationManager.AppSettings["UniversalEditor.Configuration.ConfigurationFileNameFilter"], System.IO.SearchOption.AllDirectories); foreach (string fileName in XMLFileNames) { try