stylecop things

GDKsoftware · Jul 8, 2017 · 884c8c6 · 884c8c6
1 parent a146d90
commit 884c8c6
Show file tree

Hide file tree

Showing 13 changed files with 61 additions and 62 deletions.
diff --git a/GitBitter/Program.cs b/GitBitter/Program.cs
@@ -4,9 +4,9 @@
     using GitBitterLib;
     using Microsoft.Practices.Unity;
 
-    class Program
+    public class Program
     {
-        static void Main(string[] args)
+        public static void Main(string[] args)
         {
             GitBitterContainer.Default.RegisterType<ICloner, GitSharpCloner>();
 
@@ -19,7 +19,7 @@ static void Main(string[] args)
             GitBitterContainer.Default.RegisterType<ICredentialManager, CredentialManagerWindows>();
             GitBitterContainer.Default.RegisterType<IIniFile, IniFileWindows>();
             GitBitterContainer.Default.RegisterType<IGitFilesAndFolders, GitFilesAndFoldersWindows>();
-			GitBitterContainer.Default.RegisterType<IGitBitterLogging, GitBitterLoggingCommandLine>();
+            GitBitterContainer.Default.RegisterType<IGitBitterLogging, GitBitterLoggingCommandLine>();
 #endif
 
             try

diff --git a/GitBitterEdit/LoggingUI.cs b/GitBitterEdit/LoggingUI.cs
@@ -9,7 +9,7 @@
     using System.Threading;
     using System.Windows;
 
-    public class LoggingUI: IGitBitterLogging
+    public class LoggingUI : IGitBitterLogging
     {
         private LoggingForm form = null;
         private List<string> collectedLogging = null;

diff --git a/GitBitterEdit/MainWindow.xaml.cs b/GitBitterEdit/MainWindow.xaml.cs
@@ -129,7 +129,7 @@ private void AddPackage(RepositoryDescription repo)
             var package = new Package();
             package.Repository = repo.URL;
             package.Folder = repo.Name;
-            if (!String.IsNullOrEmpty(repo.DefaultBranch))
+            if (!string.IsNullOrEmpty(repo.DefaultBranch))
             {
                 package.Branch = repo.DefaultBranch;
             }

diff --git a/GitBitterEdit/RepoSelect.xaml.cs b/GitBitterEdit/RepoSelect.xaml.cs
@@ -54,7 +54,7 @@ private void RefreshTeams()
 
             edTeam.ItemsSource = this.repoLister.GetTeams();
 
-            if (currentSelection != "")
+            if (currentSelection != string.Empty)
             {
                 var idx = edTeam.Items.IndexOf(currentSelection);
                 if (idx != -1)

diff --git a/GitBitterLib/GitBitterLoggingVoid.cs b/GitBitterLib/GitBitterLoggingVoid.cs
@@ -1,15 +1,13 @@
 namespace GitBitterLib
 {
-	using System;
+    public class GitBitterLoggingVoid : IGitBitterLogging
+    {
+        public GitBitterLoggingVoid()
+        {
+        }
 
-	public class GitBitterLoggingVoid : IGitBitterLogging
-	{
-		public GitBitterLoggingVoid()
-		{
-		}
-
-		public void Add(string AMessage, LoggingLevel ALevel, string AModule)
-		{
-		}
-	}
+        public void Add(string message, LoggingLevel level, string module)
+        {
+        }
+    }
 }
diff --git a/GitBitterLib/Implementations/BitbucketLister.cs b/GitBitterLib/Implementations/BitbucketLister.cs
@@ -46,7 +46,7 @@ public List<string> GetTeams()
             sharpBucket = new SharpBucketV2();
             if (Login())
             {
-                var endpoint = sharpBucket.TeamsEndPoint("");
+                var endpoint = sharpBucket.TeamsEndPoint(string.Empty);
                 foreach (var team in endpoint.GetUserTeams())
                 {
                     teamnames.Add(team.username);

diff --git a/GitBitterLib/Implementations/CredentialManagerPlainText.cs b/GitBitterLib/Implementations/CredentialManagerPlainText.cs
@@ -20,7 +20,7 @@ public Credential ReadCredential(string applicationName)
             var username = ini.IniReadValue(applicationName, "username");
             var password = ini.IniReadValue(applicationName, "password");
 
-            if ((username == "") && (password == ""))
+            if ((username == string.Empty) && (password == string.Empty))
             {
                 return null;
             }

diff --git a/GitBitterLib/Implementations/GitBitterLoggingCommandLine.cs b/GitBitterLib/Implementations/GitBitterLoggingCommandLine.cs
@@ -8,11 +8,11 @@ public GitBitterLoggingCommandLine()
         {
         }
 
-        public void Add(string AMessage, LoggingLevel ALevel, string AModule)
+        public void Add(string message, LoggingLevel level, string module)
         {
-            if (ALevel != LoggingLevel.Debugging)
+            if (level != LoggingLevel.Debugging)
             {
-                Console.WriteLine("[" + AModule + "] " + AMessage);
+                Console.WriteLine("[" + module + "] " + message);
             }
         }
     }

diff --git a/GitBitterLib/Implementations/GitSharpCloner.cs b/GitBitterLib/Implementations/GitSharpCloner.cs
@@ -7,12 +7,12 @@
     using LibGit2Sharp.Handlers;
     using Microsoft.Practices.Unity;
 
-    class HarmlessException : Exception
+    public class HarmlessException : Exception
     {
         public HarmlessException() : base("HarmlessException")
         {
         }
-    };
+    }
 
     public class GitSharpCloner : ICloner
     {
@@ -41,7 +41,7 @@ private string GetUrlForRepository(string repository)
                 // todo: find out why we need to do this on OSX/mono
                 return repository.Replace("https://", "git://git@");
 #else
-				return repository.Replace("https://", "ssh://git@");
+                return repository.Replace("https://", "ssh://git@");
 #endif
             }
             else
@@ -68,7 +68,8 @@ public Task Clone(string repository, string rootdir, string repodir, string bran
                     stage = "cloning";
                     logging.Add(stage, LoggingLevel.Info, repodir);
 
-                    options.OnProgress = (logmessage) => {
+                    options.OnProgress = (logmessage) =>
+                    {
                         logging.Add(logmessage, LoggingLevel.Info, repodir);
                         return true;
                     };
@@ -162,6 +163,17 @@ public Task ResetAndUpdateExisting(string repository, string rootdir, string rep
             return task;
         }
 
+        private void MoveToOldFolder(string fullRepoPath)
+        {
+            var numberOfOldFolders = 1;
+            while (Directory.Exists(fullRepoPath + "." + numberOfOldFolders + ".old"))
+            {
+                numberOfOldFolders++;
+            }
+
+            Directory.Move(fullRepoPath, fullRepoPath + "." + numberOfOldFolders + ".old");
+        }
+
         private void SetCredentialsProvider(PullOptions options, string repository)
         {
             if (gitConfig.UseSSH)
@@ -203,17 +215,6 @@ private void MoveAndReClone(string repository, string rootdir, string repodir, s
             Clone(repository, rootdir, repodir, branchname).Wait();
         }
 
-        private static void MoveToOldFolder(string fullRepoPath)
-        {
-            var numberOfOldFolders = 1;
-            while (Directory.Exists(fullRepoPath + "." + numberOfOldFolders + ".old"))
-            {
-                numberOfOldFolders++;
-            }
-
-            Directory.Move(fullRepoPath, fullRepoPath + "." + numberOfOldFolders + ".old");
-        }
-
         private Branch GetOrCreateLocalBranch(IRepository repo, string branchname)
         {
             var localBranch = repo.Branches[branchname];

diff --git a/GitBitterLib/Implementations/ParameterProcessing.cs b/GitBitterLib/Implementations/ParameterProcessing.cs
@@ -19,23 +19,23 @@ public class ParameterProcessing
 
         private string commandStr;
 
-        private const string cmdStrAdd = "add";
-        private const string cmdStrDel = "del";
+        private const string CmdStrAdd = "add";
+        private const string CmdStrDel = "del";
 
         public ParameterProcessing(string[] args)
         {
             Filepath = "gitbitter.json";
             Command = ParameterCommand.None;
-            commandStr = "";
+            commandStr = string.Empty;
 
             if (args.Length > 0)
             {
-                if ((args.Length > 1) && (args[0].Equals(cmdStrAdd) || args[0].Equals(cmdStrDel)))
+                if ((args.Length > 1) && (args[0].Equals(CmdStrAdd) || args[0].Equals(CmdStrDel)))
                 {
                     commandStr = args[0];
                     CommandArg1 = args[1];
                 }
-                else if ((args.Length > 2) && (args[1].Equals(cmdStrAdd) || args[1].Equals(cmdStrDel)))
+                else if ((args.Length > 2) && (args[1].Equals(CmdStrAdd) || args[1].Equals(CmdStrDel)))
                 {
                     Filepath = args[0];
 
@@ -48,11 +48,11 @@ public ParameterProcessing(string[] args)
                 }
             }
 
-            if (commandStr.Equals(cmdStrAdd))
+            if (commandStr.Equals(CmdStrAdd))
             {
                 Command = ParameterCommand.Add;
             }
-            else if (commandStr.Equals(cmdStrDel))
+            else if (commandStr.Equals(CmdStrDel))
             {
                 Command = ParameterCommand.Del;
             }

diff --git a/GitBitterLib/Interfaces/ICloner.cs b/GitBitterLib/Interfaces/ICloner.cs
@@ -1,21 +1,21 @@
 namespace GitBitterLib
 {
-	using System;
-	using System.Threading.Tasks;
+    using System;
+    using System.Threading.Tasks;
 
-	public class ClonerException : Exception
-	{
-		public string Activity { get; set; }
+    public class ClonerException : Exception
+    {
+        public string Activity { get; set; }
 
-		public string Folder { get; set; }
+        public string Folder { get; set; }
 
-		public ClonerException(Exception exception, string folder, string url, string activity) :
-		base("[" + folder + " (" + url + ")] While performing " + activity + ", this except was thrown: " + exception.Message, exception)
-		{
-			Folder = folder;
-			Activity = activity;
-		}
-	}
+        public ClonerException(Exception exception, string folder, string url, string activity) :
+        base("[" + folder + " (" + url + ")] While performing " + activity + ", this except was thrown: " + exception.Message, exception)
+        {
+            Folder = folder;
+            Activity = activity;
+        }
+    }
 
     public interface ICloner
     {

diff --git a/GitBitterLib/Interfaces/IGitBitterLogging.cs b/GitBitterLib/Interfaces/IGitBitterLogging.cs
@@ -7,10 +7,10 @@ public enum LoggingLevel
         Error = 1,
         Info = 2,
         Debugging = 3
-    };
+    }
 
     public interface IGitBitterLogging
     {
-        void Add(string AMessage, LoggingLevel ALevel, string AModule);
+        void Add(string message, LoggingLevel level, string module);
     }
 }
diff --git a/GitBitterLib/PromptCredentials.cs b/GitBitterLib/PromptCredentials.cs
@@ -16,10 +16,10 @@ public PromptCredentials()
         {
         }
 
-        public PromptCredentials(SecureString UserName, SecureString Password)
+        public PromptCredentials(SecureString username, SecureString password)
         {
-            this.UserName = UserName;
-            this.Password = Password;
+            this.UserName = username;
+            this.Password = password;
         }
     }
 }