From ab217c9052162b8b445aa21fb7bf387bdcd1e06c Mon Sep 17 00:00:00 2001 From: Sergey Chebotar Date: Tue, 30 May 2023 08:23:31 +0300 Subject: [PATCH] Throw exceptions on unknown Service or Tool --- RhSolutions.AddIn/Services/ReaderFactory.cs | 2 +- RhSolutions.AddIn/Services/WriterFactory.cs | 2 +- RhSolutions.AddIn/Tools/ToolFactory.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/RhSolutions.AddIn/Services/ReaderFactory.cs b/RhSolutions.AddIn/Services/ReaderFactory.cs index eea326d..b7483ce 100644 --- a/RhSolutions.AddIn/Services/ReaderFactory.cs +++ b/RhSolutions.AddIn/Services/ReaderFactory.cs @@ -15,7 +15,7 @@ public class ReaderFactory { "Guess" => (IReader)_serviceProvider.GetService(typeof(GuessReader)), "Excel" => (IReader)_serviceProvider.GetService(typeof(ExcelReader)), - _ => (IReader)_serviceProvider.GetService(typeof(ExcelReader)) + _ => throw new ArgumentException($"Незвестный интерфейс {nameof(IReader)}: {readerName}") }; } } diff --git a/RhSolutions.AddIn/Services/WriterFactory.cs b/RhSolutions.AddIn/Services/WriterFactory.cs index 66d4102..77a98d2 100644 --- a/RhSolutions.AddIn/Services/WriterFactory.cs +++ b/RhSolutions.AddIn/Services/WriterFactory.cs @@ -15,7 +15,7 @@ public class WriterFactory { "Excel" => (IWriter)_serviceProvider.GetService(typeof(ExcelWriter)), "Dxf" => (IWriter)_serviceProvider.GetService(typeof(DxfWriter)), - _ => (IWriter)_serviceProvider.GetService(typeof(ExcelWriter)) + _ => throw new ArgumentException($"Незвестный интерфейс {nameof(IWriter)}: {writerName}") }; } } diff --git a/RhSolutions.AddIn/Tools/ToolFactory.cs b/RhSolutions.AddIn/Tools/ToolFactory.cs index 2169b03..3a4fd8c 100644 --- a/RhSolutions.AddIn/Tools/ToolFactory.cs +++ b/RhSolutions.AddIn/Tools/ToolFactory.cs @@ -11,7 +11,7 @@ internal class ToolFactory "merge" => new MergeTool(RhSolutionsAddIn.ServiceProvider), "dxfexport" => new DxfTool(RhSolutionsAddIn.ServiceProvider), "Guessexport" => new GuessTool(RhSolutionsAddIn.ServiceProvider), - _ => throw new Exception("Неизвестный инструмент"), + _ => throw new Exception($"Неизвестный инструмент {toolName}"), }; return tool; }