Code cleanup (usings)

KevinJump · Oct 5, 2020 · 30366a7 · 30366a7
1 parent fc4922e
commit 30366a7
Show file tree

Hide file tree

Showing 119 changed files with 277 additions and 427 deletions.
diff --git a/uSync.Commands/Commands/InitCommand.cs b/uSync.Commands/Commands/InitCommand.cs
@@ -6,13 +6,15 @@
 using System.Threading.Tasks;
 using System.Web.Security;
 using System.Xml.Linq;
+
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Exceptions;
 using Umbraco.Core.IO;
 using Umbraco.Core.Migrations.Install;
 using Umbraco.Core.Services;
+
 using uSync8.BackOffice.Commands;
 
 namespace uSync.BaseCommands
@@ -76,7 +78,7 @@ public async Task<SyncCommandResult> Run(string[] args)
                     await writer.WriteLineAsync(" you can use the -sqlce switch to have this value automatically populated");
                     return SyncCommandResult.Error;
                 }
-                
+
             }
 
             var result = SyncCommandResult.Success;
@@ -133,7 +135,7 @@ private SyncCommandResult CreateSqlCEDb(string connectionString)
             return SyncCommandResult.Success;
         }
 
-        private SyncCommandResult CreateDatabase() 
+        private SyncCommandResult CreateDatabase()
         {
             writer.WriteLine(" Creating Database Schema");
 
@@ -179,7 +181,7 @@ private SyncCommandResult SetupAdmin(string username, string password)
                 var success = membershipUser.ChangePassword("default", password);
                 if (success == false)
                 {
-                  throw new FormatException(" Password must be at least " + GetCurrentProvider().MinRequiredPasswordLength + " characters long and contain at least " + GetCurrentProvider().MinRequiredNonAlphanumericCharacters + " symbols");
+                    throw new FormatException(" Password must be at least " + GetCurrentProvider().MinRequiredPasswordLength + " characters long and contain at least " + GetCurrentProvider().MinRequiredNonAlphanumericCharacters + " symbols");
                 }
             }
             catch (Exception ex)

diff --git a/uSync.Commands/Commands/LangCommand.cs b/uSync.Commands/Commands/LangCommand.cs
@@ -34,9 +34,10 @@ public async Task<SyncCommandResult> Run(string[] args)
                 return await List();
             }
 
-            if (args.Length > 1) {
+            if (args.Length > 1)
+            {
 
-                switch (args[0].ToLower()) 
+                switch (args[0].ToLower())
                 {
                     case "add":
                         return await AddLanguage(args[1]);
@@ -45,14 +46,14 @@ public async Task<SyncCommandResult> Run(string[] args)
                     case "default":
                         return await SetDefault(args[1]);
                 }
-          
+
             }
 
             return SyncCommandResult.NoResult;
         }
 
         private async Task<SyncCommandResult> AddLanguage(string isoCode)
