Reorganize / Alphabetize file.

otac0n · Apr 5, 2014 · 11bb8a6 · 11bb8a6
1 parent 936226d
commit 11bb8a6
Show file tree

Hide file tree

Showing 44 changed files with 945 additions and 978 deletions.
diff --git a/SharedAssemblyInfo.cs b/SharedAssemblyInfo.cs
@@ -9,8 +9,6 @@
 [assembly: AssemblyCopyright("Copyright © John Gietzen 2012")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
-
 [assembly: ComVisible(false)]
-
 [assembly: AssemblyVersion("2.1.*")]
 [assembly: AssemblyFileVersion("2.1.0.0")]
diff --git a/WebGitNet.SearchProviders/PathSearchProvider.cs b/WebGitNet.SearchProviders/PathSearchProvider.cs
@@ -20,6 +20,18 @@ public Task<IList<SearchResult>> Search(SearchQuery query, FileManager fileManag
             }
         }
 
+        public IEnumerable<SearchResult> Search(SearchQuery query, FileManager fileManager)
+        {
+            var repos = from dir in fileManager.DirectoryInfo.EnumerateDirectories()
+                        let repoInfo = GitUtilities.GetRepoInfo(dir.FullName)
+                        where repoInfo.IsGitRepo
+                        select repoInfo;
+
+            return from repo in repos
+                   from searchResult in Search(query, repo, includeRepoName: true)
+                   select searchResult;
+        }
+
         private IEnumerable<SearchResult> Search(SearchQuery query, RepoInfo repo, bool includeRepoName = false)
         {
             TreeView tree;
@@ -79,17 +91,5 @@ private IEnumerable<SearchResult> Search(SearchQuery query, RepoInfo repo, bool
                 }
             }
         }
-
-        public IEnumerable<SearchResult> Search(SearchQuery query, FileManager fileManager)
-        {
-            var repos = from dir in fileManager.DirectoryInfo.EnumerateDirectories()
-                        let repoInfo = GitUtilities.GetRepoInfo(dir.FullName)
-                        where repoInfo.IsGitRepo
-                        select repoInfo;
-
-            return from repo in repos
-                   from searchResult in Search(query, repo, includeRepoName: true)
-                   select searchResult;
-        }
     }
 }
diff --git a/WebGitNet.SearchProviders/RepoGrepSearchProvider.cs b/WebGitNet.SearchProviders/RepoGrepSearchProvider.cs
@@ -3,8 +3,8 @@
     using System;
     using System.Collections.Generic;
     using System.Linq;
-    using Search;
     using System.Threading.Tasks;
+    using Search;
 
     public class RepoGrepSearchProvider : ISearchProvider
     {
@@ -20,6 +20,18 @@ public Task<IList<SearchResult>> Search(SearchQuery query, FileManager fileManag
             }
         }
 
+        public IEnumerable<SearchResult> Search(SearchQuery query, FileManager fileManager)
+        {
+            var repos = from dir in fileManager.DirectoryInfo.EnumerateDirectories()
+                        let repoInfo = GitUtilities.GetRepoInfo(dir.FullName)
+                        where repoInfo.IsGitRepo
+                        select repoInfo;
+
+            return from repo in repos
+                   from searchResult in Search(query, repo, includeRepoName: true)
+                   select searchResult;
+        }
+
         private IEnumerable<SearchResult> Search(SearchQuery query, RepoInfo repo, bool includeRepoName = false)
         {
             var allTerms = string.Join(" --or ", query.Terms.Select(t => "-e " + GitUtilities.Q(t)));
@@ -47,17 +59,5 @@ group searchLine by filePath into g
                        Lines = g.ToList(),
                    };
         }
-
-        public IEnumerable<SearchResult> Search(SearchQuery query, FileManager fileManager)
-        {
-            var repos = from dir in fileManager.DirectoryInfo.EnumerateDirectories()
-                        let repoInfo = GitUtilities.GetRepoInfo(dir.FullName)
-                        where repoInfo.IsGitRepo
-                        select repoInfo;
-
-            return from repo in repos
-                   from searchResult in Search(query, repo, includeRepoName: true)
-                   select searchResult;
-        }
     }
 }
diff --git a/WebGitNet.SearchProviders/RepoInfoSearchProvider.cs b/WebGitNet.SearchProviders/RepoInfoSearchProvider.cs
@@ -3,9 +3,8 @@
     using System;
     using System.Collections.Generic;
     using System.Linq;
-    using System.Text;
-    using WebGitNet.Search;
     using System.Threading.Tasks;
