From b67ff9b079bde6fac4632d0d263a7c237e9b7863 Mon Sep 17 00:00:00 2001 From: Danil Kislov Date: Fri, 15 Mar 2019 18:15:34 +0300 Subject: [PATCH] =?UTF-8?q?=D0=95=D1=89=D0=B5=20=D1=80=D0=B5=D1=84=D0=B0?= =?UTF-8?q?=D0=BA=D1=82=D0=BE=D1=80=D0=B8=D0=BD=D0=B3=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- JiraTimeBotForm/DI/ContainerBuilder.cs | 11 +++-- .../{ => Comments}/IJiraDescriptionSource.cs | 4 +- .../{ => Comments}/JiraDescriptionSource.cs | 4 +- JiraTimeBotForm/JiraIntegration/JiraApi.cs | 2 + JiraTimeBotForm/JiraTimeBotForm.csproj | 22 +++++----- JiraTimeBotForm/Job.cs | 3 +- JiraTimeBotForm/Mercurial/IMercurialLog.cs | 1 + JiraTimeBotForm/Mercurial/MercurialLog.cs | 42 +++---------------- .../{ => Modifiers}/CommitSkipper.cs | 2 +- .../{ => Modifiers}/ICommitSkipper.cs | 2 +- .../Modifiers/ITechnicalInfoSkipper.cs | 7 ++++ .../Modifiers/TechnicalInfoSkipper.cs | 42 +++++++++++++++++++ .../{ => Objects}/MercurialCommitItem.cs | 2 +- JiraTimeBotForm/Program.cs | 1 + .../TaskTime/ITaskTimeDiscoverer.cs | 2 + .../TaskTime/{ => Objects}/TaskTimeItem.cs | 2 +- .../TaskTime/TaskTimeDiscoverer.cs | 2 + ...ksProcessors.cs => IAllTasksProcessors.cs} | 2 +- .../TasksProcessors/ITasksProcessor.cs | 4 +- .../TasksProcessors/MeetingProcessor.cs | 2 +- .../TasksProcessors/WorkLogTasksProcessor.cs | 2 +- JiraTimeBotForm/UI/{ => Tray}/ITrayMenu.cs | 2 +- .../UI/{ => Tray}/RestoreFromTray.cs | 2 +- JiraTimeBotForm/UI/{ => Tray}/TrayMenu.cs | 2 +- JiraTimeBotForm/UI/frmMain.Designer.cs | 2 +- JiraTimeBotForm/UI/frmMain.cs | 8 ++-- 26 files changed, 105 insertions(+), 72 deletions(-) rename JiraTimeBotForm/JiraIntegration/{ => Comments}/IJiraDescriptionSource.cs (59%) rename JiraTimeBotForm/JiraIntegration/{ => Comments}/JiraDescriptionSource.cs (89%) rename JiraTimeBotForm/Mercurial/{ => Modifiers}/CommitSkipper.cs (93%) rename JiraTimeBotForm/Mercurial/{ => Modifiers}/ICommitSkipper.cs (70%) create mode 100644 JiraTimeBotForm/Mercurial/Modifiers/ITechnicalInfoSkipper.cs create mode 100644 JiraTimeBotForm/Mercurial/Modifiers/TechnicalInfoSkipper.cs rename JiraTimeBotForm/Mercurial/{ => Objects}/MercurialCommitItem.cs (85%) rename JiraTimeBotForm/TaskTime/{ => Objects}/TaskTimeItem.cs (88%) rename JiraTimeBotForm/TasksProcessors/{ITasksProcessors.cs => IAllTasksProcessors.cs} (80%) rename JiraTimeBotForm/UI/{ => Tray}/ITrayMenu.cs (82%) rename JiraTimeBotForm/UI/{ => Tray}/RestoreFromTray.cs (93%) rename JiraTimeBotForm/UI/{ => Tray}/TrayMenu.cs (97%) diff --git a/JiraTimeBotForm/DI/ContainerBuilder.cs b/JiraTimeBotForm/DI/ContainerBuilder.cs index 5e56389..a03c053 100644 --- a/JiraTimeBotForm/DI/ContainerBuilder.cs +++ b/JiraTimeBotForm/DI/ContainerBuilder.cs @@ -2,11 +2,13 @@ using Autofac; using Autofac.Extras.AggregateService; using JiraTimeBotForm.JiraIntegration; +using JiraTimeBotForm.JiraIntegration.Comments; using JiraTimeBotForm.Mercurial; -using JiraTimeBotForm.TaskProcessors; +using JiraTimeBotForm.Mercurial.Modifiers; using JiraTimeBotForm.TasksProcessors; using JiraTimeBotForm.TaskTime; using JiraTimeBotForm.UI; +using JiraTimeBotForm.UI.Tray; namespace JiraTimeBotForm.DI { @@ -25,12 +27,13 @@ namespace JiraTimeBotForm.DI _builder.Register(f => new TrayMenu()).As().AsSelf(); _builder.Register(c => new CommitSkipper()).As(); - _builder.Register(c => new MercurialLog(c.Resolve(), c.Resolve())).As().AsSelf(); - _builder.Register(c => new TaskTimeDiscoverer(c.Resolve())).As().AsSelf(); + _builder.RegisterType().As().AsSelf(); + _builder.RegisterType().As().AsSelf(); + _builder.RegisterType().As().AsSelf(); _builder.RegisterType().AsSelf().As(); _builder.RegisterType().AsSelf().As(); - _builder.RegisterAggregateService(); + _builder.RegisterAggregateService(); _builder.RegisterType().AsSelf().As(); _builder.RegisterType().AsSelf().AsImplementedInterfaces(); diff --git a/JiraTimeBotForm/JiraIntegration/IJiraDescriptionSource.cs b/JiraTimeBotForm/JiraIntegration/Comments/IJiraDescriptionSource.cs similarity index 59% rename from JiraTimeBotForm/JiraIntegration/IJiraDescriptionSource.cs rename to JiraTimeBotForm/JiraIntegration/Comments/IJiraDescriptionSource.cs index 92ca9f9..a6d277f 100644 --- a/JiraTimeBotForm/JiraIntegration/IJiraDescriptionSource.cs +++ b/JiraTimeBotForm/JiraIntegration/Comments/IJiraDescriptionSource.cs @@ -1,6 +1,6 @@ -using JiraTimeBotForm.TaskTime; +using JiraTimeBotForm.TaskTime.Objects; -namespace JiraTimeBotForm.JiraIntegration +namespace JiraTimeBotForm.JiraIntegration.Comments { public interface IJiraDescriptionSource { diff --git a/JiraTimeBotForm/JiraIntegration/JiraDescriptionSource.cs b/JiraTimeBotForm/JiraIntegration/Comments/JiraDescriptionSource.cs similarity index 89% rename from JiraTimeBotForm/JiraIntegration/JiraDescriptionSource.cs rename to JiraTimeBotForm/JiraIntegration/Comments/JiraDescriptionSource.cs index 42526a3..99ddd97 100644 --- a/JiraTimeBotForm/JiraIntegration/JiraDescriptionSource.cs +++ b/JiraTimeBotForm/JiraIntegration/Comments/JiraDescriptionSource.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using System.Linq; -using JiraTimeBotForm.TaskTime; +using JiraTimeBotForm.TaskTime.Objects; -namespace JiraTimeBotForm.JiraIntegration +namespace JiraTimeBotForm.JiraIntegration.Comments { public class JiraDescriptionSource : IJiraDescriptionSource { diff --git a/JiraTimeBotForm/JiraIntegration/JiraApi.cs b/JiraTimeBotForm/JiraIntegration/JiraApi.cs index 0dd8de7..75ba915 100644 --- a/JiraTimeBotForm/JiraIntegration/JiraApi.cs +++ b/JiraTimeBotForm/JiraIntegration/JiraApi.cs @@ -3,7 +3,9 @@ using System.Collections.Generic; using System.Linq; using Atlassian.Jira; using JiraTimeBotForm.Configuration; +using JiraTimeBotForm.JiraIntegration.Comments; using JiraTimeBotForm.TaskTime; +using JiraTimeBotForm.TaskTime.Objects; namespace JiraTimeBotForm.JiraIntegration { diff --git a/JiraTimeBotForm/JiraTimeBotForm.csproj b/JiraTimeBotForm/JiraTimeBotForm.csproj index 60e1b01..70eb979 100644 --- a/JiraTimeBotForm/JiraTimeBotForm.csproj +++ b/JiraTimeBotForm/JiraTimeBotForm.csproj @@ -81,15 +81,17 @@ - - + + - - + + + - + + Form @@ -97,7 +99,7 @@ frmMain.cs - + @@ -107,10 +109,10 @@ - - - - + + + + frmMain.cs diff --git a/JiraTimeBotForm/Job.cs b/JiraTimeBotForm/Job.cs index f0ed5c0..bee20f7 100644 --- a/JiraTimeBotForm/Job.cs +++ b/JiraTimeBotForm/Job.cs @@ -5,9 +5,10 @@ using System.Threading; using System.Threading.Tasks; using JiraTimeBotForm.Configuration; using JiraTimeBotForm.Mercurial; -using JiraTimeBotForm.TaskProcessors; +using JiraTimeBotForm.Mercurial.Objects; using JiraTimeBotForm.TasksProcessors; using JiraTimeBotForm.TaskTime; +using JiraTimeBotForm.TaskTime.Objects; namespace JiraTimeBotForm { diff --git a/JiraTimeBotForm/Mercurial/IMercurialLog.cs b/JiraTimeBotForm/Mercurial/IMercurialLog.cs index 130d395..3cd3004 100644 --- a/JiraTimeBotForm/Mercurial/IMercurialLog.cs +++ b/JiraTimeBotForm/Mercurial/IMercurialLog.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Threading; using JiraTimeBotForm.Configuration; +using JiraTimeBotForm.Mercurial.Objects; namespace JiraTimeBotForm.Mercurial { diff --git a/JiraTimeBotForm/Mercurial/MercurialLog.cs b/JiraTimeBotForm/Mercurial/MercurialLog.cs index 48f0979..d8a7f47 100644 --- a/JiraTimeBotForm/Mercurial/MercurialLog.cs +++ b/JiraTimeBotForm/Mercurial/MercurialLog.cs @@ -5,6 +5,8 @@ using System.Linq; using System.Text; using System.Threading; using JiraTimeBotForm.Configuration; +using JiraTimeBotForm.Mercurial.Modifiers; +using JiraTimeBotForm.Mercurial.Objects; using Mercurial; namespace JiraTimeBotForm.Mercurial @@ -13,11 +15,13 @@ namespace JiraTimeBotForm.Mercurial { private readonly ILog _log; private readonly ICommitSkipper _commitSkipper; + private readonly ITechnicalInfoSkipper _technicalInfoSkipper; - public MercurialLog(ILog log, ICommitSkipper commitSkipper) + public MercurialLog(ILog log, ICommitSkipper commitSkipper, ITechnicalInfoSkipper technicalInfoSkipper) { _log = log; _commitSkipper = commitSkipper; + _technicalInfoSkipper = technicalInfoSkipper; } public List GetMercurialLog(Settings settings, DateTime? date = null, CancellationToken cancellationToken = default(CancellationToken)) @@ -60,7 +64,7 @@ namespace JiraTimeBotForm.Mercurial { continue; } - commitMessage = StripTechnicalInfo(commitMessage); + commitMessage = _technicalInfoSkipper.StripTechnicalInfo(commitMessage); workTasks.Add(new MercurialCommitItem { @@ -81,40 +85,6 @@ namespace JiraTimeBotForm.Mercurial } - private string StripTechnicalInfo(string commitMessage) - { - if (!commitMessage.Contains("Signed-by:")) - { - return commitMessage; - } - - var arr = commitMessage.Split('\n'); - var sb = new StringBuilder(); - foreach (var itm in arr) - { - if (string.IsNullOrEmpty(itm)) - { - continue; - } - if (itm.StartsWith("Signed-by")) - { - continue; - } - if (itm.StartsWith("Jira:")) - { - continue; - } - - sb.AppendLine(itm); - } - - var message = sb.ToString(); - message = message.TrimEnd('\n'); - message = message.TrimEnd('\r'); - - return message; - } - private string FixEncoding(string source) { //перекодируем сообщение - ибо оно криво забирается в 1252 diff --git a/JiraTimeBotForm/Mercurial/CommitSkipper.cs b/JiraTimeBotForm/Mercurial/Modifiers/CommitSkipper.cs similarity index 93% rename from JiraTimeBotForm/Mercurial/CommitSkipper.cs rename to JiraTimeBotForm/Mercurial/Modifiers/CommitSkipper.cs index cee2ca4..39c9148 100644 --- a/JiraTimeBotForm/Mercurial/CommitSkipper.cs +++ b/JiraTimeBotForm/Mercurial/Modifiers/CommitSkipper.cs @@ -1,6 +1,6 @@ using System; -namespace JiraTimeBotForm.Mercurial +namespace JiraTimeBotForm.Mercurial.Modifiers { public class CommitSkipper : ICommitSkipper { diff --git a/JiraTimeBotForm/Mercurial/ICommitSkipper.cs b/JiraTimeBotForm/Mercurial/Modifiers/ICommitSkipper.cs similarity index 70% rename from JiraTimeBotForm/Mercurial/ICommitSkipper.cs rename to JiraTimeBotForm/Mercurial/Modifiers/ICommitSkipper.cs index 14178d6..201dc4e 100644 --- a/JiraTimeBotForm/Mercurial/ICommitSkipper.cs +++ b/JiraTimeBotForm/Mercurial/Modifiers/ICommitSkipper.cs @@ -1,4 +1,4 @@ -namespace JiraTimeBotForm.Mercurial +namespace JiraTimeBotForm.Mercurial.Modifiers { public interface ICommitSkipper { diff --git a/JiraTimeBotForm/Mercurial/Modifiers/ITechnicalInfoSkipper.cs b/JiraTimeBotForm/Mercurial/Modifiers/ITechnicalInfoSkipper.cs new file mode 100644 index 0000000..323bb21 --- /dev/null +++ b/JiraTimeBotForm/Mercurial/Modifiers/ITechnicalInfoSkipper.cs @@ -0,0 +1,7 @@ +namespace JiraTimeBotForm.Mercurial.Modifiers +{ + public interface ITechnicalInfoSkipper + { + string StripTechnicalInfo(string commitMessage); + } +} diff --git a/JiraTimeBotForm/Mercurial/Modifiers/TechnicalInfoSkipper.cs b/JiraTimeBotForm/Mercurial/Modifiers/TechnicalInfoSkipper.cs new file mode 100644 index 0000000..287bb52 --- /dev/null +++ b/JiraTimeBotForm/Mercurial/Modifiers/TechnicalInfoSkipper.cs @@ -0,0 +1,42 @@ +using System.Text; + +namespace JiraTimeBotForm.Mercurial.Modifiers +{ + public class TechnicalInfoSkipper : ITechnicalInfoSkipper + { + public string StripTechnicalInfo(string commitMessage) + { + if (!commitMessage.Contains("Signed-by:")) + { + return commitMessage; + } + + var arr = commitMessage.Split('\n'); + var sb = new StringBuilder(); + foreach (var itm in arr) + { + if (string.IsNullOrEmpty(itm)) + { + continue; + } + if (itm.StartsWith("Signed-by")) + { + continue; + } + if (itm.StartsWith("Jira:")) + { + continue; + } + + sb.AppendLine(itm); + } + + var message = sb.ToString(); + message = message.TrimEnd('\n'); + message = message.TrimEnd('\r'); + + return message; + } + + } +} \ No newline at end of file diff --git a/JiraTimeBotForm/Mercurial/MercurialCommitItem.cs b/JiraTimeBotForm/Mercurial/Objects/MercurialCommitItem.cs similarity index 85% rename from JiraTimeBotForm/Mercurial/MercurialCommitItem.cs rename to JiraTimeBotForm/Mercurial/Objects/MercurialCommitItem.cs index 6866c3f..b2bb9f7 100644 --- a/JiraTimeBotForm/Mercurial/MercurialCommitItem.cs +++ b/JiraTimeBotForm/Mercurial/Objects/MercurialCommitItem.cs @@ -1,6 +1,6 @@ using System; -namespace JiraTimeBotForm.Mercurial +namespace JiraTimeBotForm.Mercurial.Objects { public class MercurialCommitItem { diff --git a/JiraTimeBotForm/Program.cs b/JiraTimeBotForm/Program.cs index d37b433..e5f1761 100644 --- a/JiraTimeBotForm/Program.cs +++ b/JiraTimeBotForm/Program.cs @@ -1,6 +1,7 @@ using System; using System.Diagnostics; using System.Windows.Forms; +using JiraTimeBotForm.UI; namespace JiraTimeBotForm { diff --git a/JiraTimeBotForm/TaskTime/ITaskTimeDiscoverer.cs b/JiraTimeBotForm/TaskTime/ITaskTimeDiscoverer.cs index e230c17..b28418f 100644 --- a/JiraTimeBotForm/TaskTime/ITaskTimeDiscoverer.cs +++ b/JiraTimeBotForm/TaskTime/ITaskTimeDiscoverer.cs @@ -2,6 +2,8 @@ using System.Threading; using JiraTimeBotForm.Configuration; using JiraTimeBotForm.Mercurial; +using JiraTimeBotForm.Mercurial.Objects; +using JiraTimeBotForm.TaskTime.Objects; namespace JiraTimeBotForm.TaskTime { diff --git a/JiraTimeBotForm/TaskTime/TaskTimeItem.cs b/JiraTimeBotForm/TaskTime/Objects/TaskTimeItem.cs similarity index 88% rename from JiraTimeBotForm/TaskTime/TaskTimeItem.cs rename to JiraTimeBotForm/TaskTime/Objects/TaskTimeItem.cs index 9b48d1c..2755739 100644 --- a/JiraTimeBotForm/TaskTime/TaskTimeItem.cs +++ b/JiraTimeBotForm/TaskTime/Objects/TaskTimeItem.cs @@ -1,6 +1,6 @@ using System; -namespace JiraTimeBotForm.TaskTime +namespace JiraTimeBotForm.TaskTime.Objects { public class TaskTimeItem { diff --git a/JiraTimeBotForm/TaskTime/TaskTimeDiscoverer.cs b/JiraTimeBotForm/TaskTime/TaskTimeDiscoverer.cs index 5a56236..6bd7c5f 100644 --- a/JiraTimeBotForm/TaskTime/TaskTimeDiscoverer.cs +++ b/JiraTimeBotForm/TaskTime/TaskTimeDiscoverer.cs @@ -5,6 +5,8 @@ using System.Text; using System.Threading; using JiraTimeBotForm.Configuration; using JiraTimeBotForm.Mercurial; +using JiraTimeBotForm.Mercurial.Objects; +using JiraTimeBotForm.TaskTime.Objects; namespace JiraTimeBotForm.TaskTime { diff --git a/JiraTimeBotForm/TasksProcessors/ITasksProcessors.cs b/JiraTimeBotForm/TasksProcessors/IAllTasksProcessors.cs similarity index 80% rename from JiraTimeBotForm/TasksProcessors/ITasksProcessors.cs rename to JiraTimeBotForm/TasksProcessors/IAllTasksProcessors.cs index 468cdcd..fdf03ab 100644 --- a/JiraTimeBotForm/TasksProcessors/ITasksProcessors.cs +++ b/JiraTimeBotForm/TasksProcessors/IAllTasksProcessors.cs @@ -1,6 +1,6 @@ namespace JiraTimeBotForm.TasksProcessors { - public interface ITasksProcessors + public interface IAllTasksProcessors { WorkLogTasksProcessor WorkLogTasksProcessor { get; } diff --git a/JiraTimeBotForm/TasksProcessors/ITasksProcessor.cs b/JiraTimeBotForm/TasksProcessors/ITasksProcessor.cs index 4916793..0eb1241 100644 --- a/JiraTimeBotForm/TasksProcessors/ITasksProcessor.cs +++ b/JiraTimeBotForm/TasksProcessors/ITasksProcessor.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using JiraTimeBotForm.Configuration; -using JiraTimeBotForm.TaskTime; +using JiraTimeBotForm.TaskTime.Objects; -namespace JiraTimeBotForm.TaskProcessors +namespace JiraTimeBotForm.TasksProcessors { interface ITasksProcessor { diff --git a/JiraTimeBotForm/TasksProcessors/MeetingProcessor.cs b/JiraTimeBotForm/TasksProcessors/MeetingProcessor.cs index ee5c992..51116e2 100644 --- a/JiraTimeBotForm/TasksProcessors/MeetingProcessor.cs +++ b/JiraTimeBotForm/TasksProcessors/MeetingProcessor.cs @@ -3,8 +3,8 @@ using System.Collections.Generic; using System.Linq; using JiraTimeBotForm.Configuration; using JiraTimeBotForm.JiraIntegration; -using JiraTimeBotForm.TaskProcessors; using JiraTimeBotForm.TaskTime; +using JiraTimeBotForm.TaskTime.Objects; namespace JiraTimeBotForm.TasksProcessors { diff --git a/JiraTimeBotForm/TasksProcessors/WorkLogTasksProcessor.cs b/JiraTimeBotForm/TasksProcessors/WorkLogTasksProcessor.cs index bf88a54..01b478d 100644 --- a/JiraTimeBotForm/TasksProcessors/WorkLogTasksProcessor.cs +++ b/JiraTimeBotForm/TasksProcessors/WorkLogTasksProcessor.cs @@ -2,8 +2,8 @@ using System.Collections.Generic; using JiraTimeBotForm.Configuration; using JiraTimeBotForm.JiraIntegration; -using JiraTimeBotForm.TaskProcessors; using JiraTimeBotForm.TaskTime; +using JiraTimeBotForm.TaskTime.Objects; namespace JiraTimeBotForm.TasksProcessors { diff --git a/JiraTimeBotForm/UI/ITrayMenu.cs b/JiraTimeBotForm/UI/Tray/ITrayMenu.cs similarity index 82% rename from JiraTimeBotForm/UI/ITrayMenu.cs rename to JiraTimeBotForm/UI/Tray/ITrayMenu.cs index 34a0f87..8b7a1a5 100644 --- a/JiraTimeBotForm/UI/ITrayMenu.cs +++ b/JiraTimeBotForm/UI/Tray/ITrayMenu.cs @@ -1,6 +1,6 @@ using System.Windows.Forms; -namespace JiraTimeBotForm.UI +namespace JiraTimeBotForm.UI.Tray { public interface ITrayMenu { diff --git a/JiraTimeBotForm/UI/RestoreFromTray.cs b/JiraTimeBotForm/UI/Tray/RestoreFromTray.cs similarity index 93% rename from JiraTimeBotForm/UI/RestoreFromTray.cs rename to JiraTimeBotForm/UI/Tray/RestoreFromTray.cs index 51b2a30..f47eeb7 100644 --- a/JiraTimeBotForm/UI/RestoreFromTray.cs +++ b/JiraTimeBotForm/UI/Tray/RestoreFromTray.cs @@ -2,7 +2,7 @@ using System.Runtime.InteropServices; using System.Windows.Forms; -namespace JiraTimeBotForm.UI +namespace JiraTimeBotForm.UI.Tray { public static class RestoreFromTray { [DllImport( "user32.dll" )] diff --git a/JiraTimeBotForm/UI/TrayMenu.cs b/JiraTimeBotForm/UI/Tray/TrayMenu.cs similarity index 97% rename from JiraTimeBotForm/UI/TrayMenu.cs rename to JiraTimeBotForm/UI/Tray/TrayMenu.cs index c729779..1e49890 100644 --- a/JiraTimeBotForm/UI/TrayMenu.cs +++ b/JiraTimeBotForm/UI/Tray/TrayMenu.cs @@ -1,7 +1,7 @@ using System; using System.Windows.Forms; -namespace JiraTimeBotForm.UI +namespace JiraTimeBotForm.UI.Tray { public class TrayMenu: ITrayMenu { diff --git a/JiraTimeBotForm/UI/frmMain.Designer.cs b/JiraTimeBotForm/UI/frmMain.Designer.cs index 2db1b1c..cf48f66 100644 --- a/JiraTimeBotForm/UI/frmMain.Designer.cs +++ b/JiraTimeBotForm/UI/frmMain.Designer.cs @@ -1,4 +1,4 @@ -namespace JiraTimeBotForm +namespace JiraTimeBotForm.UI { partial class frmMain { diff --git a/JiraTimeBotForm/UI/frmMain.cs b/JiraTimeBotForm/UI/frmMain.cs index 4708dce..936631f 100644 --- a/JiraTimeBotForm/UI/frmMain.cs +++ b/JiraTimeBotForm/UI/frmMain.cs @@ -8,12 +8,12 @@ using Autofac; using JiraTimeBotForm.Configuration; using JiraTimeBotForm.DI; using JiraTimeBotForm.TasksProcessors; -using JiraTimeBotForm.UI; +using JiraTimeBotForm.UI.Tray; // This is the code for your desktop app. // Press Ctrl+F5 (or go to Debug > Start Without Debugging) to run your app. -namespace JiraTimeBotForm +namespace JiraTimeBotForm.UI { public partial class frmMain : Form { @@ -21,7 +21,7 @@ namespace JiraTimeBotForm private readonly Job _job; private readonly IReadOnlyList _controls; private readonly IContainer _container; - private readonly ITasksProcessors _tasksProcessors; + private readonly IAllTasksProcessors _tasksProcessors; private readonly ITrayMenu _trayIcon; private CancellationTokenSource _tokenSource; @@ -47,7 +47,7 @@ namespace JiraTimeBotForm _job = _container.Resolve(); _log = _container.Resolve(); - _tasksProcessors = _container.Resolve(); + _tasksProcessors = _container.Resolve(); _controls = new Control[] { txtJiraLogin, txtJiraPassword, txtMercurialEmail, actTime, txtRepoPath, txtDummyMode, btnSave, btnStart, btnMeeting, chkAddComments }; }