-        { 
+        {
             var existing = localizationService.GetLanguageByIsoCode(isoCode);
             if (existing == null || existing.IsoCode != isoCode)
             {
@@ -116,7 +117,7 @@ private async Task<SyncCommandResult> List()
 
             await writer.WriteLineAsync("Language\tDefault");
             await writer.WriteLineAsync("----------------------------");
-            foreach(var lang in languages)
+            foreach (var lang in languages)
             {
                 await writer.WriteLineAsync(
                     string.Format("- {0}\t\t{1}", lang.IsoCode,

diff --git a/uSync.Commands/Commands/QuitCommand.cs b/uSync.Commands/Commands/QuitCommand.cs
@@ -1,9 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
+using System.IO;
 using System.Threading.Tasks;
+
 using uSync8.BackOffice.Commands;
 
 namespace uSync.BaseCommands

diff --git a/uSync.Commands/Properties/AssemblyInfo.cs b/uSync.Commands/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following

diff --git a/uSync.Commands/uSyncCommandComposer.cs b/uSync.Commands/uSyncCommandComposer.cs
@@ -1,10 +1,8 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+
 using Umbraco.Core;
 using Umbraco.Core.Composing;
+
 using uSync8.BackOffice.Commands;
 
 namespace uSync.BaseCommands

diff --git a/uSync.Console/BootCommands.cs b/uSync.Console/BootCommands.cs
@@ -1,15 +1,16 @@
 using System;
-using System.Collections.Generic;
 using System.Configuration;
 using System.IO;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
 using System.Xml.Linq;
+
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.IO;
+
 using uSync.BaseCommands;
+
 using uSync8.BackOffice.Commands;
 
 namespace uSync.ConsoleApp

diff --git a/uSync.Console/ConsoleHost.cs b/uSync.Console/ConsoleHost.cs
@@ -2,11 +2,12 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
+
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Configuration;
+
 using uSync8.BackOffice;
 using uSync8.BackOffice.Commands;
 using uSync8.BackOffice.Models;
@@ -55,7 +56,7 @@ public async Task<SyncCommandResult> Run(string[] args)
                 }
             }
 
-            while( result < SyncCommandResult.Complete)
+            while (result < SyncCommandResult.Complete)
             {
                 await writer.WriteAsync("uSync>");
                 var command = await reader.ReadLineAsync();
@@ -76,7 +77,8 @@ public async Task<SyncCommandResult> ProcessCommand(string[] args)
             {
                 var alias = args[0];
                 var commandFactory = factory.GetInstance<SyncCommandFactory>();
-                if (commandFactory == null) {
+                if (commandFactory == null)
+                {
                     writer.WriteLine("Cannot load the commands :(");
                     return SyncCommandResult.Error;
                 }

diff --git a/uSync.Console/ConsoleRuntime.cs b/uSync.Console/ConsoleRuntime.cs
@@ -1,10 +1,7 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Web;
+
 using Umbraco.Core;
 using Umbraco.Core.Composing;
 using Umbraco.Core.Runtime;

diff --git a/uSync.Console/Program.cs b/uSync.Console/Program.cs
@@ -1,13 +1,10 @@
 using System;
 using System.IO;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Reflection;
-using uSync8.BackOffice.Commands;
 using System.Threading;
 
+using uSync8.BackOffice.Commands;
+
 namespace uSync.ConsoleApp
 {
     /// <summary>
@@ -74,7 +71,7 @@ static void InitApplication(string[] args)
             var domain = AppDomain.CreateDomain(uSyncAppDomain,
                 AppDomain.CurrentDomain.Evidence, setup);
 
-            foreach(var assembly in AppDomain.CurrentDomain.GetAssemblies())
+            foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies())
             {
                 if (File.Exists(assembly.FullName))
                     domain.Load(assembly.FullName);

diff --git a/uSync.Console/Properties/AssemblyInfo.cs b/uSync.Console/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following

diff --git a/uSync.TemplateTracker/Properties/AssemblyInfo.cs b/uSync.TemplateTracker/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following

diff --git a/uSync.TemplateTracker/TemplateTracker.cs b/uSync.TemplateTracker/TemplateTracker.cs
@@ -1,10 +1,8 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Text;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
+
 using Umbraco.Core;
 using Umbraco.Core.IO;
 using Umbraco.Core.Models;
@@ -30,7 +28,7 @@ public TemplateTracker(IFileService fileService)
         public void WatchViewFolder()
         {
             var watcher = new FileSystemWatcher();
-                watcher.Path = viewFolderPath;
+            watcher.Path = viewFolderPath;
 
             watcher.NotifyFilter = NotifyFilters.LastAccess | NotifyFilters.LastWrite | NotifyFilters.FileName;
             watcher.Filter = "*.cshtml";

diff --git a/uSync.TemplateTracker/TemplateTrackerComponent.cs b/uSync.TemplateTracker/TemplateTrackerComponent.cs
@@ -1,14 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Umbraco.Core;
+using Umbraco.Core;
 using Umbraco.Core.Composing;
 
 namespace uSync.TemplateTracker
 {
-    public class TemplateTrackerCompose 
+    public class TemplateTrackerCompose
         : IUserComposer
     {
         public void Compose(Composition composition)

diff --git a/uSync8.BackOffice/Commands/Command/ExportCommand.cs b/uSync8.BackOffice/Commands/Command/ExportCommand.cs
@@ -1,6 +1,7 @@
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
+
 using uSync8.BackOffice.SyncHandlers;
 
 namespace uSync8.BackOffice.Commands.Command
@@ -9,7 +10,7 @@ namespace uSync8.BackOffice.Commands.Command
     [SyncCommand("Export", "export", "Exports setting from Umbraco")]
     public class ExportCommand : SyncCommandServiceBase, ISyncCommand
     {
-        public ExportCommand(TextReader reader, TextWriter writer, 
+        public ExportCommand(TextReader reader, TextWriter writer,
             uSyncService uSyncService) : base(reader, writer, uSyncService)
         { }
 

diff --git a/uSync8.BackOffice/Commands/Command/ImportCommand.cs b/uSync8.BackOffice/Commands/Command/ImportCommand.cs
@@ -1,9 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
+using System.IO;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
+
 using uSync8.BackOffice.SyncHandlers;
 using uSync8.Core;
 
@@ -12,7 +10,7 @@ namespace uSync8.BackOffice.Commands.Command
     [SyncCommand("Import", "import", "Imports uSync settings into Umbraco")]
     public class ImportCommand : SyncCommandServiceBase, ISyncCommand
     {
-        public ImportCommand(TextReader reader, TextWriter writer, 
+        public ImportCommand(TextReader reader, TextWriter writer,
             uSyncService uSyncService) : base(reader, writer, uSyncService)
         { }
 
@@ -24,7 +22,7 @@ public async Task<SyncCommandResult> Run(string[] args)
             var force = options.GetSwitchValue<bool>("force", false);
             var handlerSet = options.GetSwitchValue<string>("set", uSync.Handlers.DefaultSet);
 
-            if (force) await writer.WriteAsync("(With Force) ");            
+            if (force) await writer.WriteAsync("(With Force) ");
 
             var result = uSyncService.Import(options.Folder, force,
                 new SyncHandlerOptions(handlerSet, HandlerActions.Import),

diff --git a/uSync8.BackOffice/Commands/Command/ReportCommand.cs b/uSync8.BackOffice/Commands/Command/ReportCommand.cs
@@ -1,9 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
+using System.IO;
 using System.Linq;
-using System.Text;
 using System.Threading.Tasks;
+
 using uSync8.BackOffice.SyncHandlers;
 using uSync8.Core;
 

diff --git a/uSync8.BackOffice/Commands/ISyncCommand.cs b/uSync8.BackOffice/Commands/ISyncCommand.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 
 namespace uSync8.BackOffice.Commands
 {

diff --git a/uSync8.BackOffice/Commands/SyncCommandBase.cs b/uSync8.BackOffice/Commands/SyncCommandBase.cs
@@ -2,6 +2,7 @@
 using System.IO;
 using System.Reflection;
 using System.Threading.Tasks;
+
 using Umbraco.Core.Composing;
 
 using uSync8.BackOffice.Configuration;
@@ -16,7 +17,7 @@ public class SyncCommandBase
 
         public string AdvancedHelp { get; protected set; }
 
-        public bool Interactive { get;set; }
+        public bool Interactive { get; set; }
 
         protected readonly TextReader reader;
         protected readonly TextWriter writer;
@@ -66,14 +67,15 @@ protected SyncCommandOptions ParseArguments(string[] args)
             foreach (var argument in args)
             {
                 var cmd = argument.Trim().ToLower();
-                
+
                 if (cmd.StartsWith("-"))
                 {
                     var fragments = cmd.Split('=');
 
                     var flag = fragments[0].Substring(1);
 
-                    if (fragments.Length > 1) {
+                    if (fragments.Length > 1)
+                    {
                         options.Switches[flag] = fragments[1];
                     }
                     else

diff --git a/uSync8.BackOffice/Commands/SyncCommandCollection.cs b/uSync8.BackOffice/Commands/SyncCommandCollection.cs
@@ -9,9 +9,9 @@ namespace uSync8.BackOffice.Commands
     public class SyncCommandCollection
         : BuilderCollectionBase<ISyncCommand>
     {
-        public SyncCommandCollection(IEnumerable<ISyncCommand> items) 
+        public SyncCommandCollection(IEnumerable<ISyncCommand> items)
             : base(items)
-        {  }
+        { }
 
         public ISyncCommand GetCommand(string alias)
             => this.FirstOrDefault(x => x.Alias.Equals(alias, StringComparison.InvariantCultureIgnoreCase));

diff --git a/uSync8.BackOffice/Commands/SyncCommandFactory.cs b/uSync8.BackOffice/Commands/SyncCommandFactory.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 
 namespace uSync8.BackOffice.Commands
 {

diff --git a/uSync8.BackOffice/Commands/SyncCommandOptions.cs b/uSync8.BackOffice/Commands/SyncCommandOptions.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+
 using Umbraco.Core;
 
 namespace uSync8.BackOffice.Commands
@@ -26,7 +27,7 @@ public class SyncCommandOptions
         public SyncCommandOptions(string folder)
         {
             this.Folder = folder;
-            
+
         }
 
         /// <summary>