From 7c86cefa535998995c3c147df4a48f077ca3d121 Mon Sep 17 00:00:00 2001 From: Danil Kislov Date: Tue, 19 Mar 2019 12:27:09 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D1=82=D0=BA=D0=BB=D1=8E=D1=87=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BA=D0=BE=D0=BC=D0=BC=D0=B5=D0=BD=D1=82=D0=B0=D1=80?= =?UTF-8?q?=D0=B8=D0=B8=20=D0=B4=D0=BB=D1=8F=20=D1=80=D0=B5=D0=B6=D0=B8?= =?UTF-8?q?=D0=BC=D0=B0=20Jira?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .semver.txt | 2 +- .../Configuration/PasswordEncryptionClass.cs | 2 +- src/JiraTimeBot/Configuration/Settings.cs | 2 +- src/JiraTimeBot/DI/ContainerBuilder.cs | 17 +++-- .../Comments/IJiraDescriptionSource.cs | 7 ++- .../Comments/JiraDescriptionSource.cs | 14 +++-- src/JiraTimeBot/JiraIntegration/JiraApi.cs | 10 +-- .../JiraIntegration/JiraCommitEmulator.cs | 8 +-- src/JiraTimeBot/Job.cs | 14 ++--- src/JiraTimeBot/Logger.cs | 2 +- .../Mercurial/IAllMercurialProviders.cs | 9 +-- src/JiraTimeBot/Mercurial/IMercurialLog.cs | 6 +- src/JiraTimeBot/Mercurial/MercurialLog.cs | 8 +-- .../Mercurial/Modifiers/CommitSkipper.cs | 2 +- .../Mercurial/Modifiers/ICommitSkipper.cs | 2 +- .../Modifiers/ITechnicalInfoSkipper.cs | 2 +- .../Modifiers/TechnicalInfoSkipper.cs | 2 +- .../Mercurial/Objects/MercurialCommitItem.cs | 2 +- src/JiraTimeBot/Program.cs | 4 +- src/JiraTimeBot/Properties/AssemblyInfo.cs | 62 +++++++++---------- .../TaskTime/ITaskTimeCalculator.cs | 9 ++- .../TaskTime/Objects/TaskTimeItem.cs | 2 +- .../TaskTime/TaskTimeByCommitsCalculator.cs | 9 ++- .../TasksProcessors/IAllTasksProcessors.cs | 2 +- .../TasksProcessors/ITasksProcessor.cs | 6 +- .../TasksProcessors/MeetingProcessor.cs | 8 +-- .../TasksProcessors/WorkLogTasksProcessor.cs | 9 ++- src/JiraTimeBot/UI/Tray/ITrayMenu.cs | 2 +- src/JiraTimeBot/UI/Tray/RestoreFromTray.cs | 2 +- src/JiraTimeBot/UI/Tray/TrayMenu.cs | 2 +- src/JiraTimeBot/UI/frmMain.Designer.cs | 2 +- src/JiraTimeBot/UI/frmMain.cs | 13 ++-- src/JiraTimeBot/UI/frmSettings.Designer.cs | 2 +- src/JiraTimeBot/UI/frmSettings.cs | 4 +- src/JiraTimeBot/Update/GitHubDataObjects.cs | 8 +-- src/JiraTimeBot/Update/UpdateChecker.cs | 5 +- 36 files changed, 125 insertions(+), 137 deletions(-) diff --git a/.semver.txt b/.semver.txt index f8f3c08..140333f 100644 --- a/.semver.txt +++ b/.semver.txt @@ -1 +1 @@ -1.0.18 +1.0.19 diff --git a/src/JiraTimeBot/Configuration/PasswordEncryptionClass.cs b/src/JiraTimeBot/Configuration/PasswordEncryptionClass.cs index 7ca048b..ccfc955 100644 --- a/src/JiraTimeBot/Configuration/PasswordEncryptionClass.cs +++ b/src/JiraTimeBot/Configuration/PasswordEncryptionClass.cs @@ -2,7 +2,7 @@ using System.Security.Cryptography; using System.Text; -namespace JiraTimeBotForm.Configuration +namespace JiraTimeBot.Configuration { public class PasswordEncryptionClass { diff --git a/src/JiraTimeBot/Configuration/Settings.cs b/src/JiraTimeBot/Configuration/Settings.cs index 0e63eba..62a7a1d 100644 --- a/src/JiraTimeBot/Configuration/Settings.cs +++ b/src/JiraTimeBot/Configuration/Settings.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Windows.Forms; using Newtonsoft.Json; -namespace JiraTimeBotForm.Configuration +namespace JiraTimeBot.Configuration { public class Settings { diff --git a/src/JiraTimeBot/DI/ContainerBuilder.cs b/src/JiraTimeBot/DI/ContainerBuilder.cs index 6e2eb21..972c815 100644 --- a/src/JiraTimeBot/DI/ContainerBuilder.cs +++ b/src/JiraTimeBot/DI/ContainerBuilder.cs @@ -1,16 +1,15 @@ using System.Windows.Forms; using Autofac; using Autofac.Extras.AggregateService; -using JiraTimeBotForm.JiraIntegration; -using JiraTimeBotForm.JiraIntegration.Comments; -using JiraTimeBotForm.Mercurial; -using JiraTimeBotForm.Mercurial.Modifiers; -using JiraTimeBotForm.TasksProcessors; -using JiraTimeBotForm.TaskTime; -using JiraTimeBotForm.UI; -using JiraTimeBotForm.UI.Tray; +using JiraTimeBot.JiraIntegration; +using JiraTimeBot.JiraIntegration.Comments; +using JiraTimeBot.Mercurial; +using JiraTimeBot.Mercurial.Modifiers; +using JiraTimeBot.TasksProcessors; +using JiraTimeBot.TaskTime; +using JiraTimeBot.UI.Tray; -namespace JiraTimeBotForm.DI +namespace JiraTimeBot.DI { public class Bootstrapper { diff --git a/src/JiraTimeBot/JiraIntegration/Comments/IJiraDescriptionSource.cs b/src/JiraTimeBot/JiraIntegration/Comments/IJiraDescriptionSource.cs index a6d277f..91f3ef0 100644 --- a/src/JiraTimeBot/JiraIntegration/Comments/IJiraDescriptionSource.cs +++ b/src/JiraTimeBot/JiraIntegration/Comments/IJiraDescriptionSource.cs @@ -1,9 +1,10 @@ -using JiraTimeBotForm.TaskTime.Objects; +using JiraTimeBot.Configuration; +using JiraTimeBot.TaskTime.Objects; -namespace JiraTimeBotForm.JiraIntegration.Comments +namespace JiraTimeBot.JiraIntegration.Comments { public interface IJiraDescriptionSource { - string GetDescription(TaskTimeItem item, bool addCommentsToWorklog); + string GetDescription(TaskTimeItem item, bool addCommentsToWorklog, Settings settings); } } diff --git a/src/JiraTimeBot/JiraIntegration/Comments/JiraDescriptionSource.cs b/src/JiraTimeBot/JiraIntegration/Comments/JiraDescriptionSource.cs index 99ddd97..37015e3 100644 --- a/src/JiraTimeBot/JiraIntegration/Comments/JiraDescriptionSource.cs +++ b/src/JiraTimeBot/JiraIntegration/Comments/JiraDescriptionSource.cs @@ -1,9 +1,10 @@ using System; using System.Collections.Generic; using System.Linq; -using JiraTimeBotForm.TaskTime.Objects; +using JiraTimeBot.Configuration; +using JiraTimeBot.TaskTime.Objects; -namespace JiraTimeBotForm.JiraIntegration.Comments +namespace JiraTimeBot.JiraIntegration.Comments { public class JiraDescriptionSource : IJiraDescriptionSource { @@ -13,14 +14,19 @@ namespace JiraTimeBotForm.JiraIntegration.Comments "кодинг", "написание кода и тестов" }; - public string GetDescription(TaskTimeItem taskTimeItem, bool addCommentsToWorklog) + public string GetDescription(TaskTimeItem taskTimeItem, bool addCommentsToWorklog, Settings settings) { if (addCommentsToWorklog) { return taskTimeItem.Description; } - return _dummyComments.OrderBy(f => Guid.NewGuid()).FirstOrDefault(); + if (settings.WorkType == WorkType.Mercurial) + { + return _dummyComments.OrderBy(f => Guid.NewGuid()).FirstOrDefault(); + } + + return ""; } } } \ No newline at end of file diff --git a/src/JiraTimeBot/JiraIntegration/JiraApi.cs b/src/JiraTimeBot/JiraIntegration/JiraApi.cs index 107966c..004dfac 100644 --- a/src/JiraTimeBot/JiraIntegration/JiraApi.cs +++ b/src/JiraTimeBot/JiraIntegration/JiraApi.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; using System.Linq; using System.Threading; using Atlassian.Jira; -using JiraTimeBotForm.Configuration; -using JiraTimeBotForm.JiraIntegration.Comments; -using JiraTimeBotForm.TaskTime.Objects; +using JiraTimeBot.Configuration; +using JiraTimeBot.JiraIntegration.Comments; +using JiraTimeBot.TaskTime.Objects; -namespace JiraTimeBotForm.JiraIntegration +namespace JiraTimeBot.JiraIntegration { public class JiraApi { @@ -119,7 +119,7 @@ namespace JiraTimeBotForm.JiraIntegration { var timeSpentJira = $"{taskTimeItem.Time.TotalMinutes}m"; - var comment = _descriptionSource.GetDescription(taskTimeItem, addCommentsToWorklog); + var comment = _descriptionSource.GetDescription(taskTimeItem, addCommentsToWorklog, settings); Worklog workLogToAdd = new Worklog(timeSpentJira, date.Value, comment); if (!dummy) diff --git a/src/JiraTimeBot/JiraIntegration/JiraCommitEmulator.cs b/src/JiraTimeBot/JiraIntegration/JiraCommitEmulator.cs index cd858ff..062af14 100644 --- a/src/JiraTimeBot/JiraIntegration/JiraCommitEmulator.cs +++ b/src/JiraTimeBot/JiraIntegration/JiraCommitEmulator.cs @@ -1,11 +1,11 @@ using System; using System.Collections.Generic; using System.Threading; -using JiraTimeBotForm.Configuration; -using JiraTimeBotForm.Mercurial; -using JiraTimeBotForm.Mercurial.Objects; +using JiraTimeBot.Configuration; +using JiraTimeBot.Mercurial; +using JiraTimeBot.Mercurial.Objects; -namespace JiraTimeBotForm.JiraIntegration +namespace JiraTimeBot.JiraIntegration { public class JiraCommitEmulator : IMercurialLog { diff --git a/src/JiraTimeBot/Job.cs b/src/JiraTimeBot/Job.cs index cb764e7..f65407a 100644 --- a/src/JiraTimeBot/Job.cs +++ b/src/JiraTimeBot/Job.cs @@ -3,14 +3,14 @@ using System.Collections.Generic; using System.Linq; using System.Threading; using System.Threading.Tasks; -using JiraTimeBotForm.Configuration; -using JiraTimeBotForm.Mercurial; -using JiraTimeBotForm.Mercurial.Objects; -using JiraTimeBotForm.TasksProcessors; -using JiraTimeBotForm.TaskTime; -using JiraTimeBotForm.TaskTime.Objects; +using JiraTimeBot.Configuration; +using JiraTimeBot.Mercurial; +using JiraTimeBot.Mercurial.Objects; +using JiraTimeBot.TasksProcessors; +using JiraTimeBot.TaskTime; +using JiraTimeBot.TaskTime.Objects; -namespace JiraTimeBotForm +namespace JiraTimeBot { class Job { diff --git a/src/JiraTimeBot/Logger.cs b/src/JiraTimeBot/Logger.cs index bd4cf30..5fd35b1 100644 --- a/src/JiraTimeBot/Logger.cs +++ b/src/JiraTimeBot/Logger.cs @@ -2,7 +2,7 @@ using System.ComponentModel; using System.Windows.Forms; -namespace JiraTimeBotForm +namespace JiraTimeBot { public class Logger : ILog { diff --git a/src/JiraTimeBot/Mercurial/IAllMercurialProviders.cs b/src/JiraTimeBot/Mercurial/IAllMercurialProviders.cs index eba0aff..2d8e441 100644 --- a/src/JiraTimeBot/Mercurial/IAllMercurialProviders.cs +++ b/src/JiraTimeBot/Mercurial/IAllMercurialProviders.cs @@ -1,11 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using JiraTimeBotForm.JiraIntegration; +using JiraTimeBot.JiraIntegration; -namespace JiraTimeBotForm.Mercurial +namespace JiraTimeBot.Mercurial { public interface IAllMercurialProviders { diff --git a/src/JiraTimeBot/Mercurial/IMercurialLog.cs b/src/JiraTimeBot/Mercurial/IMercurialLog.cs index 3cd3004..1b91a89 100644 --- a/src/JiraTimeBot/Mercurial/IMercurialLog.cs +++ b/src/JiraTimeBot/Mercurial/IMercurialLog.cs @@ -1,10 +1,10 @@ using System; using System.Collections.Generic; using System.Threading; -using JiraTimeBotForm.Configuration; -using JiraTimeBotForm.Mercurial.Objects; +using JiraTimeBot.Configuration; +using JiraTimeBot.Mercurial.Objects; -namespace JiraTimeBotForm.Mercurial +namespace JiraTimeBot.Mercurial { public interface IMercurialLog { diff --git a/src/JiraTimeBot/Mercurial/MercurialLog.cs b/src/JiraTimeBot/Mercurial/MercurialLog.cs index 6676784..52aa623 100644 --- a/src/JiraTimeBot/Mercurial/MercurialLog.cs +++ b/src/JiraTimeBot/Mercurial/MercurialLog.cs @@ -4,12 +4,12 @@ using System.IO; using System.Linq; using System.Text; using System.Threading; -using JiraTimeBotForm.Configuration; -using JiraTimeBotForm.Mercurial.Modifiers; -using JiraTimeBotForm.Mercurial.Objects; +using JiraTimeBot.Configuration; +using JiraTimeBot.Mercurial.Modifiers; +using JiraTimeBot.Mercurial.Objects; using Mercurial; -namespace JiraTimeBotForm.Mercurial +namespace JiraTimeBot.Mercurial { public class MercurialLog: IMercurialLog { diff --git a/src/JiraTimeBot/Mercurial/Modifiers/CommitSkipper.cs b/src/JiraTimeBot/Mercurial/Modifiers/CommitSkipper.cs index 39c9148..e668ab8 100644 --- a/src/JiraTimeBot/Mercurial/Modifiers/CommitSkipper.cs +++ b/src/JiraTimeBot/Mercurial/Modifiers/CommitSkipper.cs @@ -1,6 +1,6 @@ using System; -namespace JiraTimeBotForm.Mercurial.Modifiers +namespace JiraTimeBot.Mercurial.Modifiers { public class CommitSkipper : ICommitSkipper { diff --git a/src/JiraTimeBot/Mercurial/Modifiers/ICommitSkipper.cs b/src/JiraTimeBot/Mercurial/Modifiers/ICommitSkipper.cs index 201dc4e..7da47ed 100644 --- a/src/JiraTimeBot/Mercurial/Modifiers/ICommitSkipper.cs +++ b/src/JiraTimeBot/Mercurial/Modifiers/ICommitSkipper.cs @@ -1,4 +1,4 @@ -namespace JiraTimeBotForm.Mercurial.Modifiers +namespace JiraTimeBot.Mercurial.Modifiers { public interface ICommitSkipper { diff --git a/src/JiraTimeBot/Mercurial/Modifiers/ITechnicalInfoSkipper.cs b/src/JiraTimeBot/Mercurial/Modifiers/ITechnicalInfoSkipper.cs index 323bb21..39b76b2 100644 --- a/src/JiraTimeBot/Mercurial/Modifiers/ITechnicalInfoSkipper.cs +++ b/src/JiraTimeBot/Mercurial/Modifiers/ITechnicalInfoSkipper.cs @@ -1,4 +1,4 @@ -namespace JiraTimeBotForm.Mercurial.Modifiers +namespace JiraTimeBot.Mercurial.Modifiers { public interface ITechnicalInfoSkipper { diff --git a/src/JiraTimeBot/Mercurial/Modifiers/TechnicalInfoSkipper.cs b/src/JiraTimeBot/Mercurial/Modifiers/TechnicalInfoSkipper.cs index 287bb52..d5e0d37 100644 --- a/src/JiraTimeBot/Mercurial/Modifiers/TechnicalInfoSkipper.cs +++ b/src/JiraTimeBot/Mercurial/Modifiers/TechnicalInfoSkipper.cs @@ -1,6 +1,6 @@ using System.Text; -namespace JiraTimeBotForm.Mercurial.Modifiers +namespace JiraTimeBot.Mercurial.Modifiers { public class TechnicalInfoSkipper : ITechnicalInfoSkipper { diff --git a/src/JiraTimeBot/Mercurial/Objects/MercurialCommitItem.cs b/src/JiraTimeBot/Mercurial/Objects/MercurialCommitItem.cs index b2bb9f7..0ff8f0f 100644 --- a/src/JiraTimeBot/Mercurial/Objects/MercurialCommitItem.cs +++ b/src/JiraTimeBot/Mercurial/Objects/MercurialCommitItem.cs @@ -1,6 +1,6 @@ using System; -namespace JiraTimeBotForm.Mercurial.Objects +namespace JiraTimeBot.Mercurial.Objects { public class MercurialCommitItem { diff --git a/src/JiraTimeBot/Program.cs b/src/JiraTimeBot/Program.cs index e5f1761..9918224 100644 --- a/src/JiraTimeBot/Program.cs +++ b/src/JiraTimeBot/Program.cs @@ -1,9 +1,9 @@ using System; using System.Diagnostics; using System.Windows.Forms; -using JiraTimeBotForm.UI; +using JiraTimeBot.UI; -namespace JiraTimeBotForm +namespace JiraTimeBot { static class Program { diff --git a/src/JiraTimeBot/Properties/AssemblyInfo.cs b/src/JiraTimeBot/Properties/AssemblyInfo.cs index d09c659..df94596 100644 --- a/src/JiraTimeBot/Properties/AssemblyInfo.cs +++ b/src/JiraTimeBot/Properties/AssemblyInfo.cs @@ -1,31 +1,31 @@ -using System.Reflection; -using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("JiraTimeBot")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("JiraTimeBot")] -[assembly: AssemblyCopyright("Copyright © 2019")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("f3b89316-c38c-4ce6-9d88-0b1373cfba1a")] -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.18")] -[assembly: AssemblyFileVersion("1.0.18")] -[assembly: AssemblyInformationalVersion("1.0.18")] +using System.Reflection; +using System.Runtime.InteropServices; +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("JiraTimeBot")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("JiraTimeBot")] +[assembly: AssemblyCopyright("Copyright © 2019")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("f3b89316-c38c-4ce6-9d88-0b1373cfba1a")] +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +[assembly: AssemblyVersion("1.0.19")] +[assembly: AssemblyFileVersion("1.0.19")] +[assembly: AssemblyInformationalVersion("1.0.19")] diff --git a/src/JiraTimeBot/TaskTime/ITaskTimeCalculator.cs b/src/JiraTimeBot/TaskTime/ITaskTimeCalculator.cs index 004f449..a17b6aa 100644 --- a/src/JiraTimeBot/TaskTime/ITaskTimeCalculator.cs +++ b/src/JiraTimeBot/TaskTime/ITaskTimeCalculator.cs @@ -1,11 +1,10 @@ using System.Collections.Generic; using System.Threading; -using JiraTimeBotForm.Configuration; -using JiraTimeBotForm.Mercurial; -using JiraTimeBotForm.Mercurial.Objects; -using JiraTimeBotForm.TaskTime.Objects; +using JiraTimeBot.Configuration; +using JiraTimeBot.Mercurial.Objects; +using JiraTimeBot.TaskTime.Objects; -namespace JiraTimeBotForm.TaskTime +namespace JiraTimeBot.TaskTime { public interface ITaskTimeCalculator { diff --git a/src/JiraTimeBot/TaskTime/Objects/TaskTimeItem.cs b/src/JiraTimeBot/TaskTime/Objects/TaskTimeItem.cs index 2755739..8c8a452 100644 --- a/src/JiraTimeBot/TaskTime/Objects/TaskTimeItem.cs +++ b/src/JiraTimeBot/TaskTime/Objects/TaskTimeItem.cs @@ -1,6 +1,6 @@ using System; -namespace JiraTimeBotForm.TaskTime.Objects +namespace JiraTimeBot.TaskTime.Objects { public class TaskTimeItem { diff --git a/src/JiraTimeBot/TaskTime/TaskTimeByCommitsCalculator.cs b/src/JiraTimeBot/TaskTime/TaskTimeByCommitsCalculator.cs index 5498711..9c80413 100644 --- a/src/JiraTimeBot/TaskTime/TaskTimeByCommitsCalculator.cs +++ b/src/JiraTimeBot/TaskTime/TaskTimeByCommitsCalculator.cs @@ -3,12 +3,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading; -using JiraTimeBotForm.Configuration; -using JiraTimeBotForm.Mercurial; -using JiraTimeBotForm.Mercurial.Objects; -using JiraTimeBotForm.TaskTime.Objects; +using JiraTimeBot.Configuration; +using JiraTimeBot.Mercurial.Objects; +using JiraTimeBot.TaskTime.Objects; -namespace JiraTimeBotForm.TaskTime +namespace JiraTimeBot.TaskTime { public class TaskTimeByCommitsCalculator: ITaskTimeCalculator { diff --git a/src/JiraTimeBot/TasksProcessors/IAllTasksProcessors.cs b/src/JiraTimeBot/TasksProcessors/IAllTasksProcessors.cs index fdf03ab..d9315d8 100644 --- a/src/JiraTimeBot/TasksProcessors/IAllTasksProcessors.cs +++ b/src/JiraTimeBot/TasksProcessors/IAllTasksProcessors.cs @@ -1,4 +1,4 @@ -namespace JiraTimeBotForm.TasksProcessors +namespace JiraTimeBot.TasksProcessors { public interface IAllTasksProcessors { diff --git a/src/JiraTimeBot/TasksProcessors/ITasksProcessor.cs b/src/JiraTimeBot/TasksProcessors/ITasksProcessor.cs index 76d380a..9cf48ed 100644 --- a/src/JiraTimeBot/TasksProcessors/ITasksProcessor.cs +++ b/src/JiraTimeBot/TasksProcessors/ITasksProcessor.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; -using JiraTimeBotForm.Configuration; -using JiraTimeBotForm.TaskTime.Objects; +using JiraTimeBot.Configuration; +using JiraTimeBot.TaskTime.Objects; -namespace JiraTimeBotForm.TasksProcessors +namespace JiraTimeBot.TasksProcessors { interface ITasksProcessor { diff --git a/src/JiraTimeBot/TasksProcessors/MeetingProcessor.cs b/src/JiraTimeBot/TasksProcessors/MeetingProcessor.cs index d95b313..13a3481 100644 --- a/src/JiraTimeBot/TasksProcessors/MeetingProcessor.cs +++ b/src/JiraTimeBot/TasksProcessors/MeetingProcessor.cs @@ -1,11 +1,11 @@ using System; using System.Collections.Generic; using System.Linq; -using JiraTimeBotForm.Configuration; -using JiraTimeBotForm.JiraIntegration; -using JiraTimeBotForm.TaskTime.Objects; +using JiraTimeBot.Configuration; +using JiraTimeBot.JiraIntegration; +using JiraTimeBot.TaskTime.Objects; -namespace JiraTimeBotForm.TasksProcessors +namespace JiraTimeBot.TasksProcessors { public class MeetingProcessor : ITasksProcessor { diff --git a/src/JiraTimeBot/TasksProcessors/WorkLogTasksProcessor.cs b/src/JiraTimeBot/TasksProcessors/WorkLogTasksProcessor.cs index e15f6c3..9a5ea57 100644 --- a/src/JiraTimeBot/TasksProcessors/WorkLogTasksProcessor.cs +++ b/src/JiraTimeBot/TasksProcessors/WorkLogTasksProcessor.cs @@ -1,11 +1,10 @@ using System; using System.Collections.Generic; -using JiraTimeBotForm.Configuration; -using JiraTimeBotForm.JiraIntegration; -using JiraTimeBotForm.TaskTime; -using JiraTimeBotForm.TaskTime.Objects; +using JiraTimeBot.Configuration; +using JiraTimeBot.JiraIntegration; +using JiraTimeBot.TaskTime.Objects; -namespace JiraTimeBotForm.TasksProcessors +namespace JiraTimeBot.TasksProcessors { public class WorkLogTasksProcessor : ITasksProcessor { diff --git a/src/JiraTimeBot/UI/Tray/ITrayMenu.cs b/src/JiraTimeBot/UI/Tray/ITrayMenu.cs index 8b7a1a5..01b8d88 100644 --- a/src/JiraTimeBot/UI/Tray/ITrayMenu.cs +++ b/src/JiraTimeBot/UI/Tray/ITrayMenu.cs @@ -1,6 +1,6 @@ using System.Windows.Forms; -namespace JiraTimeBotForm.UI.Tray +namespace JiraTimeBot.UI.Tray { public interface ITrayMenu { diff --git a/src/JiraTimeBot/UI/Tray/RestoreFromTray.cs b/src/JiraTimeBot/UI/Tray/RestoreFromTray.cs index f47eeb7..2a7ba20 100644 --- a/src/JiraTimeBot/UI/Tray/RestoreFromTray.cs +++ b/src/JiraTimeBot/UI/Tray/RestoreFromTray.cs @@ -2,7 +2,7 @@ using System.Runtime.InteropServices; using System.Windows.Forms; -namespace JiraTimeBotForm.UI.Tray +namespace JiraTimeBot.UI.Tray { public static class RestoreFromTray { [DllImport( "user32.dll" )] diff --git a/src/JiraTimeBot/UI/Tray/TrayMenu.cs b/src/JiraTimeBot/UI/Tray/TrayMenu.cs index 1e49890..b5d16a6 100644 --- a/src/JiraTimeBot/UI/Tray/TrayMenu.cs +++ b/src/JiraTimeBot/UI/Tray/TrayMenu.cs @@ -1,7 +1,7 @@ using System; using System.Windows.Forms; -namespace JiraTimeBotForm.UI.Tray +namespace JiraTimeBot.UI.Tray { public class TrayMenu: ITrayMenu { diff --git a/src/JiraTimeBot/UI/frmMain.Designer.cs b/src/JiraTimeBot/UI/frmMain.Designer.cs index 7afbfea..bf25de6 100644 --- a/src/JiraTimeBot/UI/frmMain.Designer.cs +++ b/src/JiraTimeBot/UI/frmMain.Designer.cs @@ -1,4 +1,4 @@ -namespace JiraTimeBotForm.UI +namespace JiraTimeBot.UI { partial class frmMain { diff --git a/src/JiraTimeBot/UI/frmMain.cs b/src/JiraTimeBot/UI/frmMain.cs index dae5253..095514c 100644 --- a/src/JiraTimeBot/UI/frmMain.cs +++ b/src/JiraTimeBot/UI/frmMain.cs @@ -1,22 +1,21 @@ using System; using System.Collections.Generic; -using System.Diagnostics; using System.IO; using System.IO.Compression; using System.Threading; using System.Threading.Tasks; using System.Windows.Forms; using Autofac; -using JiraTimeBotForm.Configuration; -using JiraTimeBotForm.DI; -using JiraTimeBotForm.TasksProcessors; -using JiraTimeBotForm.UI.Tray; -using JiraTimeBotForm.Update; +using JiraTimeBot.Configuration; +using JiraTimeBot.DI; +using JiraTimeBot.TasksProcessors; +using JiraTimeBot.UI.Tray; +using JiraTimeBot.Update; // This is the code for your desktop app. // Press Ctrl+F5 (or go to Debug > Start Without Debugging) to run your app. -namespace JiraTimeBotForm.UI +namespace JiraTimeBot.UI { public partial class frmMain : Form { diff --git a/src/JiraTimeBot/UI/frmSettings.Designer.cs b/src/JiraTimeBot/UI/frmSettings.Designer.cs index eaad0b3..4be6a66 100644 --- a/src/JiraTimeBot/UI/frmSettings.Designer.cs +++ b/src/JiraTimeBot/UI/frmSettings.Designer.cs @@ -1,4 +1,4 @@ -namespace JiraTimeBotForm.UI +namespace JiraTimeBot.UI { partial class frmSettings { diff --git a/src/JiraTimeBot/UI/frmSettings.cs b/src/JiraTimeBot/UI/frmSettings.cs index 0833cd6..92e2779 100644 --- a/src/JiraTimeBot/UI/frmSettings.cs +++ b/src/JiraTimeBot/UI/frmSettings.cs @@ -1,8 +1,8 @@ using System; using System.Windows.Forms; -using JiraTimeBotForm.Configuration; +using JiraTimeBot.Configuration; -namespace JiraTimeBotForm.UI +namespace JiraTimeBot.UI { public partial class frmSettings : Form { diff --git a/src/JiraTimeBot/Update/GitHubDataObjects.cs b/src/JiraTimeBot/Update/GitHubDataObjects.cs index e7710d5..d3171c4 100644 --- a/src/JiraTimeBot/Update/GitHubDataObjects.cs +++ b/src/JiraTimeBot/Update/GitHubDataObjects.cs @@ -1,13 +1,7 @@ using System; -using System.Collections.Generic; -using System.Globalization; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using Newtonsoft.Json; -using Newtonsoft.Json.Converters; -namespace JiraTimeBotForm.Update +namespace JiraTimeBot.Update { public partial class GitHubReleaseResponse { diff --git a/src/JiraTimeBot/Update/UpdateChecker.cs b/src/JiraTimeBot/Update/UpdateChecker.cs index 3d038da..aa2e53e 100644 --- a/src/JiraTimeBot/Update/UpdateChecker.cs +++ b/src/JiraTimeBot/Update/UpdateChecker.cs @@ -1,13 +1,10 @@ using System; -using System.Collections.Generic; using System.IO; using System.Linq; using System.Net; -using System.Text; -using System.Threading.Tasks; using Newtonsoft.Json; -namespace JiraTimeBotForm.Update +namespace JiraTimeBot.Update { class UpdateChecker {