diff --git a/src/Interface/ProgressBar.cs b/src/Interface/ProgressBar.cs index f703c65..7217d4e 100644 --- a/src/Interface/ProgressBar.cs +++ b/src/Interface/ProgressBar.cs @@ -1,6 +1,6 @@ namespace RhSolutions.Interface { - internal class ProgressBar : AbstractBar + internal class ProgressBar : StatusbarBase { private double CurrentProgress { get; set; } private readonly double TaskWeight; diff --git a/src/Interface/ResultBar.cs b/src/Interface/ResultBar.cs index f085e3d..3652738 100644 --- a/src/Interface/ResultBar.cs +++ b/src/Interface/ResultBar.cs @@ -3,7 +3,7 @@ using System.Text; namespace RhSolutions.Interface { - internal class ResultBar : AbstractBar + internal class ResultBar : StatusbarBase { private int Success { get; set; } private int Replaced { get; set; } diff --git a/src/Interface/RibbonController.cs b/src/Interface/RibbonController.cs index ef45cb0..6bbba3e 100644 --- a/src/Interface/RibbonController.cs +++ b/src/Interface/RibbonController.cs @@ -64,7 +64,7 @@ namespace RhSolutions.Interface { try { - AbstractTool tool; + ToolBase tool; switch (control.Id) { case "export": diff --git a/src/Interface/AbstractBar.cs b/src/Interface/StatusbarBase.cs similarity index 89% rename from src/Interface/AbstractBar.cs rename to src/Interface/StatusbarBase.cs index 12327e5..f1af972 100644 --- a/src/Interface/AbstractBar.cs +++ b/src/Interface/StatusbarBase.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace RhSolutions.Interface { - internal abstract class AbstractBar : IDisposable + internal abstract class StatusbarBase : IDisposable { protected Application Excel = AddIn.Excel; diff --git a/src/PriceListTools/CombineTool.cs b/src/PriceListTools/CombineTool.cs index 6959ac2..e0429bd 100644 --- a/src/PriceListTools/CombineTool.cs +++ b/src/PriceListTools/CombineTool.cs @@ -7,7 +7,7 @@ using Dialog = RhSolutions.Interface.Dialog; namespace RhSolutions.PriceListTools { - internal class CombineTool : AbstractTool + internal class CombineTool : ToolBase { private List SourceFiles { get; set; } diff --git a/src/PriceListTools/ConvertTool.cs b/src/PriceListTools/ConvertTool.cs index 57895b3..788d6ff 100644 --- a/src/PriceListTools/ConvertTool.cs +++ b/src/PriceListTools/ConvertTool.cs @@ -2,7 +2,7 @@ namespace RhSolutions.PriceListTools { - internal class ConvertTool : AbstractTool + internal class ConvertTool : ToolBase { private SourcePriceList Current { get; set; } diff --git a/src/PriceListTools/ExportTool.cs b/src/PriceListTools/ExportTool.cs index 4956faf..add072d 100644 --- a/src/PriceListTools/ExportTool.cs +++ b/src/PriceListTools/ExportTool.cs @@ -5,7 +5,7 @@ using RhSolutions.Interface; namespace RhSolutions.PriceListTools { - internal class ExportTool : AbstractTool + internal class ExportTool : ToolBase { private Dictionary PositionAmount; private readonly Range Selection; diff --git a/src/PriceListTools/MergeTool.cs b/src/PriceListTools/MergeTool.cs index b9673e7..3a945dd 100644 --- a/src/PriceListTools/MergeTool.cs +++ b/src/PriceListTools/MergeTool.cs @@ -5,7 +5,7 @@ using System.Linq; namespace RhSolutions.PriceListTools { - internal class MergeTool : AbstractTool + internal class MergeTool : ToolBase { private List SourceFiles { get; set; } diff --git a/src/PriceListTools/AbstractPriceList.cs b/src/PriceListTools/PriceListBase.cs similarity index 90% rename from src/PriceListTools/AbstractPriceList.cs rename to src/PriceListTools/PriceListBase.cs index 2274a7f..805cd04 100644 --- a/src/PriceListTools/AbstractPriceList.cs +++ b/src/PriceListTools/PriceListBase.cs @@ -2,7 +2,7 @@ namespace RhSolutions.PriceListTools { - internal abstract class AbstractPriceList + internal abstract class PriceListBase { public Range AmountCell { get; protected set; } public Range SkuCell { get; protected set; } diff --git a/src/PriceListTools/SourcePriceList.cs b/src/PriceListTools/SourcePriceList.cs index 7c0001e..4e43d7a 100644 --- a/src/PriceListTools/SourcePriceList.cs +++ b/src/PriceListTools/SourcePriceList.cs @@ -7,7 +7,7 @@ using RhSolutions.Interface; namespace RhSolutions.PriceListTools { - internal class SourcePriceList : AbstractPriceList + internal class SourcePriceList : PriceListBase { public Dictionary PositionAmount { get; private set; } diff --git a/src/PriceListTools/TargetPriceList.cs b/src/PriceListTools/TargetPriceList.cs index da540ae..e360062 100644 --- a/src/PriceListTools/TargetPriceList.cs +++ b/src/PriceListTools/TargetPriceList.cs @@ -4,7 +4,7 @@ using System.Linq; namespace RhSolutions.PriceListTools { - internal class TargetPriceList : AbstractPriceList + internal class TargetPriceList : PriceListBase { public Range OldSkuCell { get; private set; } diff --git a/src/PriceListTools/AbstractTool.cs b/src/PriceListTools/ToolBase.cs similarity index 99% rename from src/PriceListTools/AbstractTool.cs rename to src/PriceListTools/ToolBase.cs index 3ea907b..d64522d 100644 --- a/src/PriceListTools/AbstractTool.cs +++ b/src/PriceListTools/ToolBase.cs @@ -7,7 +7,7 @@ using ProgressBar = RhSolutions.Interface.ProgressBar; namespace RhSolutions.PriceListTools { - internal abstract class AbstractTool + internal abstract class ToolBase { protected Application ExcelApp = AddIn.Excel; protected TargetPriceList TargetFile { get; set; }