+    using WebGitNet.Search;
 
     public class RepoInfoSearchProvider : ISearchProvider
     {

diff --git a/WebGitNet.SharedLib/BreadCrumbTrail.cs b/WebGitNet.SharedLib/BreadCrumbTrail.cs
@@ -77,9 +77,9 @@ IEnumerator IEnumerable.GetEnumerator()
 
         public sealed class BreadCrumb
         {
-            private readonly string name;
-            private readonly string controller;
             private readonly string action;
+            private readonly string controller;
+            private readonly string name;
             private readonly object routeValues;
 
             public BreadCrumb(string name, string controller, string action, object routeValues)
@@ -108,11 +108,11 @@ public BreadCrumb(string name, string controller, string action, object routeVal
                 this.routeValues = routeValues;
             }
 
-            public string Name
+            public string Action
             {
                 get
                 {
-                    return this.name;
+                    return this.action;
                 }
             }
 
@@ -124,11 +124,11 @@ public string Controller
                 }
             }
 
-            public string Action
+            public string Name
             {
                 get
                 {
-                    return this.action;
+                    return this.name;
                 }
             }
 

diff --git a/WebGitNet.SharedLib/DiffInfo.cs b/WebGitNet.SharedLib/DiffInfo.cs
@@ -14,14 +14,14 @@ namespace WebGitNet
 
     public class DiffInfo
     {
+        private readonly bool added;
+        private readonly bool copied;
+        private readonly bool deleted;
+        private readonly string destinationFile;
         private readonly IList<string> headers;
         private readonly IList<string> lines;
-        private readonly string sourceFile;
-        private readonly string destinationFile;
         private readonly bool renamed;
-        private readonly bool copied;
-        private readonly bool added;
-        private readonly bool deleted;
+        private readonly string sourceFile;
 
         public DiffInfo(IList<string> lines)
         {
@@ -48,44 +48,44 @@ public DiffInfo(IList<string> lines)
             this.deleted = this.headers.Any(h => h.StartsWith("deleted file"));
         }
 
-        public IList<string> Headers
+        public bool Added
         {
-            get { return this.headers; }
+            get { return this.added; }
         }
 
-        public IList<string> Lines
+        public bool Copied
         {
-            get { return this.lines; }
+            get { return this.copied; }
         }
 
-        public string SourceFile
+        public bool Deleted
         {
-            get { return this.sourceFile; }
+            get { return this.deleted; }
         }
 
         public string DestinationFile
         {
             get { return this.destinationFile; }
         }
 
-        public bool Renamed
+        public IList<string> Headers
         {
-            get { return this.renamed; }
+            get { return this.headers; }
         }
 
-        public bool Copied
+        public IList<string> Lines
         {
-            get { return this.copied; }
+            get { return this.lines; }
         }
 
-        public bool Added
+        public bool Renamed
         {
-            get { return this.added; }
+            get { return this.renamed; }
         }
 
-        public bool Deleted
+        public string SourceFile
         {
-            get { return this.deleted; }
+            get { return this.sourceFile; }
         }
     }
 }
diff --git a/WebGitNet.SharedLib/FileManager.cs b/WebGitNet.SharedLib/FileManager.cs
@@ -11,8 +11,8 @@ namespace WebGitNet
 
     public class FileManager
     {
-        private readonly string rootPath;
         private readonly DirectoryInfo dirInfo;
+        private readonly string rootPath;
 
         public FileManager(string path)
         {

diff --git a/WebGitNet.SharedLib/GitErrorException.cs b/WebGitNet.SharedLib/GitErrorException.cs
@@ -12,8 +12,8 @@ namespace WebGitNet
     public class GitErrorException : Exception
     {
         private readonly string command;
-        private readonly int exitCode;
         private readonly string errorOutput;
+        private readonly int exitCode;
 
         public GitErrorException(string command, string workingDir, int exitCode, string errorOutput)
             : base("Fatal error executing git command in '" + workingDir + "'." + Environment.NewLine + errorOutput)
@@ -28,14 +28,14 @@ public string Command
             get { return this.command; }
         }
 
-        public int ExitCode
+        public string ErrorOutput
         {
-            get { return this.exitCode; }
+            get { return this.errorOutput; }
         }
 
-        public string ErrorOutput
+        public int ExitCode
         {
-            get { return this.errorOutput; }
+            get { return this.exitCode; }
         }
     }
 }
diff --git a/WebGitNet.SharedLib/GitRef.cs b/WebGitNet.SharedLib/GitRef.cs
@@ -54,12 +54,12 @@ public GitRef(string shaId, string refPath)
             throw new ArgumentException("The ref path specified is not recognized.", "refPath");
         }
 
-        public string ShaId { get; private set; }
-
         public string Name { get; private set; }
 
         public string RefPath { get; private set; }
 
         public RefType RefType { get; private set; }
+
+        public string ShaId { get; private set; }
     }
 }