From 69865e96e3a1f128c9c25a32a445745aa8aa4fbf Mon Sep 17 00:00:00 2001
From: Sergey Chebotar <s.chebotar@gmail.com>
Date: Sat, 12 Feb 2022 16:02:55 +0300
Subject: Create Tool Factory. Exception on empty selection in Export Tool.

---
 src/PriceListTools/MergeTool.cs | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

(limited to 'src/PriceListTools/MergeTool.cs')

diff --git a/src/PriceListTools/MergeTool.cs b/src/PriceListTools/MergeTool.cs
index 0e3f1dc..77732bf 100644
--- a/src/PriceListTools/MergeTool.cs
+++ b/src/PriceListTools/MergeTool.cs
@@ -1,4 +1,5 @@
 using RehauSku.Interface;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -6,9 +7,24 @@ namespace RehauSku.PriceListTools
 {
     internal class MergeTool : AbstractTool
     {
-        public List<SourcePriceList> SourceFiles;
+        private List<SourcePriceList> SourceFiles { get; set; }
 
-        public void FillTarget()
+        public MergeTool()
+        {
+            string[] files = Dialog.GetMultiplyFiles();
+
+            if (files != null)
+            {
+                SourceFiles = SourcePriceList.GetSourceLists(files);
+            }
+
+            else
+            {
+                throw new Exception("Не выбраны файлы");
+            }
+        }
+
+        public override void FillTarget()
         {
             ProgressBar = new ProgressBar("Заполняю строки...", SourceFiles.Sum(x => x.PositionAmount.Count));
             ResultBar = new ResultBar();
-- 
cgit v1.2.3


From 3feab7cf5f8755b4c05a6d57aece037947b16273 Mon Sep 17 00:00:00 2001
From: Sergey Chebotar <s.chebotar@gmail.com>
Date: Sat, 12 Feb 2022 16:53:34 +0300
Subject: Extract PriceListHeaders class

---
 src/PriceListTools/MergeTool.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/PriceListTools/MergeTool.cs')

diff --git a/src/PriceListTools/MergeTool.cs b/src/PriceListTools/MergeTool.cs
index 77732bf..179fb81 100644
--- a/src/PriceListTools/MergeTool.cs
+++ b/src/PriceListTools/MergeTool.cs
@@ -33,7 +33,7 @@ namespace RehauSku.PriceListTools
             {
                 foreach (var kvp in source.PositionAmount)
                 {
-                    FillPositionAmountToColumns(kvp, TargetFile.amountCell.Column);
+                    FillPositionAmountToColumns(kvp, TargetFile.AmountCell.Column);
                     ProgressBar.Update();
                 }
             }
-- 
cgit v1.2.3